closes #58

catmando · catmando · commit 15d470a04abd · 2018-11-16T00:48:49.000-05:00
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb b/ruby/hyper-component/lib/hyperstack/internal/component/class_methods.rb
@@ -130,6 +130,10 @@ def param(*args)
             options[:default] ||= nil
             options[:allow_nil] = true unless options.key?(:allow_nil)
           end
+          if name == :class
+            name = :className
+            options[:alias] ||= :Class
+          end
           if options[:default]
             validator.optional(name, options)
           else
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/props_wrapper.rb b/ruby/hyper-component/lib/hyperstack/internal/component/props_wrapper.rb
@@ -42,6 +42,7 @@ def define_param(name, param_type, aka = nil)
             param_definitions[name] = lambda do |props|
               @component.instance_variable_set :"@#{var_name}", fetch_from_cache(name, param_type, props)
             end
+            return if param_accessor_style == :hyperstack
             if param_type == Proc
               define_method(meth_name.to_sym) do |*args, &block|
                 props[name].call(*args, &block) if props[name]
diff --git a/ruby/hyper-component/spec/client_features/param_declaration_spec.rb b/ruby/hyper-component/spec/client_features/param_declaration_spec.rb
@@ -129,6 +129,20 @@ class Foo < Hyperloop::Component
           .to match(/Warning: Failed prop( type|Type): In component `Foo`\nProvided prop `foo1` could not be converted to String/)
   end
 
+  it "will properly handle params named class" do
+    mount 'Foo', className: 'a-class' do
+      class Foo < Hyperloop::Component
+
+        param :class
+
+        render do
+          DIV { "class = #{@Class}" }
+        end
+      end
+    end
+    expect(page).to have_content('class = a-class')
+  end
+
   it 'logs error in warning if validation failed' do
     evaluate_ruby do
       class Lorem; end
diff --git a/ruby/rails-hyperstack/Gemfile.lock b/ruby/rails-hyperstack/Gemfile.lock
@@ -62,14 +62,6 @@ PATH
       hyperstack-config (= 1.0.alpha1.1)
       opal (>= 0.11.0, < 0.12.0)
 
-PATH
-  remote: ../hyper-store
-  specs:
-    hyper-store (1.0.alpha1.1)
-      hyper-state (= 1.0.alpha1.1)
-      hyperstack-config (= 1.0.alpha1.1)
-      opal (>= 0.11.0, < 0.12.0)
-
 PATH
   remote: ../hyperstack-config
   specs:
@@ -412,7 +404,6 @@ DEPENDENCIES
   hyper-router!
   hyper-spec!
   hyper-state!
-  hyper-store!
   hyperstack-config!
   jbuilder (~> 2.5)
   pry
