dohutil 0.1.8 → 0.1.9

data/lib/doh/core_ext/datewithtime.rb

@@ -2,15 +2,13 @@ require 'date'
 require 'time'
 
 class DateTime
-  DOHRUBY_SECONDS_IN_DAY = (24 * 60 * 60).freeze
-
   def self.zow
     obj = now
     new(obj.year, obj.month, obj.mday, obj.hour, obj.min, obj.sec, 0)
   end
 
   def self.seconds_to_days(seconds)
-    seconds.to_f / DOHRUBY_SECONDS_IN_DAY.to_f
+    seconds.to_f * SECONDS_IN_DAY #.to_f
   end
 
   def next_second(n = 1)
@@ -23,7 +21,7 @@ class DateTime
 
   # subtract another DateTime object, return difference in seconds
   def sub_dt(other)
-    ((self - other) * DOHRUBY_SECONDS_IN_DAY).to_i
+    ((self - other) / SECONDS_IN_DAY).to_i
   end
 end
 

data/lib/doh/core_ext/inspect.rb

@@ -2,24 +2,28 @@ require 'date'
 require 'bigdecimal'
 
 class Date
+  undef inspect
   def inspect
     "#<Date:#{strftime('%F')}>"
   end
 end
 
 class DateTime
+  undef inspect
   def inspect
     "#<DateTime:#{strftime('%F %X %z')}>"
   end
 end
 
 class Time
+  undef inspect
   def inspect
     "#<Time:#{strftime('%F %X %z')}>"
   end
 end
 
 class BigDecimal
+  undef inspect
   def inspect
     "#<BigDecimal:#{to_s('F')}>"
   end

data/lib/doh/core_ext/string.rb

@@ -2,7 +2,7 @@ class String
   def firstn(limit)
     return nil if limit < 0
     return '' if limit == 0
-    slice(Range.new(0, limit -1))
+    slice(Range.new(0, limit - 1))
   end
 
   def lastn(limit)

data/lib/doh/current_date.rb

@@ -2,38 +2,36 @@ require 'doh/core_ext/datewithtime'
 
 module Doh
 
-@@current_date_objs = []
+@current_date_stack = []
 
 def self.current_date(dflt = Date.today)
-  return dflt if @@current_date_objs.empty?
-  @@current_date_objs.last.to_date
+  return dflt if @current_date_stack.empty?
+  @current_date_stack.last.to_date
 end
 
 def self.current_datetime(dflt = DateTime.zow)
-  return dflt if @@current_date_objs.empty?
-  cdo = @@current_date_objs.last
+  return dflt if @current_date_stack.empty?
+  cdo = @current_date_stack.last
   return cdo if cdo.respond_to?(:hour)
   DateTime.new(cdo.year, cdo.month, cdo.day, dflt.hour, dflt.min, dflt.sec, dflt.zone)
 end
 
 def self.push_current_date(date_obj)
-  @@current_date_objs.push(date_obj)
+  @current_date_stack.push(date_obj)
 end
 
 def self.pop_current_date
-  @@current_date_objs.pop
+  @current_date_stack.pop
 end
 
 def self.clear_current_date
-  @@current_date_objs.clear
+  @current_date_stack.clear
 end
 
-def self.date_as(date_obj, &block)
+def self.date_as(date_obj)
   push_current_date(date_obj)
   begin
-    retval = block.call
-  rescue
-    raise
+    retval = yield
   ensure
     pop_current_date
   end

data/lib/doh/log/stub.rb

@@ -1,14 +1,25 @@
-class Object
+module DohLog
+  class StubInterface
+    def self.debug(msg); end
+    def self.info(msg); end
+    def self.warn(msg); end
+    def self.error(msg, exception = nil); end
+    def self.fatal(msg, exception = nil); end
+  end
+end
+
+class Module
   unless method_defined?(:dohlog)
-    class DohlogStubInterface
-      def self.debug(msg); end
-      def self.info(msg); end
-      def self.warn(msg); end
-      def self.error(msg, exception = nil); end
-      def self.fatal(msg, exception = nil); end
+    def dohlog
+      DohLog::StubInterface
     end
+  end
+end
+
+class Object
+  unless method_defined?(:dohlog)
     def dohlog
-      DohlogStubInterface
+      DohLog::StubInterface
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohutil
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+date: 2012-04-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
-  requirement: &70168643920460 !ruby/object:Gem::Requirement
+  requirement: &70119051021380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70168643920460
+  version_requirements: *70119051021380
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: &70168643919780 !ruby/object:Gem::Requirement
+  requirement: &70119051020660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: *70168643919780
+  version_requirements: *70119051020660
 description: Tiny utilities, packaged together so they don't each have their own gem.
 email:
 - devinfo@atpsoft.com