objective 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36542ad6a5572ba8c8832cf1b1df0383516bb855
-  data.tar.gz: 1ccb77a65a1d6feec34011ba5509862df2b3b430
+  metadata.gz: 72b1cd84872138d986c27917ddde80b4a6267da6
+  data.tar.gz: 3959aa006a2b9d4f732a3ecd83cb91bef4b15d72
 SHA512:
-  metadata.gz: 6af1516855837c90b9bd954e8724ad7d9b8e9d4b0cd470df6e99f135208c8058f40c1334fa2743bf4fa7cd97d410049e7952564ded26128c1184979163ac244c
-  data.tar.gz: 65f94c72d491fe8d1447b243422c9aaa3bc49a918435b02e84bdc8db0a7f4ea74a57e2ef33b124f193d1986550633a3423e2af554e21328da43ad7f726e3762a
+  metadata.gz: 0b6b54295d84ad221cdba86531ea945255881e4a636429b1311aa952da8f52996b495f51ef9c709284b02bac8279e8e4a3f70d926ca1cb9d8fb4b235501e55c6
+  data.tar.gz: b09ee8a3750bf3294c85f60df26a06d868650357cbf8eeed712216d9b2c078522c52b2a44e275550d2eff1bcba6df3d432e215c98c07a13e026db43ef017ae87

data/lib/objective.rb

@@ -6,20 +6,11 @@ require 'time'
 require 'bigdecimal'
 require 'bigdecimal/util'
 
-require 'active_support/concern'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/core_ext/object/try'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/deep_merge'
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/string/filters'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/integer/inflections'
-
 require 'objective/allow'
 require 'objective/deny'
 
+require 'objective/helpers'
+
 require 'objective/errors/error_atom'
 require 'objective/errors/error_hash'
 require 'objective/errors/error_array'
@@ -46,6 +37,13 @@ require 'objective/unit'
 require 'objective/outcome'
 
 module Objective
-  mattr_accessor :error_message_creator
+  def self.error_message_creator
+    @@error_message_creator
+  end
+
+  def self.error_message_creator=(obj)
+    @@error_message_creator = obj
+  end
+
   self.error_message_creator = Errors::ErrorMessageCreator.new
 end

data/lib/objective/errors/error_array.rb

@@ -4,7 +4,10 @@ module Objective
   module Errors
     class ErrorArray < Array
       def codes
-        map { |e| e.try(:codes) }
+        map do |e|
+          next unless e.respond_to?(:codes)
+          e.codes
+        end
       end
 
       def message(parent_key = nil, _index = nil)

data/lib/objective/errors/error_atom.rb

@@ -21,7 +21,7 @@ module Objective
       end
 
       def message_list(parent_key = nil, index = nil)
-        Array.wrap(message(parent_key, index))
+        Objective::Helpers.wrap(message(parent_key, index))
       end
     end
   end

data/lib/objective/errors/error_hash.rb

@@ -2,7 +2,7 @@
 
 module Objective
   module Errors
-    class ErrorHash < HashWithIndifferentAccess
+    class ErrorHash < Hash
       # objective.errors is an ErrorHash instance like this:
       # {
       #   email: ErrorAtom(:matches),
@@ -13,7 +13,7 @@ module Objective
       #   }
       # }
 
-      # Returns a nested HashWithIndifferentAccess where the values are symbols.  Eg:
+      # Returns a nested Hash where the values are symbols.  Eg:
       # {
       #   email: :matches,
       #   name: :too_weird,
@@ -23,14 +23,14 @@ module Objective
       #   }
       # }
       def codes
-        HashWithIndifferentAccess.new.tap do |hash|
+        {}.tap do |hash|
           each do |k, v|
             hash[k] = v.codes
           end
         end
       end
 
-      # Returns a nested HashWithIndifferentAccess where the values are messages. Eg:
+      # Returns a nested Hash where the values are messages. Eg:
       # {
       #   email: "isn't in the right format",
       #   name: "is too weird",
@@ -40,7 +40,7 @@ module Objective
       #   }
       # }
       def message(_parent_key = nil, _index = nil)
-        HashWithIndifferentAccess.new.tap do |hash|
+        {}.tap do |hash|
           each do |k, v|
             hash[k] = v.message(k)
           end

data/lib/objective/errors/error_message_creator.rb

