objective 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1987e4e2d7c0e97589f5ee5d1071c1bd3d37c41
-  data.tar.gz: 75cf1c8c8a8fb1f90ef4408912115d69efaa03b6
+  metadata.gz: c7705d3450e744e1f7e7a887a4d834c0be973c61
+  data.tar.gz: 46ecee8f11eb7783768e9e396d968e67172ea6d4
 SHA512:
-  metadata.gz: 043aea1f02ba613f35f5edeed6194f21a63dd6e9a2a50cebbf2ae4c1adcbce162d6652a9958afcfabe993885c36964ed9c7aba5148104b42ce6e315b63c2d330
-  data.tar.gz: 941e5fe7e25266dfb18817af02d4ae6ec0e799617c97a4c8d76705e0d75a13598428235e74bab36d7ee9a7b3f6552990d343bafd07013284aaece642ee1fcaa7
+  metadata.gz: a1756e5db7deb2324ee0d175379c3346f2b32fcf166330e3972d3f06d1a746ea3ec12596948d440e3ee9a0bca3acb9285c56ac8b07bf1952d5d2ec42b9123e31
+  data.tar.gz: 0c9a485bfdb080d4117b53dcc26799f728d9a869cca0c675844f612e712285028d1cf480f48cbae1de137867d08f54d67a1ab2cd037098787174eb7fec8eea01

data/lib/objective/allow.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'singleton'
 
 module Objective

data/lib/objective/deny.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'singleton'
 
 module Objective

data/lib/objective/discard.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'singleton'
 
 module Objective

data/lib/objective/errors/error_array.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
+
 module Objective
   module Errors
     class ErrorArray < Array
       def codes
-        map { |e| e&.codes }
+        map { |e| e.try(:codes) }
       end
 
       def message(parent_key = nil, _index = nil)
-        each_with_index.map { |e, i| e&.message(parent_key, i) }
+        each_with_index.map do |e, i|
+          next if e.nil?
+          e.message(parent_key, i)
+        end
       end
 
       def message_list(parent_key = nil, _index = nil)

data/lib/objective/errors/error_atom.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Errors
     class ErrorAtom

data/lib/objective/errors/error_hash.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Errors
     class ErrorHash < HashWithIndifferentAccess

data/lib/objective/errors/error_message_creator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Errors
     class ErrorMessageCreator
@@ -36,7 +37,8 @@ module Objective
       end
 
       def index_ordinal(index)
-        index&.+(1)&.ordinalize
+        return if index.nil?
+        (index + 1).ordinalize
       end
     end
   end

data/lib/objective/errors/validation_error.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   class ValidationError < StandardError
     attr_accessor :errors

data/lib/objective/filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   class Filter
     def self.inherited(child_class)
@@ -12,7 +13,8 @@ module Objective
     end
 
     def self.filter_name(klass = self)
-      filter_name = klass.name.match(/\AObjective::Filters::(.*)Filter\z/)&.[](1)&.underscore
+      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
@@ -100,7 +102,7 @@ module Objective
     def feed_invalid(errors, raw, coerced)
       case options.invalid
       when Objective::DENY
-        # nothing
+        nil
       when Objective::DISCARD
         return Objective::DISCARD
       else

data/lib/objective/filters/any_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class AnyFilter < Objective::Filter

data/lib/objective/filters/array_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class ArrayFilter < Objective::Filter

data/lib/objective/filters/boolean_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class BooleanFilter < Objective::Filter

data/lib/objective/filters/date_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class DateFilter < Objective::Filter

data/lib/objective/filters/decimal_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class DecimalFilter < Objective::Filter

data/lib/objective/filters/duck_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class DuckFilter < Objective::Filter

data/lib/objective/filters/file_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class FileFilter < Objective::Filter
@@ -18,8 +19,8 @@ module Objective
       end
 
       def respond_to_all?(coerced)
-        methods = %i(read size)
-        methods.concat(%i(original_filename content_type)) if options.upload
+        methods = %i[read size]
+        methods.concat(%i[original_filename content_type]) if options.upload
         methods.map { |method| coerced.respond_to?(method) }.all?
       end
 

data/lib/objective/filters/float_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class FloatFilter < Objective::Filter

data/lib/objective/filters/hash_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class HashFilter < Objective::Filter

data/lib/objective/filters/integer_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class IntegerFilter < Objective::Filter

data/lib/objective/filters/model_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class ModelFilter < Objective::Filter

data/lib/objective/filters/root_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class RootFilter < Objective::Filter

data/lib/objective/filters/string_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class StringFilter < Objective::Filter

data/lib/objective/filters/time_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Filters
     class TimeFilter < Objective::Filter

data/lib/objective/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'singleton'
 
 module Objective

data/lib/objective/outcome.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   class Outcome < OpenStruct
   end

data/lib/objective/unit.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Objective
   module Unit
     extend ActiveSupport::Concern

data/lib/objective.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'ostruct'
 require 'date'
 require 'time'

data/{spec/default_spec.rb → test/default_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 require 'simple_unit'
 
 describe 'Objective - defaults' do

data/{spec/inheritance_spec.rb → test/inheritance_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 require 'simple_unit'
 
 describe 'Objective - inheritance' do

data/{spec/errors_spec.rb → test/objective/errors/errors_test.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective - errors' do
   class GivesErrors
     include Objective::Unit
     filter do
       string :str1
-      string :str2, in: %w(opt1 opt2 opt3)
+      string :str2, in: %w[opt1 opt2 opt3]
       integer :int1, none: ALLOW
 
       hash :hash1, none: ALLOW do

data/{spec/filters/any_filter_spec.rb → test/objective/filters/any_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::AnyFilter' do
   it 'Allows anything' do

data/{spec/filters/array_filter_spec.rb → test/objective/filters/array_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 require 'stringio'
 
 describe 'Objective::Filters::ArrayFilter' do
@@ -132,7 +133,9 @@ describe 'Objective::Filters::ArrayFilter' do
     end
 
     result = f.feed([{ foo: 'f', bar: 3, baz: true }, { foo: 'f', bar: 3 }, { foo: 'f' }])
-    assert_equal [{ 'foo' => 'f', 'bar' => 3, 'baz' => true }, { 'foo' => 'f', 'bar' => 3 }, { 'foo' => 'f' }], result.inputs
+    expected_result = [{ 'foo' => 'f', 'bar' => 3, 'baz' => true }, { 'foo' => 'f', 'bar' => 3 }, { 'foo' => 'f' }]
+
+    assert_equal expected_result, result.inputs
     assert_nil result.errors[0]
     assert_nil result.errors[1]
     assert_equal ({ 'bar' => :required }), result.errors[2].codes
@@ -145,8 +148,8 @@ describe 'Objective::Filters::ArrayFilter' do
       end
     end
 
-    result = f.feed([%w(h e), ['l'], [], ['lo']])
-    assert_equal [%w(h e), ['l'], [], ['lo']], result.inputs
+    result = f.feed([%w[h e], ['l'], [], ['lo']])
+    assert_equal [%w[h e], ['l'], [], ['lo']], result.inputs
     assert_nil result.errors
   end
 
@@ -158,9 +161,12 @@ 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'
+
     assert_equal [[nil, nil, :string], nil, nil, [:empty]], result.errors.codes
-    assert_equal [[nil, nil, '3rd Item must be a string'], nil, nil, ['1st Item cannot be empty']], result.errors.message
-    assert_equal ['3rd Item must be a string', '1st Item cannot be empty'], result.errors.message_list
+    assert_equal [[nil, nil, err_message_string], nil, nil, [err_message_empty]], result.errors.message
+    assert_equal [err_message_string, err_message_empty], result.errors.message_list
   end
 
   it 'can discard invalid elements' do
@@ -190,6 +196,6 @@ describe 'Objective::Filters::ArrayFilter' do
 
     result = f.feed(['', 1, '2', '', '', '4', 5, ''])
     assert_nil result.errors
-    assert_equal %w(1 2 4 5), result.inputs
+    assert_equal %w[1 2 4 5], result.inputs
   end
 end

data/{spec/filters/boolean_filter_spec.rb → test/objective/filters/boolean_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::BooleanFilter' do
   it 'allows booleans' do
@@ -57,7 +58,7 @@ describe 'Objective::Filters::BooleanFilter' do
 
   it 'considers other string to be invalid' do
     f = Objective::Filters::BooleanFilter.new
-    %w(truely 2).each do |str|
+    %w[truely 2].each do |str|
       result = f.feed(str)
       assert_equal str, result.inputs
       assert_equal :boolean, result.errors

data/{spec/filters/date_filter_spec.rb → test/objective/filters/date_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::DateFilter' do
   it 'takes a date object' do

data/{spec/filters/decimal_filter_spec.rb → test/objective/filters/decimal_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::DecimalFilter' do
   it 'allows bigdecimals' do

data/{spec/filters/duck_filter_spec.rb → test/objective/filters/duck_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::DuckFilter' do
   it 'allows objects that respond to a single specified method' do

data/{spec/filters/file_filter_spec.rb → test/objective/filters/file_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 require 'stringio'
 require 'tempfile'
 

data/{spec/filters/float_filter_spec.rb → test/objective/filters/float_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::FloatFilter' do
   it 'allows floats' do

data/{spec/filters/hash_filter_spec.rb → test/objective/filters/hash_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 require 'stringio'
 
 describe 'Objective::Filters::HashFilter' do

data/{spec/filters/integer_filter_spec.rb → test/objective/filters/integer_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::IntegerFilter' do
   it 'allows integers' do

data/{spec/filters/model_filter_spec.rb → test/objective/filters/model_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::ModelFilter' do
   class SimpleModel; end

data/{spec/filters/root_filter_spec.rb → test/objective/filters/root_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::RootFilter' do
   describe 'optional filters and nils' do

data/{spec/filters/string_filter_spec.rb → test/objective/filters/string_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::StringFilter' do
   it 'allows valid strings' do
@@ -137,14 +138,14 @@ describe 'Objective::Filters::StringFilter' do
   end
 
   it 'considers non-inclusion to be invalid' do
-    sf = Objective::Filters::StringFilter.new(:s, in: %w(red blue green))
+    sf = Objective::Filters::StringFilter.new(:s, in: %w[red blue green])
     result = sf.feed('orange')
     assert_equal 'orange', result.inputs
     assert_equal :in, result.errors
   end
 
   it 'considers inclusion to be valid' do
-    sf = Objective::Filters::StringFilter.new(:s, in: %w(red blue green))
+    sf = Objective::Filters::StringFilter.new(:s, in: %w[red blue green])
     result = sf.feed('red')
     assert_equal 'red', result.inputs
     assert_nil result.errors
@@ -174,7 +175,7 @@ describe 'Objective::Filters::StringFilter' do
   it 'converts bigdecimals to scientific notation strings' do
     sf = Objective::Filters::StringFilter.new(:s, decimal_format: 'E')
     result = sf.feed(BigDecimal.new('0.00000123'))
-    assert_equal '0.123e-5', result.inputs
+    assert_match(/\A0\.123(e|E)-5\z/, result.inputs)
     assert_nil result.errors
   end
 

data/{spec/filters/time_filter_spec.rb → test/objective/filters/time_filter_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 
 describe 'Objective::Filters::TimeFilter' do
   it 'takes a Time object' do

data/{spec → test}/simple_unit.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class SimpleUnit
   include Objective::Unit
 
@@ -9,7 +10,7 @@ class SimpleUnit
   end
 
   def validate
-    return if email&.include?('@')
+    return if email.include?('@')
     add_error(:email, :invalid, 'Email must contain @')
   end
 

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'byebug'
 require 'minitest/autorun'
 require 'pp'

data/{spec/unit_spec.rb → test/unit_test.rb}

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require 'test_helper'
 require 'simple_unit'
 
 describe 'Unit' do

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: objective
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dallin Crane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-05-31 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: '5.0'
+        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: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -99,26 +105,26 @@ files:
 - lib/objective/none.rb
 - lib/objective/outcome.rb
 - lib/objective/unit.rb
-- spec/default_spec.rb
-- spec/errors_spec.rb
-- spec/filters/any_filter_spec.rb
-- spec/filters/array_filter_spec.rb
-- spec/filters/boolean_filter_spec.rb
-- spec/filters/date_filter_spec.rb
-- spec/filters/decimal_filter_spec.rb
-- spec/filters/duck_filter_spec.rb
-- spec/filters/file_filter_spec.rb
-- spec/filters/float_filter_spec.rb
-- spec/filters/hash_filter_spec.rb
-- spec/filters/integer_filter_spec.rb
-- spec/filters/model_filter_spec.rb
-- spec/filters/root_filter_spec.rb
-- spec/filters/string_filter_spec.rb
-- spec/filters/time_filter_spec.rb
-- spec/inheritance_spec.rb
-- spec/simple_unit.rb
-- spec/spec_helper.rb
-- spec/unit_spec.rb
+- test/default_test.rb
+- test/inheritance_test.rb
+- test/objective/errors/errors_test.rb
+- test/objective/filters/any_filter_test.rb
+- test/objective/filters/array_filter_test.rb
+- test/objective/filters/boolean_filter_test.rb
+- test/objective/filters/date_filter_test.rb
+- test/objective/filters/decimal_filter_test.rb
+- test/objective/filters/duck_filter_test.rb
+- test/objective/filters/file_filter_test.rb
+- test/objective/filters/float_filter_test.rb
+- test/objective/filters/hash_filter_test.rb
+- test/objective/filters/integer_filter_test.rb
+- test/objective/filters/model_filter_test.rb
+- test/objective/filters/root_filter_test.rb
+- test/objective/filters/string_filter_test.rb
+- test/objective/filters/time_filter_test.rb
+- test/simple_unit.rb
+- test/test_helper.rb
+- test/unit_test.rb
 homepage: https://github.com/dallincrane/objective
 licenses:
 - MIT
@@ -144,23 +150,23 @@ signing_key:
 specification_version: 4
 summary: Business Logic Units
 test_files:
-- spec/default_spec.rb
-- spec/errors_spec.rb
-- spec/filters/any_filter_spec.rb
-- spec/filters/array_filter_spec.rb
-- spec/filters/boolean_filter_spec.rb
-- spec/filters/date_filter_spec.rb
-- spec/filters/decimal_filter_spec.rb
-- spec/filters/duck_filter_spec.rb
-- spec/filters/file_filter_spec.rb
-- spec/filters/float_filter_spec.rb
-- spec/filters/hash_filter_spec.rb
-- spec/filters/integer_filter_spec.rb
-- spec/filters/model_filter_spec.rb
-- spec/filters/root_filter_spec.rb
-- spec/filters/string_filter_spec.rb
-- spec/filters/time_filter_spec.rb
-- spec/inheritance_spec.rb
-- spec/simple_unit.rb
-- spec/spec_helper.rb
-- spec/unit_spec.rb
+- test/default_test.rb
+- test/inheritance_test.rb
+- test/objective/errors/errors_test.rb
+- test/objective/filters/any_filter_test.rb
+- test/objective/filters/array_filter_test.rb
+- test/objective/filters/boolean_filter_test.rb
+- test/objective/filters/date_filter_test.rb
+- test/objective/filters/decimal_filter_test.rb
+- test/objective/filters/duck_filter_test.rb
+- test/objective/filters/file_filter_test.rb
+- test/objective/filters/float_filter_test.rb
+- test/objective/filters/hash_filter_test.rb
+- test/objective/filters/integer_filter_test.rb
+- test/objective/filters/model_filter_test.rb
+- test/objective/filters/root_filter_test.rb
+- test/objective/filters/string_filter_test.rb
+- test/objective/filters/time_filter_test.rb
+- test/simple_unit.rb
+- test/test_helper.rb
+- test/unit_test.rb