wip

Author: catmando

ruby/hyper-component/Gemfile.lock

@@ -142,7 +142,7 @@ GEM
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hike (1.2.3)
-    i18n (1.1.0)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     interception (0.5)
@@ -151,17 +151,17 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    libv8 (6.3.292.48.1-x86_64-darwin-15)
+    libv8 (6.3.292.48.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -176,7 +176,7 @@ GEM
       libv8 (~> 6.3)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     opal (0.11.3)
       ast (>= 2.3.0)
@@ -263,13 +263,13 @@ GEM
       tilt
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -317,7 +317,7 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
-    webdrivers (3.4.2)
+    webdrivers (3.4.3)
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (~> 3.0)

ruby/hyper-component/lib/hyperstack/component/element.rb

@@ -66,42 +66,8 @@ def delete
       # Deprecated version of delete method
       alias as_node delete
 
-      # Any other method applied to an element will be treated as class name (haml style) thus
-      # div.foo.bar(id: :fred) is the same as saying div(class: "foo bar", id: :fred)
-      #
-      # single underscores become dashes, and double underscores become a single underscore
-      #
-      # params may be provide to each class (but typically only to the last for easy reading.)
-
-      def method_missing(class_name, args = {}, &new_block)
-        return dup.render.method_missing(class_name, args, &new_block) unless rendered?
-        Hyperstack::Internal::Component::RenderingContext.replace(
-          self,
-          Hyperstack::Internal::Component::RenderingContext.build do
-            Hyperstack::Internal::Component::RenderingContext.render(type, build_new_properties(class_name, args), &new_block)
-          end
-        )
-      end
-
-      def rendered?
-        Hyperstack::Internal::Component::RenderingContext.rendered? self
-      end
-
-      def self.haml_class_name(class_name)
-        class_name.gsub(/__|_/, '__' => '_', '_' => '-')
-      end
-
       private
 
-      def build_new_properties(class_name, args)
-        class_name = self.class.haml_class_name(class_name)
-        new_props = @properties.dup
-        new_props[:className] = "\
-          #{class_name} #{new_props[:className]} #{args.delete(:class)} #{args.delete(:className)}\
-        ".split(' ').uniq.join(' ')
-        new_props.merge! args
-      end
-
       # built in events, events going to native components, and events going to reactrb
 
       # built in events will have their event param translated to the Event wrapper

ruby/hyper-component/lib/hyperstack/ext/component/object.rb

@@ -1,17 +1,24 @@
-# Lazy load HTML tag constants in the form DIV or A
-# This is needed to allow for a HAML expression like this DIV.my_class
 class Object
-  class << self
-    alias _reactrb_tag_original_const_missing const_missing
+  # Lazy load HTML tag constants in the form DIV or A
+  # This is needed to allow for a tags to be used in expressions like
+  # render(DIV) do ...
+  # By lazy loading we don't unecessarily create a pile of constant element tags
+  # that will probably never get used.
 
-    def const_missing(const_name)
-      # Opal uses const_missing to initially define things,
-      # so we always call the original, and respond to the exception
-      _reactrb_tag_original_const_missing(const_name)
-    rescue StandardError => e
-      Hyperstack::Internal::Component::Tags.html_tag_class_for(const_name) || raise(e)
+  class Object
+    class << self
+      alias _reactrb_tag_original_const_missing const_missing
+
+      def const_missing(const_name)
+        # Opal uses const_missing to initially define things,
+        # so we always call the original, and respond to the exception
+        _reactrb_tag_original_const_missing(const_name)
+      rescue StandardError => e
+        Hyperstack::Internal::Component::Tags.html_tag_class_for(const_name) || raise(e)
+      end
     end
   end
+
   # to_key method returns a suitable unique id that can be used as
   # a react `key`.  Other classes may override to_key as needed
   # for example hyper_mesh returns the object id of the internal

ruby/hyper-component/lib/hyperstack/internal/component/tags.rb

@@ -30,26 +30,12 @@ module Tags
           end
 
           const_set tag.upcase, tag
-
-          # deprecated: remove
-          if tag == 'p'
-            define_method(tag) do |*params, &children|
-              if children || params.count == 0 || (params.count == 1 && params.first.is_a?(Hash))
-                RenderingContext.render(tag, *params, &children)
-              else
-                Kernel.p(*params)
-              end
-            end
-          else
-            #alias_method tag, tag.upcase
-          end
-          # end of deprecated code
         end
 
         # this is used for haml style (i.e. DIV.foo.bar) class tags which is deprecated
         def self.html_tag_class_for(tag)
           downcased_tag = tag.downcase
-          if tag =~ /[A-Z]+/ && HTML_TAGS.include?(downcased_tag)
+          if tag =~ /^[A-Z]+$/ && HTML_TAGS.include?(downcased_tag)
             Object.const_set tag, ReactWrapper.create_element(downcased_tag)
           end
         end

ruby/hyper-component/spec/client_features/component_spec.rb

@@ -372,7 +372,7 @@ class Lorem; end
               optional :bar, type: String
             end
 
-            def render; DIV; end
+            def render; DIV {}; end
           end
           Hyperstack::Component::ReactTestUtils.render_component_into_document(Foo, bar: 10, lorem: Lorem.new)
         end
@@ -390,7 +390,7 @@ class Lorem; end
               optional :bar, type: String
             end
 
-            def render; DIV; end
+            def render; DIV {}; end
           end
           Hyperstack::Component::ReactTestUtils.render_component_into_document(Foo, foo: 10, bar: '10', lorem: Lorem.new)
         end
@@ -587,67 +587,12 @@ class Foo
           include Hyperstack::Component
 
           def render
-            DIV() # this fails but DIV {} passes.  Why?
+            DIV()
           end
         end
       end
-      binding.pry
       expect(page.body).to include('<div data-react-class="Hyperstack.Internal.Component.TopLevelRailsComponent" data-react-props="{&quot;render_params&quot;:{},&quot;component_name&quot;:&quot;Foo&quot;,&quot;controller&quot;:&quot;HyperstackTest&quot;}"><div></div></div>')
     end
-
-    it 'redefines `p` to make method missing work' do
-      mount 'Foo' do
-        class Foo
-          include Hyperstack::Component
-
-          def render
-            DIV {
-              p(class_name: 'foo')
-              p
-              DIV { 'lorem ipsum' }
-              p(id: '10')
-            }
-          end
-        end
-      end
-      expect(page.body).to include('<div><p class="foo"></p><p></p><div>lorem ipsum</div><p id="10"></p></div>')
-    end
-
-    it 'only overrides `p` in render context' do
-      mount 'Foo' do
-        class Foo
-          include Hyperstack::Component
-
-          def self.result
-            @@result ||= 'ooopsy'
-          end
-
-          def self.result_two
-            @@result_two ||= 'ooopsy'
-          end
-
-          before_mount do
-            @@result = p 'first'
-          end
-
-          after_mount do
-            @@result_two = p 'second'
-          end
-
-          def render
-            p do
-              'third'
-            end
-          end
-        end
-      end
-      expect_evaluate_ruby('Kernel.p "first"').to eq('first')
-      expect_evaluate_ruby('p "second"').to eq('second')
-      expect_evaluate_ruby('Foo.result').to eq('first')
-      expect_evaluate_ruby('Foo.result_two').to eq('second')
-      expect(page.body[-40..-10]).to include("<p>third</p>")
-      expect(page.body[-40..-10]).not_to include("<p>first</p>")
-    end
   end
 
   describe 'new react 15/16 custom isMounted implementation' do

ruby/hyper-component/spec/client_features/dsl_spec.rb

@@ -219,25 +219,6 @@ def render
     expect(page.body[-60..-19]).to include('<span>a man walks into a bar</span>')
   end
 
-  it "can add class names by the haml .class notation" do
-    mount 'Foo' do
-      module Mod
-        class Bar
-          include Hyperstack::Component
-          collect_other_params_as :attributes
-          def render
-            "a man walks into a bar".span(params.attributes)
-          end
-        end
-      end
-      class Foo < HyperComponent
-        def render
-          Mod::Bar().the_class.other_class
-        end
-      end
-    end
-    expect(page.body[-90..-19]).to include('<span class="other-class the-class">a man walks into a bar</span>')
-  end
 
   it "can use the 'class' keyword for classes" do
     mount 'Foo' do

ruby/hyper-component/spec/test_app/app/views/components.rb

@@ -9,6 +9,7 @@
 require 'hyperstack/component/auto-import'
 require 'js'
 require 'hyper-store'
+require 'hyperstack/internal/component/haml'
 
 # these mechanisms are deprecated in favor of using the features of hyper-spec.  However
 # in order to expedite getting Hyperstack 1.0 released we are just leaving these methods

ruby/hyper-spec/Gemfile

@@ -3,4 +3,5 @@ gem 'hyper-component',   path: '../hyper-component'
 gem 'hyper-store',       path: '../hyper-store'
 gem 'hyper-state',       path: '../hyper-state'
 gem 'hyperstack-config', path: '../hyperstack-config'
+#gem 'unparser', path: '../../../unparser'
 gemspec