stronger_parameters 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cee9c15067d436594362c541eda36feab8727e6
-  data.tar.gz: ff64518e518b16e4077a9539a056c4906bfbaf43
+  metadata.gz: bfaeb90bb2f1ba836eb17d917f923700f13f0954
+  data.tar.gz: 6be4921c1fc1d6343b767f8edd8d1789860c7d73
 SHA512:
-  metadata.gz: 28f33d4429925ec7e889dfa42ccb7c8efc0c06d3a8d7da778c584f17483de9b3585e28c2d8ad3725a975fe7171e9ed457fb53c539a59f84520e337a6d93f25c2
-  data.tar.gz: ce86345534a475a3030ceefffa52d0de28619373c7bc57f07c63666199c9814118a8e87470e62cdb2fc91c104d2849ef8f9ad73a4b2cfb41330d1d1d6ef769ad
+  metadata.gz: 6f608723da40c29edf0fe29294c80ec5eb1b4e79111e094ad7139afa1cf42789201d48bab9d1f5bb0f860fa4cccb517ee9760806ccc4d0b1acebe1046c0c63a7
+  data.tar.gz: 8eb47b550731ca07ae0b309fdc6cb66cc228c28cfa6d93300487e1ab6523eb56ad23bbeb4f399cf1f95afbca295b8976d7ca9e54c3af6446ba92398f19e5a438

data/lib/stronger_parameters/constraint.rb

@@ -0,0 +1,78 @@
+require 'stronger_parameters/errors'
+
+module StrongerParameters
+  class Constraint
+    def value(v)
+      v
+    end
+
+    def |(other)
+      OrConstraint.new(self, other)
+    end
+
+    def &(other)
+      AndConstraint.new(self, other)
+    end
+
+    def ==(other)
+      self.class == other.class
+    end
+  end
+
+  class OrConstraint < Constraint
+    attr_reader :constraints
+
+    def initialize(*constraints)
+      @constraints = constraints
+    end
+
+    def value(v)
+      exception = nil
+
+      constraints.each do |c|
+        result = c.value(v)
+        if result.is_a?(InvalidValue)
+          exception ||= result
+        else
+          return result
+        end
+      end
+
+      exception
+    end
+
+    def |(other)
+      constraints << other
+      self
+    end
+
+    def ==(other)
+      super && constraints == other.constraints
+    end
+  end
+
+  class AndConstraint < Constraint
+    attr_reader :constraints
+
+    def initialize(*constraints)
+      @constraints = constraints
+    end
+
+    def value(v)
+      constraints.each do |c|
+        v = c.value(v)
+        return v if v.is_a?(InvalidValue)
+      end
+      v
+    end
+
+    def &(other)
+      constraints << other
+      self
+    end
+
+    def ==(other)
+      super && constraints == other.constraints
+    end
+  end
+end

data/lib/stronger_parameters/constraints/array_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class ArrayConstraint < Constraint

data/lib/stronger_parameters/constraints/boolean_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class BooleanConstraint < Constraint

data/lib/stronger_parameters/constraints/comparison_constraints.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class ComparisonConstraints < Constraint

data/lib/stronger_parameters/constraints/date_time_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class DateTimeConstraint < Constraint

data/lib/stronger_parameters/constraints/decimal_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class DecimalConstraint < Constraint

data/lib/stronger_parameters/constraints/enumeration_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class EnumerationConstraint < Constraint

data/lib/stronger_parameters/constraints/file_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class FileConstraint < Constraint

data/lib/stronger_parameters/constraints/float_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class FloatConstraint < Constraint

data/lib/stronger_parameters/constraints/hash_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class HashConstraint < Constraint

data/lib/stronger_parameters/constraints/hex_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class HexConstraint < Constraint

data/lib/stronger_parameters/constraints/integer_constraint.rb

@@ -1,9 +1,9 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class IntegerConstraint < Constraint
     def value(v)
-      if v.is_a?(Fixnum) || v.is_a?(Bignum)
+      if v.is_a?(Integer)
         return v
       elsif v.is_a?(String) && v =~ /\A-?\d+\Z/
         return v.to_i

data/lib/stronger_parameters/constraints/nil_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class NilConstraint < Constraint

data/lib/stronger_parameters/constraints/nil_string_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class NilStringConstraint < Constraint

data/lib/stronger_parameters/constraints/regexp_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class RegexpConstraint < Constraint

data/lib/stronger_parameters/constraints/string_constraint.rb

@@ -1,4 +1,4 @@
-require 'stronger_parameters/constraints'
+require 'stronger_parameters/constraint'
 
 module StrongerParameters
   class StringConstraint < Constraint

data/lib/stronger_parameters/constraints.rb

@@ -1,82 +1,4 @@
-require 'stronger_parameters/errors'
-
-module StrongerParameters
-  class Constraint
-    def value(v)
-      v
-    end
-
-    def |(other)
-      OrConstraint.new(self, other)
-    end
-
-    def &(other)
-      AndConstraint.new(self, other)
-    end
-
-    def ==(other)
-      self.class == other.class
-    end
-  end
-
-  class OrConstraint < Constraint
-    attr_reader :constraints
-
-    def initialize(*constraints)
-      @constraints = constraints
-    end
-
-    def value(v)
-      exception = nil
-
-      constraints.each do |c|
-        result = c.value(v)
-        if result.is_a?(InvalidValue)
-          exception ||= result
-        else
-          return result
-        end
-      end
-
-      exception
-    end
-
-    def |(other)
-      constraints << other
-      self
-    end
-
-    def ==(other)
-      super && constraints == other.constraints
-    end
-  end
-
-  class AndConstraint < Constraint
-    attr_reader :constraints
-
-    def initialize(*constraints)
-      @constraints = constraints
-    end
-
-    def value(v)
-      constraints.each do |c|
-        v = c.value(v)
-        return v if v.is_a?(InvalidValue)
-      end
-      v
-    end
-
-    def &(other)
-      constraints << other
-      self
-    end
-
-    def ==(other)
-      super && constraints == other.constraints
-    end
-  end
-end
-
+require 'stronger_parameters/constraint'
 require 'stronger_parameters/constraints/string_constraint'
 require 'stronger_parameters/constraints/float_constraint'
 require 'stronger_parameters/constraints/date_time_constraint'

data/lib/stronger_parameters/version.rb

@@ -1,3 +1,3 @@
 module StrongerParameters
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stronger_parameters
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Mick Staugaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +151,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/stronger_parameters.rb
+- lib/stronger_parameters/constraint.rb
 - lib/stronger_parameters/constraints.rb
 - lib/stronger_parameters/constraints/array_constraint.rb
 - lib/stronger_parameters/constraints/boolean_constraint.rb
@@ -218,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Type checking and type casting of parameters for Action Pack