simple_params 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTliMTVhZjE0OTJmN2M3MDgxYTJkZjQ2NTZmNTc1NWRmYzkyOWFmOQ==
+    ZmI5M2JjM2JhNGYxNjMwZmM4MGZmODdiZjM3ZDU4MGNmYWVjZWQxMA==
   data.tar.gz: !binary |-
-    MzZjMDI5OTIyZjgzMjkzMDI0MGQ2ODAwMDc3ODZmYjBhMzkzMTBkMA==
+    OTA3NDYyNWZhMmUxODA5ZTc4ZjRkZGJiMjQ3MzQzZDdiZDI2YTY0NQ==
 SHA512:
   metadata.gz: !binary |-
-    MTJhNGIxYjEyNzg5ZDgyZmUwYzk2YjcyYTAwZDUxY2M3NTExZjY2MTUyZDc5
-    MGQ1ZWViODEzZjJlMGFjOWI4ODAwOTVhYjNlZWE4ZDYzY2RlMmIzZTVkOTZh
-    MjRhNjIyZDNjMzBlZmI3YmFjM2Q5YmVmYjE1NWIxMzdjYWJiMzg=
+    YTc5NWUzOTk0MmNiZTc2ZTY1MTk5OTgwYzg5YWI4ZWU3MTM1ODAzMzM1OWVm
+    OTA1MGM4OGJhYzYwNmNjNDJiZGRhMWEyYTM5YTRjNGI0OTJlOTRiMDJiMGU5
+    OGE2YTY0MzM2ODY4NmU0MzQ5Nzc4ZTVjYjcxM2JkNmE2ZjVlYmU=
   data.tar.gz: !binary |-
-    MDAyODRiN2ZhZGY5YTg5NjM2M2NjMTZhZGFjYjhjN2EyMDkzZGM0NTgyZWIx
-    M2JjZjMwODU2YTFmOTkzNDAzYTQwY2RiZWM4NGRiYWJjZmM5MTQ2MTM2YWFj
-    ZDM3NjJlMmVmNDY3MDZiMmU4MDgxODhlYjAwZjMwNzI3Y2NlNjk=
+    ZDMyYzYxZjU5MmViYTdhNWE3MDczYzAzMmIyODY1NGY1MGQxZDhhMmMzY2Q5
+    M2E1MmQ1MmMzZTFhMDRjNjQxZWM3ZDRjZjljZGQ2YmYzYzc2YTIzNDAyODdk
+    OGQyNWExMjAzMTEzOTAyNzQ2ZGFiMjRkOGYxYzFiNTVjYjljM2Q=

data/Gemfile.lock

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

data/lib/simple_params/params.rb

@@ -103,6 +103,9 @@ module SimpleParams
       def define_nested_class(name, options, &block)
         klass_name = name.to_s.split('_').collect(&:capitalize).join
         Class.new(Params).tap do |klass|
+          # def self.model_name 
+          #   ActiveModel::Name.new(self)
+          # end
           klass.class_eval(&block)
           klass.class_eval("self.options = #{options}")
           self.const_set(klass_name, klass)
@@ -217,8 +220,12 @@ module SimpleParams
     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)
+        if self.class.const_defined?(klass_name)
+          begin
+            self.class.send(:remove_const, klass_name)
+          rescue NameError
+          end
+        end
         self.class.const_set(klass_name, klass)
       end
       anonymous_klass.allow_undefined_params

data/lib/simple_params/validation_matchers/optional_parameter_matcher.rb

@@ -5,13 +5,14 @@ module SimpleParams
     end
 
     class OptionalParameterMatcher < ValidationMatcher
-      attr_accessor :default_value, :attribute, :allowed_values
+      attr_accessor :default_value, :attribute, :allowed_values, :disallowed_values
       
       def initialize(attribute)
         super(attribute)
         @default_value = nil
         @attribute = attribute
         @allowed_values = nil
+        @disallowed_values = nil
       end
 
       def with_default(value)
@@ -24,6 +25,11 @@ module SimpleParams
         self
       end
 
+      def with_disallowed_values(*values)
+        @disallowed_values = values
+        self
+      end
+
       def matches?(subject)
         super(subject)
         
@@ -31,6 +37,8 @@ module SimpleParams
           matches_default_value?
         elsif @allowed_values
           allows_value_of(nil) && matches_allowed_values?
+        elsif @disallowed_values
+          allows_value_of(nil) && matches_disallowed_values?
         else
           allows_value_of(nil)
         end
@@ -60,6 +68,12 @@ module SimpleParams
           allows_value_of(value)
         end
       end
+
+      def matches_disallowed_values?
+        disallowed_values.all? do |value|
+          disallows_value_of(value)
+        end
+      end
     end
   end
 end

data/lib/simple_params/validation_matchers/required_parameter_matcher.rb

@@ -5,13 +5,14 @@ module SimpleParams
     end
 
     class RequiredParameterMatcher < ValidationMatcher
-      attr_accessor :default_value, :attribute, :allowed_values
+      attr_accessor :default_value, :attribute, :allowed_values, :disallowed_values
 
       def initialize(attribute)
         super(attribute)
         @default_value = nil
         @attribute = attribute
         @allowed_values = nil
+        @disallowed_values = nil
       end
 
       def with_default(value)
@@ -24,6 +25,11 @@ module SimpleParams
         self
       end
 
+      def with_disallowed_values(*values) 
+        @disallowed_values = values
+        self
+      end
+
       def matches?(subject)
         super(subject)
         @expected_message ||= :blank
@@ -32,6 +38,8 @@ module SimpleParams
           matches_default_value?
         elsif @allowed_values
           disallows_value_of(nil) && matches_allowed_values?
+        elsif @disallowed_values
+          matches_disallowed_values?
         else
           disallows_value_of(nil, @expected_message)
         end
@@ -60,6 +68,12 @@ module SimpleParams
           allows_value_of(value)
         end
       end
+
+      def matches_disallowed_values?
+        disallowed_values.all? do |value|
+          disallows_value_of(value)
+        end
+      end
     end
   end
 end

data/lib/simple_params/version.rb

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

data/spec/acceptance_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 class AcceptanceParams < SimpleParams::Params
+  allow_undefined_params
   param :reference, type: :object, optional: true
   param :name
   param :age, type: :integer, optional: true, validations: { inclusion: { in: 18..100 } }
@@ -23,6 +24,14 @@ class AcceptanceParams < SimpleParams::Params
 end
 
 describe SimpleParams::Params do
+  describe "model_name", model_name: true do
+    it "has an ActiveModel name" do
+      params = AcceptanceParams.new
+      params.class.model_name.should be_a(ActiveModel::Name)
+      params.class.model_name.to_s.should eq("AcceptanceParams")
+    end
+  end
+
   describe "original_params", original_params: true do
     it "returns symbolized params hash" do
       params = AcceptanceParams.new(name: "Tom", address: { "street" => "1 Main St."} )
@@ -49,6 +58,12 @@ describe SimpleParams::Params do
       name.should eq("AcceptanceParams::Address")
     end
 
+    it "has correct model_name" do
+      nested = AcceptanceParams.new.address
+      name = nested.class.model_name.to_s
+      name.should eq("AcceptanceParams::Address")
+    end
+
     it "names nested class model_class correctly" do
       nested = AcceptanceParams.new.address
       name = nested.class.name
@@ -243,6 +258,26 @@ describe SimpleParams::Params do
     end
   end
 
+  describe "anonymous params", anonymous_params: true do
+    it "accepts anonymous params with simple values" do
+      params = AcceptanceParams.new(random: "some_other_value")
+      params.random.should eq("some_other_value")
+    end
+
+    it "accepts anonymous params hashes and creates Params class" do
+      params = AcceptanceParams.new(random: { a: "1", b: "2"})
+      params.random.should be_a(SimpleParams::Params)
+      params.random.a.should eq("1")
+      params.random.b.should eq("2")
+    end
+
+    it "accepts anonymous params hashes and names class correctly" do
+      params = AcceptanceParams.new(random: { a: "1", b: "2"})
+      params.random.class.name.to_s.should eq("AcceptanceParams::Random")
+      params.random.class.model_name.to_s.should eq("AcceptanceParams::Random")
+    end
+  end
+
   describe "api_pie_documentation", api_pie_documentation: true do
     it "generates valida api_pie documentation" do
       documentation = AcceptanceParams.api_pie_documentation

data/spec/validation_matchers/optional_parameter_matcher_spec.rb

@@ -7,6 +7,7 @@ describe SimpleParams::ValidationMatchers::OptionalParameterMatcher do
     param :title, optional: true, default: "programmer"
     param :account_type, default: "checking", validations: { inclusion: { in: ["checking", "savings"] }}
     param :account_status, optional: true, validations: { inclusion: { in: ["active", "inactive"] }}
+    param :username, type: :string, default: "test", validations: { exclusion: { in: ['admin', 'demo'] } }
   end
 
   subject { OptionalParameterMatcher.new }
@@ -16,4 +17,7 @@ describe SimpleParams::ValidationMatchers::OptionalParameterMatcher do
   it { should have_optional_parameter(:title).with_default("programmer") }
   it { should have_optional_parameter(:account_status).with_allowed_values("active", "inactive") }
   it { should have_optional_parameter(:account_type).with_default("checking").with_allowed_values("checking", "savings") }
+  it { should have_optional_parameter(:account_type).with_disallowed_values("admin", "demo") }
+  it { should have_optional_parameter(:username).with_default("test").with_allowed_values("myuser", "kitten") }
+  it { should have_optional_parameter(:username).with_disallowed_values("admin", "demo") }
 end

data/spec/validation_matchers/required_parameter_matcher_spec.rb

@@ -7,6 +7,7 @@ describe SimpleParams::ValidationMatchers::RequiredParameterMatcher do
     param :title, default: "programmer"
     param :account_type, validations: { inclusion: { in: ["checking", "savings"] }}
     param :account_status, default: "active", validations: { inclusion: { in: ["active", "inactive"] }}
+    param :username, type: :string, validations: { exclusion: { in: ['admin', 'demo'] } }
   end
 
   subject { RequiredParameterMatcherTestClass.new }
@@ -17,4 +18,7 @@ describe SimpleParams::ValidationMatchers::RequiredParameterMatcher do
   it { should have_required_parameter(:title).with_default("programmer") }
   it { should have_required_parameter(:account_type).with_allowed_values("checking", "savings") }
   it { should have_required_parameter(:account_status).with_default("active").with_allowed_values("active", "inactive") }
+  it { should have_required_parameter(:account_status).with_disallowed_values("admin", "demo") }
+  it { should have_required_parameter(:username).with_allowed_values("myuser", "kitten") }
+  it { should have_required_parameter(:username).with_disallowed_values("admin", "demo") }
 end

metadata

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