@@ -28,7 +28,7 @@ module Objective
       def message(atom, parent_key, index)
         [
           index_ordinal(index),
-          (atom.key || parent_key || 'item').to_s.titleize,
+          (atom.key || parent_key || 'item').to_s,
           MESSAGES[atom.codes]
         ]
           .compact
@@ -37,7 +37,25 @@ module Objective
 
       def index_ordinal(index)
         return if index.nil?
-        (index + 1).ordinalize
+        ordinalize_index(index)
+      end
+
+      def ordinalize_index(index)
+        number = index + 1
+
+        ordinal =
+          if (11..13).cover?(number % 100)
+            'th'
+          else
+            case number % 10
+            when 1 then 'st'
+            when 2 then 'nd'
+            when 3 then 'rd'
+            else 'th'
+            end
+          end
+
+        "#{number}#{ordinal}"
       end
     end
   end

data/lib/objective/filter.rb

@@ -3,22 +3,17 @@
 module Objective
   class Filter
     def self.inherited(child_class)
-      method_name = filter_name(child_class)
+      filter_match = child_class.name.match(/\AObjective::Filters::(.*)Filter\z/)
+      raise "invalid class name for filter: #{child_class.name}" unless filter_match
+      filter_name = filter_match[1].gsub(/(.)([A-Z])/, '\1_\2').downcase
 
-      define_method(method_name) do |*args, &block|
+      define_method(filter_name) do |*args, &block|
         args.unshift(nil) if args[0].is_a?(Hash)
         new_filter = child_class.new(*args, &block)
         sub_filters.push(new_filter)
       end
     end
 
-    def self.filter_name(klass = self)
-      filter_match = klass.name.match(/\AObjective::Filters::(.*)Filter\z/)
-      filter_name = filter_match ? filter_match[1].try(:underscore) : nil
-      raise 'filename error in filters folder' unless filter_name
-      filter_name
-    end
-
     attr_reader :key
     attr_reader :sub_filters
 

data/lib/objective/filters/array_filter.rb

@@ -35,12 +35,12 @@ module Objective
         end
 
         result.inputs = inputs
-        result.errors = errors.present? ? errors : nil
+        result.errors = errors.empty? ? nil : errors
         result
       end
 
       def coerce(raw)
-        return Array.wrap(raw) if options.wrap
+        return Objective::Helpers.wrap(raw) if options.wrap
         raw
       end
 

data/lib/objective/filters/decimal_filter.rb

@@ -16,13 +16,16 @@ module Objective
 
       private
 
-      # TODO: the Rational class should be coerced - it requires a precision argument
       def coerce(datum)
-        return datum if datum.blank?
+        if datum.is_a?(String)
+          datum = datum.strip
+          return datum if datum.empty?
+        end
 
         return datum.to_d if datum.is_a?(Integer) || datum.is_a?(Float)
 
         return datum unless datum.is_a?(String)
+        datum = datum.strip
         return datum if options.decimal_mark != '.' && !options.delimiter.include?('.') && datum.include?('.')
 
         clean_str = datum.tr(options.delimiter, '').tr(options.decimal_mark, '.')

data/lib/objective/filters/duck_filter.rb

@@ -17,7 +17,7 @@ module Objective
       end
 
       def respond_to_all?(coerced)
-        Array.wrap(options[:methods]).map do |method|
+        Objective::Helpers.wrap(options[:methods]).map do |method|
           coerced.respond_to?(method)
         end.all?
       end

data/lib/objective/filters/float_filter.rb

@@ -17,11 +17,15 @@ module Objective
       private
 
       def coerce(datum)
-        return datum if datum.blank?
+        if datum.is_a?(String)
+          datum = datum.strip
+          return datum if datum.empty?
+        end
 
         return datum.to_f if datum.is_a?(Integer) || datum.is_a?(BigDecimal)
 
         return datum unless datum.is_a?(String)
+        datum = datum.strip
         return datum if options.decimal_mark != '.' && !options.delimiter.include?('.') && datum.include?('.')
 
         clean_str = datum.tr(options.delimiter, '').tr(options.decimal_mark, '.')

data/lib/objective/filters/hash_filter.rb

@@ -14,7 +14,7 @@ module Objective
         return result if result.errors || result.inputs.nil?
 
         errors = Objective::Errors::ErrorHash.new
-        inputs = HashWithIndifferentAccess.new
+        inputs = {}
 
         data = result.coerced
         sub_filters_hash.each_pair do |key, key_filter|
@@ -32,14 +32,10 @@ module Objective
         end
 
         result.inputs = inputs
-        result.errors = errors.present? ? errors : nil
+        result.errors = errors.empty? ? nil : errors
         result
       end
 
-      def coerce(raw)
-        raw.try(:with_indifferent_access)
-      end
-
       def coerce_error(coerced)
         return :hash unless coerced.is_a?(Hash)
       end

data/lib/objective/filters/integer_filter.rb

@@ -17,7 +17,10 @@ module Objective
       private
 
       def coerce(datum)
-        return datum if datum.blank?
+        if datum.is_a?(String)
+          datum = datum.strip
+          return datum if datum.empty?
+        end
 
         datum_str = raw_to_string(datum)
         return datum unless datum_str

data/lib/objective/filters/model_filter.rb

@@ -22,10 +22,10 @@ module Objective
       end
 
       def class_constant
-        klass = options[:class]
-        return key.to_s.camelize.constantize if klass.nil?
-        return klass if klass.instance_of? Class
-        klass.to_s.constantize
+        class_name = options[:class] || key.to_s.split('_').collect(&:capitalize).join
+
+        return class_name if class_name.instance_of? Class
+        Objective::Helpers.constantize(class_name.to_s)
       end
     end
   end

data/lib/objective/filters/root_filter.rb

@@ -18,7 +18,7 @@ module Objective
         result.raw = raw
         result.coerced = coerce(raw)
 
-        inputs = HashWithIndifferentAccess.new
+        inputs = {}
         errors = Objective::Errors::ErrorHash.new
 
         data = result.coerced
@@ -37,7 +37,7 @@ module Objective
         end
 
         result.inputs = inputs
-        result.errors = errors.present? ? errors : nil
+        result.errors = errors.empty? ? nil : errors
         result
       end
 

data/lib/objective/filters/string_filter.rb

@@ -20,7 +20,7 @@ module Objective
       def coerce(raw)
         return raw unless raw.is_a?(String) || coercable?(raw)
         tmp = raw.is_a?(BigDecimal) ? raw.to_s(options.decimal_format) : raw.to_s
-        tmp = tmp.squish if options.squish
+        tmp = tmp.gsub(/[[:space:]]+/, ' ').strip if options.squish
         tmp
       end
 

data/lib/objective/helpers.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Objective
+  module Helpers
+    # copied from activesupport
+    # https://github.com/rails/rails/blob/v5.1.1/activesupport/lib/active_support/core_ext/array/wrap.rb
+    def self.wrap(obj)
+      if obj.nil?
+        []
+      elsif obj.respond_to?(:to_ary)
+        obj.to_ary || [obj]
+      else
+        [obj]
+      end
+    end
+
+    # copied from activesupport
+    # https://github.com/rails/rails/blob/v5.1.1/activesupport/lib/active_support/inflector/methods.rb
+    def self.constantize(camel_cased_word)
+      names = camel_cased_word.split('::'.freeze)
+      Object.const_get(camel_cased_word) if names.empty?
+      names.shift if names.size > 1 && names.first.empty?
+
+      names.inject(Object) do |constant, name|
+        if constant == Object
+          constant.const_get(name)
+        else
+          candidate = constant.const_get(name)
+          next candidate if constant.const_defined?(name, false)
+          next candidate unless Object.const_defined?(name)
+
+          constant = constant.ancestors.inject(constant) do |const, ancestor|
+            break const    if ancestor == Object
+            break ancestor if ancestor.const_defined?(name, false)
+            const
+          end
+
+          constant.const_get(name, false)
+        end
+      end
+    end
+  end
+end

data/lib/objective/unit.rb

@@ -2,15 +2,16 @@
 
 module Objective
   module Unit
-    extend ActiveSupport::Concern
-
-    included do
-      attr_reader :inputs, :raw_inputs, :built
-      const_set('ALLOW', Objective::ALLOW)
-      const_set('DENY', Objective::DENY)
+    def self.included(base)
+      base.extend ClassMethods
+      base.class_eval do
+        attr_reader :inputs, :raw_inputs
+        const_set('ALLOW', Objective::ALLOW)
+        const_set('DENY', Objective::DENY)
+      end
     end
 
-    class_methods do
+    module ClassMethods
       def filter(&block)
         root_filter.filter(&block)
         root_filter.keys.each do |key|
@@ -20,18 +21,11 @@ module Objective
 
       def root_filter
         @root_filter ||=
-          superclass.try(:root_filter).try(:dup) ||
-          Objective::Filters::RootFilter.new
-      end
-
-      def build(*args)
-        new.build(*args)
-      end
-
-      def build!(*args)
-        outcome = build(*args)
-        return outcome.result if outcome.success
-        raise Objective::ValidationError, outcome.errors
+          if superclass.respond_to?(:root_filter)
+            superclass.root_filter.dup
+          else
+            Objective::Filters::RootFilter.new
+          end
       end
 
       def run(*args)
@@ -47,27 +41,14 @@ module Objective
 
     # INSTANCE METHODS
 
-    def build(*args)
+    def run(*args)
       filter_result = self.class.root_filter.feed(*args)
       @raw_inputs = filter_result.coerced
       @inputs = filter_result.inputs
       @errors = filter_result.errors
-      @built = true
-      try('validate') if valid?
-      outcome
-    end
+      validate if respond_to?(:validate) && valid?
+      result = valid? && respond_to?(:execute) ? execute : nil
 
-    def run(*args)
-      build(*args) unless built
-      result = valid? ? try('execute') : nil
-      outcome(result)
-    end
-
-    def valid?
-      @errors.nil?
-    end
-
-    def outcome(result = nil)
       Objective::Outcome.new(
         success: valid?,
         result: result,
@@ -76,6 +57,10 @@ module Objective
       )
     end
 
+    def valid?
+      @errors.nil?
+    end
+
     protected
 
     def add_error(key, kind, message = nil)
@@ -83,7 +68,7 @@ module Objective
 
       @errors ||= Objective::Errors::ErrorHash.new
       @errors.tap do |root_error_hash|
-        path = key.to_s.split('.')
+        path = Objective::Helpers.wrap(key)
         last = path.pop
 
         inner = path.inject(root_error_hash) do |current_error_hash, path_key|

data/test/default_test.rb

@@ -19,30 +19,30 @@ describe 'Objective - defaults' do
   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)
+    assert_equal({ name: 'Fred' }, outcome.result)
   end
 
   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({ name: '-nils-' }, outcome.result)
     assert_equal true, outcome.success
   end
 
   it 'should use a nils option default value if nil is passed' do
     outcome = DefaultUnit.run(name: nil)
-    assert_equal({ 'name' => '-nils-' }, outcome.result)
+    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({ 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({ 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({ '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({ '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({ '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({ '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

@@ -57,11 +57,6 @@ describe 'Objective - errors' do
     assert o.errors[:arr1][2].is_a?(Objective::Errors::ErrorAtom)
   end
 
-  it 'titleizes keys' do
-    atom = Objective::Errors::ErrorAtom.new(:newsletter_subscription, :boolean)
-    assert_equal 'Newsletter Subscription must be a boolean', atom.message
-  end
-
   describe 'Bunch o errors' do
     before do
       @outcome = GivesErrors.run(
@@ -71,11 +66,11 @@ describe 'Objective - errors' do
 
     it 'gives coded errors' do
       expected = {
-        'str1' => :empty,
-        'str2' => :in,
-        'int1' => :integer,
-        'hash1' => { 'bool1' => :boolean, 'bool2' => :nils },
-        'arr1' => [:integer, nil, :integer]
+        str1: :empty,
+        str2: :in,
+        int1: :integer,
+        hash1: { bool1: :boolean, bool2: :nils },
+        arr1: [:integer, nil, :integer]
       }
 
       assert_equal expected, @outcome.errors.codes
@@ -83,14 +78,14 @@ describe 'Objective - errors' do
 
     it 'gives messages' do
       expected = {
-        'str1' => 'Str1 cannot be empty',
-        'str2' => 'Str2 is not an available option',
-        'int1' => 'Int1 must be an integer',
-        'hash1' => {
-          'bool1' => 'Bool1 must be a boolean',
-          'bool2' => 'Bool2 cannot be nil'
+        str1: 'str1 cannot be empty',
+        str2: 'str2 is not an available option',
+        int1: 'int1 must be an integer',
+        hash1: {
+          bool1: 'bool1 must be a boolean',
+          bool2: 'bool2 cannot be nil'
         },
-        'arr1' => ['1st Arr1 must be an integer', nil, '3rd Arr1 must be an integer']
+        arr1: ['1st arr1 must be an integer', nil, '3rd arr1 must be an integer']
       }
 
       assert_equal expected, @outcome.errors.message
@@ -98,13 +93,13 @@ describe 'Objective - errors' do
 
     it 'can flatten those messages' do
       expected = [
-        'Str1 cannot be empty',
-        'Str2 is not an available option',
-        'Int1 must be an integer',
-        'Bool1 must be a boolean',
-        'Bool2 cannot be nil',
-        '1st Arr1 must be an integer',
-        '3rd Arr1 must be an integer'
+        'str1 cannot be empty',
+        'str2 is not an available option',
+        'int1 must be an integer',
+        'bool1 must be a boolean',
+        'bool2 cannot be nil',
+        '1st arr1 must be an integer',
+        '3rd arr1 must be an integer'
       ]
 
       assert_equal expected, @outcome.errors.message_list

data/test/objective/filters/array_filter_test.rb

@@ -140,15 +140,15 @@ describe 'Objective::Filters::ArrayFilter' do
       ]
     )
     expected_result = [
-      { 'foo' => 'f', 'bar' => 3, 'baz' => true },
-      { 'foo' => 'f', 'bar' => 3, 'baz' => nil },
-      { 'foo' => 'f', 'baz' => nil }
+      { 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' => :nils }), result.errors[2].codes
+    assert_equal({ bar: :nils }, result.errors[2].codes)
   end
 
   it 'lets you pass arrays of arrays' do
@@ -171,8 +171,8 @@ describe 'Objective::Filters::ArrayFilter' do
     end
 
     result = f.feed([['h', 'e', {}], ['l'], [], ['']])
-    err_message_empty = '1st Item cannot be empty'
-    err_message_string = '3rd Item must be a string'
+    err_message_empty = '1st item cannot be empty'
+    err_message_string = '3rd item must be a string'
 
     assert_equal [[nil, nil, :string], nil, nil, [:empty]], result.errors.codes
     assert_equal [[nil, nil, err_message_string], nil, nil, [err_message_empty]], result.errors.message

data/test/objective/filters/hash_filter_test.rb

@@ -10,7 +10,7 @@ describe 'Objective::Filters::HashFilter' do
     end
 
     result = hf.feed(foo: 'bar')
-    assert_equal ({ 'foo' => 'bar' }), result.inputs
+    assert_equal ({ foo: 'bar' }), result.inputs
     assert_nil result.errors
   end
 
@@ -29,7 +29,7 @@ describe 'Objective::Filters::HashFilter' do
     end
 
     result = hf.feed(foo: 3.14)
-    assert_equal ({ 'foo' => 3.14 }), result.inputs
+    assert_equal ({ foo: 3.14 }), result.inputs
     assert_nil result.errors
   end
 
@@ -39,7 +39,7 @@ describe 'Objective::Filters::HashFilter' do
     end
 
     result = hf.feed(foo: '123')
-    assert_equal ({ 'foo' => '123' }), result.inputs
+    assert_equal ({ foo: '123' }), result.inputs
     assert_nil result.errors
   end
 
@@ -60,7 +60,7 @@ describe 'Objective::Filters::HashFilter' do
     end
 
     result = hf.feed(foo: sio)
-    assert_equal ({ 'foo' => sio }), result.inputs
+    assert_equal ({ foo: sio }), result.inputs
     assert_nil result.errors
   end
 end

data/test/objective/filters/model_filter_test.rb

@@ -24,6 +24,14 @@ describe 'Objective::Filters::ModelFilter' do
     assert_nil result.errors
   end
 
+  it 'allows class option' do
+    f = Objective::Filters::ModelFilter.new(:my_model, class: 'SimpleModel')
+    m = SimpleModel.new
+    result = f.feed(m)
+    assert_equal m, result.inputs
+    assert_nil result.errors
+  end
+
   it 'raises an exception during filtering if constantization fails' do
     f = Objective::Filters::ModelFilter.new(:non_existent_class)
 

data/test/objective/filters/root_filter_test.rb

@@ -51,7 +51,7 @@ describe 'Objective::Filters::RootFilter' do
       end
 
       result = f.feed(foo: 'oof', bar: nil)
-      assert_equal({ 'foo' => 'oof', 'bar' => nil }, result.inputs)
+      assert_equal({ foo: 'oof', bar: nil }, result.inputs)
       assert_nil result.errors
     end
 
@@ -64,7 +64,7 @@ describe 'Objective::Filters::RootFilter' do
       end
 
       result = f.feed(foo: 'oof')
-      assert_equal({ 'foo' => 'oof', 'bar' => nil }, result.inputs)
+      assert_equal({ foo: 'oof', bar: nil }, result.inputs)
       assert_nil result.errors
     end
   end
@@ -79,7 +79,7 @@ describe 'Objective::Filters::RootFilter' do
       end
 
       result = f.feed(foo: 'bar', bar: '')
-      assert_equal({ 'foo' => 'bar', 'bar' => '' }, result.inputs)
+      assert_equal({ foo: 'bar', bar: '' }, result.inputs)
       assert_nil result.errors
     end
 
@@ -92,7 +92,7 @@ describe 'Objective::Filters::RootFilter' do
       end
 
       result = f.feed(foo: 'bar', bar: '')
-      assert_equal({ 'foo' => 'bar', 'bar' => '' }, result.inputs)
+      assert_equal({ foo: 'bar', bar: '' }, result.inputs)
       assert_nil result.errors
     end
   end

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({ '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({ '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
 
@@ -40,18 +40,18 @@ describe 'Unit' do
     end
 
     it 'should do standalone validation' do
-      outcome = SimpleUnit.build(name: 'JohnLong', email: 'john@gmail.com')
+      outcome = SimpleUnit.run(name: 'JohnLong', email: 'john@gmail.com')
       assert outcome.success
       assert_nil outcome.errors
 
-      outcome = SimpleUnit.build(name: 'JohnTooLong', email: 'john@gmail.com')
+      outcome = SimpleUnit.run(name: 'JohnTooLong', email: 'john@gmail.com')
       assert !outcome.success
       assert_nil outcome.result
       assert_equal :max, outcome.errors.codes[:name]
     end
 
     it 'should execute a custom validate method' do
-      outcome = SimpleUnit.build(name: 'JohnLong', email: 'xxxx')
+      outcome = SimpleUnit.run(name: 'JohnLong', email: 'xxxx')
 
       assert !outcome.success
       assert_equal :invalid, outcome.errors.codes[:email]
@@ -66,7 +66,7 @@ describe 'Unit' do
     end
 
     it 'should execute custom validate method only if regular validations succeed' do
-      outcome = SimpleUnit.build(name: 'JohnTooLong', email: 'xxxx')
+      outcome = SimpleUnit.run(name: 'JohnTooLong', email: 'xxxx')
 
       assert !outcome.success
       assert_equal :max, outcome.errors.codes[:name]
@@ -77,14 +77,7 @@ describe 'Unit' do
       outcome = SimpleUnit.run({ name: 'John', email: 'john@gmail.com' }, email: 'bob@jones.com', amount: 5)
 
       assert outcome.success
-      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({ '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 +100,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({ 'name' => 'John', 'email' => 'john@gmail.com', 'amount' => 5 }, outcome.inputs)
+      assert_equal({ name: 'John', email: 'john@gmail.com', amount: 5 }, outcome.inputs)
     end
   end
 
@@ -183,7 +176,7 @@ describe 'Unit' do
       end
 
       def execute
-        add_error('people.bob', :is_a_bob)
+        add_error([:people, 'bob'], :is_a_bob)
         1
       end
     end
@@ -193,7 +186,7 @@ describe 'Unit' do
 
       assert !outcome.success
       assert 1, outcome.result
-      assert :is_a_bob, outcome.errors[:people].codes[:bob]
+      assert :is_a_bob, outcome.errors[:people].codes['bob']
     end
   end
 
@@ -238,7 +231,7 @@ describe 'Unit' do
     end
 
     it 'should return the raw input data' do
-      input = { 'name' => 'Hello World', 'other' => 'Foo Bar Baz' }
+      input = { name: 'Hello World', other: 'Foo Bar Baz' }
       assert_equal OpenStruct.new(input), RawInputsUnit.run!(input)
     end
   end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: objective
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dallin Crane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +81,7 @@ files:
 - lib/objective/filters/root_filter.rb
 - lib/objective/filters/string_filter.rb
 - lib/objective/filters/time_filter.rb
+- lib/objective/helpers.rb
 - lib/objective/outcome.rb
 - lib/objective/unit.rb
 - test/default_test.rb
@@ -133,9 +114,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="