action_logic 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b4824f31ca1ffe3d22502fce6ce674f5fffc37
-  data.tar.gz: 16d5f9e7a00b95f6e2678c5fd2a0d68821161374
+  metadata.gz: 0f2a836061c6a36975110217dd7b4ae21bd482b9
+  data.tar.gz: ca43f16e23c1ae5e8a0af96b43d788ddf5457bf2
 SHA512:
-  metadata.gz: 23f4be5534c06e0864af1a61c08595b2410ddcbc19f3d877691b9183e1675a290402daa18f7e9635e72464ab84fab81c77ae43f43e69f7fb908a64b1e7590c2e
-  data.tar.gz: 14b9bcd6c0e2a089f944d78e469db97c2d3034d76a63b4e2d4aa1ca24dba006014c41fadc300c542119d5b35162f887097ff7943a862a70e5ae73397ff1d0909
+  metadata.gz: ced0fc7c9682743598574384d7b7923e40aef67805be0836f2ed903dc022701f7497024a1e7baf2be3be7c6a56254a90db8ef2b0639dc9e731039abe31097ff1
+  data.tar.gz: 7c7760cfe6e28013f5caf7abf1c9040747130127731c93e3250fd025f122f335e38ee7c984d5023417e1a3dbcd82f5797540784e2bebf1924107759e4d786db2

data/Gemfile.lock

@@ -1,44 +1,42 @@
 PATH
   remote: .
   specs:
-    action_logic (0.2.7)
+    action_logic (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    codecov (0.1.4)
+    codecov (0.1.14)
       json
       simplecov
       url
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    json (1.8.3)
-    method_source (0.8.2)
-    pry (0.10.3)
+    coderay (1.1.2)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    json (2.1.0)
+    method_source (0.9.2)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+      method_source (~> 0.9.0)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
     url (0.3.2)
 
 PLATFORMS
@@ -46,11 +44,11 @@ PLATFORMS
 
 DEPENDENCIES
   action_logic!
-  codecov (~> 0.1)
-  pry (~> 0.10)
-  rake (~> 10)
-  rspec (~> 3.3)
-  simplecov (~> 0.10.0)
+  codecov (~> 0.1.14)
+  pry (~> 0.12.2)
+  rake (~> 12.3.2)
+  rspec (~> 3.8.0)
+  simplecov (~> 0.16.1)
 
 BUNDLED WITH
-   1.10.6
+   1.17.2

data/README.md

@@ -4,7 +4,6 @@
 [![Gem Version](https://badge.fury.io/rb/action_logic.svg)](https://badge.fury.io/rb/action_logic)
 [![Code Climate](https://codeclimate.com/github/rewinfrey/action_logic/badges/gpa.svg)](https://codeclimate.com/github/rewinfrey/action_logic)
 [![coverage](https://codecov.io/github/rewinfrey/ActionLogic/coverage.svg?branch=master)](https://codecov.io/github/rewinfrey/ActionLogic?branch=master)
-[![Dependency Status](https://gemnasium.com/rewinfrey/action_logic.svg)](https://gemnasium.com/rewinfrey/action_logic)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](http://opensource.org/licenses/MIT)
 
 ### Introduction

data/action_logic.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
 
   s.authors = ["Rick Winfrey"]
   s.email = 'rick.winfrey@gmail.com'
-  s.date = '2016-01-18'
+  s.date = '2018-12-17'
   s.description = 'Provides common interfaces for validating and abstracting business logic'
 
-  s.add_development_dependency("rspec", "~> 3.3")
-  s.add_development_dependency("pry", "~> 0.10")
-  s.add_development_dependency("rake", "~> 10")
-  s.add_development_dependency("simplecov", "~> 0.10.0")
-  s.add_development_dependency("codecov", "~> 0.1")
+  s.add_development_dependency("rspec", "~> 3.8")
+  s.add_development_dependency("pry", "~> 0.12.2")
+  s.add_development_dependency("rake", "~> 12.3")
+  s.add_development_dependency("simplecov", "~> 0.16.1")
+  s.add_development_dependency("codecov", "~> 0.1.14")
 end

data/lib/action_logic/action_validation/type_validation.rb

@@ -9,7 +9,7 @@ module ActionLogic
         return unless validation_rules.values.find { |expected_validation| expected_validation[:type] }
 
         type_errors = validation_rules.reduce([]) do |collection, (expected_attribute, expected_validation)|
-          next unless expected_validation[:type]
+          next collection unless expected_validation[:type]
 
           if context.to_h[expected_attribute].class != expected_validation[:type]
             collection << "Attribute: #{expected_attribute} with value: #{context.to_h[expected_attribute]} was expected to be of type #{expected_validation[:type]} but is #{context.to_h[expected_attribute].class}"

data/lib/action_logic/version.rb

@@ -1,3 +1,3 @@
 module ActionLogic
-  VERSION = '0.2.8'
+  VERSION = '0.3.0'
 end

data/spec/action_logic/active_use_case_spec.rb

@@ -152,6 +152,27 @@ module ActionLogic
             raise_error(ActionLogic::UnrecognizablePresenceValidatorError)
         end
       end
+
+      describe "mixed custom presence and type" do
+        it "allows custom presence validation to be defined without type if a type validation is defined" do
+          expect { ValidateBeforeMixedTypeAndPresenceUseCase.execute(odd_integer_test: 1, string_test: "Test") }.to_not raise_error
+        end
+
+        it "raises error if custom presence validation is not satisfied" do
+          expect { ValidateBeforeMixedTypeAndPresenceUseCase.execute(odd_integer_test: 2, string_test: "Test") }.to \
+            raise_error(ActionLogic::PresenceError)
+        end
+
+        it "raises error if type validation is not satisfied" do
+          expect { ValidateBeforeMixedTypeAndPresenceUseCase.execute(odd_integer_test: 1, string_test: 15) }.to \
+            raise_error(ActionLogic::AttributeTypeError)
+        end
+
+        it "raises error if type presence validation is not satisfied" do
+          expect { ValidateBeforeMixedTypeAndPresenceUseCase.execute(odd_integer_test: 1) }.to \
+            raise_error(ActionLogic::MissingAttributeError)
+        end
+      end
     end
 
     describe "after validations" do

data/spec/fixtures/use_cases.rb

@@ -189,6 +189,21 @@ class ValidateBeforeUnrecognizablePresenceTestUseCase
   end
 end
 
+class ValidateBeforeMixedTypeAndPresenceUseCase
+  include ActionLogic::ActionUseCase
+
+  validates_before odd_integer_test: { presence: ->(i) { i % 2 != 0 } },
+                   string_test: { type: String, presence: true }
+
+  def call
+  end
+
+  def tasks
+    [UseCaseTestTask1,
+     UseCaseTestTask2]
+  end
+end
+
 class ValidateAfterTestUseCase
   include ActionLogic::ActionUseCase
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_logic
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Rick Winfrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.14
 description: Provides common interfaces for validating and abstracting business logic
 email: rick.winfrey@gmail.com
 executables: []
@@ -149,7 +149,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: Business logic abstraction
@@ -166,4 +166,3 @@ test_files:
 - spec/fixtures/tasks.rb
 - spec/fixtures/use_cases.rb
 - spec/spec_helper.rb
-has_rdoc: