objective 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7705d3450e744e1f7e7a887a4d834c0be973c61
-  data.tar.gz: 46ecee8f11eb7783768e9e396d968e67172ea6d4
+  metadata.gz: 36542ad6a5572ba8c8832cf1b1df0383516bb855
+  data.tar.gz: 1ccb77a65a1d6feec34011ba5509862df2b3b430
 SHA512:
-  metadata.gz: a1756e5db7deb2324ee0d175379c3346f2b32fcf166330e3972d3f06d1a746ea3ec12596948d440e3ee9a0bca3acb9285c56ac8b07bf1952d5d2ec42b9123e31
-  data.tar.gz: 0c9a485bfdb080d4117b53dcc26799f728d9a869cca0c675844f612e712285028d1cf480f48cbae1de137867d08f54d67a1ab2cd037098787174eb7fec8eea01
+  metadata.gz: 6af1516855837c90b9bd954e8724ad7d9b8e9d4b0cd470df6e99f135208c8058f40c1334fa2743bf4fa7cd97d410049e7952564ded26128c1184979163ac244c
+  data.tar.gz: 65f94c72d491fe8d1447b243422c9aaa3bc49a918435b02e84bdc8db0a7f4ea74a57e2ef33b124f193d1986550633a3423e2af554e21328da43ad7f726e3762a

data/lib/objective.rb

@@ -19,8 +19,6 @@ require 'active_support/core_ext/integer/inflections'
 
 require 'objective/allow'
 require 'objective/deny'
-require 'objective/discard'
-require 'objective/none'
 
 require 'objective/errors/error_atom'
 require 'objective/errors/error_hash'

data/lib/objective/errors/error_message_creator.rb

@@ -6,7 +6,6 @@ module Objective
       MESSAGES = Hash.new('is invalid').tap do |h|
         h.merge!(
           nils: 'cannot be nil',
-          required: 'is required',
 
           string: 'must be a string',
           integer: 'must be an integer',

data/lib/objective/filter.rb

@@ -53,7 +53,6 @@ module Objective
     end
 
     def feed(raw)
-      return feed_none if raw == Objective::NONE
       return feed_nil if raw.nil?
 
       coerced = options.strict == true ? raw : coerce(raw)
@@ -66,33 +65,16 @@ module Objective
       feed_result(errors, raw, coerced)
     end
 
-    def feed_none
-      case options.none
-      when Objective::ALLOW
-        return Objective::DISCARD
-      when Objective::DENY
-        coerced = Objective::NONE
-        errors = :required
-      when Objective::DISCARD
-        raise 'the none option cannot be discarded — did you mean to use allow instead?'
-      else
-        coerced = options.none
-      end
-
-      feed_result(errors, Objective::NONE, coerced)
-    end
-
     def feed_nil
       case options.nils
       when Objective::ALLOW
-        coerced = nil
         errors = nil
-      when Objective::DENY
         coerced = nil
+      when Objective::DENY
         errors = :nils
-      when Objective::DISCARD
-        return Objective::DISCARD
+        coerced = nil
       else
+        errors = nil
         coerced = options.nils
       end
 
@@ -101,11 +83,12 @@ module Objective
 
     def feed_invalid(errors, raw, coerced)
       case options.invalid
+      when Objective::ALLOW
+        errors = nil
       when Objective::DENY
         nil
-      when Objective::DISCARD
-        return Objective::DISCARD
       else
+        errors = nil
         coerced = options.invalid
       end
 
@@ -118,8 +101,6 @@ module Objective
         errors = nil
       when Objective::DENY
         errors = :empty
-      when Objective::DISCARD
-        return Objective::DISCARD
       else
         coerced = options.empty
       end

data/lib/objective/filters/any_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class AnyFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::ALLOW,
         invalid: Objective::DENY,
         strict: false

data/lib/objective/filters/array_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class ArrayFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,
@@ -13,7 +12,7 @@ module Objective
 
       def feed(raw)
         result = super(raw)
-        return result if result == Objective::DISCARD || result.errors || result.inputs.nil?
+        return result if result.errors || result.inputs.nil?
 
         inputs = []
         errors = Objective::Errors::ErrorArray.new
@@ -25,11 +24,6 @@ module Objective
         data = result.coerced
         data.each_with_index do |sub_data, index|
           sub_result = sub_filter.feed(sub_data)
-          if sub_result == Objective::DISCARD
-            index_shift += 1
-            next
-          end
-
           sub_data = sub_result.inputs
           sub_error = sub_result.errors
 

data/lib/objective/filters/boolean_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class BooleanFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/date_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class DateFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/decimal_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class DecimalFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/duck_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class DuckFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/file_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class FileFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/float_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class FloatFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/hash_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class HashFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false
@@ -12,16 +11,15 @@ module Objective
 
       def feed(raw)
         result = super(raw)
-        return result if result == Objective::DISCARD || result.errors || result.inputs.nil?
+        return result if result.errors || result.inputs.nil?
 
         errors = Objective::Errors::ErrorHash.new
         inputs = HashWithIndifferentAccess.new
 
         data = result.coerced
         sub_filters_hash.each_pair do |key, key_filter|
-          datum = data.key?(key) ? data[key] : Objective::NONE
+          datum = data[key]
           key_filter_result = key_filter.feed(datum)
-          next if key_filter_result == Objective::DISCARD
 
           sub_data = key_filter_result.inputs
           sub_error = key_filter_result.errors

data/lib/objective/filters/integer_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class IntegerFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/model_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class ModelFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/root_filter.rb

@@ -18,14 +18,13 @@ module Objective
         result.raw = raw
         result.coerced = coerce(raw)
 
-        inputs = OpenStruct.new
+        inputs = HashWithIndifferentAccess.new
         errors = Objective::Errors::ErrorHash.new
 
         data = result.coerced
         sub_filters_hash.each_pair do |key, key_filter|
-          datum = data.to_h.key?(key) ? data[key] : Objective::NONE
+          datum = data.to_h[key]
           key_filter_result = key_filter.feed(datum)
-          next if key_filter_result == Objective::DISCARD
 
           sub_data = key_filter_result.inputs
           sub_error = key_filter_result.errors

data/lib/objective/filters/string_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class StringFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/filters/time_filter.rb

@@ -4,7 +4,6 @@ module Objective
   module Filters
     class TimeFilter < Objective::Filter
       Options = OpenStruct.new(
-        none: Objective::DENY,
         nils: Objective::DENY,
         invalid: Objective::DENY,
         strict: false,

data/lib/objective/unit.rb

@@ -8,7 +8,6 @@ module Objective
       attr_reader :inputs, :raw_inputs, :built
       const_set('ALLOW', Objective::ALLOW)
       const_set('DENY', Objective::DENY)
-      const_set('DISCARD', Objective::DISCARD)
     end
 
     class_methods do

data/test/default_test.rb

@@ -6,29 +6,43 @@ require 'simple_unit'
 describe 'Objective - defaults' do
   class DefaultUnit
     include Objective::Unit
+
     filter do
-      string :name, none: 'Bob Jones'
+      string :name, nils: '-nils-', invalid: '-invalid-', empty: '-empty-'
     end
 
     def execute
-      inputs.to_h
+      inputs
     end
   end
 
-  it 'should have a default if no value is passed' do
-    outcome = DefaultUnit.run
-    assert_equal({ name: 'Bob Jones' }, outcome.result)
+  it 'should use a valid value passed to it' do
+    outcome = DefaultUnit.run(name: 'Fred')
     assert_equal true, outcome.success
+    assert_equal({ 'name' => 'Fred' }, outcome.result)
   end
 
-  it 'should have the passed value if a value is passed' do
-    outcome = DefaultUnit.run(name: 'Fred')
+  it 'should use a nils option default value if no value is passed' do
+    outcome = DefaultUnit.run
+    assert_equal({ 'name' => '-nils-' }, outcome.result)
     assert_equal true, outcome.success
-    assert_equal({ name: 'Fred' }, outcome.result)
   end
 
-  it 'should be an error if nil is passed on a required field with a default' do
+  it 'should use a nils option default value if nil is passed' do
     outcome = DefaultUnit.run(name: nil)
-    assert_equal false, outcome.success
+    assert_equal({ 'name' => '-nils-' }, outcome.result)
+    assert_equal true, outcome.success
+  end
+
+  it 'should use the invalid option default if an invalid value is passed' do
+    outcome = DefaultUnit.run(name: /regex/)
+    assert_equal({ 'name' => '-invalid-' }, outcome.result)
+    assert_equal true, outcome.success
+  end
+
+  it 'should use the empty option default if an empty value is passed' do
+    outcome = DefaultUnit.run(name: ' ')
+    assert_equal({ 'name' => '-empty-' }, outcome.result)
+    assert_equal true, outcome.success
   end
 end

data/test/inheritance_test.rb

@@ -16,22 +16,22 @@ describe 'Objective - inheritance' do
   it 'should filter with inherited unit' do
     outcome = SimpleInherited.run(name: 'bob', email: 'jon@jones.com', age: 10, amount: 22)
     assert outcome.success
-    assert_equal OpenStruct.new(name: 'bob', email: 'jon@jones.com', age: 10, amount: 22), outcome.inputs
+    assert_equal({ 'name' => 'bob', 'email' => 'jon@jones.com', 'age' => 10, 'amount' => 22 }, outcome.inputs)
   end
 
   it 'should filter with original unit' do
     outcome = SimpleUnit.run(name: 'bob', email: 'jon@jones.com', age: 10, amount: 22)
     assert outcome.success
-    assert_equal OpenStruct.new(name: 'bob', email: 'jon@jones.com', amount: 22), outcome.inputs
+    assert_equal({ 'name' => 'bob', 'email' => 'jon@jones.com', 'amount' => 22 }, outcome.inputs)
   end
 
   it 'shouldnt collide' do
     outcome = SimpleInherited.run(name: 'bob', email: 'jon@jones.com', age: 10, amount: 22)
     assert outcome.success
-    assert_equal OpenStruct.new(name: 'bob', email: 'jon@jones.com', age: 10, amount: 22), outcome.inputs
+    assert_equal({ 'name' => 'bob', 'email' => 'jon@jones.com', 'age' => 10, 'amount' => 22 }, outcome.inputs)
 
     outcome = SimpleUnit.run(name: 'bob', email: 'jon@jones.com', age: 10, amount: 22)
     assert outcome.success
-    assert_equal OpenStruct.new(name: 'bob', email: 'jon@jones.com', amount: 22), outcome.inputs
+    assert_equal({ 'name' => 'bob', 'email' => 'jon@jones.com', 'amount' => 22 }, outcome.inputs)
   end
 end

data/test/objective/errors/errors_test.rb

@@ -8,14 +8,14 @@ describe 'Objective - errors' do
     filter do
       string :str1
       string :str2, in: %w[opt1 opt2 opt3]
-      integer :int1, none: ALLOW
+      integer :int1, nils: ALLOW
 
-      hash :hash1, none: ALLOW do
+      hash :hash1, nils: ALLOW do
         boolean :bool1
         boolean :bool2
       end
 
-      array :arr1, none: ALLOW do
+      array :arr1, nils: ALLOW do
         integer
       end
     end
@@ -74,7 +74,7 @@ describe 'Objective - errors' do
         'str1' => :empty,
         'str2' => :in,
         'int1' => :integer,
-        'hash1' => { 'bool1' => :boolean, 'bool2' => :required },
+        'hash1' => { 'bool1' => :boolean, 'bool2' => :nils },
         'arr1' => [:integer, nil, :integer]
       }
 
@@ -88,7 +88,7 @@ describe 'Objective - errors' do
         'int1' => 'Int1 must be an integer',
         'hash1' => {
           'bool1' => 'Bool1 must be a boolean',
-          'bool2' => 'Bool2 is required'
+          'bool2' => 'Bool2 cannot be nil'
         },
         'arr1' => ['1st Arr1 must be an integer', nil, '3rd Arr1 must be an integer']
       }
@@ -102,7 +102,7 @@ describe 'Objective - errors' do
         'Str2 is not an available option',
         'Int1 must be an integer',
         'Bool1 must be a boolean',
-        'Bool2 is required',
+        'Bool2 cannot be nil',
         '1st Arr1 must be an integer',
         '3rd Arr1 must be an integer'
       ]
@@ -114,23 +114,4 @@ describe 'Objective - errors' do
       expected.each { |e| assert @outcome.errors.message_list.include?(e) }
     end
   end
-
-  class WithShrinkingArray
-    include Objective::Unit
-    filter do
-      array :arr_one do
-        integer nils: DISCARD
-      end
-    end
-  end
-
-  it 'returns an ErrorArray for errors in arrays' do
-    o = WithShrinkingArray.run(arr_one: [nil, 1, 'sally'])
-
-    assert !o.success
-    assert o.errors.is_a?(Objective::Errors::ErrorHash)
-    assert o.errors[:arr_one].is_a?(Objective::Errors::ErrorArray)
-    assert_nil o.errors[:arr_one][0]
-    assert o.errors[:arr_one][1].is_a?(Objective::Errors::ErrorAtom)
-  end
 end

data/test/objective/filters/array_filter_test.rb

@@ -128,17 +128,27 @@ describe 'Objective::Filters::ArrayFilter' do
       hash do
         string :foo
         integer :bar
-        boolean :baz, none: Objective::ALLOW
+        boolean :baz, nils: Objective::ALLOW
       end
     end
 
-    result = f.feed([{ foo: 'f', bar: 3, baz: true }, { foo: 'f', bar: 3 }, { foo: 'f' }])
-    expected_result = [{ 'foo' => 'f', 'bar' => 3, 'baz' => true }, { 'foo' => 'f', 'bar' => 3 }, { 'foo' => 'f' }]
+    result = f.feed(
+      [
+        { foo: 'f', bar: 3, baz: true },
+        { foo: 'f', bar: 3 },
+        { foo: 'f' }
+      ]
+    )
+    expected_result = [
+      { 'foo' => 'f', 'bar' => 3, 'baz' => true },
+      { 'foo' => 'f', 'bar' => 3, 'baz' => nil },
+      { 'foo' => 'f', 'baz' => nil }
+    ]
 
     assert_equal expected_result, result.inputs
     assert_nil result.errors[0]
     assert_nil result.errors[1]
-    assert_equal ({ 'bar' => :required }), result.errors[2].codes
+    assert_equal ({ 'bar' => :nils }), result.errors[2].codes
   end
 
   it 'lets you pass arrays of arrays' do
@@ -169,33 +179,33 @@ describe 'Objective::Filters::ArrayFilter' do
     assert_equal [err_message_string, err_message_empty], result.errors.message_list
   end
 
-  it 'can discard invalid elements' do
+  it 'can make invalid elements nil' do
     f = Objective::Filters::ArrayFilter.new(:arr) do
-      integer invalid: Objective::DISCARD
+      integer invalid: nil
     end
 
     result = f.feed([1, '2', 'three', '4', 5, [6]])
     assert_nil result.errors
-    assert_equal [1, 2, 4, 5], result.inputs
+    assert_equal [1, 2, nil, 4, 5, nil], result.inputs
   end
 
-  it 'can discard nil elements' do
+  it 'can allow nil elements' do
     f = Objective::Filters::ArrayFilter.new(:arr) do
-      integer nils: Objective::DISCARD
+      integer nils: Objective::ALLOW
     end
 
     result = f.feed([nil, 1, '2', nil, nil, '4', 5, nil])
     assert_nil result.errors
-    assert_equal [1, 2, 4, 5], result.inputs
+    assert_equal [nil, 1, 2, nil, nil, 4, 5, nil], result.inputs
   end
 
-  it 'can discard empty elements' do
+  it 'can allow empty elements' do
     f = Objective::Filters::ArrayFilter.new(:arr) do
-      string empty: Objective::DISCARD
+      string empty: Objective::ALLOW
     end
 
-    result = f.feed(['', 1, '2', '', '', '4', 5, ''])
+    result = f.feed(['', 'foo', '', '', 'bar', ''])
     assert_nil result.errors
-    assert_equal %w[1 2 4 5], result.inputs
+    assert_equal ['', 'foo', '', '', 'bar', ''], result.inputs
   end
 end

data/test/objective/filters/root_filter_test.rb

@@ -3,111 +3,96 @@
 require 'test_helper'
 
 describe 'Objective::Filters::RootFilter' do
-  describe 'optional filters and nils' do
-    it 'bar is optional -- it works if not passed' do
-      hf = Objective::Filters::RootFilter.new do
+  describe 'by default' do
+    it 'does not allow missing keys' do
+      f = Objective::Filters::RootFilter.new do
         filter do
           string :foo
-          string :bar, none: Objective::ALLOW
+          string :bar
         end
       end
 
-      result = hf.feed(foo: 'bar')
-      assert_equal OpenStruct.new(foo: 'bar'), result.inputs
-      assert_nil result.errors
+      result = f.feed(foo: 'oof')
+      assert_equal :nils, result.errors[:bar].codes
     end
 
-    it 'bar is optional -- it works if nil is passed' do
-      hf = Objective::Filters::RootFilter.new do
+    it 'does not allow nil values' do
+      f = Objective::Filters::RootFilter.new do
         filter do
           string :foo
-          string :bar, nils: Objective::DISCARD
+          string :bar
         end
       end
 
-      result = hf.feed(foo: 'bar', bar: nil)
-      assert_equal OpenStruct.new(foo: 'bar'), result.inputs
-      assert_nil result.errors
+      result = f.feed(foo: 'oof', bar: nil)
+      assert_equal :nils, result.errors[:bar].codes
     end
 
-    it 'bar is optional -- it works if nil is passed and nils are allowed' do
-      hf = Objective::Filters::RootFilter.new do
+    it 'does not allow empty values' do
+      f = Objective::Filters::RootFilter.new do
         filter do
           string :foo
-          string :bar, nils: Objective::ALLOW
+          string :bar
         end
       end
 
-      result = hf.feed(foo: 'bar', bar: nil)
-      assert_equal OpenStruct.new(foo: 'bar', bar: nil), result.inputs
-      assert_nil result.errors
+      result = f.feed(foo: 'oof', bar: ' ')
+      assert_equal :empty, result.errors[:bar].codes
     end
   end
 
-  describe 'optional filters and empty values' do
-    it 'bar is optional -- discards empty' do
-      hf = Objective::Filters::RootFilter.new do
+  describe 'when nils are allowed' do
+    it 'can accept a nil value' do
+      f = Objective::Filters::RootFilter.new do
         filter do
           string :foo
-          string :bar, empty: Objective::DISCARD
+          string :bar, nils: Objective::ALLOW
         end
       end
 
-      result = hf.feed(foo: 'bar', bar: '')
-      assert_equal OpenStruct.new(foo: 'bar'), result.inputs
+      result = f.feed(foo: 'oof', bar: nil)
+      assert_equal({ 'foo' => 'oof', 'bar' => nil }, result.inputs)
       assert_nil result.errors
     end
 
-    it 'bar is optional -- discards empty if it needs to be squished' do
-      hf = Objective::Filters::RootFilter.new do
+    it 'uses nil when a value is not passed' do
+      f = Objective::Filters::RootFilter.new do
         filter do
           string :foo
-          string :bar, empty: Objective::DISCARD
+          string :bar, nils: Objective::ALLOW
         end
       end
 
-      result = hf.feed(foo: 'bar', bar: ' ')
-      assert_equal OpenStruct.new(foo: 'bar'), result.inputs
+      result = f.feed(foo: 'oof')
+      assert_equal({ 'foo' => 'oof', 'bar' => nil }, result.inputs)
       assert_nil result.errors
     end
+  end
 
-    it "bar is optional -- don't discard empty if it's spaces but squishing is off" do
-      hf = Objective::Filters::RootFilter.new do
+  describe 'when empty values are allowed' do
+    it 'can accept an empty value' do
+      f = Objective::Filters::RootFilter.new do
         filter do
           string :foo
-          string :bar, empty: Objective::DISCARD, squish: false
+          string :bar, empty: Objective::ALLOW
         end
       end
 
-      result = hf.feed(foo: 'bar', bar: ' ')
-      assert_equal OpenStruct.new(foo: 'bar', bar: ' '), result.inputs
+      result = f.feed(foo: 'bar', bar: '')
+      assert_equal({ 'foo' => 'bar', 'bar' => '' }, result.inputs)
       assert_nil result.errors
     end
 
-    it 'bar is optional -- errors if value is blank' do
-      hf = Objective::Filters::RootFilter.new do
-        filter do
-          string :foo
-          string :bar, none: Objective::ALLOW
-        end
-      end
-
-      result = hf.feed(foo: 'bar', bar: '')
-      assert_equal({ 'bar' => :empty }, result.errors.codes)
-    end
-  end
-
-  describe 'discarding invalid values' do
-    it 'should discard invalid optional values' do
-      hf = Objective::Filters::RootFilter.new do
+    it 'can default a nil value to being empty' do
+      f = Objective::Filters::RootFilter.new do
         filter do
           string :foo
-          integer :bar, invalid: Objective::DISCARD
+          string :bar, empty: Objective::ALLOW, nils: ''
         end
       end
 
-      result = hf.feed(foo: 'bar', bar: 'baz')
-      assert_equal OpenStruct.new(foo: 'bar'), result.inputs
+      result = f.feed(foo: 'bar', bar: '')
+      assert_equal({ 'foo' => 'bar', 'bar' => '' }, result.inputs)
       assert_nil result.errors
     end
   end

data/test/simple_unit.rb

@@ -6,7 +6,7 @@ class SimpleUnit
   filter do
     string :name, max: 10
     string :email
-    integer :amount, none: ALLOW
+    integer :amount, nils: ALLOW
   end
 
   def validate

data/test/unit_test.rb

@@ -9,7 +9,7 @@ describe 'Unit' do
       outcome = SimpleUnit.run(name: 'John', email: 'john@gmail.com', amount: 5)
 
       assert outcome.success
-      assert_equal OpenStruct.new(name: 'John', email: 'john@gmail.com', amount: 5), outcome.inputs
+      assert_equal({ 'name' => 'John', 'email' => 'john@gmail.com', 'amount' => 5 }, outcome.inputs)
       assert_nil outcome.errors
     end
 
@@ -17,7 +17,7 @@ describe 'Unit' do
       outcome = SimpleUnit.run(name: 'John', email: 'john@gmail.com', amount: 5, buggers: true)
 
       assert outcome.success
-      assert_equal OpenStruct.new(name: 'John', email: 'john@gmail.com', amount: 5), outcome.inputs
+      assert_equal({ 'name' => 'John', 'email' => 'john@gmail.com', 'amount' => 5 }, outcome.inputs)
       assert_nil outcome.errors
     end
 
@@ -77,14 +77,14 @@ describe 'Unit' do
       outcome = SimpleUnit.run({ name: 'John', email: 'john@gmail.com' }, email: 'bob@jones.com', amount: 5)
 
       assert outcome.success
-      assert_equal OpenStruct.new(name: 'John', email: 'bob@jones.com', amount: 5), outcome.inputs
+      assert_equal({ 'name' => 'John', 'email' => 'bob@jones.com', 'amount' => 5 }, outcome.inputs)
     end
 
     it 'should merge hashes indifferently' do
       outcome = SimpleUnit.run({ name: 'John', email: 'john@gmail.com' }, 'email' => 'bob@jones.com', 'amount' => 5)
 
       assert outcome.success
-      assert_equal OpenStruct.new(name: 'John', email: 'bob@jones.com', amount: 5), outcome.inputs
+      assert_equal({ 'name' => 'John', 'email' => 'bob@jones.com', 'amount' => 5 }, outcome.inputs)
     end
 
     it 'shouldn\'t accept non-hashes' do
@@ -107,7 +107,7 @@ describe 'Unit' do
 
     it 'should return the filtered inputs in the outcome' do
       outcome = SimpleUnit.run(name: ' John ', email: 'john@gmail.com', amount: '5')
-      assert_equal(OpenStruct.new(name: 'John', email: 'john@gmail.com', amount: 5), outcome.inputs)
+      assert_equal({ 'name' => 'John', 'email' => 'john@gmail.com', 'amount' => 5 }, outcome.inputs)
     end
   end
 
@@ -116,7 +116,7 @@ describe 'Unit' do
       include Objective::Unit
       filter do
         string :name
-        string :email, none: ALLOW
+        string :email, nils: ALLOW
       end
 
       def execute
@@ -135,12 +135,12 @@ describe 'Unit' do
       include Objective::Unit
       filter do
         string :name
-        string :email, none: ALLOW
+        string :email, nils: ALLOW
       end
 
       def execute
-        inputs.name = 'bob'
-        inputs.email = 'bob@jones.com'
+        inputs[:name] = 'bob'
+        inputs[:email] = 'bob@jones.com'
         { name: inputs[:name], email: inputs[:email] }
       end
     end
@@ -156,7 +156,7 @@ describe 'Unit' do
       include Objective::Unit
       filter do
         string :name
-        string :email, none: ALLOW
+        string :email, nils: ALLOW
       end
 
       def execute
@@ -179,7 +179,7 @@ describe 'Unit' do
       include Objective::Unit
       filter do
         string :name
-        string :email, none: ALLOW
+        string :email, nils: ALLOW
       end
 
       def execute
@@ -202,7 +202,7 @@ describe 'Unit' do
       include Objective::Unit
       filter do
         string :name
-        string :email, none: ALLOW
+        string :email, nils: ALLOW
       end
 
       def execute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: objective
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dallin Crane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,7 +81,6 @@ files:
 - lib/objective.rb
 - lib/objective/allow.rb
 - lib/objective/deny.rb
-- lib/objective/discard.rb
 - lib/objective/errors/error_array.rb
 - lib/objective/errors/error_atom.rb
 - lib/objective/errors/error_hash.rb
@@ -102,7 +101,6 @@ files:
 - lib/objective/filters/root_filter.rb
 - lib/objective/filters/string_filter.rb
 - lib/objective/filters/time_filter.rb
-- lib/objective/none.rb
 - lib/objective/outcome.rb
 - lib/objective/unit.rb
 - test/default_test.rb

data/lib/objective/discard.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'singleton'
-
-module Objective
-  class Discard
-    include Singleton
-  end
-end
-
-Objective::DISCARD = Objective::Discard.instance.freeze

data/lib/objective/none.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'singleton'
-
-module Objective
-  class None
-    include Singleton
-  end
-end
-
-Objective::NONE = Objective::None.instance.freeze