simple_params 0.0.5 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWM1MGE4MTFhODA2YzgzZDFiNDFmNGIxZjFiNTIxMzI4ZDNjOTg5OQ==
+    ZGFjNDQ2M2VjMDY5MDExZTI3MGMxOGQzYzA5M2ExOGY3MDA0YzlhNg==
   data.tar.gz: !binary |-
-    MGJlNGI0MDM4MGFlZTA5NDUwZTBhYTdhNDRhMmI5YzYwYTRhMTBhNw==
+    MGMzOGQ3MDNjMDY2ZjE2ZTY1ZTBjM2IyYTExMTJlOWZmMjZhOWYxZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGJmZDhjNDYxOWYxZjc0ODk5OGMwNjdmNDQwMGE4NDgyZjg4NGU3MDkwODdl
-    NmQ4YTFhNGNiNzUyYTMzODFmODVlYzgzYmU4MzdkYjY5MmIxNGMxMDJiMzZk
-    OWYyZDVmNDc5N2JjZjAwMzEwMWEzZjZkOTdlNjY4ZTA2NzNmNDY=
+    YjU1ZmI0OGRiNzZlYjFmZjcyMTAyMjFjNjViMTNiMGQzNzUzODVjYTEwY2U0
+    OTkwMmUzYWVmMTI0NmZmYTFlYzMzOTA5NGE2NWRmMGZjMWUwYjBjYjE3YzRm
+    OGNjZjFmYWMzZDlkMTEyYjM0Yjg5ZDMwOGU1MmRmNTQ1YzYwODc=
   data.tar.gz: !binary |-
-    MWY2OGU5NmUyM2Y5ZWY1YmExYWY5NTkxOTc2ZDk2ZjUwNTNjZGRlNTFlMGJm
-    NjVmN2ZkZTdhNDM1M2RjNDY1YjY2ZjYyMWJiY2M5MmVmY2YyYjk0YTA1YzI5
-    ODczNjgzMjhmNjIwNzBmNDY0ZmYwNDVlMmEyZmE5ZTY0NWY1ZDE=
+    NzA2NjI5OWM0MDJiOGE1YTBlZmYwMTgyYzlkMTYyN2RkM2Q5NzNkNDliOWQx
+    NmQ5Yjc4OWY3YTZjYjBkNTBjYWMyN2NjZmQ4NjExNDM5ZGE2N2QwZGY0Yjcx
+    ZDkxYmU4YzZmMTliOTc3ZDVhYjU1MTE0MzZlMTA5YjQ5NTU3ZDE=

data/Gemfile.lock

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

data/lib/simple_params/params.rb

@@ -50,7 +50,7 @@ module SimpleParams
 
       def nested_hash(name, opts={}, &block)
         attr_accessor name
-        nested_class = define_nested_class(opts, &block)
+        nested_class = define_nested_class(name, opts, &block)
         @nested_hashes ||= {}
         @nested_hashes[name.to_sym] = nested_class
       end
@@ -88,16 +88,12 @@ module SimpleParams
         validates name, validations unless validations.empty?
       end
 
-      def define_nested_class(options, &block)
+      def define_nested_class(name, options, &block)
+        klass_name = name.to_s.split('_').collect(&:capitalize).join
         Class.new(Params).tap do |klass|
-          name_function = Proc.new {
-            def self.model_name
-              ActiveModel::Name.new(self, nil, "temp")
-            end
-          }
-          klass.class_eval(&name_function)
           klass.class_eval(&block)
-          klass.class_eval("self.options = options")
+          klass.class_eval("self.options = #{options}")
+          self.const_set(klass_name, klass)
         end
       end
     end
@@ -146,7 +142,7 @@ module SimpleParams
         if @original_params.include?(method_name.to_sym)
           value = @original_params[method_name.to_sym]
           if value.is_a?(Hash)
-            define_anonymous_class(value)
+            define_anonymous_class(method_name, value)
           else
             Attribute.new(self, method_name).value = value
           end
@@ -206,17 +202,15 @@ module SimpleParams
       end
     end
 
-    def define_anonymous_class(hash)
-      klass = Class.new(Params).tap do |k|
-        name_function = Proc.new {
-          def self.model_name
-            ActiveModel::Name.new(self, nil, "temp")
-          end
-        }
-        k.class_eval(&name_function)
+    def define_anonymous_class(name, hash)
+      klass_name = name.to_s.split('_').collect(&:capitalize).join
+      anonymous_klass = Class.new(Params).tap do |klass|
+        # Have to undefine, then redefine, this const in order to avoid warnings.
+        self.class.send(:remove_const, klass_name) if self.class.const_defined?(klass_name)
+        self.class.const_set(klass_name, klass)
       end
-      klass.allow_undefined_params
-      klass.new(hash)
+      anonymous_klass.allow_undefined_params
+      anonymous_klass.new(hash)
     end
   end
 end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "0.0.5"
+  VERSION = "1.0.0"
 end

data/spec/acceptance_spec.rb

@@ -12,6 +12,7 @@ class AcceptanceParams < SimpleParams::Params
     param :city, validations: { length: { in: 4..40 } }
     param :zip_code, optional: true
     param :state, default: "North Carolina"
+    param :company, optional: true
   end
 
   def name_has_letters
@@ -41,6 +42,20 @@ describe SimpleParams::Params do
     end
   end
 
+  describe "nested_class", nested_class: true do
+    it "names nested class correctly" do
+      nested = AcceptanceParams.new.address
+      name = nested.class.name
+      name.should eq("AcceptanceParams::Address")
+    end
+
+    # it "names nested class model_class correctly" do
+    #   nested = AcceptanceParams.new.address
+    #   name = nested.model_class
+    #   name.should eq("")
+    # end
+  end
+
   describe "accessors", accessors: true do
     let(:params) { AcceptanceParams.new }
 
@@ -183,6 +198,34 @@ describe SimpleParams::Params do
         )
       end
     end
+
+    describe "acceptance cases" do
+      let(:params) do
+        {
+          name: "Tom", 
+          age: 41,
+          address: { 
+            street: "1 Main St.",
+            city: "Chicago",
+            state: "IL",
+            zip_code: 33440
+          }
+        }
+      end
+
+      it "is valid after multiple times" do
+        acceptance_params = AcceptanceParams.new(params)
+        acceptance_params.should be_valid
+        acceptance_params.should be_valid
+      end
+
+      it "is invalidated if validity changes after initial assignment" do
+        acceptance_params = AcceptanceParams.new(params)
+        acceptance_params.should be_valid
+        acceptance_params.name = nil
+        acceptance_params.should_not be_valid
+      end
+    end
   end
 
   describe "api_pie_documentation", api_pie_documentation: true do
@@ -198,6 +241,7 @@ describe SimpleParams::Params do
           param :city, String, desc: '', required: true
           param :zip_code, String, desc: '', required: false
           param :state, String, desc: '', required: true
+          param :company, String, desc: '', required: false
         end
       API_PIE_DOCS
 

data/spec/multiple_classes_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+class Example
+  class ParamsOne < SimpleParams::Params
+    param :name
+    param :age, type: :integer, validations: { inclusion: { in: 18..100 } }
+
+    nested_hash :address do
+      param :street
+      param :city, validations: { length: { in: 4..40 } }
+      param :zip_code, optional: true
+      param :state, optional: true, default: "North Carolina"
+    end
+  end
+
+  class ParamsTwo < SimpleParams::Params
+    param :name
+    param :age, type: :integer, optional: true
+
+    nested_hash :address do
+      param :street
+      param :city, validations: { length: { in: 4..40 } }
+      param :zip_code
+      param :state
+      param :country
+    end
+  end
+end
+
+describe SimpleParams::Params do
+  describe "api_pie_documentation", api_pie_documentation: true do
+    it "generates valid api_pie documentation for Example::ParamsOne" do
+      documentation = Example::ParamsOne.api_pie_documentation
+      api_docs = <<-API_PIE_DOCS
+        param :name, String, desc: '', required: true
+        param :age, Integer, desc: '', required: true
+        param :address, Hash, desc: '', required: true do
+          param :street, String, desc: '', required: true
+          param :city, String, desc: '', required: true
+          param :zip_code, String, desc: '', required: false
+          param :state, String, desc: '', required: false
+        end
+      API_PIE_DOCS
+
+      expect(documentation).to be_a String
+      expect(documentation.gsub(/\s+/, "")).to eq api_docs.gsub(/\s+/, "")
+    end
+
+    it "generates valid api_pie documentation for Example::ParamsTwo" do
+      documentation = Example::ParamsTwo.api_pie_documentation
+      api_docs = <<-API_PIE_DOCS
+        param :name, String, desc: '', required: true
+        param :age, Integer, desc: '', required: false
+        param :address, Hash, desc: '', required: true do
+          param :street, String, desc: '', required: true
+          param :city, String, desc: '', required: true
+          param :zip_code, String, desc: '', required: true
+          param :state, String, desc: '', required: true
+          param :country, String, desc: '', required: true
+        end
+      API_PIE_DOCS
+
+      expect(documentation).to be_a String
+      expect(documentation.gsub(/\s+/, "")).to eq api_docs.gsub(/\s+/, "")
+    end
+  end
+
+  describe "acceptance", acceptance: true do
+    it "is valid with only required params for Example::ParamsOne" do
+      params = {
+        name: "Tom",
+        age: 21,
+        address: {
+          street: "1 Main St.",
+          city: "Chicago"
+        }
+      }
+      Example::ParamsOne.new(params).should be_valid
+    end
+
+    it "is valid with only required params for Example::ParamsTwo" do
+      params = {
+        name: "Tom",
+        address: {
+          street: "1 Main St.",
+          city: "Chicago",
+          zip_code: "20122",
+          state: "IL",
+          country: "USA"
+        }
+      }
+      Example::ParamsTwo.new(params).should be_valid
+    end
+  end
+end

data/spec/params_spec.rb

@@ -292,6 +292,11 @@ describe SimpleParams::Params do
         model.nested.should be_a(SimpleParams::Params)
       end
 
+      it "allows undefined nested params, and name class correctly" do
+        model = DummyParams.new(nested: { some_value: 1 } )
+        model.nested.class.name.should eq("DummyParams::Nested")
+      end
+
       it "allows accessors for nested attributes" do
         model = DummyParams.new(nested: { some_value: 1 } )
         model.nested.some_value.should eq(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -155,6 +155,7 @@ files:
 - spec/errors_spec.rb
 - spec/fixtures/dummy_params.rb
 - spec/formatter_spec.rb
+- spec/multiple_classes_spec.rb
 - spec/params_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/base_attribute.rb
@@ -196,6 +197,7 @@ test_files:
 - spec/errors_spec.rb
 - spec/fixtures/dummy_params.rb
 - spec/formatter_spec.rb
+- spec/multiple_classes_spec.rb
 - spec/params_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/base_attribute.rb