reactive-ruby 0.7.16 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62be457a5e6af8f6d9256a011861d1e3d24b6af4
-  data.tar.gz: e157fb2ff874e37b04298478da4f82081c07b616
+  metadata.gz: 29fbf083f6ff7680077ff9123a55f40b3212b9e1
+  data.tar.gz: 539e46aaf607d86f535e6ed7f3a78a12188e00e9
 SHA512:
-  metadata.gz: dde88af3a00a5718e5059fb710506098dcf5ca34389bed3007773f51f30067a2e600ce2ee2d07246c262b661460ec6a55da734bedeaaf3069dde9c35bfabd7ab
-  data.tar.gz: ce17d4836b267ea0db712a7b684fa14d492c8fdad81472db749ae21a051c11d6c3743ea959e8a3c74bf075f2147d6a6298182003b70c32a1c99797b315017031
+  metadata.gz: dc3ce82f056121c1ebf795eca5e4d2b165e489d6bb148711599f258e9165aaf9c431cfcc6c578042beb10455670cd9fad4889939934d2c57791d603888fd9402
+  data.tar.gz: 504baa1e1fe8118e848b336758a3ead39a87f3b36a2f044c6d18e74041553e528ea7e9c6de93cde832d70c9cd1bec888d08a4fbae167d33e1d95ae9edc7ef071

data/lib/rails-helpers/top_level_rails_component.rb

@@ -14,6 +14,8 @@ module React
     required_param :controller
     required_param :render_params
     
+    backtrace :on
+    
     def render
       paths_searched = []
       if component_name.start_with? "::"

data/lib/reactive-ruby/api.rb

@@ -76,6 +76,8 @@ module React
           getDefaultProps: function(){
             return #{type.respond_to?(:default_props) ? type.default_props.to_n : `{}`};
           },
+          mixins: #{type.respond_to?(:native_mixins) ? type.native_mixins : `[]`},
+          statics: #{type.respond_to?(:static_call_backs) ? type.static_call_backs.to_n : `{}`},
           componentWillMount: function() {
             var instance = this._getOpalInstance.apply(this);
             return #{`instance`.component_will_mount if type.method_defined? :component_will_mount};
@@ -154,6 +156,7 @@ module React
     end
     
     def self.convert_props(properties)
+      raise "Component parameters must be a hash. Instead you sent #{properties}" unless properties.is_a? Hash
       props = {}
       properties.map do |key, value|
         if key == "class_name" && value.is_a?(Hash)

data/lib/reactive-ruby/component.rb

@@ -28,7 +28,7 @@ module React
         end unless method_defined? :render
         
         def children
-          nodes = `#{@native}.props.children` 
+          nodes = `#{@native}.props.children` || []
           class << nodes
             include Enumerable
 
@@ -63,16 +63,23 @@ module React
       base.extend(ClassMethods)
       
       if base.name
+#puts "getting parent of #{base.name}"
         parent = base.name.split("::").inject([Module]) { |nesting, next_const| nesting + [nesting.last.const_get(next_const)] }[-2] 
-        parent.class_eval do
-        
+#puts "defining method missing for module #{parent}"
+
+        class << parent #.class_eval do
+          
+          
+
           def method_missing(n, *args, &block)
+#puts "method missing for #{n} called"
             name = n
             if name =~ /_as_node$/ 
               node_only = true
               name = name.gsub(/_as_node$/, "")
             end
             unless name = const_get(name) and name.method_defined? :render
+#puts "can't find render method"
               return super
             end
             if node_only
@@ -81,6 +88,7 @@ module React
               React::RenderingContext.render(name, *args, &block)
             end
           rescue Exception => e
+            puts "pow"
             message = "#{base.name}.#{n} method_missing handler exception raised: #{e}"
             `console.error(#{message})`
           end
@@ -327,9 +335,16 @@ module React
       
       def optional_param(name, options = {})
         validator.optional(name, options)
-        define_param_method(name, options[:type])
+        define_param_method(name, options[:type]) unless name == :params
       end 
       
+      def collect_other_params_as(name)
+        validator.all_others(name)
+        define_method(name) do
+          @_all_others ||= self.class.validator.collect_all_others(params)
+        end
+      end
+      
       def define_state(*states, &block) 
         default_initial_value = (block and block.arity == 0) ? yield : nil
         states_hash = (states.last.is_a? Hash) ? states.pop : {}
@@ -378,6 +393,22 @@ module React
         end
       end
       
+      def native_mixin(item)
+        native_mixins << item
+      end
+      
+      def native_mixins
+        @native_mixins ||= []
+      end
+      
+      def static_call_back(name, &block)
+        static_call_backs[name] = block
+      end
+      
+      def static_call_backs
+        @static_call_backs ||= {}
+      end
+      
       def export_component(opts = {})
         export_name = (opts[:as] || name).split("::")
         first_name = export_name.first

data/lib/reactive-ruby/validator.rb

@@ -26,19 +26,35 @@ module React
       @rules[prop_name] = options
     end
     
-    def type_check(errors, error_prefix, object, klass)
+    def all_others(prop_name)
+      @all_others = {}
+    end
+    
+    def collect_all_others(params)
+      Hash[params.collect { |prop_name, value| [prop_name, value] if @rules[prop_name] == nil}.compact]
+    end
+    
+    def type_check(errors, error_prefix, object, klass, nil_allowed)
+      return if !object and nil_allowed
       is_native = !object.respond_to?(:is_a?) rescue true
       if is_native or !object.is_a? klass
-        unless klass.respond_to? :_react_param_conversion and klass._react_param_conversion object, :validate_only
-          errors << "#{error_prefix} could not be converted to #{klass}" unless klass._react_param_conversion object, :validate_only
+        unless klass.respond_to? :_react_param_conversion and klass._react_param_conversion(object, :validate_only)
+          errors << "#{error_prefix} could not be converted to #{klass}"
         end
       end
     end
   
     def validate(props)
       errors = []
-      props.keys.each do |prop_name|
-        errors <<  "Provided prop `#{prop_name}` not specified in spec"  if @rules[prop_name] == nil
+      
+      if @all_others
+        props.each do |prop_name, value|
+          @all_others[prop_name] = value if @rules[prop_name] == nil
+        end
+      else   
+        props.keys.each do |prop_name|
+          errors <<  "Provided prop `#{prop_name}` not specified in spec"  if @rules[prop_name] == nil
+        end
       end
 
       props = props.select {|key| @rules.keys.include?(key) }
@@ -54,12 +70,12 @@ module React
           if is_klass_array
             value_is_array_like = value.respond_to?(:each_with_index) rescue nil
             if value_is_array_like
-              value.each_with_index { |ele, i| type_check(errors, "Provided prop `#{prop_name}`[#{i}]", ele, klass[0]) }
+              value.each_with_index { |ele, i| type_check(errors, "Provided prop `#{prop_name}`[#{i}]", ele, klass[0], @rules[prop_name][:allow_nil]) }
             else
               errors << "Provided prop `#{prop_name}` was not an Array"
             end
           else
-            type_check(errors, "Provided prop `#{prop_name}`", value, klass)
+            type_check(errors, "Provided prop `#{prop_name}`", value, klass, @rules[prop_name][:allow_nil])
           end
         end
       end

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = "0.7.16"
+  VERSION = "0.7.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
 platform: ruby
 authors:
 - David Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal