remove deprecated prop define methods

Author: ajjahn

lib/react/component/class_methods.rb

@@ -28,7 +28,7 @@ def deprecation_warning(message)
       end
 
       def validator
-        @validator ||= Validator.new(self)
+        @validator ||= Validator.new(props_wrapper)
       end
 
       def prop_types
@@ -59,10 +59,6 @@ def props_wrapper
         @props_wrapper ||= Class.new(PropsWrapper)
       end
 
-      def define_param(name, param_type)
-        props_wrapper.define_param(name, param_type, self)
-      end
-
       def param(*args)
         if args[0].is_a? Hash
           options = args[0]
@@ -81,18 +77,6 @@ def param(*args)
         end
       end
 
-      def required_param(name, options = {})
-        deprecation_warning "`required_param` is deprecated, use `param` instead."
-        validator.requires(name, options)
-      end
-
-      alias_method :require_param, :required_param
-
-      def optional_param(name, options = {})
-        deprecation_warning "`optional_param` is deprecated, use `param param_name: default_value` instead."
-        validator.optional(name, options)
-      end
-
       def collect_other_params_as(name)
         validator.allow_undefined_props = true
         define_method(name) do

lib/react/component/props_wrapper.rb

@@ -3,14 +3,8 @@ module Component
     class PropsWrapper
       attr_reader :props
 
-      def self.define_param(name, param_type, owner)
-        owner.define_method("#{name}") do
-          deprecated_params_method("#{name}", *args, &block)
-        end
+      def self.define_param(name, param_type)
         if param_type == Observable
-          owner.define_method("#{name}!") do |*args|
-            deprecated_params_method("#{name}!", *args)
-          end
           define_method("#{name}") do
             value_for(name)
           end

lib/react/validator.rb

@@ -1,11 +1,11 @@
 module React
-
   class Validator
     attr_accessor :errors
-    private :errors
+    attr_reader :props_wrapper
+    private :errors, :props_wrapper
 
-    def initialize(component_class)
-      @component_class = component_class
+    def initialize(props_wrapper = Class.new(Component::PropsWrapper))
+      @props_wrapper = props_wrapper
     end
 
     def self.build(&block)
@@ -70,7 +70,7 @@ def rules
 
     def define_rule(name, options = {})
       rules[name] = coerce_native_hash_values(options)
-      @component_class.define_param(name, options[:type]) unless name == :params
+      props_wrapper.define_param(name, options[:type])
     end
 
     def errors

spec/react/validator_spec.rb

@@ -2,13 +2,10 @@
 
 if opal?
 describe React::Validator do
-  before do
-    stub_const 'Foo', Class.new(React::Component::Base)
-  end
   describe '#validate' do
     describe "Presence validation" do
       it "should check if required props provided" do
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           requires :foo
           requires :bar
         end
@@ -18,7 +15,7 @@
       end
 
       it "should check if passed non specified prop" do
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           optional :foo
         end
 
@@ -29,7 +26,7 @@
 
     describe "Type validation" do
       it "should check if passed value with wrong type" do
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           requires :foo, type: String
         end
 
@@ -39,7 +36,7 @@
 
       it "should check if passed value with wrong custom type" do
         stub_const 'Bar', Class.new
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           requires :foo, type: Bar
         end
 
@@ -48,7 +45,7 @@
       end
 
       it 'coerces native JS prop types to opal objects' do
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           requires :foo, type: `{ x: 1 }`
         end
 
@@ -57,7 +54,7 @@
       end
 
       it 'coerces native JS values to opal objects' do
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           requires :foo, type: Array[Fixnum]
         end
 
@@ -66,7 +63,7 @@
       end
 
       it "should support Array[Class] validation" do
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           requires :foo, type: Array[Hash]
         end
 
@@ -83,7 +80,7 @@
 
     describe "Limited values" do
       it "should check if passed value is not one of the specified values" do
-        validator = React::Validator.new(Foo).build do
+        validator = React::Validator.new.build do
           requires :foo, values: [4,5,6]
         end
 
@@ -96,7 +93,7 @@
   describe '#undefined_props' do
     let(:props) { { foo: 'foo', bar: 'bar', biz: 'biz', baz: 'baz' } }
     let(:validator) do
-      React::Validator.new(Foo).build do
+      React::Validator.new.build do
         requires :foo
         optional :bar
       end
@@ -115,7 +112,7 @@
 
   describe "default_props" do
     it "should return specified default values" do
-      validator = React::Validator.new(Foo).build do
+      validator = React::Validator.new.build do
         requires :foo, default: 10
         requires :bar
         optional :lorem, default: 20