mutations 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9df957aca8cdb7ad065a71ade7fb1ccf48091e025e73f395822f53dab1de255
-  data.tar.gz: a6a3df2daca41bb6886bc76c75027f28d131c483d69120a10a5b108c79f549c7
+  metadata.gz: 3eda7e54196daf6a06659a669f0864921ab376c54f218f4463f7c8b06d1dc075
+  data.tar.gz: 0c6d22af4d18c4ae3041c600f2c61873cae3728514f49d48dfed41bfd6b57e63
 SHA512:
-  metadata.gz: e4ba37c6965c370d1d5cf39a28dcdb1a854e72ca0ad7ae91c5612bce03d2c35e09431eb21ffc4e46ec212d3806a89562517fea37eba2fdfce3683cfae0a0bb21
-  data.tar.gz: 5ed2f4404656a7646dbfb93a69f2bc7008c5182d44e2bb66e3e1ba9a259cd100c56e4849cb6ec5bd923d919db2aee25c2a8d7888862066f15e0b763a28bc67f2
+  metadata.gz: eb82171717884e5ed61fa499c50fa9f5d3b4b1108c988619610b461e76f1a25c70078ad4aa3fff275e32e4b43f711cbe334d402b86e61a53d58778b4792c5986
+  data.tar.gz: 9538cc3fbe474561fe72ff096c072128a03bb13237541e1e21338d72557abd2beeb75e85d1ff2bb72b5c9d9015bb89046b44d4330e6cd3ddde8eebb6f1e3ebb7

data/.gitignore

@@ -2,3 +2,5 @@
 .ruby-version
 *.gem
 Gemfile.lock
+.bundle
+vendor/bundle

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.8.3
+-----------
+ - Add `min_length` and `max_length` options to array filter (#128, @jwoertink)
+ - Add `empty_is_nil` option to date filter (#122, @jamesacarr)
+ - Respect `Mutations.cache_constants` in array filters (#125, @eugeneius)
+
 0.8.2
 -----------
  - Add `:error_key` filter option to allow error messages to be customised. (#115, @mwhatters)

data/lib/mutations/array_filter.rb

@@ -10,7 +10,9 @@ module Mutations
     @default_options = {
       :nils => false,            # true allows an explicit nil to be valid. Overrides any other options
       :class => nil,             # A constant or string indicates that each element of the array needs to be one of these classes
-      :arrayize => false         # true will convert "hi" to ["hi"]. "" converts to []
+      :arrayize => false,        # true will convert "hi" to ["hi"]. "" converts to []
+      :min_length => nil,        # Can be a number like 5, meaning 5 objects are required
+      :max_length => nil         # Can be a number like 20, meaning no more than 20 objects
     }
 
     def initialize(name, opts = {}, &block)
@@ -38,7 +40,23 @@ module Mutations
       @element_filter = ArrayFilter.new(nil, options, &block)
     end
 
+    def initialize_constants!
+      @initialize_constants ||= begin
+        if options[:class]
+          options[:class] = options[:class].constantize if options[:class].is_a?(String)
+        end
+
+        true
+      end
+
+      unless Mutations.cache_constants?
+        options[:class] = options[:class].to_s.constantize if options[:class]
+      end
+    end
+
     def filter(data)
+      initialize_constants!
+
       # Handle nil case
       if data.nil?
         return [nil, nil] if options[:nils]
@@ -54,6 +72,9 @@ module Mutations
         errors = ErrorArray.new
         filtered_data = []
         found_error = false
+
+        return [data, :min_length] if options[:min_length] && data.length < options[:min_length]
+        return [data, :max_length] if options[:max_length] && data.length > options[:max_length]
         data.each_with_index do |el, i|
           el_filtered, el_error = filter_element(el)
           el_error = ErrorAtom.new(@name, el_error, :index => i) if el_error.is_a?(Symbol)
@@ -81,10 +102,7 @@ module Mutations
         data, el_errors = @element_filter.filter(data)
         return [data, el_errors] if el_errors
       elsif options[:class]
-        class_const = options[:class]
-        class_const = class_const.constantize if class_const.is_a?(String)
-
-        if !data.is_a?(class_const)
+        if !data.is_a?(options[:class])
           return [data, :class]
         end
       end

data/lib/mutations/date_filter.rb

@@ -1,21 +1,26 @@
 module Mutations
   class DateFilter < AdditionalFilter
     @default_options = {
-      :nils => false,       # true allows an explicit nil to be valid. Overrides any other options
-      :format => nil,       # If nil, Date.parse will be used for coercion. If something like "%Y-%m-%d", Date.strptime is used
-      :after => nil,        # A date object, representing the minimum date allowed, inclusive
-      :before => nil        # A date object, representing the maximum date allowed, inclusive
+      :nils => false,         # true allows an explicit nil to be valid. Overrides any other options
+      :empty_is_nil => false, # If true, treat empty string as if it were nil
+      :format => nil,         # If nil, Date.parse will be used for coercion. If something like "%Y-%m-%d", Date.strptime is used
+      :after => nil,          # A date object, representing the minimum date allowed, inclusive
+      :before => nil          # A date object, representing the maximum date allowed, inclusive
     }
 
     def filter(data)
+      if options[:empty_is_nil] && data == ""
+        data = nil
+      end
+
       # Handle nil case
       if data.nil?
         return [nil, nil] if options[:nils]
         return [nil, :nils]
       end
-      
+
       # Now check if it's empty:
-      return [data, :empty] if "" == data 
+      return [data, :empty] if "" == data
 
       if data.is_a?(Date) # Date and DateTime
         actual_date = data
@@ -34,7 +39,7 @@ module Mutations
       else
         return [nil, :date]
       end
-      
+
       # Ok, its a valid date, check if it falls within the range
       if options[:after]
         if actual_date <= options[:after]

data/lib/mutations/version.rb

@@ -1,3 +1,3 @@
 module Mutations
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/array_filter_spec.rb

@@ -3,6 +3,8 @@ require 'stringio'
 
 describe "Mutations::ArrayFilter" do
 
+  class SimpleModel; end
+
   it "allows arrays" do
     f = Mutations::ArrayFilter.new(:arr)
     filtered, errors = f.filter([1])
@@ -189,4 +191,76 @@ describe "Mutations::ArrayFilter" do
     assert_equal [1,2,4,5], filtered
     assert_equal nil, errors
   end
+
+  it "considers long arrays to be valid" do
+    f = Mutations::ArrayFilter.new(:arr, :min_length => 2)
+    filtered, errors = f.filter([1, 2])
+    assert_equal [1, 2], filtered
+    assert_equal nil, errors
+  end
+
+  it "considers short arrays to be invalid" do
+    f = Mutations::ArrayFilter.new(:arr, :min_length => 2)
+    filtered, errors = f.filter([1])
+    assert_equal [1], filtered
+    assert_equal :min_length, errors
+  end
+
+  it "sets a max_length for the array of 20 with one element as valid" do
+    f = Mutations::ArrayFilter.new(:arr, :max_length => 20)
+    filtered, errors = f.filter([1])
+    assert_equal [1], filtered
+    assert_equal nil, errors
+  end
+  
+  it "sets a max_length for the array of 2 with 5 as invalid" do
+    f = Mutations::ArrayFilter.new(:arr, :max_length => 2)
+    filtered, errors = f.filter([1,2,3,4,5])
+    assert_equal [1,2,3,4,5], filtered
+    assert_equal :max_length, errors
+  end
+
+  it "will not re-constantize if cache_constants is true" do
+    was = Mutations.cache_constants?
+    Mutations.cache_constants = true
+
+    f = Mutations::ArrayFilter.new(:simple_models, class: "SimpleModel")
+
+    m = SimpleModel.new
+    filtered, errors = f.filter([m])
+    assert_equal [m], filtered
+    assert_equal nil, errors
+
+    Object.send(:remove_const, 'SimpleModel')
+    class SimpleModel; end
+
+    m = SimpleModel.new
+    filtered, errors = f.filter([m])
+    assert_equal [m], filtered
+    assert_equal [:class], errors.symbolic
+
+    Mutations.cache_constants = was
+  end
+
+  it "will re-constantize if cache_constants is false" do
+    was = Mutations.cache_constants?
+    Mutations.cache_constants = false
+
+    f = Mutations::ArrayFilter.new(:simple_models, class: "SimpleModel")
+
+    m = SimpleModel.new
+    filtered, errors = f.filter([m])
+    assert_equal [m], filtered
+    assert_equal nil, errors
+
+    Object.send(:remove_const, 'SimpleModel')
+    class SimpleModel; end
+
+    m = SimpleModel.new
+    filtered, errors = f.filter([m])
+    assert_equal [m], filtered
+    assert_equal nil, errors
+
+    Mutations.cache_constants = was
+  end
 end

data/spec/date_filter_spec.rb

@@ -124,7 +124,7 @@ describe "Mutations::DateFilter" do
     assert_equal nil, filtered
     assert_equal :nils, errors
   end
-  
+
   it "considers empty strings to be empty" do
     f = Mutations::DateFilter.new
     filtered, errors = f.filter("")
@@ -140,6 +140,19 @@ describe "Mutations::DateFilter" do
     assert_equal nil, errors
   end
 
+  it "considers empty strings to be nil if empty_is_nil option is used" do
+    f = Mutations::DateFilter.new(:empty_is_nil => true)
+    _filtered, errors = f.filter("")
+    assert_equal :nils, errors
+  end
+
+  it "returns empty strings as nil if empty_is_nil option is used" do
+    f = Mutations::DateFilter.new(:empty_is_nil => true, :nils => true)
+    filtered, errors = f.filter("")
+    assert_equal nil, filtered
+    assert_equal nil, errors
+  end
+
   it "doesn't allow non-existing dates" do
     date_string = "1, 20, 2013"
     f = Mutations::DateFilter.new

data/spec/model_filter_spec.rb

@@ -60,6 +60,27 @@ describe "Mutations::ModelFilter" do
     assert_equal nil, filtered
     assert_equal nil, errors
   end
+
+  it "will not re-constantize if cache_constants is true" do
+    was = Mutations.cache_constants?
+    Mutations.cache_constants = true
+    f = Mutations::ModelFilter.new(:simple_model)
+    m = SimpleModel.new
+    filtered, errors = f.filter(m)
+    assert_equal m, filtered
+    assert_equal nil, errors
+
+    Object.send(:remove_const, 'SimpleModel')
+
+    class SimpleModel; end
+
+    m = SimpleModel.new
+    filtered, errors = f.filter(m)
+    assert_equal m, filtered
+    assert_equal :model, errors
+
+    Mutations.cache_constants = was
+  end
   
   it "will re-constantize if cache_constants is false" do
     was = Mutations.cache_constants?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutations
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Jonathan Novak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport