dohutil 0.1.4 → 0.1.5

data/lib/doh/app/init_from_pwd.rb

@@ -0,0 +1,4 @@
+require 'doh/app/util'
+
+Doh::find_root_from_pwd
+DohApp::require_custom_config

data/lib/doh/app/util.rb

@@ -0,0 +1,15 @@
+require 'doh/root'
+
+module DohApp
+
+def self.require_custom_config
+  path = File.expand_path(File::join(Doh::root, 'config/dohapp.rb'))
+  require(path) if File.exist?(path)
+end
+
+def self.init_from_file(filepath)
+  Doh::find_root_from_file(filepath)
+  DohApp::require_custom_config
+end
+
+end

data/lib/doh/core_ext/bigdecimal.rb

@@ -1,22 +1,15 @@
 require 'bigdecimal'
+require 'bigdecimal/util'
 
 class Integer
+  # this is being added in 1.9.3, so remove it once that is the required version
   def to_d
     to_s.to_d
   end
 end
 
 class BigDecimal
-  alias :_original_to_s :to_s
-  def to_s(format = 'F')
-    _original_to_s(format)
-  end
-
-  undef inspect
-  def inspect
-    to_s
-  end
-
+  # this is being added in 1.9.3, so remove it once that is the required version
   def to_d
     self
   end
@@ -25,7 +18,7 @@ class BigDecimal
     raise ArgumentError.new("digits_after_decimal must be > 0") unless digits_after_decimal > 0
     return '0.' + ('0' * digits_after_decimal) if nan? || infinite?
 
-    retval = truncate(digits_after_decimal).to_s
+    retval = truncate(digits_after_decimal).to_s('F')
     digits_needed = retval.index('.') + digits_after_decimal + 1 - retval.size
     retval += ('0' * digits_needed) if digits_needed > 0
 

data/lib/doh/core_ext/date.rb

@@ -1,29 +1,10 @@
 require 'date'
-require 'time'
 
 class Date
   def self.days_in_month(year, month)
     civil(year, month, -1).mday
   end
 
-  def self.smart_parse(datestr)
-    if datestr =~ /\A(\d\d)\/(\d\d)\/(\d\d)\z/
-      month = $1.to_i
-      mday = $2.to_i
-      year = $3.to_i
-      result = Date.new(year, month, mday)
-    else
-      result = Date.parse(datestr)
-    end
-
-    if result.year < 50
-      result = Date.new(result.year + 2000, result.month, result.day)
-    elsif result.year < 100
-      result = Date.new(result.year + 1900, result.month, result.day)
-    end
-    result
-  end
-
   undef inspect
   def inspect
     strftime('%F')
@@ -33,77 +14,7 @@ class Date
     (wday > 0) && (wday < 6)
   end
 
-  def date_only
-    self
-  end
-
-  def self.short_weekday_to_num(weekday)
-    @@short_days_of_week ||= Time::RFC2822_DAY_NAME.collect {|day| day.downcase}
-    @@short_days_of_week.index(weekday.downcase)
-  end
-
-  def years_since(date)
-    years_diff = year - date.year
-    if month < date.month || (month == date.month && day < date.day)
-      years_diff -= 1
-    end
-    years_diff
-  end
-
-  def make_datetime(hour = 0, min = 0, sec = 0)
-    DateTime.new(year, month, mday, hour, min, sec)
-  end
-
-  def add_months(months, new_day = nil)
-    total_month = month + months
-    new_month = total_month % 12
-    new_month = 12 if new_month == 0
-    new_year = year + ((total_month - 1) / 12)
-    calc_day = [mday, Date.days_in_month(new_year, new_month)].min
-    Date.new(new_year, new_month, new_day || calc_day)
-  end
-
-  def add_years(years)
-    new_year = year + years
-    calc_day = [mday, Date.days_in_month(new_year, month)].min
-    Date.new(new_year, month, calc_day)
-  end
-end
-
-class DateTime
-  DOHRUBY_SECONDS_IN_DAY = (24 * 60 * 60).freeze
-
-  def self.seconds_to_days(seconds)
-    seconds.to_f / DOHRUBY_SECONDS_IN_DAY.to_f
-  end
-
-  def self.zow
-    obj = now
-    new(obj.year, obj.month, obj.mday, obj.hour, obj.min, obj.sec)
-  end
-
-  def inspect
-    strftime('%F %X')
-  end
-
-  def date_only
-    Date.new(year, month, mday)
-  end
-
-  def add_seconds(seconds)
-    self + Rational(seconds, DOHRUBY_SECONDS_IN_DAY)
-  end
-
-  def sub_seconds(seconds)
-    add_seconds(-seconds)
-  end
-
-  # subtract another DateTime object, return difference in seconds
-  def sub_dt(other)
-    ((self - other) * DOHRUBY_SECONDS_IN_DAY).to_i
-  end
-
-  def make_datetime
-    self
+  def make_datetime(hour = 0, minute = 0, second = 0, offset = 0)
+    DateTime.new(year, month, mday, hour, minute, second, offset)
   end
 end

data/lib/doh/core_ext/datewithtime.rb

@@ -0,0 +1,52 @@
+require 'date'
+require 'time'
+
+# these are sets of methods to make DateTime & Time objects more interchangeable
+# they are not comprehensive, nor exact - for example, this DateTime utc method does not modify the receiver, whereas the Time utc method does
+# they simply provide good enough compatibility for what I've encountered so far
+module MakeDateTimeLikeTime
+  def utc
+    new_offset
+  end
+end
+
+module MakeTimeLikeDateTime
+  def next_second(n = 1)
+    self + n
+  end
+
+  def prev_second(n = 1)
+    self + n
+  end
+end
+
+class DateTime
+  include MakeDateTimeLikeTime
+
+  DOHRUBY_SECONDS_IN_DAY = (24 * 60 * 60).freeze
+
+  def self.seconds_to_days(seconds)
+    seconds.to_f / DOHRUBY_SECONDS_IN_DAY.to_f
+  end
+
+  def inspect
+    strftime('%F %X')
+  end
+
+  def next_second(n = 1)
+    self + (SECONDS_IN_DAY * n)
+  end
+
+  def prev_second(n = 1)
+    next_second(-n)
+  end
+
+  # subtract another DateTime object, return difference in seconds
+  def sub_dt(other)
+    ((self - other) * DOHRUBY_SECONDS_IN_DAY).to_i
+  end
+end
+
+class Time
+  include MakeTimeLikeDateTime
+end

data/lib/doh/current_date.rb

@@ -1,4 +1,4 @@
-require 'doh/core_ext/date'
+require 'doh/core_ext/datewithtime'
 
 module Doh
 
@@ -6,10 +6,10 @@ module Doh
 
 def self.current_date(dflt = Date.today)
   return dflt if @@current_date_objs.empty?
-  @@current_date_objs.last.date_only
+  @@current_date_objs.last.to_date
 end
 
-def self.current_datetime(dflt = DateTime.zow)
+def self.current_datetime(dflt = DateTime.now.utc)
   return dflt if @@current_date_objs.empty?
   cdo = @@current_date_objs.last
   return cdo if cdo.respond_to?(:hour)

data/lib/doh/to_display.rb

@@ -12,6 +12,12 @@ class DateTime
   end
 end
 
+class Time
+  def to_display
+    strftime('%m/%d/%Y %I:%M%P')
+  end
+end
+
 class Date
   def to_display
     strftime('%m/%d/%Y')

data/test/test_date.rb

@@ -0,0 +1,14 @@
+require 'minitest/autorun'
+require_relative '../lib/doh/core_ext/date'
+
+module Doh
+
+class Test_core_ext_date < MiniTest::Unit::TestCase
+  def test_weekday
+    Date.new(2007, 1, 15).upto(Date.new(2007, 1, 19)) { |date| assert(date.weekday?) }
+    assert(!Date.new(2007, 1, 13).weekday?)
+    assert(!Date.new(2007, 1, 14).weekday?)
+  end
+end
+
+end

data/test/test_datewithtime.rb

@@ -0,0 +1,13 @@
+require 'minitest/autorun'
+require_relative '../lib/doh/core_ext/datewithtime'
+
+module Doh
+
+class Test_core_ext_datewithtime < MiniTest::Unit::TestCase
+  def test_next_second
+    assert_equal(DateTime.new(2009, 2, 10, 15, 30, 3), DateTime.new(2009, 2, 10, 15, 30, 2).next_second(1))
+    assert_equal(Time.new(2009, 2, 10, 15, 30, 3), Time.new(2009, 2, 10, 15, 30, 2).next_second(1))
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohutil
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies: []
 description: Tiny utilities, packaged together so they don't each have their own gem.
 email:
@@ -20,17 +20,17 @@ extensions: []
 extra_rdoc_files:
 - MIT-LICENSE
 files:
-- lib/doh/app/common.rb
-- lib/doh/app/pwd.rb
+- lib/doh/app/init_from_pwd.rb
+- lib/doh/app/util.rb
 - lib/doh/array_to_hash.rb
 - lib/doh/class_basename.rb
 - lib/doh/config.rb
 - lib/doh/core_ext/bigdecimal.rb
 - lib/doh/core_ext/class/force_deep_copy.rb
 - lib/doh/core_ext/date.rb
+- lib/doh/core_ext/datewithtime.rb
 - lib/doh/core_ext/dir.rb
 - lib/doh/core_ext/hash.rb
-- lib/doh/core_ext/kernel.rb
 - lib/doh/core_ext/string.rb
 - lib/doh/current_date.rb
 - lib/doh/env.rb
@@ -40,6 +40,8 @@ files:
 - lib/doh/options.rb
 - lib/doh/root.rb
 - lib/doh/to_display.rb
+- test/test_date.rb
+- test/test_datewithtime.rb
 - MIT-LICENSE
 homepage: https://github.com/atpsoft/dohutil
 licenses:
@@ -66,4 +68,7 @@ rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: assorted tiny utilities
-test_files: []
+test_files:
+- test/test_date.rb
+- test/test_datewithtime.rb
+has_rdoc: 

data/lib/doh/app/common.rb

@@ -1,10 +0,0 @@
-require 'doh/root'
-require 'doh/core_ext/kernel'
-
-module Doh
-
-def self.require_dohapp_config
-  require_optional(File::join(Doh::root, 'config/dohapp'))
-end
-
-end

data/lib/doh/app/pwd.rb

@@ -1,4 +0,0 @@
-require 'doh/app/common'
-
-Doh::find_root_from_pwd
-Doh::require_dohapp_config

data/lib/doh/core_ext/kernel.rb

@@ -1,8 +0,0 @@
-module Kernel
-
-def require_optional(string)
-  require(string)
-rescue LoadError => ignore
-end
-
-end