date_supercharger 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cbde5991d41f650cdea7c806ad19374ab489464
-  data.tar.gz: 7feaee3da4b2d798efb969ddec64a168f05128cb
+  metadata.gz: 2896b5b0efeff824bef43c94880d0194db738c5e
+  data.tar.gz: 4dca365454e6c76764e68c7c2e4eaeda6919e2e2
 SHA512:
-  metadata.gz: cabbb1d6e0f9e892ed56c15fd03424b3717a5c746c815e1c620d15f45692b06007ccc1cb296d730b28a7f6b5fa9d86afd8eb5956047ebd6255d82986c99455b0
-  data.tar.gz: bd635957f1bcf9a25c5eeaf32501781837c3256701704d0eee68d8ab7754e1d09cb282925f7d2658f4f38ba6e8ec2237952baa4f452b70fa6bbaf1e62d4f5f3c
+  metadata.gz: 438d4293b37490c687b82a770590f02250f93173021378461b0699cc2a95e7f886b6c5e66d15110b96108c9380e43dc4d8e6b1c5fc52736bdcbaa24a08573014
+  data.tar.gz: ca21fc7f5a0529201a384dd2bda0bb59c2d4ebb7636346050b647e6857429c183d637053aaa6cc35b5ad6aca7ac5cc29952e23c5fcb50b46df1d3a735e320845

data/README.md

@@ -2,7 +2,7 @@
 
 A nice shortcut for date queries.
 
-`date_supercharger` adds `_after`, `_after_or_at`, `_before` and `_before_or_at` methods to every date/datetime field of Active Record models.
+`date_supercharger` adds `between`,`between_inclusive`,`_after`, `_after_or_at`, `_before` and `_before_or_at` methods to every date/datetime field of Active Record models.
 
 [![Build Status](https://travis-ci.org/simon0191/date_supercharger.svg)](https://travis-ci.org/simon0191/date_supercharger)
 [![Code Climate](https://codeclimate.com/github/simon0191/date_supercharger/badges/gpa.svg)](https://codeclimate.com/github/simon0191/date_supercharger)
@@ -10,13 +10,33 @@ A nice shortcut for date queries.
 ## Usage
 
 ```ruby
-Visit.created_at_after(DateTime.now)
+Visit.created_at_between(from,to)
 ```
 
 instead of
 
 ```ruby
-Visit.where("created_at > ?",DateTime.now)
+Visit.where("created_at >= ? AND created_at < ?",from,to)
+```
+
+```ruby
+Visit.created_at_between_inclusive(from,to)
+```
+
+instead of
+
+```ruby
+Visit.where("created_at >= ? AND created_at <= ?",from,to)
+```
+
+```ruby
+Visit.created_at_after(some_date)
+```
+
+instead of
+
+```ruby
+Visit.where("created_at > ?",some_date)
 ```
 
 ## Installation

data/lib/date_supercharger.rb

@@ -1,4 +1,6 @@
 require "date_supercharger/version"
+require "date_supercharger/matcher"
+require "date_supercharger/method_definer"
 require "active_record"
 
 module DateSupercharger
@@ -7,30 +9,11 @@ module DateSupercharger
   included do
     def self.method_missing(method_sym, *arguments, &block)
       return super unless descends_from_active_record?
-      match = ModelDateExtensionMatch.new(self,method_sym)
+      matcher = Matcher.new(self,method_sym)
 
-      if match.match?
-        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
+      if matcher.match?
+        method_definer = MethodDefiner.new(self)
+        method_definer.define(attribute: matcher.attribute, suffix: matcher.suffix)
         send(method_sym, *arguments)
       else
         super
@@ -39,34 +22,12 @@ module DateSupercharger
 
     def self.respond_to?(method_sym, include_private = false)
       return super unless descends_from_active_record?
-      if ModelDateExtensionMatch.new(self,method_sym).match?
+      if Matcher.new(self,method_sym).match?
         true
       else
         super
       end
     end
   end
-
-  class ModelDateExtensionMatch
-
-    attr_accessor :attribute,:suffix
-
-    def initialize(model,method_sym)
-      #TODO: implement between and between_inclusive
-      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
-          @suffix = $2.to_sym
-        end
-      end
-
-    end
-
-    def match?
-      @attribute != nil
-    end
-  end
-
 end
 ActiveRecord::Base.send :include, DateSupercharger

data/lib/date_supercharger/matcher.rb

@@ -0,0 +1,30 @@
+module DateSupercharger
+  class Matcher
+
+    attr_accessor :attribute,:suffix
+
+    def initialize(model,method_sym)
+      if method_sym.to_s =~ /^(.+)_(before|after|before_or_at|after_or_at|between|between_inclusive)$/
+        date_columns = get_date_columns(model)
+
+        if date_columns.include? $1.to_sym
+          @attribute = $1.to_sym
+          @suffix = $2.to_sym
+        end
+      end
+
+    end
+
+    def match?
+      @attribute != nil
+    end
+
+    private
+
+      def get_date_columns(model)
+        model.columns_hash.keys.select do |c|
+          [:datetime,:date].include? model.columns_hash[c].type
+        end.map(&:to_sym)
+      end
+  end
+end

data/lib/date_supercharger/method_definer.rb

@@ -0,0 +1,36 @@
+module DateSupercharger
+  class MethodDefiner
+
+    attr_reader :klass
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def define(opts)
+      attribute = opts[:attribute]
+      suffix = opts[:suffix]
+
+      new_method = "#{attribute}_#{suffix}"
+      case suffix
+      when :after,:before,:before_or_at,:after_or_at
+        operators = { after: ">", before: "<", before_or_at: "<=", after_or_at: ">=" }
+        klass.singleton_class.class_eval do
+          define_method(new_method) do |date|
+            where("#{attribute} #{operators[suffix]} ?", date)
+          end
+        end
+      when :between,:between_inclusive
+        methods = {between: ["after_or_at","before"],between_inclusive:["after_or_at","before_or_at"]}
+        klass.singleton_class.class_eval do
+          define_method(new_method) do |from,to|
+            from_method = methods[suffix].first
+            to_method = methods[suffix].second
+            send("#{attribute}_#{from_method}",from).send("#{attribute}_#{to_method}",to)
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/date_supercharger/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: date_supercharger
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Simon Soriano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,6 +138,8 @@ files:
 - Rakefile
 - date_supercharger.gemspec
 - lib/date_supercharger.rb
+- lib/date_supercharger/matcher.rb
+- lib/date_supercharger/method_definer.rb
 - lib/date_supercharger/version.rb
 - test/date_supercharger_test.rb
 - test/test_helper.rb