simple_params 1.3.4 → 1.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmJmMzBhZmYzODAzOTdlOTA1M2EzYThlNTdhNGY2YzFmNTBmYTk0YQ==
+    OGI2NjkyN2FkNzY5NDVjYjQ0NmNlYjBhMzllYjFlNTk3ZWMwZWE4MA==
   data.tar.gz: !binary |-
-    N2JjMDczZDgyMTdlNWZkN2YzNDM1NDUxOWFhN2NlZjY5NTFlY2RkNw==
+    ZWNhNzhlZDVlYzJhZjU5OTFiNTU4ZGYxYWRlMDcxMGJkMjg3MWZjZA==
 SHA512:
   metadata.gz: !binary |-
-    MTcyOTg0YmE1MDZkNTYwZWU0NzdmMTY5OGQ4NTRkZTYwY2ZlNWIyYWNmMzAz
-    M2Q2YWRhNzQ4OWRhNjY2ZjVlYzIzYzdiNTQwMWU5YzhiZDY5MzdmMjgyYjJk
-    NzQ4OTgxY2NjNWFlYTE3YWM2NGIyYTQ0MTFmNzhjMjBiOTc0YjU=
+    NWFlMTkxZDdkMGNiZjA3NWE1ZTgxZTFlMTdiMDU5YjY2M2NkM2M3ZmU1ZjU0
+    YTUyOWY2Mzc1Mjg3MjEzY2I5MGYwYWEwOTFmMmYxNDQxNmUyM2ZlZTAwYzFk
+    ZGU3NGY4OTkyZDgxNTBjNjM1MjE1YTIzNGUxMjIzODcyYTYxMWE=
   data.tar.gz: !binary |-
-    NTcyMmIxOGFkNTBhOWZmZDkzZjEyODJiYmY0N2I3YWFkMDdlMjY4MWYxYWE3
-    ZTk5YWMyNWJiMzc3MTNjNzFiOTMyMzhmY2VhMzhjZWVhODAxMWE2MjBlZjk1
-    MTg5NmE0Nzk1Yzk5ZmFiMDA5MjM2ODk5NmQxNDMxMWRjZGIxMTM=
+    YzQxM2QxZjFjZjEwOGJjODY1MDg5N2M2YWYwYTJhZjAzNGFhMGJmNmQxMzc1
+    NzEyMjRhZWNkOThjNjk4MWQyNTMxYmNhNmQ3MThmMDQwODE4OGNmZDNjMDgx
+    NGJjMjEwMWYzZDI4NjViMmU2MzhmYjE0ZjI2M2RhYWY2NDQ5M2M=

data/Gemfile.lock

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

data/lib/simple_params.rb

@@ -10,8 +10,8 @@ require 'simple_params/concerns/rails_helpers'
 require 'simple_params/concerns/strict_params'
 require 'simple_params/concerns/validations'
 require 'simple_params/params'
-require 'simple_params/nil_params'
 require 'simple_params/nested_params'
+require 'simple_params/nil_params'
 require 'simple_params/simple_params_error'
 require 'simple_params/type_mappings'
 require 'simple_params/api_pie_doc'

data/lib/simple_params/concerns/rails_helpers.rb

@@ -4,13 +4,39 @@ module SimpleParams
   module RailsHelpers
     extend ActiveSupport::Concern
     included do
+      def to_model
+        self
+      end
+      def name_came_from_user?; end
+      def _destroy_came_from_user?; end
+
       # Required for ActiveModel
       def persisted?
         false
       end
+
+      # Needed for nested_model helpers that try to iterate over
+      # all associations
+      def each
+        self
+      end
+
+      def marked_for_destruction?
+        _destroy.eql?(true)
+      end
     end
 
     module ClassMethods
+      attr_accessor :rails_helpers
+
+      def with_rails_helpers
+        @rails_helpers = true
+      end
+
+      def using_rails_helpers?
+        @rails_helpers||= false
+        !!@rails_helpers
+      end
       # http://apidock.com/rails/ActiveRecord/Reflection/AssociationReflection/klass
       # class Author < ActiveRecord::Base
       #   has_many :books
@@ -22,16 +48,20 @@ module SimpleParams
         nested_classes[assoc_sym]
       end
 
-      # Used with reflect_on_association
+      # # Used with reflect_on_association
       def klass
         self
       end
 
       def define_rails_helpers(name, klass)
+        # define a _destroy param (Boolean, default: false)
+        unless method_defined?(:_destroy_attribute)
+          define_attribute(:_destroy, {type: :boolean, default: false})
+        end
+
         # E.g. if we have a nested_class named :phones, then we need:
         #  - a method called :phones_attributes that also sets :phones
         #  - a method called :build_phone
-
         define_method("#{name}_attributes=") do |value|
           send("#{name}=", value)
         end

data/lib/simple_params/nested_params.rb

@@ -31,7 +31,16 @@ module SimpleParams
       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
+          if klass.parent_class.using_rails_helpers?
+            klass.instance_eval("with_rails_helpers")
+          end
           extend ActiveModel::Naming
           klass.class_eval(&block)
           klass.class_eval("self.options = #{options}")
@@ -45,7 +54,7 @@ module SimpleParams
     end
 
     def id
-      @id
+      @id ||= nil
     end
 
     def set_accessors(params={})

data/lib/simple_params/nil_params.rb

@@ -1,7 +1,27 @@
 module SimpleParams
-  class NilParams < Params
-    def initialize(params = {}, mocked_object = nil)
-      @mocked_object = mocked_object
+  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
 
@@ -32,5 +52,14 @@ module SimpleParams
         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/lib/simple_params/params.rb

@@ -6,12 +6,12 @@ module SimpleParams
     include Virtus.model
     include ActiveModel::Validations
     extend ActiveModel::Naming
+    include SimpleParams::RailsHelpers
     include SimpleParams::Validations
     include SimpleParams::HasAttributes
     include SimpleParams::HasTypedParams
     include SimpleParams::HashHelpers
     include SimpleParams::DateTimeHelpers
-    include SimpleParams::RailsHelpers
     include SimpleParams::StrictParams
 
     class << self
@@ -59,7 +59,9 @@ module SimpleParams
         @nested_classes ||= {}
         @nested_classes[name.to_sym] = klass
         define_nested_accessor(name, klass, opts)
-        define_rails_helpers(name, klass)
+        if using_rails_helpers?
+          define_rails_helpers(name, klass)
+        end
       end
 
       def define_nested_accessor(name, klass, opts)
@@ -70,7 +72,11 @@ module SimpleParams
             # This logic basically sets the nested class to an instance of itself, unless
             #  it is optional.
             klass_instance = klass.new({}, self)
-            init_value = opts[:optional] ? NilParams.new({}, klass_instance) : klass_instance
+            init_value = if opts[:optional]
+              NilParams.define_nil_class(klass).new
+            else 
+              klass_instance
+            end
             init_value = klass.hash? ? init_value : [init_value]
             instance_variable_set("@#{name}", init_value)
           end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/spec/acceptance_spec.rb

@@ -193,11 +193,11 @@ describe SimpleParams::Params do
         "current_time(6i)" => "56", 
         "current_time(5i)" => "11", 
         "current_time(4i)" => "9",
-        "current_time(3i)" => "31", 
+        "current_time(3i)" => "29", 
         "current_time(2i)" => "10", 
         "current_time(1i)" => "2015"
       )
-      params.current_time.should eq(DateTime.new(2015, 10, 31, 9, 11, 56))
+      params.current_time.should eq(DateTime.new(2015, 10, 29, 9, 11, 56))
     end
   end
 

data/spec/nested_params_spec.rb

@@ -2,11 +2,6 @@ require 'spec_helper'
 require 'fixtures/dummy_params'
 
 describe SimpleParams::NestedParams do
-  # Turn off Constant Redefined errors
-  before(:each) do
-    $VERBOSE = nil
-  end
-
   class DummyParentClass < SimpleParams::Params
   end
 
@@ -33,6 +28,10 @@ describe SimpleParams::NestedParams do
         defined_class.name.should eq("DummyParentClass::MySpecialParams")
       end
 
+      it "has correct parent class" do
+        defined_class.parent_class.should eq(DummyParentClass)
+      end
+
       it "has correct options" do
         defined_class.options.should eq(
           {

data/spec/nil_params_spec.rb

@@ -1,58 +1,135 @@
 require 'spec_helper'
-require 'fixtures/dummy_params'
 
-describe SimpleParams::NilParams do
-  # Turn off Constant Redefined errors
-  before(:each) do
-    $VERBOSE = nil
+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
 
-  let!(:mocked_params) { DummyParams.new }
+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
 
-  describe "#valid" do
-    let(:instance) { described_class.new({}, mocked_params)}
+      it "has correct name" do
+        defined_class.name.should eq("DummyPersonParams::NilParams")
+      end
 
-    it "is valid" do
-      instance.should be_valid
+      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 "#errors" do
-    let(:instance) { described_class.new({}, mocked_params)}
+  describe "public methods", public_methods: true do
+    context "with no parent_class" do
+      let!(:instance) { described_class.new({})}
 
-    it "has no errors" do
-      instance.errors.should be_empty
-    end
+      describe "#valid" do
+        it "is valid" do
+          instance.should be_valid
+        end
+      end
 
-    it "can clear errors" do
-      instance.valid?
-      instance.errors.clear.should eq([])
-    end
+      describe "#errors" do
+        it "has no errors" do
+          instance.errors.should be_empty
+        end
 
-    it "has no error messages" do
-      instance.valid?
-      instance.errors.messages.should be_empty
-    end
-  end
+        it "can clear errors" do
+          instance.valid?
+          instance.errors.clear.should eq([])
+        end
 
-  describe "#to_hash" do
-    let(:instance) { described_class.new({}, mocked_params)}
+        it "has no error messages" do
+          instance.valid?
+          instance.errors.messages.should be_empty
+        end
+      end
 
-    it "is empty" do
-      instance.to_hash.should be_empty
+      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
-  end
 
-  describe "#mocked_params accessors" do
-    let(:instance) { described_class.new({}, mocked_params)}
+    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
 
-    it "responds to mocked_params" 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)
+      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

data/spec/rails_integration_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 class RailsIntegrationParams < SimpleParams::Params
+  with_rails_helpers
+  
   param :name
   param :age, type: :integer, optional: true, validations: { inclusion: { in: 18..100 } }
   param :current_time, type: :datetime, optional: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel