simple_params 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGFjNDQ2M2VjMDY5MDExZTI3MGMxOGQzYzA5M2ExOGY3MDA0YzlhNg==
+    ZTliMTVhZjE0OTJmN2M3MDgxYTJkZjQ2NTZmNTc1NWRmYzkyOWFmOQ==
   data.tar.gz: !binary |-
-    MGMzOGQ3MDNjMDY2ZjE2ZTY1ZTBjM2IyYTExMTJlOWZmMjZhOWYxZQ==
+    MzZjMDI5OTIyZjgzMjkzMDI0MGQ2ODAwMDc3ODZmYjBhMzkzMTBkMA==
 SHA512:
   metadata.gz: !binary |-
-    YjU1ZmI0OGRiNzZlYjFmZjcyMTAyMjFjNjViMTNiMGQzNzUzODVjYTEwY2U0
-    OTkwMmUzYWVmMTI0NmZmYTFlYzMzOTA5NGE2NWRmMGZjMWUwYjBjYjE3YzRm
-    OGNjZjFmYWMzZDlkMTEyYjM0Yjg5ZDMwOGU1MmRmNTQ1YzYwODc=
+    MTJhNGIxYjEyNzg5ZDgyZmUwYzk2YjcyYTAwZDUxY2M3NTExZjY2MTUyZDc5
+    MGQ1ZWViODEzZjJlMGFjOWI4ODAwOTVhYjNlZWE4ZDYzY2RlMmIzZTVkOTZh
+    MjRhNjIyZDNjMzBlZmI3YmFjM2Q5YmVmYjE1NWIxMzdjYWJiMzg=
   data.tar.gz: !binary |-
-    NzA2NjI5OWM0MDJiOGE1YTBlZmYwMTgyYzlkMTYyN2RkM2Q5NzNkNDliOWQx
-    NmQ5Yjc4OWY3YTZjYjBkNTBjYWMyN2NjZmQ4NjExNDM5ZGE2N2QwZGY0Yjcx
-    ZDkxYmU4YzZmMTliOTc3ZDVhYjU1MTE0MzZlMTA5YjQ5NTU3ZDE=
+    MDAyODRiN2ZhZGY5YTg5NjM2M2NjMTZhZGFjYjhjN2EyMDkzZGM0NTgyZWIx
+    M2JjZjMwODU2YTFmOTkzNDAzYTQwY2RiZWM4NGRiYWJjZmM5MTQ2MTM2YWFj
+    ZDM3NjJlMmVmNDY3MDZiMmU4MDgxODhlYjAwZjMwNzI3Y2NlNjk=

data/Gemfile.lock

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

data/lib/simple_params/api_pie_doc/attribute_base.rb

@@ -15,12 +15,10 @@ module SimpleParams
     NotValidValueError = Class.new(StandardError)
 
     def requirement_description
-      value = options[:optional]
-      case value
-      when true
+      optional = options[:optional]
+      has_default = options.has_key?(:default)
+      if optional || has_default
         "required: false"
-      when false
-        "required: true"
       else
         "required: true"
       end

data/lib/simple_params/attribute.rb

@@ -5,6 +5,10 @@ module SimpleParams
   class Attribute
     attr_reader :parent
     attr_reader :name
+    attr_reader :type
+    attr_reader :default
+    attr_reader :validations
+    attr_reader :formatter
 
     def initialize(parent, name, opts={})
       @parent = parent
@@ -13,11 +17,12 @@ module SimpleParams
       @value = nil
       @default = opts[:default]
       @formatter = opts[:formatter]
+      @validations = opts[:validations] || {}
     end
 
     def raw_value
       empty = @value.nil? || (@value.is_a?(String) && @value.blank?)
-      empty ? default : @value
+      empty ? raw_default : @value
     end
 
     def value
@@ -39,7 +44,7 @@ module SimpleParams
     end
 
   private
-    def default
+    def raw_default
       if @default.is_a?(Proc)
         @default.call(parent, self)
       else

data/lib/simple_params/params.rb

@@ -84,7 +84,19 @@ module SimpleParams
 
       def add_validations(name, opts = {})
         validations = opts[:validations] || {}
-        opts[:optional] ? validations.merge!(presence: false, allow_nil: true) : validations.merge!(presence: true)
+        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
 

data/lib/simple_params/version.rb

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

data/spec/acceptance_spec.rb

@@ -49,11 +49,11 @@ describe SimpleParams::Params do
       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
+    it "names nested class model_class correctly" do
+      nested = AcceptanceParams.new.address
+      name = nested.class.name
+      name.should eq("AcceptanceParams::Address")
+    end
   end
 
   describe "accessors", accessors: true do
@@ -103,6 +103,21 @@ describe SimpleParams::Params do
       params = AcceptanceParams.new
       params.attributes.should eq([:reference, :name, :age, :color, :address])
     end
+
+    it "returns array of attribute symbols for nested class" do
+      params = AcceptanceParams::Address.new
+      params.attributes.should eq([:street, :city, :zip_code, :state, :company])
+    end
+
+    it "initializes attributes correctly" do
+      params = AcceptanceParams.new
+      attribute = params.instance_variable_get("@age_attribute")
+      attribute.parent.should eq(params)
+      attribute.name.should eq(:age)
+      attribute.type.should eq(Integer)
+      attribute.formatter.should be_nil
+      attribute.validations.should eq({ inclusion: { in: 18..100 }, allow_nil: true })
+    end
   end
 
   describe "array syntax", array_syntax: true do
@@ -235,12 +250,12 @@ describe SimpleParams::Params do
         param:reference, Object, desc:'', required: false
         param :name, String, desc: '', required: true
         param :age, Integer, desc: '', required: false
-        param :color, String, desc: '', required: true
+        param :color, String, 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: false
-          param :state, String, desc: '', required: true
+          param :state, String, desc: '', required: false
           param :company, String, desc: '', required: false
         end
       API_PIE_DOCS

data/spec/api_pie_doc/nested_attribute_spec.rb

@@ -40,7 +40,7 @@ describe SimpleParams::ApiPieDoc::NestedAttribute do
 
   describe '#to_s' do
     specify 'should return properly formatted string' do
-      expect(nested_attribute.to_s).to eq("param :address, Hash, desc: 'i like pie', required: true do\nparam :street, String, desc: '', required: true\nparam :city, String, desc: '', required: true\nparam :zip_code, String, desc: '', required: false\nparam :state, String, desc: '', required: true\nend")
+      expect(nested_attribute.to_s).to eq("param :address, Hash, desc: 'i like pie', required: true do\nparam :street, String, desc: '', required: true\nparam :city, String, desc: '', required: true\nparam :zip_code, String, desc: '', required: false\nparam :state, String, desc: '', required: false\nend")
     end
   end
 end

data/spec/attribute_spec.rb

@@ -105,6 +105,10 @@ describe SimpleParams::Attribute do
     context "with static default" do
       let(:model) { described_class.new(house, "color", { default: "something" })}
 
+      it "has default attr_reader" do
+        model.default.should eq("something")
+      end
+
       it "uses default when value not set" do
         model.value.should eq("something")
       end
@@ -116,6 +120,10 @@ describe SimpleParams::Attribute do
       end
       let(:model) { described_class.new(house, "color", { default: default })}
 
+      it "has default attr_reader" do
+        model.default.should eq(default)
+      end
+
       it "uses default when value not set" do
         model.value.should eq("My house rocks!")
       end
@@ -126,6 +134,10 @@ describe SimpleParams::Attribute do
     context "with function reference" do
       let(:model) { described_class.new(house, "color", { formatter: :capitalize })}
 
+      it "has formatter attr_reader" do
+        model.formatter.should eq(:capitalize)
+      end
+
       it "uses method formatter from parent" do
         model.value = "lower"
         model.value.should eq("LOWER")
@@ -139,10 +151,32 @@ describe SimpleParams::Attribute do
 
       let(:model) { described_class.new(house, "color", { formatter: formatter })}
 
+      it "has formatter attr_reader" do
+        model.formatter.should eq(formatter)
+      end
+
       it "uses Proc formatter on value" do
         model.value = "rocks"
         model.value.should eq("My house ROCKS")
       end
     end
   end
+
+  describe "validations" do
+    context "without validations" do
+      let(:model) { described_class.new(house, "color", {})}
+
+      it "has empty hash as validations" do
+        model.validations.should eq({})
+      end
+    end
+
+    context "with validations" do
+      let(:model) { described_class.new(house, "color", { validations: { presence: true } })}
+
+      it "has validations hash" do
+        model.validations.should eq({ presence: true })
+      end
+    end
+  end
 end

data/spec/params_spec.rb

@@ -316,20 +316,20 @@ describe SimpleParams::Params do
       api_docs = <<-API_PIE_DOCS
                   param :name, String, desc: '', required: true
                   param :age, Integer, desc: '', required: false
-                  param :first_initial, String, desc: '', required: true
+                  param :first_initial, String, desc: '', required: false
                   param :amount, desc: '', required: false
-                  param :color, String, desc: '', required: true
+                  param :color, String, desc: '', required: false
                   param :height, String, 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: false
-                    param :state, String, desc: '', required: true
+                    param :state, String, desc: '', required: false
                   end
                   param :phone, Hash, desc: '', required: true do
-                    param :cell_phone, desc: '', required: true
+                    param :cell_phone, desc: '', required: false
                     param :phone_number, String, desc: '', required: true
-                    param :area_code, String, desc: '', required: true
+                    param :area_code, String, desc: '', required: false
                   end
                 API_PIE_DOCS
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel