scarpe 0.2.2 → 0.3.0

data/scarpe-components/test/test_html.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "scarpe/components/html"
+
+class TestHTML < Minitest::Test
+  def test_works_without_content
+    subject = ::Scarpe::Components::HTML.render(&:div)
+
+    assert_equal "<div></div>", subject
+  end
+
+  def test_works_for_pure_tags
+    subject = Scarpe::Components::HTML.render { |h| h.div { "foo" } }
+
+    assert_equal "<div>foo</div>", subject
+  end
+
+  def test_works_for_classes
+    subject = Scarpe::Components::HTML.render { |h| h.div(class: "container") { "foo" } }
+
+    assert_equal '<div class="container">foo</div>', subject
+  end
+
+  def test_works_for_style
+    subject = Scarpe::Components::HTML.render { |h| h.div(style: { display: "block", width: "100px" }) { "foo" } }
+
+    assert_equal '<div style="display:block;width:100px">foo</div>', subject
+  end
+
+  def test_works_for_string_style
+    subject = Scarpe::Components::HTML.render { |h| h.div(style: "display:block;width:100px") { "foo" } }
+
+    assert_equal '<div style="display:block;width:100px">foo</div>', subject
+  end
+
+  def test_no_style_if_style_empty
+    subject = ::Scarpe::Components::HTML.render { |h| h.div(style: {}) { "foo" } }
+
+    assert_equal "<div>foo</div>", subject
+  end
+
+  def test_works_with_multiple_children
+    subject = Scarpe::Components::HTML.render do |h|
+      h.ul do
+        h.li { "one" }
+        h.li { "two" }
+      end
+    end
+
+    assert_equal "<ul><li>one</li><li>two</li></ul>", subject
+  end
+
+  def test_works_with_void_tag
+    subject = Scarpe::Components::HTML.render { |h| h.input(type: "text") }
+
+    assert_equal '<input type="text" />', subject
+  end
+
+  def test_raises_with_void_tag_blocks
+    assert_raises(Shoes::Errors::InvalidAttributeValueError, "void tag input cannot have content") do
+      Scarpe::Components::HTML.render { |h| h.input(type: "text") { "foo" } }
+    end
+  end
+end

data/scarpe-components/test/test_minitest_result.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+require "scarpe/components/minitest_result"
+
+class TestMinitestResult < Minitest::Test
+  def test_mtr_success
+    path = File.join __dir__, "mtr_data/succeed_2_asserts.json"
+    res = Scarpe::Components::MinitestResult.new(path)
+
+    refute res.error?
+    refute res.fail?
+    refute res.skip?
+    assert res.passed?, "Passing result with two assertions should count as passing!"
+    assert_equal 2, res.assertions
+  end
+
+  def test_mtr_failure
+    path = File.join __dir__, "mtr_data/fail_with_message.json"
+    res = Scarpe::Components::MinitestResult.new(path)
+
+    refute res.error?, "Fail-with-message data should not be an error!"
+    assert res.fail?, "Fail-with-message data should be a failure!"
+    refute res.skip?
+    refute res.passed?
+    assert_equal "Fail with message", res.fail_message
+  end
+
+  def test_mtr_error
+    path = File.join __dir__, "mtr_data/exception.json"
+    res = Scarpe::Components::MinitestResult.new(path)
+
+    assert res.error?, "Exception data should show an error!"
+    refute res.fail?, "Exception data should not be an assertion failure!"
+    refute res.skip?
+    refute res.passed?
+    assert res.error_message.include?("This is an exception"), "Error msg data should include the exception message"
+  end
+
+  def test_mtr_skip_no_msg
+    path = File.join __dir__, "mtr_data/skipped_no_message.json"
+    res = Scarpe::Components::MinitestResult.new(path)
+
+    refute res.error?, "Skipped data should not be an error!"
+    refute res.fail?, "Skipped data should not be a failure!"
+    assert res.skip?, "Skipped data should count as skipped"
+    refute res.passed?
+  end
+
+  def test_mtr_skip_w_msg
+    path = File.join __dir__, "mtr_data/skipped_w_msg.json"
+    res = Scarpe::Components::MinitestResult.new(path)
+
+    refute res.error?, "Skipped data should not be an error!"
+    refute res.fail?, "Skipped data should not be a failure!"
+    assert res.skip?, "Skipped data should count as skipped"
+    refute res.passed?
+    assert_equal "Just skipping", res.skip_message
+  end
+end

data/scarpe-components/test/test_promises.rb

@@ -6,18 +6,19 @@ require "scarpe/components/promises"
 
 class TestPromises < Minitest::Test
   Promise = Scarpe::Promise
+  PrintLogger = Scarpe::Components::PrintLogImpl::PrintLogger
 
   def setup
     # Save so we can restore it post-test
-    @normal_log_config = Shoes::Log.current_log_config
+    @silenced = PrintLogger.silence
 
     # For these tests, don't log anything
-    Shoes::Log.configure_logger("default" => "fatal")
+    PrintLogger.silence = true
   end
 
   def teardown
-    # Restore previous log config
-    Shoes::Log.configure_logger(@normal_log_config)
+    # Restore previous log state
+    PrintLogger.silence = @silenced
   end
 
   def empty_promise_with_checker(state: nil, parents: [])

data/scarpe-components/test/test_segmented_app_files.rb

@@ -61,13 +61,15 @@ class TestSegmentedAppFiles < Minitest::Test
     assert_equal({ app_ran: true }, SEG_TEST_DATA)
   end
 
+  # TODO: this test is partially updated to ShoesSpec rather
+  # than CatsCradle, but we could use a proper version.
   def test_default_double_segment_with_front_matter
     app = <<~SEG_TEST_FILE
       ---
       front_matter: yes
       ----- app code
       SEG_TEST_DATA[:app_ran] = true
-      eval File.read(ENV['SCARPE_APP_TEST']) # run test code
+      eval File.read(ENV['SHOES_SPEC_TEST']) # run test code
       ----- test code
       SEG_TEST_DATA[:test_ran] = true
     SEG_TEST_FILE
@@ -83,7 +85,7 @@ class TestSegmentedAppFiles < Minitest::Test
       ---
       ----- app code
       SEG_TEST_DATA[:app_ran] = true
-      eval File.read(ENV['SCARPE_APP_TEST']) # run test code
+      eval File.read(ENV['SHOES_SPEC_TEST']) # run test code
       ----- test code
       SEG_TEST_DATA[:test_ran] = true
     SEG_TEST_FILE
@@ -98,7 +100,7 @@ class TestSegmentedAppFiles < Minitest::Test
     app = <<~SEG_TEST_FILE
       ----- app code
       SEG_TEST_DATA[:app_ran] = true
-      eval File.read(ENV['SCARPE_APP_TEST']) # run test code
+      eval File.read(ENV['SHOES_SPEC_TEST']) # run test code
       ----- test code
       SEG_TEST_DATA[:test_ran] = true
     SEG_TEST_FILE
@@ -113,7 +115,7 @@ class TestSegmentedAppFiles < Minitest::Test
     app = <<~SEG_TEST_FILE
       -----
       SEG_TEST_DATA[:app_ran] = true
-      eval File.read(ENV['SCARPE_APP_TEST']) # run test code
+      eval File.read(ENV['SHOES_SPEC_TEST']) # run test code
       -----
       SEG_TEST_DATA[:test_ran] = true
     SEG_TEST_FILE
@@ -127,7 +129,7 @@ class TestSegmentedAppFiles < Minitest::Test
   def test_default_double_segment_no_front_matter_no_initial_name
     app = <<~SEG_TEST_FILE
       SEG_TEST_DATA[:app_ran] = true
-      eval File.read(ENV['SCARPE_APP_TEST']) # run test code
+      eval File.read(ENV['SHOES_SPEC_TEST']) # run test code
       ----- test code
       SEG_TEST_DATA[:test_ran] = true
     SEG_TEST_FILE
@@ -144,7 +146,7 @@ class TestSegmentedAppFiles < Minitest::Test
         front_matter: yes
       ---------------- app code
       SEG_TEST_DATA[:app_ran] = true
-      eval File.read(ENV['SCARPE_APP_TEST']) # run test code
+      eval File.read(ENV['SHOES_SPEC_TEST']) # run test code
       ------- test code
       SEG_TEST_DATA[:test_ran] = true
     SEG_TEST_FILE

data/scarpegen.rb

@@ -5,7 +5,7 @@ require "erb"
 class ScarpeGenerator
   def initialize
     @filename = ""
-    @display_properties = ""
+    @shoes_styles = ""
   end
 
   def generate
@@ -14,7 +14,7 @@ class ScarpeGenerator
     choice = get_choice
     if choice == "1"
       class_template_choice = get_class_template_choice
-      get_display_properties if class_template_choice != "1"
+      get_shoes_styles if class_template_choice != "1"
     end
     generate_files(choice, class_template_choice)
   end
@@ -89,14 +89,14 @@ class ScarpeGenerator
     end
   end
 
-  def get_display_properties
-    print "\n\e[33mDo you want to enter display properties? (y/n):\e[0m "
+  def get_shoes_styles
+    print "\n\e[33mDo you want to enter Shoes styles? (y/n):\e[0m "
     response = gets.chomp.downcase
-    @display_properties = response == "y" || response == "yes" ? get_properties_input : ":dummy"
+    @shoes_styles = response == "y" || response == "yes" ? get_properties_input : ":dummy"
   end
 
   def get_properties_input
-    print "\e[33mEnter the display properties:(enter like :width,:height)\e[0m  "
+    print "\e[33mEnter the Shoes styles:(enter like :width,:height)\e[0m  "
     gets.chomp
   end
 
@@ -112,20 +112,20 @@ class ScarpeGenerator
     end
     generate_webview_file
     generate_example_file
-    add_require_relative_to_widgets_file
+    add_require_relative_to_drawables_file
     puts "\n\e[1;32mYayyyy! Files generated successfully!\e[0m\n"
   end
 
-  def add_require_relative_to_widgets_file
-    widgets_file_path = "lib/scarpe/widgets.rb"
+  def add_require_relative_to_drawables_file
+    drawables_file_path = "lacci/lib/shoes/drawables.rb"
     filename = @filename.downcase
-    require_line = "require_relative \"#{filename}\""
+    require_line = "require \"shoes/drawables/#{filename}\""
 
-    File.open(widgets_file_path, "a") do |file|
+    File.open(drawables_file_path, "a") do |file|
       file.puts require_line
     end
 
-    puts "Added require_relative to widgets.rb file"
+    puts "Added require_relative to drawables.rb file"
   end
 
   def generate_webview_file
@@ -169,7 +169,7 @@ class ScarpeGenerator
     class_template = File.read(class_template_file)
     class_content = ERB.new(class_template).result(binding_with_argument(class_template_choice))
 
-    File.write("lib/scarpe/#{@filename}.rb", class_content)
+    File.write("lacci/lib/shoes/drawables/#{@filename}.rb", class_content)
   end
 
   def generate_module_file
@@ -183,7 +183,7 @@ class ScarpeGenerator
     capitalized_argument = @filename.capitalize
     binding.dup.tap do |b|
       b.local_variable_set(:argument, capitalized_argument)
-      b.local_variable_set(:display_properties, @display_properties)
+      b.local_variable_set(:shoes_styles, @shoes_styles)
       b.local_variable_set(:class_template_choice, class_template_choice) unless class_template_choice.nil?
     end
   end

data/sig/scarpe.rbs

@@ -1,4 +1,4 @@
-class Scarpe
+module Scarpe
   VERSION: String
   # See the writing guide of rbs: https://github.com/ruby/rbs#guides
 end

data/templates/basic_class_template.erb

@@ -1,19 +1,19 @@
 # class_template.erb
 # frozen_string_literal: true
 
-class Scarpe
-  class <%= argument %> < Shoes::Widget
+module Shoes
+  class <%= argument %> < Shoes::Drawable
 
-    # Display Properties
-    # These properties determine the visual characteristics of the widget
+    # Shoes styles
+    # These properties determine the visual characteristics of the drawable
     # Customize them according to your requirements
 
-    # Example display properties:
-    # :background_color - Sets the background color of the widget (<%= argument %>)
-    # :width - Specifies the width of the widget(<%= argument %>)
-    # :height - Specifies the height of the widget(<%= argument %>)
+    # Example Shoes styles:
+    # :background_color - Sets the background color of the drawable (<%= argument %>)
+    # :width - Specifies the width of the drawable(<%= argument %>)
+    # :height - Specifies the height of the drawable(<%= argument %>)
 
-    display_properties <%= display_properties %>
+    shoes_styles <%= shoes_styles %>
 
     def initialize
       super
@@ -26,13 +26,12 @@ class Scarpe
       #   # Event handling code goes here
       # end
 
-
-    # This method uses the DisplayService to create a visual representation of the widget
-    # It generates a display widget based on the specified display properties
-      create_display_widget
+      # This method uses the DisplayService to create a visual representation of the drawable
+      # It generates a display drawable based on the specified Shoes styles
+      create_display_drawable
     end
 
-  # other methods
+    # other methods
 
   end
 end

data/templates/class_template_with_event_bind.erb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-class Scarpe
-  class <%= argument %> < Shoes::Widget
-     display_properties <%= display_properties %> # Write your display proporties here
+module Scarpe
+  class <%= argument %> < Shoes::Drawable
+    shoes_styles <%= shoes_styles %> # Write your shoes styles here
 
     def initialize(text, width: nil, height: nil, top: nil, left: nil, &block)
       # Properties passed as positional args, not keywords, don't get auto-set
@@ -16,7 +16,7 @@ class Scarpe
         @block&.call
       end
 
-      create_display_widget
+      create_display_drawable
     end
 
     # Set the click handler

data/templates/class_template_with_shapes.erb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
-class Scarpe
-  class InvalidAttributeValueError < StandardError; end
+module Scarpe
+  #class InvalidAttributeValueError < Scarpe::Error; end # add new errors to errors.rb
 
-  class <%= argument %> < Shoes::Widget
-     display_properties <%= display_properties %>  # Write your display proporties here
+  class <%= argument %> < Shoes::Drawable
+    # Shoes style with verification or value mapping:
+    # shoes_style(:left) { |val| convert_to_integer(val, "left") }
+
+    shoes_styles <%= shoes_styles %>  # Write your shoes styles here
 
     def initialize(left, top)
       @left = convert_to_integer(left, "left")
       @top = convert_to_integer(top, "top")
 
       super()
-      create_display_widget
+      create_display_drawable
     end
 
     private
@@ -27,17 +30,5 @@ class Scarpe
         raise InvalidAttributeValueError, error_message
       end
     end
-
-    def convert_to_float(value, attribute_name, default = 0.0)
-      begin
-        value = Float(value)
-        raise InvalidAttributeValueError, "Negative num '#{value}' not allowed for attribute '#{attribute_name}'" if value < 0
-
-        value
-      rescue ArgumentError
-        error_message = "Invalid value '#{value}' provided for attribute '#{attribute_name}'. The value should be a number."
-        raise InvalidAttributeValueError, error_message
-      end
-    end
   end
 end

data/templates/example_template.erb

@@ -1,3 +1,3 @@
 Shoes.app do
-    para "heyya ssup!"
+  para "heyya ssup!"
 end

data/templates/module_template.erb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Scarpe
   module <%= argument %>
     def self.included(includer)
-    <%# add display propeties below... for this example :background_color is added as display_property %>
-      includer.display_property(:background_color)
+    <%# add shoes styles below... for this example :background_color is added as shoes_style %>
+      includer.shoes_style(:background_color)
     end
 
-# Write any methods here!
+    # Write any methods here!
   end
 end

data/templates/webview_template.erb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-class Scarpe
-  class Webview<%= argument %> < Scarpe::WebviewWidget
+module Scarpe::Webview
+  class <%= argument %> < Drawable
 
     def initialize(properties)
       super
 
     end
 
+    # If the drawable is intended to be overridable, add element and style to Calzini instead
     def element
       HTML.render do |h|
         h.textarea(id: html_id, style: style)