date_ranger 0.0.1 → 0.0.2

data/lib/date_ranger/bootstrapper.rb

@@ -4,7 +4,11 @@ module DateRanger::Bootstrapper
     cattr_accessor :date_ranger_options
     self.date_ranger_options = options
     self.date_ranger_options[:timestep] ||= :daily
-    self.send :include, DateRanger
+    if self.date_ranger_options[:class]
+      extend DateRanger
+    else
+      self.send :include, DateRanger
+    end
   end
 
 end

data/lib/date_ranger/version.rb

@@ -1,3 +1,3 @@
 module DateRanger
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/date_ranger.rb

@@ -1,31 +1,38 @@
 module DateRanger
 
-  def start_date
-    @start_date ||= self.class.date_ranger_options[:default_start_date].call
-    case self.class.date_ranger_options[:timestep]
-    when :daily; @start_date
-    when :monthly; @start_date.beginning_of_month
+  attr_writer :start_date, :end_date
+
+  def date_ranger_options
+    if self.class.respond_to?(:date_ranger_options)
+      self.class.date_ranger_options
+    else
+      super
     end
   end
 
-  def start_date=(date)
-    @start_date = date.respond_to?(:to_date) ? date.to_date : date
+  def start_date
+    @start_date ||= self.date_ranger_options[:default_start_date].call
+    @start_date = case self.date_ranger_options[:timestep]
+                  when :daily; @start_date
+                  when :monthly; @start_date.beginning_of_month
+                  end
+    @start_date = if @start_date.respond_to?(:to_date)
+                    @start_date.to_date
+                  else
+                    @start_date
+                  end
   end
 
   def end_date
-    @end_date ||= self.class.date_ranger_options[:default_end_date].call
-    case self.class.date_ranger_options[:timestep]
-    when :daily; @end_date
-    when :monthly; @end_date.end_of_month
-    end
-  end
-
-  def end_date=(date)
-    @end_date = date.respond_to?(:to_date) ? date.to_date : date
+    @end_date ||= self.date_ranger_options[:default_end_date].call
+    @end_date = case self.date_ranger_options[:timestep]
+                when :daily; @end_date
+                when :monthly; @end_date.end_of_month
+                end
+    @end_date = @end_date.respond_to?(:to_date) ? @end_date.to_date : @end_date
   end
 
 end
 
 require "active_support/all"
-require "date_ranger/version"
 require 'date_ranger/bootstrapper'

data/spec/date_ranger_spec.rb

@@ -5,11 +5,26 @@ describe DateRanger do
   class Something
   end
 
+  class Another
+  end
+
   describe '.has_date_range' do
     it 'should default timestep to :daily' do
       Something.has_date_range
       Something.date_ranger_options[:timestep].should == :daily
     end
+
+    context 'when applied to a class' do
+      it "should not overwrite another class' settings" do
+        Something.has_date_range :timestep => :daily, :class => true
+        Another.has_date_range :timestep => :monthly, :class => true
+        Something.date_ranger_options[:timestep].should == :daily
+        Another.date_ranger_options[:timestep].should == :monthly
+
+        Something.start_date = '2012-01-01'
+        Something.start_date.should == '2012-01-01'.to_date
+      end
+    end
   end
 
   describe "#start_date" do
@@ -20,9 +35,16 @@ describe DateRanger do
       something.start_date.should == '2012-01-01'.to_date
     end
 
+    it 'should return date given a time' do
+      Something.has_date_range
+      something = Something.new
+      something.start_date = 5.days.ago
+      something.start_date.should == 5.days.ago.to_date
+    end
+
     context 'when not overriden' do
       it 'should return the given default start date' do
-        Something.has_date_range :default_start_date => lambda { 2.days.ago.to_date }
+        Something.has_date_range :default_start_date => lambda { 2.days.ago }
         something  = Something.new
         something.start_date.should == 2.days.ago.to_date
       end
@@ -55,6 +77,13 @@ describe DateRanger do
       something.end_date.should == '2012-01-01'.to_date
     end
 
+    it 'should return date given a time' do
+      Something.has_date_range
+      something = Something.new
+      something.end_date = 5.days.ago
+      something.end_date.should == 5.days.ago.to_date
+    end
+
     context 'when not overriden' do
       it 'should return the given default end date' do
         Something.has_date_range :default_end_date => lambda { 2.days.ago.to_date }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: date_ranger
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Nestor Pestelos and Ramon Tayag
@@ -18,7 +18,9 @@ cert_chain: []
 date: 2012-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +31,12 @@ dependencies:
         - 12
         - 0
         version: 2.12.0
-  prerelease: false
   type: :development
-  name: rspec
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,10 +46,8 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
   type: :runtime
-  name: activesupport
-  requirement: *id002
+  version_requirements: *id002
 description: Provides date range methods
 email: 
 - ngpestelos@gmail.com