reaction 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca4aad215915e667e9c711483c2cfc9ff476868
-  data.tar.gz: d54fd1353ef63abad3c25aae23e09031f111beae
+  metadata.gz: 9d44ed5a4d16563ce2b661c870d73950cd4bb81f
+  data.tar.gz: 22851e1ee79194a12e563da426aacc1b7c3ecf91
 SHA512:
-  metadata.gz: 69b6a817db4c326691a171514987a0d4bd98b12a568d51c771db34f7eec84eaa917d47f8a653252c2191cc514d15b3fea5d9fff075099c14d546f3298056a744
-  data.tar.gz: 26262301db8e8898ce28e399019cb11b6b083b8ebb7ee51ed6c97a7e68b1a06e358cd77e7df3fc3e1dfc688e59ab3d514cc21b43b98cd32e22b1fe1e0c8e6475
+  metadata.gz: eba75f96b595f8c5844a92aa6ffebb0eaff6d9045690570dd41d2b904a2af124ecd5fcd29c6593b573c2f2f654b9cfa8edb3af47b26229fb3ddb1c7354ceee4c
+  data.tar.gz: 32d58d640be2c370fc5b6f9b37711e397ec2594311ea557fa374e3d79377d9e595d75861299dd280b4767d3ad5e5f8f48cb8307a5e3bf88225affc22f7a49054

data/lib/reaction/action.rb

@@ -1,5 +1,6 @@
 module Reaction
   class Action
+    include HasAttributes
     include HasErrors
     include HasParams
 
@@ -32,29 +33,17 @@ module Reaction
     end
 
     def validate!
-      params.each do |name, value|
-        unless self.class.class_for_type(name)
-          errors.add(name, 'is not a valid parameter.')
-        end
-      end
-      self.class.types.each do |name, type|
-        type.validate_each(self, name, raw_param(name))
-      end
-      self.class.validators.each do |name, validator|
-        validator.validate_each(self, name, raw_param(name))
-      end
+      errors.clear
+      validate_attributes
+      validate_params
       if errors.any?
         raise ArgumentError.new("Validations failed: #{errors.full_messages.join(',')}")
       end
     end
 
     def cleanup
-      self.class.types.each do |name, type|
-        type.cleanup
-      end
-      self.class.validators.each do |name, validator|
-        validator.cleanup
-      end
+      cleanup_types
+      cleanup_validators
     end
   end
 end

data/lib/reaction/has_attributes.rb

@@ -0,0 +1,33 @@
+module Reaction
+  module HasAttributes
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def attribute(name)
+        attr_accessor name
+        attributes << name
+      end
+
+      def attributes
+        @attributes ||= []
+      end
+    end
+
+    def set_attributes(attributes = {})
+      attributes.each do |key, value|
+        if self.class.attributes.include?(key)
+          send("#{key}=", value)
+        end
+      end
+    end
+
+    def validate_attributes
+      self.class.attributes.each do |attribute|
+        errors.add(attribute, 'is not set.') unless send(attribute)
+      end
+    end
+
+  end
+end

data/lib/reaction/has_params.rb

@@ -13,17 +13,25 @@ module Reaction
         set_type(name, options.delete(:type) || RawType)
         set_validators(name, options)
       end
+
+      def param_settable?(name)
+        !type(name).nil?
+      end
     end
 
     def param(name)
       typed_params[name.to_sym] ||= begin
         type = self.class.types[name.to_sym]
-        type ? type.convert(raw_param(name)) : raw_param(name)
+        type.convert(raw_param(name))
       end
     end
 
     def params
-      @params ||= {}
+      ret = {}
+      raw_params.keys.each do |name|
+        ret[name.to_sym] = param(name)
+      end
+      ret
     end
 
     def typed_params
@@ -31,8 +39,9 @@ module Reaction
     end
 
     def set_param(name, value, meta = {})
+      return unless self.class.param_settable?(name)
       set_meta(name, meta)
-      params[name.to_sym] = value
+      raw_params[name.to_sym] = value
     end
 
     def set_params(params = {}, meta = {})
@@ -42,7 +51,20 @@ module Reaction
     end
 
     def raw_param(name)
-      params[name.to_sym]
+      raw_params[name.to_sym]
+    end
+
+    def raw_params
+      @raw_params ||= {}
+    end
+
+    def validate_params
+      raw_params.each do |name, value|
+        self.class.type(name).validate_each(self, name, value)
+        self.class.validators(name).each do |validator|
+          validator.validate_each(self, name, value)
+        end
+      end
     end
 
   end

data/lib/reaction/has_types.rb

@@ -5,13 +5,17 @@ module Reaction
     end
 
     module ClassMethods
+      def type(name)
+        types[name.to_sym]
+      end
+
       def types
         @types ||= {}
       end
 
       def set_type(name, type)
         type ||= Type
-        klass = class_for_type(type)
+        klass = class_for_type!(type)
         types[name.to_sym] = klass.new(name)
       end
 
@@ -22,6 +26,20 @@ module Reaction
       rescue NameError
         nil
       end
+
+      def class_for_type!(type)
+        class_for_type(type) or raise ArgumentError.new("Unknown type: #{type}")
+      end
+
+      def cleanup_types
+        types.each do |name, type|
+          type.cleanup
+        end
+      end
+    end
+
+    def cleanup_types
+      self.class.cleanup_types
     end
 
   end

data/lib/reaction/has_validators.rb

@@ -5,18 +5,24 @@ module Reaction
     end
 
     module ClassMethods
-      def validators
-        @validators ||= {}
+      def all_validators
+        @all_validators ||= {}
       end
 
-      def set_validator(name, validator, options = {})
+      def validators(name)
+        all_validators[name.to_sym] ||= []
+        all_validators[name.to_sym]
+      end
+
+      def add_validator(name, validator, options = {})
         klass = class_for_validator(validator)
-        validators[name.to_sym] = klass.new(options)
+        validators(name) << klass.new(options)
       end
 
-      def set_validators(name, validators = {})
-        validators.each do |validator, options|
-          set_validator(name, validator, options)
+      def set_validators(name, new_validators = {})
+        validators(name).clear
+        new_validators.each do |validator, options|
+          add_validator(name, validator, options)
         end
       end
 
@@ -27,6 +33,18 @@ module Reaction
       rescue NameError
         raise ArgumentError.new("Unknown param validator: #{validator}")
       end
+
+      def cleanup_validators
+        all_validators.each do |name, validators|
+          validators.each do |validator|
+            validator.cleanup
+          end
+        end
+      end
+    end
+
+    def cleanup_validators
+      self.class.cleanup_validators
     end
 
   end

data/lib/reaction.rb

@@ -3,6 +3,7 @@ module Reaction
   autoload :Doc, 'reaction/doc'
   autoload :EachValidator, 'reaction/each_validator'
   autoload :Errors, 'reaction/errors'
+  autoload :HasAttributes, 'reaction/has_attributes'
   autoload :HasDocs, 'reaction/has_docs'
   autoload :HasErrors, 'reaction/has_errors'
   autoload :HasMetas, 'reaction/has_metas'

data/reaction.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'reaction'
-  gem.version       = '0.2.0'
+  gem.version       = '0.2.4'
   gem.authors       = ["Jon Calhoun", "Jon Calhoun", "Ryan Jackson"]
   gem.email         = ["joncalhoun@gmail.com", "jon@paidlabs.com", "ryan@paidlabs.com"]
   gem.description   = 'Reaction makes it easy to build reusable controller actions along with reusable validators and param type converters.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reaction
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Jon Calhoun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies: []
 description: Reaction makes it easy to build reusable controller actions along with
   reusable validators and param type converters.
@@ -30,6 +30,7 @@ files:
 - lib/reaction/doc.rb
 - lib/reaction/each_validator.rb
 - lib/reaction/errors.rb
+- lib/reaction/has_attributes.rb
 - lib/reaction/has_docs.rb
 - lib/reaction/has_errors.rb
 - lib/reaction/has_metas.rb