dohutil 0.1.5 → 0.1.6

data/lib/doh/core_ext/bigdecimal.rb

@@ -14,6 +14,11 @@ class BigDecimal
     self
   end
 
+  alias :_doh_original_to_s :to_s
+  def to_s(format = 'F')
+    _doh_original_to_s(format)
+  end
+
   def to_dig(digits_after_decimal = 2)
     raise ArgumentError.new("digits_after_decimal must be > 0") unless digits_after_decimal > 0
     return '0.' + ('0' * digits_after_decimal) if nan? || infinite?

data/lib/doh/core_ext/date.rb

@@ -5,11 +5,6 @@ class Date
     civil(year, month, -1).mday
   end
 
-  undef inspect
-  def inspect
-    strftime('%F')
-  end
-
   def weekday?
     (wday > 0) && (wday < 6)
   end

data/lib/doh/core_ext/datewithtime.rb

@@ -16,7 +16,7 @@ module MakeTimeLikeDateTime
   end
 
   def prev_second(n = 1)
-    self + n
+    self - n
   end
 end
 
@@ -29,10 +29,6 @@ class DateTime
     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

data/lib/doh/core_ext/inspect.rb

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

data/lib/doh/core_ext/utc.rb

@@ -0,0 +1,19 @@
+require 'doh/core_ext/datewithtime'
+
+class Date
+  def self.utcday
+    Time.now.utc.to_date
+  end
+end
+
+class DateTime
+  def self.utcnow
+    now.utc
+  end
+end
+
+class Time
+  def self.utcnow
+    now.utc
+  end
+end

data/lib/doh/current_date.rb

@@ -4,12 +4,12 @@ module Doh
 
 @@current_date_objs = []
 
-def self.current_date(dflt = Date.today)
+def self.current_date(dflt = Date.utcday)
   return dflt if @@current_date_objs.empty?
   @@current_date_objs.last.to_date
 end
 
-def self.current_datetime(dflt = DateTime.now.utc)
+def self.current_datetime(dflt = DateTime.utcnow)
   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

@@ -42,41 +42,16 @@ class BigDecimal
   end
 end
 
-class PhoneDisplayString < String
-  def to_display
-    Doh::display_phone(self)
-  end
-
-  def to_s
-    self
-  end
-end
-
-class PostalDisplayString < String
-  def to_display
-    Doh::display_postal(self)
-  end
-
-  def to_s
-    self
-  end
-end
-
-class SsnDisplayString < String
-  def to_display
-    Doh::display_ssn(self)
-  end
-
-  def to_s
-    self
-  end
-end
-
 module Doh
 
-def self.display_phone(str)
+def self.display_phone(str, html_format = false)
   return str unless str.size == 10
-  str[0..2] + '-' + str[3..5] + '-' + str[6..9]
+  formatted = "#{str[0..2]}-#{str[3..5]}-#{str[6..9]}"
+  if html_format
+    "<a href='callto:+1#{formatted}'>#{formatted}</a>"
+  else
+    formatted
+  end
 end
 
 def self.display_postal(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohutil
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
-dependencies: []
+date: 2012-03-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dohroot
+  requirement: &70300039051680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70300039051680
 description: Tiny utilities, packaged together so they don't each have their own gem.
 email:
 - devinfo@atpsoft.com
@@ -26,19 +37,18 @@ files:
 - 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/force_deep_copy.rb
 - lib/doh/core_ext/hash.rb
+- lib/doh/core_ext/inspect.rb
 - lib/doh/core_ext/string.rb
+- lib/doh/core_ext/utc.rb
 - lib/doh/current_date.rb
 - lib/doh/env.rb
-- lib/doh/findup.rb
 - lib/doh/http_helper.rb
 - lib/doh/log/stub.rb
-- lib/doh/options.rb
-- lib/doh/root.rb
 - lib/doh/to_display.rb
 - test/test_date.rb
 - test/test_datewithtime.rb

data/lib/doh/findup.rb

@@ -1,12 +0,0 @@
-module Doh
-  def self.findup(start_directory, filename, max_tries = 20)
-    curr_directory = start_directory
-    max_tries.times do
-      path = File.expand_path(File.join(curr_directory, filename))
-      return path if File.exist?(path)
-      return nil if (path == '/')
-      curr_directory = File.join(curr_directory, '..')
-    end
-    nil
-  end
-end

data/lib/doh/options.rb

@@ -1,108 +0,0 @@
-require 'ostruct'
-require 'optparse'
-
-module Doh
-
-class Options
-  # this class is for command line parsing
-  # the hash is of the form: {'variable_name' => option_list}
-  # you can also pass an array of hashes [{'var1' => optlist1}, {'var2' => optlist2}]
-  # if you use an array of hashes, the help will be shown in the order specified (otherwise it's random)
-
-  # option_list is an array, the first element of which is the default value of the option
-  # the others are of the form with examples shown on
-  # http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/index.html
-  # returns any non-options parameters via method varargs
-  # set allow_unknown_options to true to allow for filename specification, etc..
-  # if the default value is :required for a field, then if that field isn't
-  # specified, an exception will be raised
-  def initialize(param_definition_hash_or_array, allow_unknown_options = false, explanation_text = '', unknown_options_name = 'file', allow_no_prefix = false)
-    @vals = OpenStruct.new
-
-    @opts = OptionParser.new
-    @opts.banner = "Usage: #{$0} [options]"
-    if explanation_text != ''
-      @opts.separator ""
-      @opts.separator explanation_text
-    end
-    @opts.separator ""
-    @opts.separator "Specific options:"
-    @opts.separator ""
-
-    if param_definition_hash_or_array.class == Array
-      param_definition_array = param_definition_hash_or_array
-      param_definition_hash = param_definition_hash_or_array.inject({}) {|sum, elem| sum.merge(elem)}
-    else
-      param_definition_array = param_definition_hash_or_array.collect {|elem1, elem2| {elem1 => elem2}}
-      param_definition_hash = param_definition_hash_or_array
-    end
-
-    param_definition_array.each do |elem|
-      keyname = elem.to_a[0][1][2]
-      if keyname =~ /^--no-/
-        raise "key name: #{keyname} will not behave as desired if meant to be a boolean, rename it, or pass in allow_no_prefix flag as 5th param"
-      end
-    end
-
-    param_definition_array.each do |elem|
-      key = elem.to_a[0][0]
-      val = elem.to_a[0][1]
-      default = val.shift
-      @vals.send("#{key}=", default)
-      val.last.insert(0, '(required) - ') if val.last.is_a?(String) && default == :required
-      @opts.on(*val) do |optval|
-        @vals.send("#{key}=", optval)
-      end
-    end
-
-    @opts.separator ""
-    @opts.separator "Common options:"
-    @opts.separator ""
-
-    @opts.on("-h", "-?", "--help", "Show this message") do
-      puts @opts
-      exit
-    end
-
-    varargs = []
-    @opts.order(ARGV) do |arg|
-      varargs.push(arg)
-    end
-    @vals.varargs = varargs
-
-    unset_vars = []
-    param_definition_hash.each do |key,val|
-      if @vals.send(key) == :required
-        unset_vars.push(key)
-      end
-    end
-
-    exception = ''
-    exception << "Required options not specified: #{unset_vars.inspect}\n" unless unset_vars.size == 0
-    exception << "Unknown options specified: #{varargs.inspect}\n" unless allow_unknown_options || (varargs.size == 0)
-    exception << "You must specify #{allow_unknown_options} #{unknown_options_name}#{allow_unknown_options > 1 ? 's' : ''}" if allow_unknown_options.class == Fixnum && varargs.size != allow_unknown_options
-    if allow_unknown_options.class == Range
-      if (allow_unknown_options.min == allow_unknown_options.max)
-        if (varargs.size < allow_unknown_options.min)
-          exception << "You must specify at least #{allow_unknown_options.min} #{unknown_options_name}#{allow_unknown_options.min > 1 ? 's' : ''}"
-        end
-      elsif !allow_unknown_options.include?(varargs.size)
-        exception << "You must specify between #{allow_unknown_options.min} and #{allow_unknown_options.max} #{unknown_options_name}s"
-      end
-    end
-    if exception != ''
-      puts @opts
-      raise exception
-    end
-  end
-
-  def method_missing(sym, *args)
-    @vals.send(sym, *args)
-  end
-
-  def to_s
-    @opts.to_s
-  end
-end
-
-end

data/lib/doh/root.rb

@@ -1,40 +0,0 @@
-require 'doh/findup'
-
-module Doh
-  def self.root
-    @root
-  end
-
-  def self.root=(directory)
-    @root = directory
-    libdir = File.join(@root, 'lib')
-    $LOAD_PATH.push(libdir) if libdir
-  end
-
-  def self.find_root(start_directory, filename = 'dohroot', max_tries = 20)
-    rootfile = Doh::findup(start_directory, filename, max_tries)
-    if rootfile
-      Doh::root = File.dirname(rootfile)
-    end
-  end
-
-  def self.find_root_from_file(filepath = nil)
-    Doh::find_root(File.dirname(filepath || caller[0]))
-  end
-
-  def self.find_root_from_path(path)
-    if File.directory?(path)
-      Doh::find_root(path)
-    else
-      Doh::find_root(File.dirname(path))
-    end
-  end
-
-  def self.find_root_from_prog
-    Doh::find_root(File.dirname($PROGRAM_NAME))
-  end
-
-  def self.find_root_from_pwd
-    Doh::find_root(Dir.pwd)
-  end
-end