riveter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb45f9d2ebfccc21e3c71b5ac6a551454b10d359
-  data.tar.gz: 328c01ed790e9d1c5bcd6c8a86aa9b978803930c
+  metadata.gz: 89d184638bd46e4851c34befdaa1b8451312d210
+  data.tar.gz: b498d93ece35a0f8bb532fac557cc46de5b9976a
 SHA512:
-  metadata.gz: 253fe16c9fdd4bb4ec446f2149def89be88ef9f5657a1c73736b8e7b8573c9ca2d51d5b708aba391886e197951eee52750a80a6e7df3b6f39b41e09ab674a7f6
-  data.tar.gz: 7e056ea8970035a69a0577a7887b1046c982846727e1ebe8c9d5d180b8333a9664cd574a21f07c8a8b115cc5892bf001dda666c1ff7404b053ebf010ad2971ca
+  metadata.gz: 7e85400604b6388dccc7956461f9bed3c012927560d76a7edfdfbdb3db57f5d25a18e4e79736321bcf71694f48b8384151a6a81ef8531341f7e5d282990e8dcf
+  data.tar.gz: 91ea69d6ac1b17187741125ef6a42b111e7f835dbb0e2922ee29fdeb4e3d058bcfe66f9c85b0797a217a712843d887d90e6af96ef22b9f18c626310fcb25bfdf

data/Gemfile.lock

@@ -1,13 +1,10 @@
 PATH
   remote: .
   specs:
-    riveter (0.2.0)
-      actionpack (~> 4.2.1)
-      activemodel (~> 4.2.1)
-      activerecord (~> 4.2.1)
-      activesupport (~> 4.2.1)
-      railties (~> 4.2.1)
-      validates_timeliness (~> 3.0.14)
+    riveter (0.2.1)
+      activemodel (>= 4.0.0)
+      railties (>= 4.0.0)
+      validates_timeliness (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/generators/rspec/enquiry/templates/enquiry_spec.rb

@@ -54,7 +54,7 @@ describe <%= class_name %>Enquiry do
       expect(block).to receive(:call).any_number_of_times
 
       subject.submit(valid_query_filter_attributes)
-      subject.query_results.each &block
+      subject.query_results.each(&block)
     end
 
     it "fails with invalid attributes" do

data/lib/generators/rspec/query/templates/query_spec.rb

@@ -17,7 +17,7 @@ describe <%= class_name %>Query do
     it {
       block = Mock::Block.new
       expect(block).to receive(:call).at_least(:once)
-      subject.find_each &block
+      subject.find_each(&block)
     }
 
   end
@@ -31,7 +31,7 @@ describe <%= class_name %>Query do
     it {
       block = Mock::Block.new
       expect(block).to_not receive(:call)
-      subject.find_each &block
+      subject.find_each(&block)
     }
 
   end

data/lib/riveter/core_extensions.rb

@@ -234,13 +234,18 @@ class Hash
   include Riveter::CoreExtensions::HashExtensions
 end
 
-class ActiveRecord::Relation
-  include Riveter::CoreExtensions::ChainedQuerySupport
-  include Riveter::CoreExtensions::BatchFinderSupport
-end
+# mixin if active record is available
+if defined?(ActiveRecord)
 
-module ActiveRecord
-  module Querying
-    delegate :find_each_with_order, :find_in_batches_with_order, :to => :scoped
+  class ActiveRecord::Relation
+    include Riveter::CoreExtensions::ChainedQuerySupport
+    include Riveter::CoreExtensions::BatchFinderSupport
   end
+
+  module ActiveRecord
+    module Querying
+      delegate :find_each_with_order, :find_in_batches_with_order, :to => :scoped
+    end
+  end
+
 end

data/lib/riveter/enquiry.rb

@@ -26,7 +26,7 @@ module Riveter
           # define an anomymous class derived from QueryFilter
           # which invokes the block given in the classes context
           query_filter_klass = Class.new(QueryFilter::Base)
-          query_filter_klass.class_eval &block
+          query_filter_klass.class_eval(&block)
 
           # for anonymous classes, need to override the
           # model_name method so that forms etc can work

data/lib/riveter/version.rb

@@ -1,3 +1,3 @@
 module Riveter
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/riveter.rb

@@ -1,7 +1,6 @@
 require "riveter/version"
 
 require 'active_model'
-require 'active_record'
 require 'active_support'
 require 'validates_timeliness'
 

data/riveter.gemspec

@@ -20,12 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'railties'                 , '~> 4.2.1'
-  spec.add_dependency 'actionpack'               , '~> 4.2.1'
-  spec.add_dependency 'activemodel'              , '~> 4.2.1'
-  spec.add_dependency 'activerecord'             , '~> 4.2.1'
-  spec.add_dependency 'activesupport'            , '~> 4.2.1'
-  spec.add_dependency 'validates_timeliness'     , '~> 3.0.14'
+  spec.add_dependency 'railties'                     , '>= 4.0.0'
+  spec.add_dependency 'activemodel'                  , '>= 4.0.0'
+  spec.add_dependency 'validates_timeliness'         , '>= 3.0.0'
 
   spec.add_development_dependency 'bundler'          , '~> 1.10.1'
   spec.add_development_dependency 'rake'             , '~> 10.4.2'

data/spec/riveter/core_extensions_spec.rb

@@ -94,13 +94,13 @@ describe Riveter::CoreExtensions do
       it "should invoke block" do
         block = Mock::Block.new()
         expect(block).to receive(:call).exactly(4).times
-        subject.find_each_with_order &block
+        subject.find_each_with_order(&block)
       end
 
       it "should not invoke block" do
         block = Mock::Block.new()
         expect(block).to_not receive(:call)
-        [].find_each_with_order &block
+        [].find_each_with_order(&block)
       end
     end
   end

data/spec/riveter/query_spec.rb

@@ -44,13 +44,13 @@ describe Riveter::Query do
       expect(block).to receive(:call).at_least(:once)
 
       fake_relation = [1]
-      allow(fake_relation).to receive(:find_each_with_order) do |*args, &block|
-        block.call(*args)
+      allow(fake_relation).to receive(:find_each_with_order) do |*args, &blck|
+        blck.call(*args)
       end
       allow_any_instance_of(TestQuery).to receive(:relation) { fake_relation }
 
       query = TestQuery.new(nil)
-      query.find_each &block
+      query.find_each(&block)
     end
   end
 

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ SimpleCov.start do
 end
 
 require 'pry'
+require 'active_record'
 
 require 'riveter'
 require 'riveter/spec_helper'

data/spec/support/validator_detector.rb

@@ -30,13 +30,17 @@ module ValidatorDetector
       if method.instance_of?(Symbol) || method.instance_of?(String)
         # it's a model method, so evalulate within context
         self.new().instance_eval do
-          send(method, self) rescue false
+          # call the method assocated with the validation
+          # if a method is called in an unless, we need to flip the boolean result
+          ( validator.options[:unless].present? ? !send(method) : send(method) ) rescue false
         end
 
       elsif method.instance_of?(Proc)
         # it's a lambda, so invoke within context
         self.new().instance_eval do
-          method.call(self) rescue false
+          # call the proc assocated with the validation
+          # if a method is called in an unless, we need to flip the boolean result
+          ( validator.options[:unless].present? ? !method.call(self) : method.call(self) ) rescue false
         end
 
       else

metadata

@@ -1,99 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: riveter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: validates_timeliness
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.14
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement