timespan 0.4.5 → 0.4.6

data/Gemfile

@@ -2,6 +2,7 @@ source :rubygems
 
 gem 'chronic'
 gem 'chronic_duration'
+gem 'activesupport', '>= 3.0.0'
 gem 'spanner'
 gem 'xduration', '~> 2.2'
 

data/Gemfile.lock

@@ -116,6 +116,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 3.0.0)
   bundler (>= 1.0.0)
   chronic
   chronic_duration

data/README.md

@@ -176,6 +176,46 @@ account.start_date = tomorrow
 account.end_date = tomorrow + 5.days
 ```
 
+## Factory method
+
+Timespan now has the class level factory methods `#from` and `#untill`. 
+
+### From
+
+```ruby
+account = Account.create :period => Timespan.from :tomorrow, 7.days
+
+# today
+Timespan.from :today, 7.days
+
+# now
+Timespan.from :asap, 7.days
+Timespan.from :now, 7.days
+
+# now
+Timespan.from :today, 7.days
+
+# starting one week from today
+Timespan.from :next_week, 7.days
+
+# starting first day next week
+Timespan.from :next_week, 7.days, start: true
+
+# starting first day next month
+Timespan.from :next_month, 7.days, start: true
+```
+
+### Untill
+
+Creates timespan from `Time.now` until the time specified.
+
+```ruby
+Timespan.untill :tomorrow
+Timespan.untill :next_week
+Timespan.untill :next_month, start: true
+Timespan.untill 2.days.from_now
+```
+
 ## Searching periods
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/timespan.rb

@@ -7,6 +7,7 @@ require 'timespan/units'
 require 'timespan/compare'
 require 'timespan/printer'
 require 'timespan/span'
+require 'active_support/core_ext/date/calculations.rb'
 
 if defined?(Mongoid)
 	require 'timespan/mongoid'
@@ -16,6 +17,12 @@ if defined?(Rails) && Rails::VERSION::STRING >= '3.1'
 	require 'duration/rails/engine' 
 end
 
+class Date
+	def self.next_week
+		Date.today.next_week
+	end
+end
+
 class Timespan
 	include Span
 	include Printer
@@ -53,6 +60,43 @@ class Timespan
 		@is_new = false
 	end
 
+	def self.from start, duration, options = {}
+		start = case start.to_sym
+		when :now, :asap
+			Time.now
+		when :today
+			Date.today
+		when :tomorrow
+			Date.today + 1.day
+		when :next_week # requires active_support
+			date = Date.today.next_week
+			options[:start] ? date.beginning_of_week : date
+		when :next_month			
+			date = Date.today.next_month
+			options[:start] ? date.at_beginning_of_month.next_month : date
+		else
+			start
+		end
+
+		self.new start_date: start, duration: duration
+	end
+
+	def self.untill ending
+		ending = case ending.to_sym
+		when :tomorrow
+			Date.today + 1.day
+		when :next_week # requires active_support
+			date = Date.today.next_week
+			options[:start] ? date.beginning_of_week : date
+		when :next_month			
+			date = Date.today.next_month
+			options[:start] ? date.at_beginning_of_month.next_month : date
+		else
+			ending
+		end
+		self.new start_date: Date.now, end_date: ending
+	end
+
 	def start_time= time
 		@start_time = convert_to_time time		
 		unless is_new?
@@ -188,7 +232,7 @@ class Timespan
 	end
 
 	def set_end_time
-		self.end_time = start_time - duration.total
+		self.end_time = start_time + duration.total
 	end
 
 	def set_start_time_miss

data/spec/timespan/mongoid/mongoid_timespan_spec.rb

@@ -10,6 +10,104 @@ describe TimeSpan do
   let(:from) { Chronic.parse("1 day ago") }
   let(:to)   { Time.now }
 
+  context 'factory method #from' do
+    describe ':today' do
+      let(:account) do 
+        Account.create period: Timespan.from(:today, 5.days)
+      end
+
+      describe '.start_date' do
+        it 'should default to today' do
+          DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
+        end
+      end
+
+      describe '.duration' do
+        it 'should be 5 days' do
+          subject.period.to_days.should == 5
+        end
+      end
+
+      describe '.end_date' do
+        it 'should be 5 days from today' do
+          DateTime.parse(subject.period.end_date.to_s).strftime('%d %b %Y').should == (Date.today + 5.days).strftime('%d %b %Y')
+        end
+      end
+    end
+
+    describe ':asap' do
+      let(:account) do 
+        Account.create period: Timespan.from(:asap, 5.days)
+      end
+
+      describe '.start_date' do
+        it 'should default to today' do
+          DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
+        end
+      end
+
+      describe '.duration' do
+        it 'should be 5 days' do
+          subject.period.to_days.should == 5
+        end
+      end
+
+      describe '.end_date' do
+        it 'should be 5 days from today' do
+          DateTime.parse(subject.period.end_date.to_s).strftime('%d %b %Y').should == (Date.today + 5.days).strftime('%d %b %Y')
+        end
+      end
+    end
+
+    describe ':tomorrow' do
+      let(:account) do 
+        Account.create period: Timespan.from(:tomorrow, 5.days)
+      end
+
+      describe '.start_date' do
+        it 'should be tomorrow' do
+          DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.tomorrow.strftime('%d %b %Y')
+        end
+      end
+
+      describe '.duration' do
+        it 'should be 5 days' do
+          subject.period.to_days.should == 5
+        end
+      end
+
+      describe '.end_date' do
+        it 'should be 5 days from tomorrow' do
+          DateTime.parse(subject.period.end_date.to_s).strftime('%d %b %Y').should == (Date.tomorrow + 5.days).strftime('%d %b %Y')
+        end
+      end
+    end
+
+    describe ':next_week' do
+      let(:account) do 
+        Account.create period: Timespan.from(:next_week, 5.days)
+      end
+
+      describe '.start_date' do
+        it 'should be 1 week from today' do
+          DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.next_week.strftime('%d %b %Y')
+        end
+      end
+
+      describe '.duration' do
+        it 'should be 5 days' do
+          subject.period.to_days.should == 5
+        end
+      end
+
+      describe '.end_date' do
+        it 'should be 5 days from next week' do
+          DateTime.parse(subject.period.end_date.to_s).strftime('%d %b %Y').should == (Date.next_week + 5.days).strftime('%d %b %Y')
+        end
+      end
+    end
+  end
+
   context '2 days duration using factory method' do
     let(:account) do 
       Account.create_it! '2 days'

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-09-19"
+  s.date = "2012-09-24"
   s.description = "Makes it easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
       s.add_runtime_dependency(%q<chronic_duration>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<spanner>, [">= 0"])
       s.add_runtime_dependency(%q<xduration>, ["~> 2.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
@@ -80,6 +81,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<chronic>, [">= 0"])
       s.add_dependency(%q<chronic_duration>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<spanner>, [">= 0"])
       s.add_dependency(%q<xduration>, ["~> 2.2"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
@@ -93,6 +95,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<chronic>, [">= 0"])
     s.add_dependency(%q<chronic_duration>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<spanner>, [">= 0"])
     s.add_dependency(%q<xduration>, ["~> 2.2"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: spanner
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4117334554078744124
+      hash: -1422999725425630205
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: