rspec-validates_timeliness 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33418e0bc1ca0d9159d7261d703e400d64c5580
-  data.tar.gz: d07b63180655408b4919558a75bf3e001ab186bc
+  metadata.gz: 29e14959d36cf8d82f3c1b1f628d57d5124ad4d4
+  data.tar.gz: f66a2898132974c51bf5a783f3c388e3088927bf
 SHA512:
-  metadata.gz: 533b1d9f4d0737feaee37c26ef12a0d66d67c28e213b743c7fb11a697af7d0affc1b33a92a6f044a152ab1f510b6c265e2b595045f92d6a33252a0d6cb4ee945
-  data.tar.gz: 1898aba67ad2dcc7ba31da36cee42b726efa18a88aedfa6e51a876e81c51d90960b4fcdc90b3d95fd860a6f855b295e4c7234cfc6480af135526c63a09d1804d
+  metadata.gz: 65f71a940a09f8ccb851fd35efe7cbe2a3f0ef1fada7aa2f1b159e36de84be7b5310dc51b9bfab4e497a44430384c071c92ed8b2357b84ab738e5c4590305a25
+  data.tar.gz: 22a2f0ecedd75841d16b20d28deba1a7805048553d3e262b4d14075d053900f1311d4b78197da5923c042e36fec74daf0e547fbd31ea272b43044277eeaf0351

data/.travis.yml

@@ -1,5 +1,13 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.1
+  - 2.2
+  - 2.3.0
   - 2.3.1
-before_install: gem install bundler -v 1.12.5
+before_install:
+  - "gem install bundler -v '~> 1.12'"
+bundler_args: "--jobs=2"
+cache: bundler
+script:
+  - "bundle exec rspec"

data/README.md

@@ -1,13 +1,12 @@
-# RSpec::ValidatesTimeliness
+# RSpec::ValidatesTimeliness [![Build Status](https://travis-ci.org/yhirano55/rspec-validates_timeliness.svg?branch=master)](https://travis-ci.org/yhirano55/rspec-validates_timeliness)
 
 Simple RSpec matchers for [validates_timeliness](https://github.com/adzap/validates_timeliness)
 
 ## Matchers
 
-- **validates_timeliness_of** tests usage of validates_timeliness
-- **validates_datetime** tests usage of `validates_datetime` (alias of `validates_timeliness_of`).
-- **validates_date** tests usage of `validates_date` (alias of `validates_timeliness_of`).
-- **validates_time** tests usage of `validate_time` (alias of `validates_timeliness_of`).
+- **validates_datetime** tests usage of validates_timeliness's `validates_datetime`.
+- **validates_date** tests usage of validates_timeliness's `validates_date`.
+- **validates_time** tests usage of validates_timeliness's `validate_time`.
 
 ## Installation
 
@@ -37,8 +36,8 @@ class Person
   validates_time :breakfast_time, is_at: '7:00am'
   validates_time :updated_at, between: ['9:00am', '5:00pm']
 
-  # validates_datetime :start_time, before: :finish_time **[CAUTION] Method symbol is not support**
-  # validates_date :created_at, on_or_after: :today      **[CAUTION] Shorthand is not support**
+  # validates_datetime :start_time, before: :finish_time **[NOT SUPPORT] Method symbol
+  # validates_date :created_at, on_or_after: :today      **[NOT SUPPORT] Shorthand
 end
 ```
 
@@ -48,9 +47,11 @@ And with `rspec-validates_timeliness` we can now make simple assertions about th
 require 'spec_helper'
 
 describe Person, type: :model do
-  it { is_expected.to validates_date(:date_of_birth).before { 18.years.ago.to_date } }
+  it { is_expected.to validates_date(:date_of_birth).before(lambda { 18.years.ago }) }
+  it { is_expected.to validates_date(:date_of_birth).before { 18.years.ago } } # The same as previous example
   it { is_expected.to validates_time(:breakfast_time).is_at('7:00am') }
   it { is_expected.to validates_time(:updated_at).between(['9:00am', '5:00pm']) }
+  it { is_expected.to validates_time(:updated_at).on_or_after('9:00am').on_or_before('5:00pm') } # The same as previous example
 end
 ```
 
@@ -64,4 +65,8 @@ end
 
 ## Changelog
 
-* Release 0.0.1 (Jun 12, 2016)
+#### Release 0.1.1 (Jun 13, 2016)
+
+* Fix to optimize expected values.
+
+#### Release 0.1.0 (Jun 12, 2016)

data/lib/rspec-validates_timeliness/matchers.rb

@@ -6,6 +6,9 @@ require 'rspec-validates_timeliness/matchers/expected_value'
 require 'rspec-validates_timeliness/matchers/message_builder'
 require 'rspec-validates_timeliness/matchers/validation_matcher'
 require 'rspec-validates_timeliness/matchers/validator_proxy'
+require 'rspec-validates_timeliness/matchers/validates_date_matcher'
+require 'rspec-validates_timeliness/matchers/validates_datetime_matcher'
+require 'rspec-validates_timeliness/matchers/validates_time_matcher'
 
 module RSpec
   module ValidatesTimeliness

data/lib/rspec-validates_timeliness/matchers/expected_value.rb

@@ -1,8 +1,8 @@
 module RSpec::ValidatesTimeliness
   module Matchers
     class ExpectedValue
-      def initialize(value)
-        @value = evaluate(value)
+      def initialize(value, type)
+        @value = evaluate(value, type)
       end
 
       def equal
@@ -31,11 +31,12 @@ module RSpec::ValidatesTimeliness
 
       attr_reader :value
 
-      def evaluate(value)
+      def evaluate(value, type)
         case value
-        when Proc then value.call
-        when Time, DateTime, Date then value
-        when String then value.to_time
+        when Proc
+          value.call.try("to_#{type}")
+        when Time, DateTime, Date, String
+          value.try("to_#{type}")
         else nil
         end
       end

data/lib/rspec-validates_timeliness/matchers/validates_date_matcher.rb

@@ -0,0 +1,16 @@
+module RSpec::ValidatesTimeliness
+  module Matchers
+    def validates_date(attr_name)
+      ValidatesDateMatcher.new(attr_name)
+    end
+
+    class ValidatesDateMatcher < ValidationMatcher
+      private
+
+      def type
+        :date
+      end
+    end
+  end
+end
+

data/lib/rspec-validates_timeliness/matchers/validates_datetime_matcher.rb

@@ -0,0 +1,16 @@
+module RSpec::ValidatesTimeliness
+  module Matchers
+    def validates_datetime(attr_name)
+      ValidatesDatetimeMatcher.new(attr_name)
+    end
+
+    class ValidatesDatetimeMatcher < ValidationMatcher
+      private
+
+      def type
+        :datetime
+      end
+    end
+  end
+end
+

data/lib/rspec-validates_timeliness/matchers/validates_time_matcher.rb

@@ -0,0 +1,16 @@
+module RSpec::ValidatesTimeliness
+  module Matchers
+    def validates_time(attr_name)
+      ValidatesTimeMatcher.new(attr_name)
+    end
+
+    class ValidatesTimeMatcher < ValidationMatcher
+      private
+
+      def type
+        :time
+      end
+    end
+  end
+end
+

data/lib/rspec-validates_timeliness/matchers/validation_matcher.rb

@@ -1,13 +1,5 @@
 module RSpec::ValidatesTimeliness
   module Matchers
-    def validates_timeliness_of(attr_name)
-      ValidationMatcher.new(attr_name)
-    end
-
-    alias validates_date validates_timeliness_of
-    alias validates_time validates_timeliness_of
-    alias validates_datetime validates_timeliness_of
-
     class ValidationMatcher
       attr_reader :description
 
@@ -68,7 +60,7 @@ module RSpec::ValidatesTimeliness
 
       private
 
-      attr_reader :attr_name, :options, :subject
+      attr_reader :attr_name, :options, :subject, :type
 
       def base_description
         "validate that :#{attr_name} must be"
@@ -93,7 +85,7 @@ module RSpec::ValidatesTimeliness
 
       def is_at_correct?
         run_correct do
-          value = ExpectedValue.new(options[:is_at])
+          value = ExpectedValue.new(options[:is_at], type)
           description << "at #{value.equal}"
           valid?(value.equal) && invalid?(value.over) && invalid?(value.under)
         end
@@ -101,7 +93,7 @@ module RSpec::ValidatesTimeliness
 
       def after_correct?
         run_correct do
-          value = ExpectedValue.new(options[:after])
+          value = ExpectedValue.new(options[:after], type)
           description << "after #{value.equal}"
           valid?(value.over) && invalid?(value.equal) && invalid?(value.under)
         end
@@ -109,7 +101,7 @@ module RSpec::ValidatesTimeliness
 
       def on_or_after_correct?
         run_correct do
-          value = ExpectedValue.new(options[:on_or_after])
+          value = ExpectedValue.new(options[:on_or_after], type)
           description << "on or after #{value.equal}"
           valid?(value.equal) && valid?(value.over) && invalid?(value.under)
         end
@@ -117,7 +109,7 @@ module RSpec::ValidatesTimeliness
 
       def before_correct?
         run_correct do
-          value = ExpectedValue.new(options[:before])
+          value = ExpectedValue.new(options[:before], type)
           description << "before #{value.equal}"
           valid?(value.under) && invalid?(value.equal) && invalid?(value.over)
         end
@@ -125,7 +117,7 @@ module RSpec::ValidatesTimeliness
 
       def on_or_before_correct?
         run_correct do
-          value = ExpectedValue.new(options[:on_or_before])
+          value = ExpectedValue.new(options[:on_or_before], type)
           description << "on or before #{value.equal}"
           valid?(value.equal) && valid?(value.under) && invalid?(value.over)
         end
@@ -135,6 +127,10 @@ module RSpec::ValidatesTimeliness
         @validator_proxy ||= ValidatorProxy.new(subject, attr_name)
       end
 
+      def type
+        fail NotImplementedError
+      end
+
       delegate :valid?, to: :validator_proxy
       delegate :invalid?, to: :validator_proxy
     end

data/lib/rspec-validates_timeliness/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module ValidatesTimeliness
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/spec/acceptance/validates_date_spec.rb

@@ -13,7 +13,7 @@ end
 
 describe ValidatesDate do
   it { is_expected.to validates_date(:date_of_birth).is_at { Date.current } }
-  it { is_expected.to validates_date(:date_of_start).after { 1.week.ago.to_date }.before { 1.week.since.to_date } }
-  it { is_expected.to validates_date(:date_of_finish).on_or_after { 1.year.ago.to_date }.on_or_before { 1.year.since.to_date } }
-  it { is_expected.to validates_date(:date_of_expiry).between([3.days.ago.to_date, 3.days.since.to_date]) }
+  it { is_expected.to validates_date(:date_of_start).after { 1.week.ago }.before { 1.week.since } }
+  it { is_expected.to validates_date(:date_of_finish).on_or_after { 1.year.ago }.on_or_before { 1.year.since } }
+  it { is_expected.to validates_date(:date_of_expiry).between([3.days.ago, 3.days.since]) }
 end

data/spec/acceptance/{validates_date_time_spec.rb → validates_datetime_spec.rb}

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-class ValidatesDateTime
+class ValidatesDatetime
   include ActiveModel::Model
 
   attr_reader :started_at, :finished_at, :created_at, :updated_at
 
   validates_datetime :started_at, is_at: lambda { DateTime.current }
-  validates_datetime :finished_at, after: lambda { 1.week.ago.to_datetime }, before: lambda { 1.week.since.to_datetime }
-  validates_datetime :created_at, on_or_after: lambda { 1.year.ago.to_datetime }, on_or_before: lambda { 1.year.since.to_datetime }
+  validates_datetime :finished_at, after: lambda { 1.week.ago }, before: lambda { 1.week.since }
+  validates_datetime :created_at, on_or_after: lambda { 1.year.ago }, on_or_before: lambda { 1.year.since }
   validates_datetime :updated_at, between: [DateTime.new(2008, 9, 1, 10, 5, 0), DateTime.new(2009, 4, 1, 0, 30, 0)]
 end
 
-describe ValidatesDateTime do
+describe ValidatesDatetime do
   it { is_expected.to validates_datetime(:started_at).is_at { DateTime.current } }
-  it { is_expected.to validates_datetime(:finished_at).after { 1.week.ago.to_datetime }.before { 1.week.since.to_datetime } }
-  it { is_expected.to validates_datetime(:created_at).on_or_after { 1.year.ago.to_datetime }.on_or_before { 1.year.since.to_datetime } }
+  it { is_expected.to validates_datetime(:finished_at).after { 1.week.ago }.before { 1.week.since } }
+  it { is_expected.to validates_datetime(:created_at).on_or_after { 1.year.ago }.on_or_before { 1.year.since } }
   it { is_expected.to validates_datetime(:updated_at).between([DateTime.new(2008, 9, 1, 10, 5, 0), DateTime.new(2009, 4, 1, 0, 30, 0)]) }
 end

data/spec/lib/rspec-validates_timeliness/matchers/expected_value_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe RSpec::ValidatesTimeliness::Matchers::ExpectedValue do
   describe '#equal' do
     let(:result) { Date.current }
-    let(:model) { described_class.new(result) }
+    let(:model) { described_class.new(result, :date) }
 
     subject { model.equal }
 
@@ -11,12 +11,13 @@ describe RSpec::ValidatesTimeliness::Matchers::ExpectedValue do
   end
 
   describe '#over' do
-    let(:model) { described_class.new(value) }
+    let(:model) { described_class.new(value, type) }
 
     subject { model.over }
 
     context 'value is kind of Date' do
       let(:value) { Date.current }
+      let(:type) { :date }
       let(:result) { value + 1.day }
 
       it 'returns value + 1.day (tomorrow)' do
@@ -26,6 +27,7 @@ describe RSpec::ValidatesTimeliness::Matchers::ExpectedValue do
 
     context 'value is not kind of Date' do
       let(:value) { DateTime.current }
+      let(:type) { :datetime }
       let(:result) { value + 1.second }
 
       it 'returns value + 1.second' do
@@ -35,12 +37,13 @@ describe RSpec::ValidatesTimeliness::Matchers::ExpectedValue do
   end
 
   describe '#under' do
-    let(:model) { described_class.new(value) }
+    let(:model) { described_class.new(value, type) }
 
     subject { model.under }
 
     context 'value is kind of Date' do
       let(:value) { Date.current }
+      let(:type) { :date }
       let(:result) { value - 1.day }
 
       it 'returns value - 1.day (yesterday)' do
@@ -50,6 +53,7 @@ describe RSpec::ValidatesTimeliness::Matchers::ExpectedValue do
 
     context 'value is not kind of Date' do
       let(:value) { DateTime.current }
+      let(:type) { :datetime }
       let(:result) { value - 1.second }
 
       it 'returns value - 1.second' do
@@ -59,39 +63,46 @@ describe RSpec::ValidatesTimeliness::Matchers::ExpectedValue do
   end
 
   describe '#evaluate' do
-    let(:model) { described_class.new(nil) }
+    let(:model) { described_class.new(nil, nil) }
+    let(:type) { :datetime }
 
-    subject { model.send(:evaluate, value) }
+    subject { model.send(:evaluate, value, type) }
+
+    shared_examples 'exactly value' do
+      let(:result) { value.try("to_#{type}") }
+
+      it { is_expected.to eq result }
+    end
 
     context 'velue is kind of Proc' do
       let(:value) { proc { Date.today } }
+      let(:result) { value.call.try("to_#{type}") }
 
-      it { is_expected.to eq value.call }
+      it { is_expected.to eq result }
     end
 
     context 'value is kind of Time' do
       let(:value) { Time.now }
 
-      it { is_expected.to eq value }
+      it_behaves_like 'exactly value'
     end
 
     context 'value is kind of DateTime' do
       let(:value) { DateTime.current }
 
-      it { is_expected.to eq value }
+      it_behaves_like 'exactly value'
     end
 
     context 'value is kind of Date' do
       let(:value) { Date.current }
 
-      it { is_expected.to eq value }
+      it_behaves_like 'exactly value'
     end
 
     context 'value is kind of String' do
       let(:value) { '9:00am' }
-      let(:result) { value.to_time }
 
-      it { is_expected.to eq result }
+      it_behaves_like 'exactly value'
     end
 
     context 'value is not kind of Proc, Time, DateTime, Date' do

data/spec/lib/rspec-validates_timeliness/matchers/validates_date_matcher_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe RSpec::ValidatesTimeliness::Matchers::ValidatesDateMatcher do
+end

data/spec/lib/rspec-validates_timeliness/matchers/validates_datetime_matcher_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe RSpec::ValidatesTimeliness::Matchers::ValidatesDatetimeMatcher do
+end

data/spec/lib/rspec-validates_timeliness/matchers/validates_time_matcher_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe RSpec::ValidatesTimeliness::Matchers::ValidatesTimeMatcher do
+end
+

data/spec/lib/rspec-validates_timeliness/matchers_spec.rb

@@ -1,18 +1,22 @@
 require 'spec_helper'
 
 describe RSpec::ValidatesTimeliness::Matchers do
-  describe '#validates_timeliness_of' do
-    before do
-      class DummyModel
-        include RSpec::ValidatesTimeliness::Matchers
-      end
+  before do
+    class DummyModel
+      include RSpec::ValidatesTimeliness::Matchers
     end
+  end
+
+  let(:model) { DummyModel.new }
+  let(:attr_name) { :one }
 
-    let(:model) { DummyModel.new }
-    let(:attr_name) { :one }
+  %i(validates_date validates_datetime validates_time).each do |matcher_name|
+    describe "##{matcher_name}" do
+      let(:type) { "RSpec::ValidatesTimeliness::Matchers::#{matcher_name.to_s.classify}Matcher".constantize }
 
-    subject { model.validates_timeliness_of(attr_name) }
+      subject { model.try(matcher_name, attr_name) }
 
-    it { is_expected.to be_kind_of(RSpec::ValidatesTimeliness::Matchers::ValidationMatcher) }
+      it { is_expected.to be_kind_of(type) }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yoshiyuki Hirano
@@ -130,15 +130,21 @@ files:
 - lib/rspec-validates_timeliness/matchers.rb
 - lib/rspec-validates_timeliness/matchers/expected_value.rb
 - lib/rspec-validates_timeliness/matchers/message_builder.rb
+- lib/rspec-validates_timeliness/matchers/validates_date_matcher.rb
+- lib/rspec-validates_timeliness/matchers/validates_datetime_matcher.rb
+- lib/rspec-validates_timeliness/matchers/validates_time_matcher.rb
 - lib/rspec-validates_timeliness/matchers/validation_matcher.rb
 - lib/rspec-validates_timeliness/matchers/validator_proxy.rb
 - lib/rspec-validates_timeliness/version.rb
 - rspec-validates_timeliness.gemspec
 - spec/acceptance/validates_date_spec.rb
-- spec/acceptance/validates_date_time_spec.rb
+- spec/acceptance/validates_datetime_spec.rb
 - spec/acceptance/validates_time_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/expected_value_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/message_builder_spec.rb
+- spec/lib/rspec-validates_timeliness/matchers/validates_date_matcher_spec.rb
+- spec/lib/rspec-validates_timeliness/matchers/validates_datetime_matcher_spec.rb
+- spec/lib/rspec-validates_timeliness/matchers/validates_time_matcher_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/validation_matcher_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/validator_proxy_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers_spec.rb
@@ -169,10 +175,13 @@ specification_version: 4
 summary: Simple RSpec matchers for validates_timeliness
 test_files:
 - spec/acceptance/validates_date_spec.rb
-- spec/acceptance/validates_date_time_spec.rb
+- spec/acceptance/validates_datetime_spec.rb
 - spec/acceptance/validates_time_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/expected_value_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/message_builder_spec.rb
+- spec/lib/rspec-validates_timeliness/matchers/validates_date_matcher_spec.rb
+- spec/lib/rspec-validates_timeliness/matchers/validates_datetime_matcher_spec.rb
+- spec/lib/rspec-validates_timeliness/matchers/validates_time_matcher_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/validation_matcher_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers/validator_proxy_spec.rb
 - spec/lib/rspec-validates_timeliness/matchers_spec.rb