dohutil 0.1.6 → 0.1.7

data/lib/doh/core_ext/hash.rb

@@ -2,20 +2,4 @@ class Hash
   def to_h
     self
   end
-
-  def setnew(key, value)
-    store(key, value) unless key?(key)
-  end
-
-  def merge_with_remove(hash)
-    self.dup.merge_with_remove!(hash)
-  end
-
-  #merges the given hash with the current
-  #then removes any elements from the merged hash that have
-  #a value of nil in the hash argument
-  def merge_with_remove!(hash)
-    self.merge!(hash).reject! {|elem, value| hash.key?(elem) && hash[elem].nil?}
-    self
-  end
 end

data/test/core_ext/bigdecimal.dt.rb

@@ -0,0 +1,30 @@
+require 'doh/core_ext/bigdecimal'
+
+module Doh
+
+class Test_core_ext_bigdecimal < DohTest::TestGroup
+  def test_to_dig_valid
+    assert_equal('0.00', BigDecimal('0').to_dig)
+    assert_equal('1.00', BigDecimal('1').to_dig)
+    assert_equal('1.10', BigDecimal('1.1').to_dig)
+    assert_equal('1.11', BigDecimal('1.11134').to_dig)
+    assert_equal('1.111', BigDecimal('1.1113456').to_dig(3))
+  end
+
+  def test_to_dig_errors
+    assert_raises(ArgumentError) { BigDecimal('1').to_dig(-1) }
+    assert_raises(ArgumentError) { BigDecimal('1').to_dig(0) }
+    assert_equal('0.00', BigDecimal('NaN').to_dig)
+    assert_equal('0.00', BigDecimal('Infinity').to_dig)
+    assert_equal('0.00', BigDecimal('blah').to_dig)
+  end
+
+  def test_to_dig_doesnt_modify
+    bd = BigDecimal('1.11134')
+    assert_equal('1.11134', bd.to_s)
+    assert_equal('1.11', bd.to_dig)
+    assert_equal('1.11134', bd.to_s)
+  end
+end
+
+end

data/test/{test_date.rb → core_ext/date.dt.rb}

@@ -1,9 +1,8 @@
-require 'minitest/autorun'
-require_relative '../lib/doh/core_ext/date'
+require 'doh/core_ext/date'
 
 module Doh
 
-class Test_core_ext_date < MiniTest::Unit::TestCase
+class Test_core_ext_date < DohTest::TestGroup
   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?)

data/test/{test_datewithtime.rb → core_ext/datewithtime.dt.rb}

@@ -1,9 +1,8 @@
-require 'minitest/autorun'
-require_relative '../lib/doh/core_ext/datewithtime'
+require 'doh/core_ext/datewithtime'
 
 module Doh
 
-class Test_core_ext_datewithtime < MiniTest::Unit::TestCase
+class Test_core_ext_datewithtime < DohTest::TestGroup
   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))

data/test/core_ext/force_deep_copy.dt.rb

@@ -0,0 +1,67 @@
+require 'doh/core_ext/force_deep_copy'
+
+module Doh
+
+class Parent
+  force_deep_copy :var1, :var2
+  attr_accessor :var1, :var2
+end
+
+class Child < Parent
+  force_deep_copy :var3
+  attr_accessor :var3
+end
+
+class ShallowParent
+  attr_accessor :var1, :var2
+end
+
+class Test_core_ext_force_deep_copy < DohTest::TestGroup
+  def test_regular_dup
+    parent = ShallowParent.new
+    parent.var1 = ['elem1']
+    parent.var2 = {'key1' => 'val1'}
+    parent2 = parent.dup
+    assert(parent2.var1.equal?(parent.var1))
+    assert(parent2.var2.equal?(parent.var2))
+  end
+
+  def test_force_deep_copy
+    parent = Parent.new
+    parent.var1 = ['elem1']
+    parent.var2 = {'key1' => 'val1'}
+    parent2 = parent.dup
+    assert(!parent2.var1.equal?(parent.var1))
+    assert(!parent2.var2.equal?(parent.var2))
+
+    parent2.var1.push('elem2')
+    parent2.var2['key2'] = 'val2'
+    assert_equal(['elem1'], parent.var1)
+    assert_equal(['key1'], parent.var2.keys)
+    assert_equal(['val1'], parent.var2.values)
+  end
+
+  def test_force_deep_copy_inheritance
+    child = Child.new
+    child.var1 = ['elem1']
+    child.var2 = {'key1' => 'val1'}
+    child.var3 = Parent.new
+    child.var3.var1 = ['blah']
+    child2 = child.dup
+    assert(!child2.var1.equal?(child.var1))
+    assert(!child2.var2.equal?(child.var2))
+    assert(!child2.var3.equal?(child.var3))
+
+    child2.var1.push('elem2')
+    child2.var2['key2'] = 'val2'
+    child2.var3.var1.push(['smoe'])
+    child2.var3.var2 = 'val3'
+    assert_equal(['elem1'], child.var1)
+    assert_equal(['key1'], child.var2.keys)
+    assert_equal(['val1'], child.var2.values)
+    assert_equal(['blah'], child.var3.var1)
+    assert_equal(nil, child.var3.var2)
+  end
+end
+
+end

data/test/core_ext/string.dt.rb

@@ -0,0 +1,85 @@
+require 'doh/core_ext/string'
+
+module Doh
+
+class Test_core_ext_string < DohTest::TestGroup
+  def test_mid
+    str = 'smoe:blah'
+    assert_equal('smoe:blah', str.mid(0))
+    assert_equal('moe:blah', str.mid(1))
+    assert_equal('ah', str.mid(7))
+    assert_equal('h', str.mid(8))
+    assert_equal('', str.mid(9))
+    assert_equal(nil, str.mid(10))
+    assert_equal(nil, str.mid(11))
+    assert_equal('h', str.mid(-1))
+    assert_equal('ah', str.mid(-2))
+    assert_equal('moe:blah', str.mid(-8))
+    assert_equal('smoe:blah', str.mid(-9))
+    assert_equal(nil, str.mid(-10))
+
+    assert_equal('', str.mid(0, 0))
+    assert_equal('s', str.mid(0, 1))
+    assert_equal('smoe', str.mid(0, 4))
+    assert_equal('', str.mid(1, 0))
+    assert_equal('ah', str.mid(7, 4))
+    assert_equal('', str.mid(9, 0))
+    assert_equal('', str.mid(9, 10))
+    assert_equal('h', str.mid(-1, 10))
+
+    assert_equal(nil, str.mid(0, -1))
+    assert_equal(nil, str.mid(-1, -1))
+  end
+
+  def test_after
+    str = 'smoe:blah:blee'
+    assert_equal(nil, str.after('notinthereatall'))
+    assert_equal('blah:blee', str.after(':'))
+    assert_equal('', str.after(':blee'))
+    assert_equal('blee', str.after('blah:'))
+  end
+
+  def test_rafter
+    str = 'smoe:blah:blee'
+    assert_equal(nil, str.rafter('notinthereatall'))
+    assert_equal('blee', str.rafter(':'))
+    assert_equal('', str.after(':blee'))
+    assert_equal('blee', str.after('blah:'))
+  end
+
+  def test_before
+    str = 'smoe:blah:blee'
+    assert_equal(nil, str.before('notinthereatall'))
+    assert_equal('smoe', str.before(':'))
+    assert_equal('', str.before('smoe:'))
+    assert_equal('smoe:blah', str.before(':blee'))
+  end
+
+  def test_rbefore
+    str = 'smoe:blah:blee'
+    assert_equal(nil, str.rbefore('notinthereatall'))
+    assert_equal('smoe:blah', str.rbefore(':'))
+    assert_equal('', str.rbefore('smoe:'))
+    assert_equal('smoe:blah', str.rbefore(':blee'))
+  end
+
+  def test_firstn
+    str = 'blah'
+    assert_equal(nil, str.firstn(-1))
+    assert_equal('', str.firstn(0))
+    assert_equal('b', str.firstn(1))
+    assert_equal('bl', str.firstn(2))
+    assert_equal('blah', str.firstn(100))
+  end
+
+  def test_lastn
+    str = 'blah'
+    assert_equal(nil, str.lastn(-1))
+    assert_equal('', str.lastn(0))
+    assert_equal('h', str.lastn(1))
+    assert_equal('ah', str.lastn(2))
+    assert_equal('blah', str.lastn(100))
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohutil
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
-  requirement: &70300039051680 !ruby/object:Gem::Requirement
+  requirement: &70099400285420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,18 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300039051680
+  version_requirements: *70099400285420
+- !ruby/object:Gem::Dependency
+  name: dohtest
+  requirement: &70099400267060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :development
+  prerelease: false
+  version_requirements: *70099400267060
 description: Tiny utilities, packaged together so they don't each have their own gem.
 email:
 - devinfo@atpsoft.com
@@ -50,8 +61,11 @@ files:
 - lib/doh/http_helper.rb
 - lib/doh/log/stub.rb
 - lib/doh/to_display.rb
-- test/test_date.rb
-- test/test_datewithtime.rb
+- test/core_ext/bigdecimal.dt.rb
+- test/core_ext/date.dt.rb
+- test/core_ext/datewithtime.dt.rb
+- test/core_ext/force_deep_copy.dt.rb
+- test/core_ext/string.dt.rb
 - MIT-LICENSE
 homepage: https://github.com/atpsoft/dohutil
 licenses:
@@ -79,6 +93,9 @@ signing_key:
 specification_version: 3
 summary: assorted tiny utilities
 test_files:
-- test/test_date.rb
-- test/test_datewithtime.rb
+- test/core_ext/bigdecimal.dt.rb
+- test/core_ext/date.dt.rb
+- test/core_ext/datewithtime.dt.rb
+- test/core_ext/force_deep_copy.dt.rb
+- test/core_ext/string.dt.rb
 has_rdoc: