simple_params 1.4.5 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzIyNzJjMTNjYjNiYWVjYjkwYWNhYzZjOTYyNTY5NWU1NDk3MDAwMg==
+    YzgyNzMyMTQzMDg3OGQ0ZjBmMDY1ZjZmMDUyNTNmMjY4OTgzMzU0OA==
   data.tar.gz: !binary |-
-    MWZlZGFlMGI2YzMzYzI2MzQ2YzRmMTAwNTJjOTFmYWNjYTkyNTNmMA==
+    OGQ3NTZmYzU0YzQ5MGE5NzE2ZDFlYmFkYWI1NmY4OTU2ZmE3ODRlNw==
 SHA512:
   metadata.gz: !binary |-
-    OTM5OTlkMDI2MjBlNGRhMzM0MGQzNGIxNjc2NzI0ZjljMDY1M2FkYjQ1MmNm
-    NjdmMjgyOGVkODAzMmNlZTUzN2MwZmJiNzVkMGNjOTZmMjVkOWM1OTI0MTcw
-    NDE5NTZkMmIwZDMwYTY5YzQ0MzA0NjMyYThhOWNmNzQ1NDZjYTk=
+    MGMwNmYxZjdkNzVjYjNmYjVkMjIzNGFkODBkNDNjYmJhZjgyM2IyMDg4ZDAx
+    NTQ5MTUxYmE1N2I2NzMxNWVmYzNkNTY4OGQ1YjMyMGU5OWUwOGJmMzYzYTNj
+    NTRiZjFhYjYzODBmNjVmNTNiYjJjOWJiZTIxMmY4OTI5N2M5OGI=
   data.tar.gz: !binary |-
-    NDNjOWU2OTFmZGQ3ZjEwYTJmOTY1NGJmYjU5ODU0NTVkNGNhYTY4MmE2YWI1
-    YmI5ZjQ5ZDU0NzJkNDg2MzQzM2RlMDc0NWE5MzM3NzcxOGU3YjIyZTI3M2Rl
-    NTBmMDYyNzg1ZGIyNDAyZTRmZDkxZTFmNmFmOTU3ZGJkOGIzMGE=
+    NTljMTFlOTI0MGRmODdlOWNmOTgzZDczMzRhMGZiOGE5ODBjZDJhMWQ5YTU0
+    NDllYzNiM2Q5NjVjZjI1NWJmMjIxMWY1OTI2NzNkYWY1NzVhMmU3ZmFlNDJl
+    YjJiMTE0MGEzMDVlYzg2Y2M5NGMxZTk2ZDQyYjU2ZjUyMTIwNzY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_params (1.4.4)
+    simple_params (1.4.5)
       activemodel (>= 3.0, < 5.0)
       shoulda-matchers (~> 2.8)
       virtus (>= 1.0.0)

data/lib/simple_params/attribute.rb

@@ -39,20 +39,6 @@ module SimpleParams
       end
     end
 
-    def assign_parameter_attributes(pairs)
-      @p6i ||= pairs["6i"]
-      @p5i ||= pairs["5i"]
-      @p4i ||= pairs["4i"]
-      @p3i ||= pairs["3i"]
-      @p2i ||= pairs["2i"]
-      @p1i ||= pairs["1i"]
-      if all_multiparams_present?
-        self.value = parse_multiparams
-      end
-    rescue ArgumentError
-      self.value = nil
-    end
-
   private
     def raw_default
       if @default.is_a?(Proc)
@@ -61,25 +47,5 @@ module SimpleParams
         @default
       end
     end
-
-    def all_multiparams_present?
-      if @type == Date
-        [@p1i, @p2i, @p3i].all? { |p| !p.nil? }
-      elsif (@type == DateTime) || (@type == Time)
-        [@p1i, @p2i, @p3i, @p4i, @p5i, @p6i].all? { |p| !p.nil? }
-      else
-        true
-      end
-    end
-
-    def parse_multiparams
-      if @type == Date
-        Date.new(@p1i.to_i, @p2i.to_i, @p3i.to_i)
-      elsif @type == DateTime
-        DateTime.new(@p1i.to_i, @p2i.to_i, @p3i.to_i, @p4i.to_i, @p5i.to_i, @p6i.to_i)
-      elsif @type == Time
-        Time.new(@p1i.to_i, @p2i.to_i, @p3i.to_i, @p4i.to_i, @p5i.to_i, @p6i.to_i)
-      end
-    end
   end
 end

data/lib/simple_params/concerns/has_attributes.rb

@@ -2,12 +2,6 @@ module SimpleParams
   module HasAttributes
     extend ActiveSupport::Concern
     included do
-      def define_attributes(params)
-        self.class.defined_attributes.each_pair do |key, opts|
-          send("#{key}_attribute=", Attribute.new(self, key, opts))
-        end
-      end
-
       def attributes
         (defined_attributes.keys + nested_classes.keys).flatten
       end
@@ -38,30 +32,6 @@ module SimpleParams
           attribute = send("#{name}_attribute")
           attribute.send("value=", val)
         end
-
-        if [Date, 'Date', :date].include?(opts[:type])
-          define_date_helper_methods(name)
-        elsif [DateTime, 'DateTime', :datetime, Time, 'Time', :time].include?(opts[:type])
-          define_datetime_helper_methods(name)
-        end
-      end
-
-      def add_validations(name, opts = {})
-        validations = opts[:validations] || {}
-        has_default = opts.has_key?(:default) # checking has_key? because :default may be nil
-        optional = opts[:optional]
-        if !validations.empty?
-          if optional || has_default
-            validations.merge!(allow_nil: true)
-          else
-            validations.merge!(presence: true)
-          end
-        else
-          if !optional && !has_default
-            validations.merge!(presence: true)
-          end
-        end
-        validates name, validations unless validations.empty?
       end
     end
   end

data/lib/simple_params/concerns/validations.rb

@@ -32,9 +32,9 @@ module SimpleParams
       if nested_class.is_a?(Array)
         # Have to map? & THEN all?, or else it won't
         #  necessarily call valid? on every object
-        nested_class.map(&:valid?).all?
+        nested_class.map { |klass| klass.nil? || klass.valid? }.all?
       else
-        nested_class.valid?
+        nested_class.nil? || nested_class.valid?
       end
     end
   end

data/lib/simple_params/errors.rb

@@ -34,20 +34,12 @@ module SimpleParams
 
     def clear
       super
-      @nested_classes.map do |attribute, klass| 
-        run_or_mapped_run(klass) do |k| 
-          k.errors.clear
-        end
-      end
+      nested_instances.each { |i| i.errors.clear }
     end
 
     def empty?
       super &&
-      @nested_classes.all? do |attribute, klass|
-        run_or_mapped_run(klass) do |k| 
-          k.errors.empty?
-        end
-      end
+      nested_instances.all? { |i| i.errors.empty? }
     end
     alias_method :blank?, :empty? 
 
@@ -63,20 +55,15 @@ module SimpleParams
 
     def values
       messages.values +
-      @nested_classes.map do |key, klass|
-        run_or_mapped_run(klass) { |k| k.errors.values }
-      end
+      nested_instances.map { |i| i.errors.values }
     end
 
     def full_messages
       parent_messages = map { |attribute, message| full_message(attribute, message) }
-      nested_messages = @nested_classes.map do |attribute, klass|
-        run_or_mapped_run(klass) do |k|
-          unless k.errors.full_messages.nil?
-            k.errors.full_messages.map { |message| "#{attribute} " + message }
-          end
-        end
+      nested_messages = nested_instances.map do |i| 
+        i.errors.full_messages.map { |message| "#{i.parent_attribute_name} " + message }
       end
+
       (parent_messages + nested_messages).flatten
     end
 
@@ -93,11 +80,12 @@ module SimpleParams
           msgs.merge!(attribute.to_sym => nested_msgs)
         end
       end
+
       msgs
     end
 
     def to_s(full_messages = false)
-      array = to_a
+      array = to_a.compact
       array.join(', ')
     end
 
@@ -135,7 +123,7 @@ module SimpleParams
     end
 
     def empty_messages?(msgs)
-      msgs.nil? || msgs.empty? || (msgs.is_a?(Array) && msgs.all?(&:empty?))
+      msgs.nil? || msgs.empty? || (msgs.is_a?(Array) && msgs.all? { |m| m.nil? || m.empty? })
     end
 
     def run_or_mapped_run(object, &block)
@@ -149,5 +137,21 @@ module SimpleParams
     def symbolize_nested(nested)
       nested.inject({}) { |memo,(k,v) | memo[k.to_sym] = v; memo }
     end
+
+
+    def nested_instances
+      array =[]
+      @nested_classes.each do |key, instance|
+        if instance.is_a?(Array)
+          array << instance
+          array = array.flatten.compact
+        else
+          unless instance.nil?
+            array << instance
+          end
+        end
+      end
+      array
+    end
   end
 end

data/lib/simple_params/hash_builder.rb

@@ -0,0 +1,34 @@
+require "active_model"
+
+module SimpleParams
+  class HashBuilder
+    def initialize(params)
+      @params = params
+    end
+
+    # TODO: This still needs specs around it, as well as a SIGNIFICANT refactor
+    def build
+      hash = {}
+      attributes = @params.attributes
+      attributes.each do |attribute|
+        raw_attribute = @params.send(attribute)
+        if raw_attribute.nil?
+          hash[attribute] = nil
+        elsif raw_attribute.is_a?(SimpleParams::Params)
+          hash[attribute] = @params.send(attribute).to_hash
+        elsif raw_attribute.is_a?(Array)
+          attribute_array = []
+          raw_attribute.each do |r_attr|
+            unless r_attr.nil?
+              attribute_array << r_attr.to_hash
+            end
+          end
+          hash[attribute] = attribute_array
+        else
+          hash[attribute] = @params.send(attribute)
+        end
+      end
+      hash
+    end
+  end
+end

data/lib/simple_params/initialization_hash.rb

@@ -0,0 +1,52 @@
+module SimpleParams
+  class InitializationHash < ::Hash
+    include SimpleParams::HashHelpers
+
+    DATETIME_INDICATORS = ['(6i)', '(5i)', '(4i)', '(3i)', '(2i)', '(1i)']
+
+    attr_reader :original_params
+
+    def initialize(inputs={})
+      @original_params = hash_to_symbolized_hash(inputs)
+      assign_parameters
+    end
+
+    private
+    def assign_parameters
+      original_params.each_pair do |key, value|
+        date_time_found = false
+        DATETIME_INDICATORS.each do |indicator|
+          if key.to_s.include?(indicator)
+            date_time_found = true
+            key_name = key.to_s.partition(indicator).first
+            assign_datetime_params(key_name)
+          end
+        end
+        unless date_time_found
+          assign_param(key, value)
+        end
+      end
+    end
+
+    def assign_datetime_params(key)
+      p6i = original_params[:"#{key}(6i)"]
+      p5i = original_params[:"#{key}(5i)"]
+      p4i = original_params[:"#{key}(4i)"]
+      p3i = original_params[:"#{key}(3i)"]
+      p2i = original_params[:"#{key}(2i)"]
+      p1i = original_params[:"#{key}(1i)"]
+      value = if [p1i, p2i, p3i].all? && [p4i, p5i, p6i].none?
+        Date.new(p1i.to_i, p2i.to_i, p3i.to_i)
+      elsif [p6i, p5i, p4i, p3i, p1i, p1i].all?
+        Time.new(p1i.to_i, p2i.to_i, p3i.to_i, p4i.to_i, p5i.to_i, p6i.to_i)
+      end
+      self[key.to_sym] = value
+    rescue ArgumentError
+      self[key.to_sym] = nil
+    end
+
+    def assign_param(key, value)
+      self[key.to_sym] = value
+    end
+  end
+end

data/lib/simple_params/nested_params.rb

@@ -17,71 +17,76 @@ module SimpleParams
         !!options[:with_ids]
       end
 
+      def optional?
+        !!options[:optional]
+      end
+
       def define_new_hash_class(parent, name, options, &block)
-        options = options.merge(type: :hash)
-        define_new_class(parent, name, options, &block)
+        define_new_class(parent, name, options.merge(type: :hash), &block)
       end
 
       def define_new_array_class(parent, name, options, &block)
-        options = options.merge(type: :array)
-        define_new_class(parent, name, options, &block)
+        define_new_class(parent, name, options.merge(type: :array), &block)
+      end
+
+      def build(params, parent, name)
+        if params.is_a?(Array)
+          params.map { |p| build_instance(p, parent, name) }.compact
+        elsif with_ids?
+          params.each_pair.map { |key, val| build_instance({key => val}, parent, name) }.compact
+        else
+          build_instance(params, parent, name)
+        end
       end
 
       private
       def define_new_class(parent, name, options, &block)
-        klass_name = name.to_s.split('_').collect(&:capitalize).join
-        Class.new(self).tap do |klass|
-          parent.send(:remove_const, klass_name) if parent.const_defined?(klass_name)
-          parent.const_set(klass_name, klass)
-          klass.instance_eval <<-DEF
-            def parent_class
-              #{parent}
-            end
-          DEF
-          extend ActiveModel::Naming
-          klass.class_eval(&block)
-          klass.class_eval("self.options = #{options}")
-          if klass.parent_class.using_rails_helpers?
-            klass.instance_eval("with_rails_helpers")
-          end
-
-          # define a _destroy param (Boolean, default: false)
-          if klass.using_rails_helpers?
-            klass.send(:define_attribute, :_destroy, {type: :boolean, default: false})
-          end
-        end
+        NestedParamsClassBuilder.new(parent).build(self, name, options, &block)
       end
-    end
 
-    def initialize(params={}, parent = nil)
-      @parent = parent
-      super(params)
+      def build_instance(params, parent, name)
+        instance = self.new(params, parent, name)
+        instance.destroyed? ? nil : instance
+      end
     end
 
-    def id
-      @id ||= nil
-    end
+    attr_reader :parent, :id, :params, :parent_attribute_name
 
-    def set_accessors(params={})
-      if class_has_ids?
-        @id = params.keys.first
-        params = params.values.first || {}
-      end
+    def initialize(params={}, parent, parent_attribute_name)
+      @parent = parent
+      @parent_attribute_name = parent_attribute_name.to_sym
+      @id = extract_id(params)
+      @params = extract_initialization_params(params)
+      super(@params)
+    end
 
-      super(params)
+    def destroyed?
+      sym_params = symbolize_params(params)
+      [true, 1, "1", "true"].include?(sym_params[:_destroy])
     end
 
     private
-    def class_has_ids?
+    def with_ids?
       self.class.with_ids?
     end
 
-    def hash_class?
-      self.class.hash?
+    def symbolize_params(params)
+      Hash[params.map{ |k, v| [k.to_sym, v] }]
     end
 
-    def array_class?
-      self.class.array?
+    def extract_id(params)
+      if with_ids?
+        id = params.keys[0]
+        id ? id.to_sym : nil
+      end
+    end
+
+    def extract_initialization_params(params)
+      if with_ids?
+        params.values[0] || {}
+      else
+        params || {}
+      end
     end
   end
 end

data/lib/simple_params/nested_params_class_builder.rb

@@ -0,0 +1,32 @@
+module SimpleParams
+  class NestedParamsClassBuilder
+    def initialize(parent)
+      @parent = parent
+    end
+
+    #TODO: Need to test this!
+    def build(nested_params, name, options, &block)
+      klass_name = name.to_s.split('_').collect(&:capitalize).join
+      Class.new(nested_params).tap do |klass|
+        @parent.send(:remove_const, klass_name) if @parent.const_defined?(klass_name)
+        @parent.const_set(klass_name, klass)
+        klass.instance_eval <<-DEF
+          def parent_class
+            #{@parent}
+          end
+        DEF
+        klass.class_eval('extend ActiveModel::Naming')
+        klass.class_eval(&block)
+        klass.class_eval("self.options = #{options}")
+        if klass.parent_class.using_rails_helpers?
+          klass.instance_eval("with_rails_helpers")
+        end
+
+        # define a _destroy param (Boolean, default: false)
+        if klass.using_rails_helpers?
+          klass.send(:define_attribute, :_destroy, {type: :boolean, default: false})
+        end
+      end
+    end
+  end
+end

data/lib/simple_params/params.rb

@@ -11,8 +11,6 @@ module SimpleParams
     include SimpleParams::Validations
     include SimpleParams::HasAttributes
     include SimpleParams::HasTypedParams
-    include SimpleParams::HashHelpers
-    include SimpleParams::DateTimeHelpers
     include SimpleParams::StrictParams
 
     class << self
@@ -31,6 +29,11 @@ module SimpleParams
         add_validations(name, opts)
       end
 
+      def add_validations(name, opts = {})
+        validation_string = ValidationBuilder.new(name, opts).validation_string
+        eval(validation_string)
+      end
+
       def nested_classes
         @nested_classes ||= {}
       end
@@ -72,44 +75,18 @@ module SimpleParams
           else
             # This logic basically sets the nested class to an instance of itself, unless
             #  it is optional.
-            klass_instance = klass.new({}, self)
-            init_value = if opts[:optional]
-              NilParams.define_nil_class(klass).new
+            init = if opts[:optional]
+              nil
             else 
-              klass_instance
+              klass_instance = klass.new({}, self, name)
             end
-            init_value = klass.hash? ? init_value : [init_value]
+            init_value = klass.hash? ? init : [init]
             instance_variable_set("@#{name}", init_value)
           end
         end
 
         define_method("#{name}=") do |initializer|
-          init_value = if initializer.is_a?(Array)
-            initializer.map do |val|
-              destroyed = if val.has_key?(:_destroy)
-                val[:_destroy]
-              elsif val.has_key?("_destroy")
-                val["_destroy"]
-              end
-              unless [true, 1, "1", "true"].include?(destroyed)
-                klass.new(val, self)
-              end
-            end.compact
-          elsif klass.with_ids?
-            initializer.each_pair.inject([]) do |array, (key, val)|
-              destroyed = if val.has_key?(:_destroy)
-                val[:_destroy]
-              elsif val.has_key?("_destroy")
-                val["_destroy"]
-              end
-              unless [true, 1, "1", "true"].include?(destroyed)
-                array << klass.new({key => val}, self)
-              end
-              array
-            end
-          else
-            klass.new(initializer, self)
-          end
+          init_value = klass.build(initializer, self, name)
           instance_variable_set("@#{name}", init_value)
         end
       end
@@ -121,34 +98,23 @@ module SimpleParams
 
     def initialize(params={})
       set_strictness
-
-      @original_params = hash_to_symbolized_hash(params)
+      params = InitializationHash.new(params)
+      @original_params = params.original_params
       define_attributes(@original_params)
 
       # Nested Classes
       @nested_classes = nested_classes.keys
-
       set_accessors(params)
     end
 
-    def to_hash
-      hash = {}
-      attributes.each do |attribute|
-        raw_attribute = send(attribute)
-        if raw_attribute.is_a?(SimpleParams::Params)
-          hash[attribute] = send(attribute).to_hash
-        elsif raw_attribute.is_a?(Array)
-          attribute_array = []
-          raw_attribute.each do |r_attr|
-            attribute_array << r_attr.to_hash
-          end
-          hash[attribute] = attribute_array
-        else
-          hash[attribute] = send(attribute)
-        end
+    def define_attributes(params)
+      self.class.defined_attributes.each_pair do |key, opts|
+        send("#{key}_attribute=", Attribute.new(self, key, opts))
       end
+    end
 
-      hash
+    def to_hash
+      HashBuilder.new(self).build
     end
 
     def errors
@@ -156,7 +122,6 @@ module SimpleParams
       @nested_classes.each do |param|
         nested_class_hash[param.to_sym] = send(param)
       end
-
       @errors ||= SimpleParams::Errors.new(self, nested_class_hash)
     end
 

data/lib/simple_params/validation_builder.rb

@@ -0,0 +1,31 @@
+module SimpleParams
+  class ValidationBuilder
+    def initialize(name, opts={})
+      @name = name
+      @opts = opts
+    end
+
+    def validation_string
+      validations = @opts[:validations] || {}
+      has_default = @opts.has_key?(:default) # checking has_key? because :default may be nil
+      optional = @opts[:optional]
+      if !validations.empty?
+        if optional || has_default
+          validations.merge!(allow_nil: true)
+        else
+          validations.merge!(presence: true)
+        end
+      else
+        if !optional && !has_default
+          validations.merge!(presence: true)
+        end
+      end
+
+      if validations.empty?
+        return  ''
+      else
+        return "validates :#{@name.to_sym}, #{validations}"
+      end
+    end
+  end
+end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.4.5"
+  VERSION = "1.5.0"
 end

data/lib/simple_params.rb

@@ -3,17 +3,19 @@ require 'simple_params/attribute'
 require 'simple_params/formatter'
 require 'simple_params/errors'
 require 'simple_params/concerns/has_attributes'
-require 'simple_params/concerns/date_time_helpers'
 require 'simple_params/concerns/hash_helpers'
 require 'simple_params/concerns/has_typed_params'
 require 'simple_params/concerns/rails_helpers'
 require 'simple_params/concerns/strict_params'
 require 'simple_params/concerns/validations'
 require 'simple_params/params'
+require 'simple_params/initialization_hash'
+require 'simple_params/hash_builder'
 require 'simple_params/nested_params'
-require 'simple_params/nil_params'
+require 'simple_params/nested_params_class_builder'
 require 'simple_params/simple_params_error'
 require 'simple_params/type_mappings'
+require 'simple_params/validation_builder'
 require 'simple_params/api_pie_doc'
 require 'simple_params/api_pie_doc/attribute_base'
 require 'simple_params/api_pie_doc/attribute'

data/spec/acceptance_spec.rb

@@ -34,6 +34,11 @@ class AcceptanceParams < SimpleParams::Params
     param :name
   end
 
+  nested_array :birds, optional: true, with_ids: true do
+    with_rails_helpers
+    param :name
+  end
+
   before_validation :set_current_time
 
   def set_current_time
@@ -117,7 +122,7 @@ describe SimpleParams::Params do
           state: "North Carolina",
           company: nil
         },
-        phone: {},
+        phone: nil,
         dogs: [
           {
             name: "Spot",
@@ -130,6 +135,8 @@ describe SimpleParams::Params do
             name: nil,
             _destroy: false
           }
+        ],
+        birds: [
         ]
       })
     end
@@ -216,18 +223,19 @@ describe SimpleParams::Params do
         "current_time(2i)" => "10", 
         "current_time(1i)" => "2015"
       )
-      params.current_time.should eq(DateTime.new(2015, 10, 29, 9, 11, 56))
+      params.current_time.should eq(DateTime.new(2015, 10, 29, 9, 11, 56, '-04:00'))
     end
   end
 
   describe "attributes", attributes: true do
     it "returns array of attribute symbols" do
       params = AcceptanceParams.new
-      params.attributes.should eq([:reference, :name, :date_of_birth, :current_time, :age, :color, :sibling_names, :address, :phone, :dogs, :cats])
+      params.attributes.should eq([:reference, :name, :date_of_birth, :current_time, :age, :color, :sibling_names, :address, :phone, :dogs, :cats, :birds])
     end
 
-    it "returns array of attribute symbols for nested class" do
-      params = AcceptanceParams::Address.new
+    it "returns array of attribute symbols for nested class", failing: true do
+      params = AcceptanceParams::Address.new({}, nil, "address")
+      params.parent_attribute_name.should eq(:address)
       params.attributes.should eq([:street, :city, :zip_code, :state, :company])
     end
 
@@ -343,6 +351,32 @@ describe SimpleParams::Params do
         params.should_not be_valid
         params.errors[:dogs][1][:age].should eq(["is not included in the list", "can't be blank"])
       end
+
+      # it "initializes birds as empty", failing: true do
+      #   params = AcceptanceParams.new
+      #   params.birds.should be_empty
+      # end
+
+      # it "allows absense of optional params", failing: true do
+      #   params = AcceptanceParams.new(
+      #     name: "test",
+      #     address: {
+      #       street: "1 Main St.",
+      #       city: "Asheville",
+      #       zip_code: "28806"
+      #     },
+      #     dogs: [
+      #       { name: "spot", age: 13 }
+      #     ],
+      #     cats: {
+      #       "0" => {
+      #         name: "Purr"
+      #       }
+      #     },
+      #   )
+      #   params.birds.should be_empty
+      #   params.should be_valid
+      # end
     end
 
     describe "#validate!" do
@@ -383,7 +417,9 @@ describe SimpleParams::Params do
           acceptance_params = AcceptanceParams.new(params)
           acceptance_params.valid?
           acceptance_params.should be_valid
+          acceptance_params.errors.should be_empty
           acceptance_params.should be_valid
+          acceptance_params.errors.should be_empty
         end
 
         it "is invalidated if validity changes after initial assignment" do
@@ -580,6 +616,10 @@ describe SimpleParams::Params do
           param :name, String, desc:'', required: true
           param :_destroy, Boolean, desc:'', required: false
         end
+        param :birds, Array, desc:'', required: false do
+          param :name, String, desc:'', required: true
+          param :_destroy, Boolean, desc:'', required: false
+        end
       API_PIE_DOCS
 
       expect(documentation).to be_a String

data/spec/errors_spec.rb

@@ -44,6 +44,10 @@ describe SimpleParams::Errors do
       nil
     end
 
+    def parent_attribute_name
+      :dog
+    end
+
     def read_attribute_for_validation(attr)
       send(attr)
     end
@@ -71,6 +75,10 @@ describe SimpleParams::Errors do
       123
     end
 
+    def parent_attribute_name
+      :cats
+    end
+
     def read_attribute_for_validation(attr)
       send(attr)
     end

data/spec/initialization_hash_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe SimpleParams::InitializationHash do
+  let(:raw_params) do
+    {
+      "name" => "Emily",
+      "age" => "28",
+      "date_of_birth(3i)" => "30", 
+      "date_of_birth(2i)" => "4", 
+      "date_of_birth(1i)" => "1987",
+      "current_time(6i)" => "56", 
+      "current_time(5i)" => "11", 
+      "current_time(4i)" => "9",
+      "current_time(3i)" => "29", 
+      "current_time(2i)" => "10", 
+      "current_time(1i)" => "2015",
+      "invalid_time(6i)" => "56", 
+      "invalid_time(5i)" => nil, 
+      "invalid_time(4i)" => "9",
+      "invalid_time(3i)" => nil, 
+      "invalid_time(2i)" => "10", 
+      "invalid_time(1i)" => "2015"      
+    }
+  end
+
+  let(:initialization_hash) do
+    described_class.new(raw_params)
+  end
+
+  it "has correct original_params" do
+    initialization_hash.original_params.should eq(
+      :name => "Emily",
+      :age => "28",
+      :"date_of_birth(3i)" => "30", 
+      :"date_of_birth(2i)" => "4", 
+      :"date_of_birth(1i)" => "1987",
+      :"current_time(6i)" => "56", 
+      :"current_time(5i)" => "11", 
+      :"current_time(4i)" => "9",
+      :"current_time(3i)" => "29", 
+      :"current_time(2i)" => "10", 
+      :"current_time(1i)" => "2015",      
+      :"invalid_time(6i)" => "56", 
+      :"invalid_time(5i)" => nil, 
+      :"invalid_time(4i)" => "9",
+      :"invalid_time(3i)" => nil, 
+      :"invalid_time(2i)" => "10", 
+      :"invalid_time(1i)" => "2015"      
+    )
+  end
+
+  it "has correct name" do
+    initialization_hash[:name].should eq("Emily")
+  end 
+
+  it "has correct age" do
+    initialization_hash[:age].should eq("28")
+  end 
+
+  it "has correct date_of_birth" do
+    initialization_hash[:date_of_birth].should eq(Date.new(1987, 4, 30))
+  end 
+
+  it "has correct current_time" do
+    initialization_hash[:current_time].should eq(Time.new(2015, 10, 29, 9, 11, 56))
+  end 
+
+  it "has nil invalid_time" do
+    initialization_hash[:invalid_time].should eq(nil)
+  end 
+end

data/spec/nested_params_spec.rb

@@ -102,7 +102,7 @@ describe SimpleParams::NestedParams do
           end
         end
 
-        subject { defined_class.new(name: "Bill", age: 21) }
+        subject { defined_class.new({name: "Bill", age: 21}, nil, :my_special_params) }
         
         specify "name" do
           expect(subject.name).to eq "Bill"
@@ -125,7 +125,7 @@ describe SimpleParams::NestedParams do
           end
         end
 
-        subject { defined_class.new("132" => { name: "Bill", age: 21 }) }
+        subject { defined_class.new({ "132" => { name: "Bill", age: 21 } }, nil, :my_special_params) }
         
         specify "name" do
           expect(subject.name).to eq "Bill"
@@ -136,7 +136,7 @@ describe SimpleParams::NestedParams do
         end
 
         specify "id" do
-          expect(subject.id).to eq "132"
+          expect(subject.id).to eq :"132"
         end
       end
     end
@@ -150,7 +150,7 @@ describe SimpleParams::NestedParams do
           end
         end
 
-        subject { defined_class.new(name: "Bill", age: 21) }
+        subject { defined_class.new({name: "Bill", age: 21}, nil, :my_special_params) }
         
         specify "name" do
           expect(subject.name).to eq "Bill"
@@ -173,7 +173,7 @@ describe SimpleParams::NestedParams do
           end
         end
 
-        subject { defined_class.new("132" => { name: "Bill", age: 21 }) }
+        subject { defined_class.new({ "132" => { name: "Bill", age: 21 } }, nil, :my_special_params) }
         
         specify "name" do
           expect(subject.name).to eq "Bill"
@@ -184,7 +184,7 @@ describe SimpleParams::NestedParams do
         end
 
         specify "id" do
-          expect(subject.id).to eq "132"
+          expect(subject.id).to eq :"132"
         end
       end
     end

data/spec/rails_integration_spec.rb

@@ -49,7 +49,7 @@ describe SimpleParams::Params do
     end
 
     specify "setting datetime" do
-      expect(params.current_time).to eq DateTime.new(2009, 3, 4, 11, 58, 59)
+      expect(params.current_time).to eq DateTime.new(2009, 3, 4, 11, 58, 59, '-05:00')
     end
 
     specify "sets address" do

data/spec/validation_builder_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe SimpleParams::ValidationBuilder do
+  let(:name) { "my_attribute" }
+
+  context "with blank opts" do
+    let(:builder) { described_class.new(name) }
+
+    it "has correct validation string" do
+      builder.validation_string.should eq(
+        'validates :my_attribute, {:presence=>true}'
+      )
+    end
+  end
+
+  context "with optional" do
+    let(:opts) do
+      {
+        optional: true
+      }
+    end
+
+    let(:builder) { described_class.new(name, opts) }
+
+    it "has correct validation string" do
+      builder.validation_string.should eq('')
+    end
+  end
+
+  context "with default" do
+    let(:opts) do
+      {
+        default: Proc.new { Time.now }
+      }
+    end
+
+    let(:builder) { described_class.new(name, opts) }
+
+    it "has correct validation string" do
+      builder.validation_string.should eq('')
+    end
+  end
+
+  context "with other validations" do
+    let(:opts) do
+      {
+        validations: { presence: true, length: { in: [0..20]} }
+      }
+    end
+
+    let(:builder) { described_class.new(name, opts) }
+
+    it "has correct validation string" do
+      builder.validation_string.should eq(
+        'validates :my_attribute, {:presence=>true, :length=>{:in=>[0..20]}}'
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.5.0
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -133,7 +133,6 @@ files:
 - lib/simple_params/api_pie_doc/attribute_base.rb
 - lib/simple_params/api_pie_doc/nested_attribute.rb
 - lib/simple_params/attribute.rb
-- lib/simple_params/concerns/date_time_helpers.rb
 - lib/simple_params/concerns/has_attributes.rb
 - lib/simple_params/concerns/has_typed_params.rb
 - lib/simple_params/concerns/hash_helpers.rb
@@ -142,11 +141,14 @@ files:
 - lib/simple_params/concerns/validations.rb
 - lib/simple_params/errors.rb
 - lib/simple_params/formatter.rb
+- lib/simple_params/hash_builder.rb
+- lib/simple_params/initialization_hash.rb
 - lib/simple_params/nested_params.rb
-- lib/simple_params/nil_params.rb
+- lib/simple_params/nested_params_class_builder.rb
 - lib/simple_params/params.rb
 - lib/simple_params/simple_params_error.rb
 - lib/simple_params/type_mappings.rb
+- lib/simple_params/validation_builder.rb
 - lib/simple_params/validation_matchers/coercion_matcher.rb
 - lib/simple_params/validation_matchers/format_matcher.rb
 - lib/simple_params/validation_matchers/nested_array_matcher.rb
@@ -165,13 +167,14 @@ files:
 - spec/fixtures/dummy_params.rb
 - spec/fixtures/validator_params.rb
 - spec/formatter_spec.rb
+- spec/initialization_hash_spec.rb
 - spec/multiple_classes_spec.rb
 - spec/nested_params_spec.rb
-- spec/nil_params_spec.rb
 - spec/params_spec.rb
 - spec/rails_integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/base_attribute.rb
+- spec/validation_builder_spec.rb
 - spec/validation_matchers/coercion_matcher_spec.rb
 - spec/validation_matchers/format_matcher_spec.rb
 - spec/validation_matchers/nested_array_matcher_spec.rb
@@ -212,13 +215,14 @@ test_files:
 - spec/fixtures/dummy_params.rb
 - spec/fixtures/validator_params.rb
 - spec/formatter_spec.rb
+- spec/initialization_hash_spec.rb
 - spec/multiple_classes_spec.rb
 - spec/nested_params_spec.rb
-- spec/nil_params_spec.rb
 - spec/params_spec.rb
 - spec/rails_integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/base_attribute.rb
+- spec/validation_builder_spec.rb
 - spec/validation_matchers/coercion_matcher_spec.rb
 - spec/validation_matchers/format_matcher_spec.rb
 - spec/validation_matchers/nested_array_matcher_spec.rb

data/lib/simple_params/concerns/date_time_helpers.rb

@@ -1,59 +0,0 @@
-module SimpleParams
-  module DateTimeHelpers
-    extend ActiveSupport::Concern
-
-    included do
-    end
-
-    module ClassMethods
-      def define_date_helper_methods(name)
-        define_method("#{name}(3i)=") do |day|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("3i" => day)
-        end
-
-        define_method("#{name}(2i)=") do |month|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("2i" => month)
-        end
-
-        define_method("#{name}(1i)=") do |year|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("1i" => year)
-        end
-      end
-
-      def define_datetime_helper_methods(name)
-        define_method("#{name}(6i)=") do |sec|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("6i" => sec)
-        end
-
-        define_method("#{name}(5i)=") do |minute|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("5i" => minute)
-        end
-
-        define_method("#{name}(4i)=") do |hour|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("4i" => hour)
-        end
-
-        define_method("#{name}(3i)=") do |day|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("3i" => day)
-        end
-
-        define_method("#{name}(2i)=") do |month|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("2i" => month)
-        end
-
-        define_method("#{name}(1i)=") do |year|
-          attribute = send("#{name}_attribute")
-          attribute.assign_parameter_attributes("1i" => year)
-        end
-      end
-    end
-  end
-end

data/lib/simple_params/nil_params.rb

@@ -1,65 +0,0 @@
-module SimpleParams
-  class NilParams < NestedParams
-    class << self
-      def define_nil_class(parent)
-        define_new_class(parent, :nil_params, {}) do
-        end
-      end
-
-      def nested_classes
-        if respond_to?(:parent_class) && parent_class.present?
-          parent_class.nested_classes
-        else
-          {}
-        end
-      end
-    end
-
-    def initialize(params = {})      
-      self.class.options ||= {}
-      @mocked_object = if parent_class
-        parent_class.new
-      else
-        nil
-      end
-      super(params)
-    end
-
-    def valid?
-      true
-    end
-
-    def to_hash
-      {}
-    end
-
-    def errors
-      Errors.new(self)
-    end
-
-    def method_missing(method_name, *arguments, &block)
-      if @mocked_object.present?
-        @mocked_object.send(method_name, *arguments, &block)
-      else
-        super(method_name, *arguments, &block)
-      end
-    end
-
-    def respond_to?(method_name, include_private = false)
-      if @mocked_object.present?
-        @mocked_object.respond_to?(:method) || super
-      else
-        super
-      end
-    end
-
-    private
-    def parent_class
-      if self.class.respond_to?(:parent_class)
-        self.class.parent_class
-      else
-        nil
-      end
-    end
-  end
-end

data/spec/nil_params_spec.rb

@@ -1,135 +0,0 @@
-require 'spec_helper'
-
-class DummyPersonParams < SimpleParams::Params
-  param :name
-  param :age, type: :integer
-  nested_hash :address do
-    param :street
-    param :city
-  end
-  nested_array :phones do
-    param :phone_number
-  end
-end
-
-class DummyDogParams < SimpleParams::Params
-  param :name
-  param :age, type: :integer
-  nested_hash :owners_address do
-    param :street
-    param :city
-  end
-  nested_array :puppies do
-    param :name
-    param :age
-  end
-end
-
-describe SimpleParams::NilParams do
-  describe "class methods", class_methods: true do
-    describe "define_nil_class" do
-      let(:defined_class) do
-        described_class.define_nil_class(DummyPersonParams)
-      end
-
-      it "has correct name" do
-        defined_class.name.should eq("DummyPersonParams::NilParams")
-      end
-
-      it "has correct parent class" do
-        defined_class.parent_class.should eq(DummyPersonParams)
-      end
-
-      it "has correct nested_classes" do
-        defined_class.nested_classes.should eq({
-          address: DummyPersonParams::Address, 
-          phones: DummyPersonParams::Phones
-        })
-      end
-    end
-  end
-
-  describe "public methods", public_methods: true do
-    context "with no parent_class" do
-      let!(:instance) { described_class.new({})}
-
-      describe "#valid" do
-        it "is valid" do
-          instance.should be_valid
-        end
-      end
-
-      describe "#errors" do
-        it "has no errors" do
-          instance.errors.should be_empty
-        end
-
-        it "can clear errors" do
-          instance.valid?
-          instance.errors.clear.should eq([])
-        end
-
-        it "has no error messages" do
-          instance.valid?
-          instance.errors.messages.should be_empty
-        end
-      end
-
-      describe "#to_hash" do
-        it "is empty" do
-          instance.to_hash.should be_empty
-        end
-      end
-
-      describe "#mocked_params accessors" do
-        it "does not respond to random accessors" do
-          instance.should_not respond_to(:name)
-          instance.should_not respond_to(:age)
-        end
-      end
-    end
-
-    context "with parent class" do
-      let!(:instance) { described_class.define_nil_class(DummyPersonParams).new({})}
-
-      describe "#valid" do
-        it "is valid" do
-          instance.should be_valid
-        end
-      end
-
-      describe "#errors" do
-        it "has no errors" do
-          instance.errors.should be_empty
-        end
-
-        it "can clear errors" do
-          instance.valid?
-          instance.errors.clear.should eq([])
-        end
-
-        it "has no error messages" do
-          instance.valid?
-          instance.errors.messages.should be_empty
-        end
-      end
-
-      describe "#to_hash" do
-        it "is empty" do
-          instance.to_hash.should be_empty
-        end
-      end
-
-      describe "#mocked_params accessors" do
-        it "responds to parent class instance's accessors" do
-          instance.name.should be_nil
-          instance.age.should be_nil
-          instance.name = "Amy"
-          instance.age = 33
-          instance.name.should eq("Amy")
-          instance.age.should eq(33)
-        end
-      end
-    end
-  end
-end