riveter 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d184638bd46e4851c34befdaa1b8451312d210
-  data.tar.gz: b498d93ece35a0f8bb532fac557cc46de5b9976a
+  metadata.gz: ac7829381fcfecbda57c395c23653edc8df876b3
+  data.tar.gz: 57005498bcf3833e4b487f8d1e174cfd6adb5b77
 SHA512:
-  metadata.gz: 7e85400604b6388dccc7956461f9bed3c012927560d76a7edfdfbdb3db57f5d25a18e4e79736321bcf71694f48b8384151a6a81ef8531341f7e5d282990e8dcf
-  data.tar.gz: 91ea69d6ac1b17187741125ef6a42b111e7f835dbb0e2922ee29fdeb4e3d058bcfe66f9c85b0797a217a712843d887d90e6af96ef22b9f18c626310fcb25bfdf
+  metadata.gz: 3cda2c9c10fa00fef707ed7d8bff72b40684ed8f3f088fb8fecb6879988d30a4ce02d0b57056da324bb8c1a77ac5a3fe9ba822bfa9082ad75ee767d00bbade38
+  data.tar.gz: e0853c278c745da742bf13bd9e6d6b2a1319f0297b09b0a9864eccf77b7b397eaa979025f7848ddd683fbaf335f2ab4bbef621c63003747385a72f21722ddcd7

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.2
+ruby-2.2.4

data/.travis.yml

@@ -3,12 +3,9 @@ cache: bundler
 
 rvm:
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
-  - 2.2.0
-  - 2.2.1
-  - 2.2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 
 script: 'bundle exec rake spec'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riveter (0.2.1)
+    riveter (0.3.0)
       activemodel (>= 4.0.0)
       railties (>= 4.0.0)
       validates_timeliness (>= 3.0.0)
@@ -173,22 +173,22 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
-    timeliness (0.3.7)
+    timeliness (0.3.8)
     tins (1.5.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    validates_timeliness (3.0.14)
-      timeliness (~> 0.3.6)
+    validates_timeliness (4.0.2)
+      timeliness (~> 0.3.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ammeter (~> 1.1.2)
-  bundler (~> 1.10.1)
+  bundler (~> 1.11.2)
   coveralls (~> 0.8.1)
   haml-rails (~> 0.9.0)
   pry (~> 0.10.1)
@@ -200,4 +200,4 @@ DEPENDENCIES
   shoulda-matchers (~> 2.8.0)
 
 BUNDLED WITH
-   1.10.1
+   1.11.2

data/config/locales/validators.en.yml

@@ -26,6 +26,3 @@ en:
       email: is not valid
       invalid_date: is not a valid date
       invalid_time: is not a valid time
-      date_range: is not a valid date range
-      date_range_date_from: "must be before %{date_to}"
-      date_range_date_to: "must be after %{date_from}"

data/lib/generators/riveter/query_filter/templates/query_filter.rb

@@ -11,30 +11,34 @@ class <%= class_name %>QueryFilter < Riveter::QueryFilter::Base
   #
   # E.g.
   #
-  #   attr_string :name[, options]
+  #   attr_string :name[, options] [do |value|
+  #     # optional converter logic
+  #     value.to_i
+  #   end]
   #
   #   options include:
-  #    :required => true|false  # default is false
-  #    :default => 'a value'    # default is nil
-  #    :validate => true|false  # default is true
+  #    :required => true|false            # default is false
+  #    :default => 'a value' or lambda    # default is nil
+  #    :validate => true|false            # default is true
+  #
+  #   optionally, provide a block which takes one argument and returns the converted value
   #
   #  supported attributes:
   #
-  #   attr_string
-  #   attr_text
-  #   attr_integer
-  #   attr_decimal
-  #   attr_date
-  #   attr_date_range
-  #   attr_time
-  #   attr_boolean
-  #   attr_enum
-  #   attr_array
-  #   attr_hash
-  #   attr_model
+  #   attr_string      :attr_name
+  #   attr_text        :attr_name
+  #   attr_integer     :attr_name
+  #   attr_decimal     :attr_name
+  #   attr_date        :attr_name
+  #   attr_date_range  :attr_name[, :min => <date>, :max => <date>]
+  #   attr_time        :attr_name
+  #   attr_boolean     :attr_name
+  #   attr_enum        :attr_name, <enum_module>
+  #   attr_array       :attr_name[, :data_type => :integer]
+  #   attr_hash        :attr_name[, :data_type => :integer]
+  #
+  # optionally, define additional validations and helper methods
   #
-
-  # optionally, define additional validations
 <% end -%>
 
 end

data/lib/riveter.rb

@@ -14,7 +14,6 @@ module Riveter
   autoload :BooleanessValidator, 'riveter/booleaness_validator'
   autoload :Command, 'riveter/command'
   autoload :CommandController, 'riveter/command_controller'
-  autoload :DateRangeValidator, 'riveter/date_range_validator'
   autoload :EmailValidator, 'riveter/email_validator'
   autoload :Enquiry, 'riveter/enquiry'
   autoload :EnquiryController, 'riveter/enquiry_controller'
@@ -30,7 +29,6 @@ end
 module ActiveModel
   module Validations
     autoload :BooleanessValidator, 'riveter/booleaness_validator'
-    autoload :DateRangeValidator, 'riveter/date_range_validator'
     autoload :EmailValidator, 'riveter/email_validator'
   end
 end

data/lib/riveter/attributes.rb

@@ -61,15 +61,13 @@ module Riveter
 
         required = (true == options.delete(:required))
 
-        # expecting the default value to be a date range
-        # so extract out the first and last parts for the from and to
-        # otherwise, it may just be a date or nil
-        default = options.delete(:default)
-        default = default.is_a?(Range) ? default : (default..default)
-        defaults = {
-          :from => default.first,
-          :to => default.last
-        }
+        [:min, :max].each do |limit|
+          limit_value = options.delete(limit)
+
+          define_method :"#{name}_#{limit}" do
+            limit_value.respond_to?(:call) ? limit_value.call : limit_value
+          end
+        end
 
         converter = block_given? ? block : Converters.converter_for(:date)
 
@@ -79,18 +77,31 @@ module Riveter
           send(:"#{name}_from")..send(:"#{name}_to") rescue nil
         end
 
-        define_method "#{name}=" do |value|
+        define_method :"#{name}=" do |value|
           value ||= nil..nil
           range = value.is_a?(Range) ? value : value..value
           send(:"#{name}_from=", range.first)
           send(:"#{name}_to=", range.last)
         end
 
-        validates name,
-                  :allow_nil => !required,
-                  :date_range => true if options[:validate]
+        add_attr(name, :date_range, converter, options)
+
+        if options[:validate]
+
+          validate :"#{name}_validation"
+
+          define_method :"#{name}_validation" do
+            date_from = send(:"#{name}_from")
+            date_to = send(:"#{name}_to")
+
+            errors.add(name, :blank) if
+              required && (date_from.blank? || date_to.blank?)
+
+            errors.add(name, :invalid) if
+              !(date_from.blank? || date_to.blank?) && (date_from > date_to || date_to < date_from)
+          end
 
-        add_attr(name, :date_range)
+        end
 
         # break down into parts
         [:from, :to].each do |part|
@@ -106,8 +117,32 @@ module Riveter
                     :allow_nil => !required,
                     :timeliness => { :type => :date } if options[:validate]
 
-          add_attr(:"#{name}_#{part}", :date, converter, options.merge(:default => defaults[part]))
+          add_attr(:"#{name}_#{part}", :date, converter)
+        end
+
+        # helper for determining if both from and to dates have been provided
+        define_method :"#{name}_present?" do
+          date_from = send(:"#{name}_from")
+          date_to = send(:"#{name}_to")
+          date_from && date_to
+        end
+
+        # return from and to as range in UTC
+        define_method :"#{name}_utc" do
+          date_from = send(:"#{name}_from")
+          date_to = send(:"#{name}_to")
+          if date_from && date_to
+            if date_from == date_to
+              date = date_from.to_utc_date
+              DateTime.new(date.year, date.month, date.day, 0, 0, 0)..DateTime.new(date.year, date.month, date.day, 23, 59, 59)
+            else
+              date_from.to_utc_date..date_to.to_utc_date
+            end
+          else
+            nil
+          end
         end
+
       end
 
       def attr_boolean(name, options={}, &block)
@@ -311,6 +346,7 @@ module Riveter
 
       def default
         @default ||= options[:default]
+        @default.respond_to?(:call) ? @default.call : @default
       end
 
       def default?
@@ -354,6 +390,10 @@ module Riveter
       false
     end
 
+    def has_attribute?(column)
+      self.class._attributes.key?(column)
+    end
+
     # forms use this for getting column meta data
     def column_for_attribute(column)
       attribute_info = self.class._attributes[column]

data/lib/riveter/version.rb

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

data/riveter.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   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 'bundler'          , '~> 1.11.2'
   spec.add_development_dependency 'rake'             , '~> 10.4.2'
   spec.add_development_dependency 'rails'            , '~> 4.2.1'
   spec.add_development_dependency 'haml-rails'       , '~> 0.9.0'

data/spec/riveter/attributes_spec.rb

@@ -67,7 +67,6 @@ describe Riveter::Attributes do
         end
         let(:instance) { subject.new() }
 
-        it { instance.should validate_date_range_of(:an_attribute) }
         it { instance.should validate_timeliness_of(:an_attribute_from) }
         it { instance.should validate_timeliness_of(:an_attribute_to) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riveter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -304,7 +304,6 @@ files:
 - lib/riveter/command_controller.rb
 - lib/riveter/command_routes.rb
 - lib/riveter/core_extensions.rb
-- lib/riveter/date_range_validator.rb
 - lib/riveter/email_validator.rb
 - lib/riveter/enquiry.rb
 - lib/riveter/enquiry_controller.rb
@@ -357,7 +356,6 @@ files:
 - spec/riveter/command_routes_spec.rb
 - spec/riveter/command_spec.rb
 - spec/riveter/core_extensions_spec.rb
-- spec/riveter/date_range_validator_spec.rb
 - spec/riveter/email_validator_spec.rb
 - spec/riveter/enquiry_controller_spec.rb
 - spec/riveter/enquiry_routes_spec.rb
@@ -387,7 +385,6 @@ files:
 - spec/support/test_query_filter.rb
 - spec/support/test_service.rb
 - spec/support/validate_booleaness_of_matcher.rb
-- spec/support/validate_date_range_of_matcher.rb
 - spec/support/validate_timeliness_of_matcher.rb
 - spec/support/validator_detector.rb
 homepage: https://github.com/virtualstaticvoid/riveter
@@ -410,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Provides several useful patterns, packaged in a gem, for use in Rails.
@@ -449,7 +446,6 @@ test_files:
 - spec/riveter/command_routes_spec.rb
 - spec/riveter/command_spec.rb
 - spec/riveter/core_extensions_spec.rb
-- spec/riveter/date_range_validator_spec.rb
 - spec/riveter/email_validator_spec.rb
 - spec/riveter/enquiry_controller_spec.rb
 - spec/riveter/enquiry_routes_spec.rb
@@ -479,6 +475,5 @@ test_files:
 - spec/support/test_query_filter.rb
 - spec/support/test_service.rb
 - spec/support/validate_booleaness_of_matcher.rb
-- spec/support/validate_date_range_of_matcher.rb
 - spec/support/validate_timeliness_of_matcher.rb
 - spec/support/validator_detector.rb

data/lib/riveter/date_range_validator.rb

@@ -1,34 +0,0 @@
-module Riveter
-  class DateRangeValidator < ActiveModel::EachValidator
-    def initialize(options={})
-      @date_from_attr = options.delete(:date_from_attr)
-      @date_to_attr = options.delete(:date_to_attr)
-
-      super
-    end
-
-    def validate_each(record, attribute, value)
-      # NOTE: validate_each usually isn't called when the value is nil
-      #  however it is possible to have a nil..nil range, so check for this
-      if value.is_a?(Range) && value.first && value.last
-        date_from = value.first
-        date_to = value.last
-        if date_from > date_to
-          record.errors.add(attribute, :date_range)
-          record.errors.add(@date_from_attr || :"#{attribute}_from", :date_range_date_from, :date_to => date_to)
-          record.errors.add(@date_to_attr || :"#{attribute}_to", :date_range_date_to, :date_from => date_from)
-        end
-      else
-        unless options[:allow_nil] || options[:allow_blank]
-          record.errors.add(attribute, :blank)
-          record.errors.add(@date_from_attr || :"#{attribute}_from", :blank)
-          record.errors.add(@date_to_attr || :"#{attribute}_to", :blank)
-        end
-      end
-    end
-  end
-end
-
-# add compatibility with ActiveModel validates method which
-# matches option keys to their validator class
-ActiveModel::Validations::DateRangeValidator = Riveter::DateRangeValidator

data/spec/riveter/date_range_validator_spec.rb

@@ -1,97 +0,0 @@
-require 'spec_helper'
-
-describe Riveter::DateRangeValidator do
-  subject { Riveter::DateRangeValidator }
-
-  describe "#validate_each" do
-    def record_for(value)
-      record = double()
-      allow(record).to receive(:read_attribute_for_validation) { value }
-      record
-    end
-
-    def errors
-      errors = double
-      allow(errors).to receive(:add)
-      errors
-    end
-
-    describe "with defaults" do
-      it {
-        validator = subject.new(:attributes => [:test])
-        record = record_for('not_a_date_range')
-        expect(record).to receive(:errors).at_least(:once).and_return(errors)
-
-        validator.validate(record)
-      }
-
-      it {
-        validator = subject.new(:attributes => [:test])
-        record = record_for(nil..nil)
-        expect(record).to receive(:errors).at_least(:once).and_return(errors)
-
-        validator.validate(record)
-      }
-
-      it {
-        validator = subject.new(:attributes => [:test])
-        record = record_for(Date.new(2010, 1, 1)..Date.new(2011, 1, 1))
-        expect(record).to_not receive(:errors)
-
-        validator.validate(record)
-      }
-
-      it {
-        validator = subject.new(:attributes => [:test])
-        record = record_for(Date.new(2012, 1, 1)..Date.new(2011, 1, 1))
-        expect(record).to receive(:errors).at_least(:once).and_return(errors)
-
-        validator.validate(record)
-      }
-    end
-
-    describe "with allow_nil" do
-      it {
-        validator = subject.new(:attributes => [:test], :allow_nil => false)
-        record = record_for(nil)
-        expect(record).to receive(:errors).at_least(:once).and_return(errors)
-
-        validator.validate(record)
-      }
-
-      it {
-        validator = subject.new(:attributes => [:test], :allow_nil => true)
-        record = record_for(nil)
-        expect(record).to_not receive(:errors)
-
-        validator.validate(record)
-      }
-
-      it {
-        validator = subject.new(:attributes => [:test], :allow_nil => true)
-        record = record_for(nil..nil)
-        expect(record).to_not receive(:errors)
-
-        validator.validate(record)
-      }
-    end
-
-    describe "with allow_blank" do
-      it {
-        validator = subject.new(:attributes => [:test], :allow_blank => false)
-        record = record_for('')
-        expect(record).to receive(:errors).at_least(:once).and_return(errors)
-
-        validator.validate(record)
-      }
-
-      it {
-        validator = subject.new(:attributes => [:test], :allow_blank => true)
-        record = record_for('')
-        expect(record).to_not receive(:errors)
-
-        validator.validate(record)
-      }
-    end
-  end
-end

data/spec/support/validate_date_range_of_matcher.rb

@@ -1,17 +0,0 @@
-RSpec::Matchers.define :validate_date_range_of do |attribute|
-  match do |model|
-    ValidatorDetector.detect(model, attribute, Riveter::DateRangeValidator)
-  end
-
-  failure_message do |actual|
-    "expect #{attribute} to validate date range of"
-  end
-
-  failure_message_when_negated do |actual|
-    "expect #{attribute} to not validate date range of"
-  end
-
-  description do
-    "expect #{attribute} to validate date range of"
-  end
-end