date_supercharger 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e74bb40da956266672fdb1ac7524311ba3cf7d01
-  data.tar.gz: a37b5cb86f7ba85931acdf7a666ac2d960fe121f
+  metadata.gz: 9cbde5991d41f650cdea7c806ad19374ab489464
+  data.tar.gz: 7feaee3da4b2d798efb969ddec64a168f05128cb
 SHA512:
-  metadata.gz: 1050ca6e2de7883260f75cc97af51453685d4ed5a7b2fe625a7f542ee162aa443cccc7715b03c2c7f742c5e91c9f064a95c435465b7d31a051c169e2b7cf9750
-  data.tar.gz: b2e15e021452eb57748dcf90f7bc75dc975abb30768312c40fda784d19d576ec88b444b811e00fc4ed61012e321093787e8a4cac5d967c176dca9e8a3d5bcf4d
+  metadata.gz: cabbb1d6e0f9e892ed56c15fd03424b3717a5c746c815e1c620d15f45692b06007ccc1cb296d730b28a7f6b5fa9d86afd8eb5956047ebd6255d82986c99455b0
+  data.tar.gz: bd635957f1bcf9a25c5eeaf32501781837c3256701704d0eee68d8ab7754e1d09cb282925f7d2658f4f38ba6e8ec2237952baa4f452b70fa6bbaf1e62d4f5f3c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0
+
+- Add `between` and `between_incluve` methods
+
 ## 0.0.2
 
 - Raise ArgumentError when date methods receives wrong number of parameters

data/lib/date_supercharger.rb

@@ -10,10 +10,25 @@ module DateSupercharger
       match = ModelDateExtensionMatch.new(self,method_sym)
 
       if match.match?
-        operators = { after: ">", before: "<", before_or_at: "<=", after_or_at: ">=" }
-        singleton_class.class_eval do
-          define_method("#{match.attribute}_#{match.suffix}") do |date|
-            where("#{match.attribute} #{operators[match.suffix]} ?", date)
+        case match.suffix
+        when :after,:before,:before_or_at,:after_or_at
+          operators = { after: ">", before: "<", before_or_at: "<=", after_or_at: ">=" }
+          singleton_class.class_eval do
+            define_method("#{match.attribute}_#{match.suffix}") do |date|
+              where("#{match.attribute} #{operators[match.suffix]} ?", date)
+            end
+          end
+        when :between
+          singleton_class.class_eval do
+            define_method("#{match.attribute}_#{match.suffix}") do |from,to|
+              send("#{match.attribute}_after_or_at",from).send("#{match.attribute}_before",to)
+            end
+          end
+        when :between_inclusive
+          singleton_class.class_eval do
+            define_method("#{match.attribute}_#{match.suffix}") do |from,to|
+              send("#{match.attribute}_after_or_at",from).send("#{match.attribute}_before_or_at",to)
+            end
           end
         end
         send(method_sym, *arguments)
@@ -38,7 +53,7 @@ module DateSupercharger
 
     def initialize(model,method_sym)
       #TODO: implement between and between_inclusive
-      if method_sym.to_s =~ /^(.+)_(before|after|before_or_at|after_or_at)$/
+      if method_sym.to_s =~ /^(.+)_(before|after|before_or_at|after_or_at|between|between_inclusive)$/
         date_columns = model.columns_hash.keys.select { |c| [:datetime,:date].include? model.columns_hash[c].type }.map(&:to_sym)
         if date_columns.include? $1.to_sym
           @attribute = $1.to_sym

data/lib/date_supercharger/version.rb

@@ -1,3 +1,3 @@
 module DateSupercharger
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/test/date_supercharger_test.rb

@@ -54,6 +54,26 @@ class TestDateSupercharger < Minitest::Test
       end
     end
 
+    describe "#_between" do
+      it "should include from but exclude to" do
+        assert_equal 6, Visit.visit_date_between(monday,sunday).count
+      end
+    end
+
+    describe "#_between_inclusive" do
+      it "should include from but exclude to" do
+        assert_equal 7, Visit.visit_date_between_inclusive(monday,sunday).count
+      end
+    end
+
+    describe "#respond_to?" do
+      it "should respond_to date supercharger methods" do
+        supercharger_methods = [:before,:after,:before_or_at,:after_or_at,:between,:between_inclusive]
+        supercharger_methods.each do |method|
+          assert_equal true, Visit.respond_to?("visit_date_#{method}")
+        end
+      end
+    end
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date_supercharger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Simon Soriano