simple_date_scopes 0.1.0 → 0.1.1

data/README.md

@@ -71,6 +71,9 @@ We can now also take a field to use instead of :created\_at:
 
 # Changes
 
+## 0.1.1
+* Refactoring to use a common private method instead of 3 almost identical methods
+
 ## 0.1.0
 * Renamed to simple\_date\_scopes so we can push to rubygems
 

data/lib/simple_date_scopes/simple_date_scopes.rb

@@ -10,34 +10,31 @@ module SimpleDateScopes
 
       base_class.extend(InstanceMethods)
 
-      scope :in_week_of, ->(d,field = 'created_at') { where("#{field} BETWEEN ? AND ?",
-                                             d.beginning_of_week.beginning_of_day,
-                                             d.end_of_week.end_of_day ) }
+      scope :in_week_of, ->(d,field = 'created_at') { in_x_of(d, field, :week) }
       scope :last_week, ->(f = 'created_at') { in_week_of(Date.today - 7.days, f) }
       scope :this_week, ->(f = 'created_at') { in_week_of(Date.today, f) }
       scope :next_week, ->(f = 'created_at') { in_week_of(Date.today + 7.days, f) }
 
-      scope :in_month_of, ->(d,field = 'created_at') { where("#{field} BETWEEN ? AND ?",
-                                             d.beginning_of_month.beginning_of_day,
-                                             d.end_of_month.end_of_day ) }
+      scope :in_month_of, ->(d,field = 'created_at') { in_x_of(d, field, :month) }
       scope :last_month, ->(f = 'created_at') { in_month_of(Date.today - 1.months, f) }
       scope :this_month, ->(f = 'created_at') { in_month_of(Date.today, f) }
       scope :next_month, ->(f = 'created_at') { in_month_of(Date.today + 1.months, f) }
 
-      scope :in_year_of, ->(d,field = 'created_at') { where("#{field} BETWEEN ? AND ?",
-                                             d.beginning_of_year.beginning_of_day,
-                                             d.end_of_year.end_of_day ) }
+      scope :in_year_of, ->(d,field = 'created_at') { in_x_of(d, field, :year) }
       scope :last_year, ->(f = 'created_at') { in_year_of(Date.today - 1.years, f) }
       scope :this_year, ->(f = 'created_at') { in_year_of(Date.today, f) }
       scope :next_year, ->(f = 'created_at') { in_year_of(Date.today + 1.years, f) }
 
-      private
-      def in_x_of(date, field, method)
-      end
     end
   end
 
   module ClassMethods
+    private
+    def in_x_of(date, field, method)
+      where("#{field} BETWEEN ? AND ?",
+            date.send("beginning_of_#{method.to_s}".to_sym).beginning_of_day,
+            date.send("end_of_#{method.to_s}".to_sym).end_of_day)
+    end
   end
 
   module InstanceMethods

data/lib/simple_date_scopes/spec_support.rb

@@ -11,7 +11,7 @@ shared_examples_for 'simple date scopes' do
     @new_item = kind.last
   end
 
-  it "should have 4 items" do
+  it 'should have 4 items' do
     kind.count.should eq(4)
   end
 

data/lib/simple_date_scopes/version.rb

@@ -1,3 +1,3 @@
 module SimpleDateScopes
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_date_scopes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2259891919373961889
+      hash: 2204942028803521934
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2259891919373961889
+      hash: 2204942028803521934
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23