riveter 0.0.6 → 0.0.7

data/lib/riveter/date_range_validator.rb

@@ -0,0 +1,34 @@
+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/lib/riveter/enumerated.rb

@@ -25,13 +25,8 @@ module Riveter
         const_names
       end
 
-      # returns an array of the constant names as symbols
-      define_singleton_method :values do
-        const_values
-      end
-
       # returns an array of constant values
-      define_singleton_method :all do
+      define_singleton_method :values do
         const_values
       end
 

data/lib/riveter/version.rb

@@ -1,3 +1,3 @@
 module Riveter
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/riveter.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Chris Stefano']
   spec.email         = ['virtualstaticvoid@gmail.com']
   spec.summary       = %q{Provides several useful patterns, packaged in a gem, for use in Rails.}
-  spec.description   = %q{Provides several useful patterns, such as Enumerated, Command, Enquiry, Query, QueryFilter, Service, Presenter and Worker, packaged in a gem, for use in Rails and other Ruby applications.}
+  spec.description   = %q{Provides several useful patterns, such as Enumerated, Command, Enquiry, Query, QueryFilter, Service and Presenter, packaged in a gem, for use in Rails and other Ruby applications.}
   spec.homepage      = 'https://github.com/virtualstaticvoid/riveter'
   spec.license       = 'MIT'
 
@@ -21,20 +21,20 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'railties', '~> 4.0.0'
-  spec.add_dependency 'actionpack'
-  spec.add_dependency 'activemodel'
-  spec.add_dependency 'activerecord'
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'validates_timeliness'
+  spec.add_dependency 'actionpack', '~> 4.0.0'
+  spec.add_dependency 'activemodel', '~> 4.0.0'
+  spec.add_dependency 'activerecord', '~> 4.0.0'
+  spec.add_dependency 'activesupport', '~> 4.0.0'
+  spec.add_dependency 'validates_timeliness', '~> 3.0.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rails', '~> 4.0.5'
-  spec.add_development_dependency 'haml-rails'
-  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'bundler', '~> 1.6.0'
+  spec.add_development_dependency 'rake', '~> 10.3.0'
+  spec.add_development_dependency 'rails', '~> 4.0.0'
+  spec.add_development_dependency 'haml-rails', '~> 0.5.0'
+  spec.add_development_dependency 'rspec-rails', '~> 2.14.0'
   spec.add_development_dependency 'shoulda-matchers', '~> 2.6.1'
-  spec.add_development_dependency 'ammeter'
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'ammeter', '~> 1.0.0'
+  spec.add_development_dependency 'coveralls', '~> 0.7.0'
+  spec.add_development_dependency 'pry', '~> 0.9.0'
+  spec.add_development_dependency 'pry-byebug', '~> 1.3.0'
 end

data/spec/examples/attribute_examples.rb

@@ -7,34 +7,36 @@ shared_examples_for "an attribute" do |type, default_value, *args, &block|
   let(:assigned_value) { default_value }
   let(:expected_value) { assigned_value }
 
-  describe type do
+  describe "of type '#{type}'" do
     let(:name) { "a_#{type}" }
     let(:instance) { subject.new() }
 
-    describe "as attribute" do
+    describe "with" do
       before do
-        subject.send :"attr_#{type}", name, *args, options
+        subject.send :"attr_#{type}", name, *args
       end
 
       it { subject.attributes.should include(name.to_s) }
       it { instance.attributes.should include(name.to_s) }
+
       it { instance.should respond_to(name)}
       it { instance.should respond_to("#{name}=")}
 
-      it "assigns attribute in initializer" do
+      it "assigned via initializer" do
         a = subject.new(name => assigned_value)
         a.send(name).should eq(expected_value)
         a.attributes[name].should eq(expected_value)
       end
 
-      it "assigns attribute" do
+      it "assigned via writer" do
         a = subject.new()
         a.send("#{name}=", assigned_value)
+        a.send(name).should eq(expected_value)
         a.attributes[name].should eq(expected_value)
       end
     end
 
-    describe "as required attribute" do
+    describe "required" do
       before do
         subject.send :"attr_#{type}", name, *args, options.merge(:required => true)
       end

data/spec/helpers/riveter/enquiry_form_helper_spec.rb

@@ -23,4 +23,20 @@ describe Riveter::EnquiryFormHelper do
       subject.enquiry_form_for(enquiry)
     end
   end
+
+  describe "#paginate_enquiry" do
+    it "delegates to paginate if available" do
+      enquiry = TestEnquiry.new()
+      allow(enquiry).to receive(:query) { :query }
+
+      expect(subject).to receive(:paginate).with(:query, {:a => :b})
+      subject.paginate_enquiry(enquiry, {:a => :b})
+    end
+
+    it "does nothing unless paginate method exists" do
+      enquiry = TestEnquiry.new()
+
+      subject.paginate_enquiry(enquiry).should be_nil
+    end
+  end
 end

data/spec/riveter/attributes_spec.rb

@@ -60,6 +60,43 @@ describe Riveter::Attributes do
       end
     end
 
+    it_should_behave_like "an attribute", :date_range, Date.new(2010, 1, 12)..Date.new(2012, 1, 11) do
+      describe "additional" do
+        before do
+          subject.attr_date_range :an_attribute
+        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) }
+
+        it { instance.should respond_to(:an_attribute_from?) }
+
+        it {
+          instance.an_attribute = nil
+          instance.an_attribute_from?.should be_false
+        }
+
+        it {
+          instance.an_attribute_from = Date.today
+          instance.an_attribute_from?.should be_true
+        }
+
+        it { instance.should respond_to(:an_attribute_to?) }
+
+        it {
+          instance.an_attribute = nil
+          instance.an_attribute_to?.should be_false
+        }
+
+        it {
+          instance.an_attribute_to = Date.today
+          instance.an_attribute_to?.should be_true
+        }
+      end
+    end
+
     it_should_behave_like "an attribute", :time, Time.new(2010, 1, 12, 8, 4, 45) do
       let(:assigned_value) { '2010-01-12 08:04:12' }
       let(:expected_value) { Time.new(2010, 1, 12, 8, 4, 12) }
@@ -77,15 +114,6 @@ describe Riveter::Attributes do
     it_should_behave_like "an attribute", :boolean, true do
       let(:assigned_value) { '0' }
       let(:expected_value) { false }
-
-      describe "additional" do
-        before do
-          subject.attr_boolean :an_attribute
-        end
-        let(:instance) { subject.new() }
-
-        it { instance.should validate_booleaness_of(:an_attribute) }
-      end
     end
 
     it_should_behave_like "an attribute", :enum, TestEnum::Member1, TestEnum do
@@ -98,7 +126,7 @@ describe Riveter::Attributes do
         end
         let(:instance) { subject.new() }
 
-        it { instance.should ensure_inclusion_of(:product_type).in_array(TestEnum.all) }
+        it { instance.should ensure_inclusion_of(:product_type).in_array(TestEnum.values) }
 
         it { should respond_to(:product_type_enum)}
         it { subject.product_type_enum.should eq(TestEnum) }
@@ -167,6 +195,9 @@ describe Riveter::Attributes do
         subject.integer.should eq(1)
         subject.decimal.should eq(9.998)
         subject.date.should eq(Date.new(2010, 1, 12))
+        subject.date_range.should eq(Date.new(2010, 1, 12)..Date.new(2011, 1, 12))
+        subject.date_range_from.should eq(Date.new(2010, 1, 12))
+        subject.date_range_to.should eq(Date.new(2011, 1, 12))
         subject.time.should eq(Time.new(2010, 1, 12, 14, 56))
         subject.boolean.should eq(true)
         subject.enum.should eq(TestEnum::Member1)
@@ -187,6 +218,9 @@ describe Riveter::Attributes do
           'integer' => 1,
           'decimal' => 9.998,
           'date' => Date.new(2010, 1, 12),
+          'date_range' => Date.new(2010, 1, 12)..Date.new(2011, 1, 12),
+          'date_range_from' => Date.new(2010, 1, 12),
+          'date_range_to' => Date.new(2011, 1, 12),
           'time' => Time.new(2010, 1, 12, 14, 56),
           'boolean' => true,
           'enum' => TestEnum::Member1,

data/spec/riveter/booleaness_validator_spec.rb

@@ -16,68 +16,66 @@ describe Riveter::BooleanessValidator do
       errors
     end
 
-    context "valid data" do
-      describe "with defaults" do
-        it {
-          validator = subject.new(:attributes => [:test])
-          record = record_for('not_a_boolean')
-          expect(record).to receive(:errors).and_return(errors)
-
-          validator.validate(record)
-        }
-
-        it {
-          validator = subject.new(:attributes => [:test])
-          record = record_for(true)
-          expect(record).to_not receive(:errors)
-
-          validator.validate(record)
-        }
-
-        it {
-          validator = subject.new(:attributes => [:test])
-          record = record_for(false)
-          expect(record).to_not receive(: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).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)
-        }
-      end
-
-      describe "with allow_blank" do
-        it {
-          validator = subject.new(:attributes => [:test], :allow_blank => false)
-          record = record_for('')
-          expect(record).to receive(:errors).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
+    describe "with defaults" do
+      it {
+        validator = subject.new(:attributes => [:test])
+        record = record_for('not_a_boolean')
+        expect(record).to receive(:errors).and_return(errors)
+
+        validator.validate(record)
+      }
+
+      it {
+        validator = subject.new(:attributes => [:test])
+        record = record_for(true)
+        expect(record).to_not receive(:errors)
+
+        validator.validate(record)
+      }
+
+      it {
+        validator = subject.new(:attributes => [:test])
+        record = record_for(false)
+        expect(record).to_not receive(: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).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)
+      }
+    end
+
+    describe "with allow_blank" do
+      it {
+        validator = subject.new(:attributes => [:test], :allow_blank => false)
+        record = record_for('')
+        expect(record).to receive(:errors).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/riveter/date_range_validator_spec.rb

@@ -0,0 +1,97 @@
+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