banking_date_tools 0.0.2 → 0.0.3

data/lib/banking_date_tools/banking_date_tools.rb

@@ -1,5 +1,6 @@
 require 'date'
 module BankingDateTools
+  
   def banking_day?(date=Date.today, options={})
     date = Date.today if date.nil?
     # Set defaults
@@ -10,20 +11,22 @@ module BankingDateTools
         
     unless options[:force_allow_days].include?(date)
       return false if options[:no_holidays] && options[:holidays].include?(date)
-      return false if options[:no_weekends] && self.weekend?(date)
-      return false if options[:no_saturdays] && self.saturday?(date)
-      return false if options[:no_sundays] && self.sunday?(date)
+      if options[:no_weekends] 
+        return false if (date.saturday? || date.sunday?)
+      else
+        return false if options[:no_saturdays] && date.saturday?
+        return false if options[:no_sundays] && date.sunday?
+      end
     end
     true
   end
-
      
   def get_banking_day(date, options={})
-    options[:padding] ||= 0
+    options = ({:padding => 0, :previous => false}.merge(options))
     adjusted_padding = (options[:padding].abs + 1)
-    increment = (options[:previous] ? -1 : 1)  
-    adjusted_padding.times do |p|  
-      date = (date + increment) unless ((p + 1) == adjusted_padding)
+    increment = (options[:previous] ? -1 : 1)
+    adjusted_padding.times do |p|
+      date = (date + increment ) if p != 0 
       while !banking_day?(date, options)
         date = (date + increment )    
       end
@@ -32,47 +35,35 @@ module BankingDateTools
   end
 
   def get_next_banking_day(date, options={})
-    options[:previous] = false
+    options = ({:padding => 1, :previous => false}.merge(options))
     get_banking_day(date, options)
   end
     
   def get_previous_banking_day(date, options={})
-    options[:previous] = true
+    options = ({:padding => 1, :previous => true}.merge(options))
     get_banking_day(date, options)
   end
 
-  def weekend?(date)
-    date.wday == 0 || date.wday == 6
-  end
-
-  def sunday?(date)
-    date.wday == 0
-  end
-
-  def saturday?(date)
-    date.wday == 6
-  end
-
   def safe_date(date)
     if date.blank?
       return Date.today
     end
-    if date.class == String
-      if date.include?("/") || date.include?("-")
-        split = date.split("/") if date.include?("/")
-        split = date.split("-") if date.include?("-")
-        time = ""
-        if split[2] && split[2].include?(":")
-          year_time = split[2].split(" ")
-          split[2] = year_time[0]
-          time = year_time[1]
-        end
-        safe = "#{split[2]}-#{split[0]}-#{split[1]}"
-        safe << " #{time}" unless time.blank?
-        return safe if split.length == 3 && split[2].length == 4
-      end
-    end
-    date
+#    if date.class == String
+#      if date.include?("/") || date.include?("-")
+#        split = date.split("/") if date.include?("/")
+#        split = date.split("-") if date.include?("-")
+#        time = ""
+#        if split[2] && split[2].include?(":")
+#          year_time = split[2].split(" ")
+#          split[2] = year_time[0]
+#          time = year_time[1]
+#        end
+#        safe = "#{split[2]}-#{split[0]}-#{split[1]}"
+#        safe << " #{time}" unless time.blank?
+#        return safe if split.length == 3 && split[2].length == 4
+#      end
+#    end
+    date.to_date
   end
   
   # creates a date integer formated  like a MS.Net date tick
@@ -80,8 +71,8 @@ module BankingDateTools
     if date.blank?
       date = Time.now
     else
-      date = safe_date(date).to_time
+      date = date.to_time
     end
-    ((date.to_f) *1000).to_i
+    date.tick
   end
 end

data/lib/banking_date_tools/extend_ruby.rb

@@ -0,0 +1,25 @@
+Time.class_eval do
+  # creates a date integer formated  like a MS.Net date tick
+  def tick
+    ((self.to_f) *1000).to_i
+  end
+end
+
+String.class_eval do  
+  def to_date
+    if self.include?("/") || self.include?("-")
+      split = self.split("/") if self.include?("/")
+      split = self.split("-") if self.include?("-")
+      time = ""
+      if split[2] && split[2].include?(":")
+        year_time = split[2].split(" ")
+        split[2] = year_time[0]
+        time = year_time[1]
+      end
+      safe = "#{split[2]}-#{split[0]}-#{split[1]}"
+      safe << " #{time}" unless time.blank?
+      return Date.parse(safe) if split.length == 3 && split[2].length == 4
+    end
+    Date.parse(self)
+  end
+end

data/lib/banking_date_tools/version.rb

@@ -1,3 +1,3 @@
 module BankingDateTools
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/banking_date_tools.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'banking_date_tools/extend_ruby'
 require 'banking_date_tools/banking_date_tools'
 module BankingDateTools
   def self.root

data/spec/lib/banking_date_tools_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 include BankingDateTools
-describe BankingDateTools, "get_banking_day" do
-   
-  context "padding == 0" do
-      
+describe BankingDateTools, "get_banking_day" do  
+  context "padding == 0" do   
     context "no_weekends == true" do
       it "should role date to following banking day if on weekend and no_weekends are true" do
         options = {:padding => 0, :no_weekends => true}
@@ -33,17 +31,16 @@ describe BankingDateTools, "get_banking_day" do
         it "should role date to 2 banking days ago padding = 2" do
           options = {:previous => true,:padding => 2}
           get_previous_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-25"))   
-        end
-               
+        end             
       end 
     end
   end
+  
   it "should desc" do
     options = {:padding => 1, :no_weekends => true}
     get_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-28"))    
   end
-  
-   
+     
   it "should desc" do
     options = {:padding => 2, :no_weekends => true}
     get_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-29"))  
@@ -58,23 +55,23 @@ end
 describe BankingDateTools, "get_next_banking_day" do
   it "should desc" do
     options = {:no_weekends => true}
-    get_next_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-27"))    
+    get_next_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-28"))    
   end
   it "should desc" do
-    options = {:padding => 1, :no_weekends => true}
-    get_next_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-28"))    
+    options = {:padding => 2, :no_weekends => true}
+    get_next_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-29"))    
   end
 end
 
 describe BankingDateTools, "get_previous_banking_day" do
   it "should desc" do
     options = {:no_weekends => true}
-    get_previous_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-27"))    
+    get_previous_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-26"))    
   end
     
   it "should desc" do
-    options = {:padding => 1, :no_weekends => true}
-    get_previous_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-26"))    
+    options = {:padding => 2, :no_weekends => true}
+    get_previous_banking_day(Date.parse("2012-03-27"),options).should eql(Date.parse("2012-03-23"))    
   end 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banking_date_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000Z
+date: 2012-07-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70162087372440 !ruby/object:Gem::Requirement
+  requirement: &70184074299280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162087372440
+  version_requirements: *70184074299280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70162087468100 !ruby/object:Gem::Requirement
+  requirement: &70184074298820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162087468100
+  version_requirements: *70184074298820
 description: Banking Date Tools
 email:
 - joshmckin@gmail.com
@@ -49,6 +49,7 @@ files:
 - date_tools.gemspec
 - lib/banking_date_tools.rb
 - lib/banking_date_tools/banking_date_tools.rb
+- lib/banking_date_tools/extend_ruby.rb
 - lib/banking_date_tools/version.rb
 - spec/lib/banking_date_tools_spec.rb
 - spec/spec.opts