gravitext-util 1.6.2-java → 1.7.0-java

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.7.0 (2012-11-8)
+* Add Gravitext::DateSupport module, TimeDelta, JDate extension for
+  ruby core Time style basic math operations with java.util.Date
+* Add ArrayHTMap.putAll() (optimized), augment(); Use put_all for ruby
+  UniMap.merge( UniMap )
+* Optimize KeySpace.keys() array public access
+* Fix error message in ArrayHTMap same KeySpace check
+
 === 1.6.2 (2012-9-15)
 * Upgrade/broaden to slf4j [1.6.5,1.8), logback ~> 1.2 (now dev)
 

data/Manifest.txt

@@ -9,11 +9,13 @@ bin/gravitext-perftest
 lib/gravitext-util/version.rb
 lib/gravitext-util.rb
 lib/gravitext-util/concurrent.rb
+lib/gravitext-util/date_support.rb
 lib/gravitext-util/perftest.rb
 lib/gravitext-util/unimap.rb
 test/setup.rb
 test/test_concurrent.rb
+test/test_date_support.rb
 test/test_ioutils.rb
 test/test_perftest.rb
 test/test_unimap.rb
-lib/gravitext-util/gravitext-util-1.6.2.jar
+lib/gravitext-util/gravitext-util-1.7.0.jar

data/lib/gravitext-util/date_support.rb

@@ -0,0 +1,225 @@
+#--
+# Copyright (c) 2012 David Kellum
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License.  You
+# may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#++
+
+require 'gravitext-util/version'
+require 'java'
+
+module Gravitext::DateSupport
+
+  # Alias for java.util.Date
+  JDate   = Java::java.util.Date
+
+  # One second in milliseconds
+  SEC_TO_MS  =                1_000
+
+  # One minute in milliseconds
+  MIN_TO_MS  =           60 * 1_000
+
+  # One hour in milliseconds
+  HOUR_TO_MS =      60 * 60 * 1_000
+
+  # One day in milliseconds
+  DAY_TO_MS  = 24 * 60 * 60 * 1_000
+
+  # Return TimeDelta given Numeric seconds
+  def d_secs( v )
+    TimeDelta.new( SEC_TO_MS * v )
+  end
+
+  # Return TimeDelta given Numeric minutes
+  def d_mins( v )
+    TimeDelta.new( MIN_TO_MS * v )
+  end
+
+  # Return TimeDelta gioven Numeric hours
+  def d_hours( v )
+    TimeDelta.new( HOUR_TO_MS * v )
+  end
+
+  # Return TimeDelta gioven Numeric days
+  def d_days( v )
+    TimeDelta.new(  DAY_TO_MS * v )
+  end
+
+  # A Calendar-unaware, immutable, positive or negative time duration
+  # optimized for Java's Integer milliseconds resolution and offering
+  # various convenience methods for conversion.
+  class TimeDelta
+
+    # Return milliseconds as initialized
+    attr_reader :msecs
+
+    # New TimeDelta given Numeric, positive or negative
+    # milliseconds. Optimized for Integer msecs.
+    def initialize( msecs )
+      @msecs = msecs
+    end
+
+    # True if other is a TimeDelta with equal msecs.
+    def ==( other )
+      other.is_a?( TimeDelta ) && ( @msecs == other.msecs )
+    end
+
+    # Compare this with other TimeDelta.
+    def <=>( other )
+      @msecs <=> other.msecs
+    end
+
+    # Return a new TimeDelta representing the sum of this and other
+    # TimeDelta
+    def +( other )
+      TimeDelta.new( @msecs + other.msecs )
+    end
+
+    # Return a new TimeDelta representing the difference of this and
+    # other TimeDelta.
+    def -( other )
+      TimeDelta.new( @msecs - other.msecs )
+    end
+
+    # Return hash code.
+    def hash
+      @msecs.hash
+    end
+
+    # Return delta as Integer seconds.
+    def to_i
+      ( @msecs / SEC_TO_MS ).to_i
+    end
+
+    # Return delta as Float seconds (with precision as initialized.)
+    def secs
+      @msecs / SEC_TO_MS_F
+    end
+
+    alias to_f secs
+
+    # Return delta as Rational seconds.
+    def to_r
+      Rational( @msecs, SEC_TO_MS )
+    end
+
+    # Return delta as Float minutes.
+    def mins
+      @msecs / MIN_TO_MS_F
+    end
+
+    # Return delta as Float hours.
+    def hours
+      @msecs / HOUR_TO_MS_F
+    end
+
+    # Return delta as Float days.
+    def days
+      @msecs / DAY_TO_MS_F
+    end
+
+    # Return String representation of this TimeDelta using
+    # "+/-(hh:)(mm:)(ss.uuu)" notation (where hour and minute
+    # components are only provided when non-zero.
+    def to_s
+      ms, neg = @msecs < 0 ? [ -@msecs, true ] : [ @msecs, false ]
+      secs   = ( ms % MIN_TO_MS ) / SEC_TO_MS_F
+      mmins  = ( ms / MIN_TO_MS ).to_i
+      hours, mins = mmins / 60, mmins % 60
+
+      pad = ( secs < 10.0 ) ? '0' : '';
+
+      if hours > 0
+        hours = -hours if neg
+        "%+d:%02d:%s%g" % [ hours, mins, pad, secs ]
+      elsif mins > 0
+        mins = -mins if neg
+        "%+d:%s%g" % [ mins, pad, secs ]
+      else
+        secs = -secs if neg
+        "%+g" % [ secs ]
+      end
+    end
+
+    private
+
+    SEC_TO_MS_F  = SEC_TO_MS.to_f  #:nodoc:
+    MIN_TO_MS_F  = MIN_TO_MS.to_f  #:nodoc:
+    HOUR_TO_MS_F = HOUR_TO_MS.to_f #:nodoc:
+    DAY_TO_MS_F  = DAY_TO_MS.to_f  #:nodoc:
+
+  end
+
+  # Extensions to java.util.Date for some basic math operations and
+  # and conversions.
+  class JDate
+
+    # Return conversion to ruby core Time (with millisecond precision).
+    def to_ruby
+      ems = self.time
+      Time.at( ems/1000, ( ems % 1000 ) * 1000 )
+    end
+
+    # Return the difference between self and other. If other is a
+    # JDate or ruby core Time, returns a TimeDelta. If other is a
+    # TimeDelta or Numeric (seconds), return a new JDate.
+    def -( other )
+      case( other )
+      when JDate
+        TimeDelta.new( self.time - other.time )
+      when TimeDelta
+        JDate.new( self.time - other.msecs )
+      when Numeric
+        JDate.new( self.time - ( other * 1000 ).to_i )
+      when Time
+        TimeDelta.new( self.time -
+                       ( ( other.to_i * 1000 ) + other.usec / 1000 ) )
+      else
+        raise TypeError, "Can't subract #{other.class} from JDate"
+      end
+    end
+
+    # Return a new JDate representing the sum of self and other
+    # TimeDelta or Numeric (seconds).
+    def +( other )
+      case( other )
+      when TimeDelta
+        JDate.new( self.time + other.msecs )
+      when Numeric
+        JDate.new( self.time + ( other * 1000 ).to_i )
+      else
+        raise TypeError, "Can't add #{other.class} to JDate"
+      end
+    end
+
+    # Return age of self as a TimeDelta, by difference between the
+    # current time and self (with millisecond resolution.) Will be
+    # positive if self is "in the past".
+    def age
+      TimeDelta.new( JSystem.current_time_millis - self.time )
+    end
+
+    JSystem = Java::java.lang.System #:nodoc:
+
+  end
+
+end
+
+# Ruby core Time extension
+class Time
+
+  # Return self, already ruby.
+  def to_ruby
+    self
+  end
+
+end

data/lib/gravitext-util/unimap.rb

@@ -201,18 +201,21 @@ module Gravitext::HTMap
       UniMap.deep_hash( self )
     end
 
-    # Merge other (Hash or UniMap) and return new UniMap. Any nil
-    # values from other Hash will result in removing the associated
-    # key.
+    # Merge other (Hash or UniMap) and return new UniMap. Nil values
+    # in other Hash are ignored.
     def merge( other )
       clone.merge!( other )
     end
 
-    # Merge other (Hash or UniMap) values to self. Any nil values from
-    # other Hash will result in removing key from self.
+    # Merge other (Hash or UniMap) values to self. Nil values in other
+    # Hash are ignored.
     def merge!( other )
-      other.each do |k,v|
-        set( k, v )
+      if other.is_a?( UniMap )
+        put_all( other )
+      else
+        other.each do |k,v|
+          set( k, v ) unless v.nil?
+        end
       end
       self
     end

data/lib/gravitext-util/version.rb

@@ -16,7 +16,7 @@
 
 module Gravitext
   module Util
-    VERSION = '1.6.2'
+    VERSION = '1.7.0'
 
     LIB_DIR = File.dirname(__FILE__) # :nodoc:
   end

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.gravitext</groupId>
   <artifactId>gravitext-util</artifactId>
   <packaging>jar</packaging>
-  <version>1.6.2</version>
+  <version>1.7.0</version>
   <name>Gravitext Utilities</name>
   <url>http://gravitext.com/oss/gravitext-util</url>
 

data/test/test_date_support.rb

@@ -0,0 +1,121 @@
+#!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+
+#--
+# Copyright (c) 2012 David Kellum
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License.  You
+# may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#++
+
+require File.join( File.dirname( __FILE__ ), "setup" )
+
+require 'gravitext-util/date_support'
+
+class TestDateSupport < MiniTest::Unit::TestCase
+  include Gravitext::DateSupport
+
+  def test_math
+    now = JDate.new
+    prior = ( now - ( d_mins( 20 ) + d_secs( 10.001 ) ) )
+    assert_equal( prior, now - ( 20 * 60.0 + 10.001 ) )
+    assert_kind_of( JDate, prior )
+    assert_equal( now, prior + ( d_mins( 20 ) + d_secs( 10.001 ) ) )
+    assert_equal( now, prior + ( 20 * 60.0 + 10.001 ) )
+    assert_equal( ( d_mins( 20 ) + d_secs( 10.001 ) ), now - prior )
+  end
+
+  def test_ruby_math
+    now = JDate.new
+    assert_equal( 0.0, ( now - now.to_ruby ).secs )
+  end
+
+  def test_age
+    prior = JDate.new - d_mins( 1 )
+    assert_in_delta( 60.0, prior.age.secs, 1.0 )
+  end
+
+  def test_to_ruby
+    now = JDate.new.to_ruby
+    assert_kind_of( Time, now )
+    assert_same( now, now.to_ruby )
+    assert_in_delta( 0.0, Time.now - now, 0.01 )
+  end
+
+  def test_seconds
+    assert_equal(  0.001, TimeDelta.new(     1 ).secs )
+    assert_equal(  0.9,   TimeDelta.new(   900 ).secs )
+    assert_equal( -9.98,  TimeDelta.new( -9980 ).secs )
+    assert_equal( 70.9,   TimeDelta.new( 70900 ).secs )
+
+    assert_equal( -0.9, d_secs( -0.9 ).secs )
+    assert_equal( 70.9, d_secs( 70.9 ).secs )
+  end
+
+  def test_minutes
+    assert_equal(  0.015, TimeDelta.new(   900 ).mins )
+    assert_equal( -0.15,  TimeDelta.new( -9000 ).mins )
+    assert_equal(  1.10,  TimeDelta.new( 66000 ).mins )
+
+    assert_equal( -0.15, d_mins( -0.15  ).mins )
+    assert_equal(  1.10, d_mins(  1.10  ).mins )
+  end
+
+  def test_hours
+    assert_equal( 0.25, TimeDelta.new(  15 * 60 * 1_000 ).hours )
+    assert_equal( -1.5, TimeDelta.new( -90 * 60 * 1_000 ).hours )
+
+    assert_equal( 0.25, d_hours( 0.25 ).hours )
+    assert_equal( -1.5, d_hours( -1.5 ).hours )
+  end
+
+  def test_seconds_to_s
+    assert_equal( "+0.001", TimeDelta.new(    1 ).to_s )
+    assert_equal( "+0.9",   TimeDelta.new(  900 ).to_s )
+    assert_equal( "+0.999", TimeDelta.new(  999 ).to_s )
+    assert_equal( "+1.9",   TimeDelta.new( 1900 ).to_s )
+    assert_equal( "+9.98",  TimeDelta.new( 9980 ).to_s )
+  end
+
+  def test_minutes_to_s
+    assert_equal( "+1:10.9", TimeDelta.new( 70900 ).to_s )
+  end
+
+  def test_hours_to_s
+    assert_equal(  "+1:00:00.953",
+                  TimeDelta.new(  1 * 60 * 60 * 1000 +  953 ).to_s )
+    assert_equal( "+99:14:01.001",
+                  TimeDelta.new( 99 * 60 * 60 * 1000 +
+                                 14 * 60 * 1000 + 1001 ).to_s )
+  end
+
+  def test_seconds_neg_to_s
+    assert_equal( "-0.001", TimeDelta.new(    -1 ).to_s )
+    assert_equal( "-0.9",   TimeDelta.new(  -900 ).to_s )
+    assert_equal( "-0.999", TimeDelta.new(  -999 ).to_s )
+    assert_equal( "-1.9",   TimeDelta.new( -1900 ).to_s )
+    assert_equal( "-9.98",  TimeDelta.new( -9980 ).to_s )
+  end
+
+  def test_minute_neg_to_s
+    assert_equal( "-1:10.9", TimeDelta.new( -70900 ).to_s )
+  end
+
+  def test_hours_neg_to_s
+    assert_equal(  "-1:00:00.953",
+                  TimeDelta.new(  -1 * 60 * 60 * 1000 +  -953 ).to_s )
+    assert_equal( "-99:14:01.001",
+                  TimeDelta.new( -99 * 60 * 60 * 1000 +
+                                 -14 * 60 * 1000 + -1001 ).to_s )
+  end
+
+end

metadata

@@ -1,128 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gravitext-util
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.6.2
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.7.0
 platform: java
-authors: 
-  - David Kellum
-autorequire: 
+authors:
+- David Kellum
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-09-15 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rjack-slf4j
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.6.5
-        - - <
-          - !ruby/object:Gem::Version 
-            version: "1.8"
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: rjack-logback
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "1.2"
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: minitest
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.3"
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rjack-tarpit
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.0"
-    requirement: *id004
-    prerelease: false
-    type: :development
-description: 
-email: 
-  - dek-oss@gravitext.com
-executables: 
-  - gravitext-ioutil-perftest
-  - gravitext-perftest
+date: 2012-11-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rjack-slf4j
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rjack-logback
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: minitest
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rjack-tarpit
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    none: false
+  prerelease: false
+  type: :development
+description:
+email:
+- dek-oss@gravitext.com
+executables:
+- gravitext-ioutil-perftest
+- gravitext-perftest
 extensions: []
-
-extra_rdoc_files: 
-  - History.rdoc
-  - README.rdoc
-files: 
-  - History.rdoc
-  - Manifest.txt
-  - NOTICE.txt
-  - README.rdoc
-  - Rakefile
-  - pom.xml
-  - bin/gravitext-ioutil-perftest
-  - bin/gravitext-perftest
-  - lib/gravitext-util/version.rb
-  - lib/gravitext-util.rb
-  - lib/gravitext-util/concurrent.rb
-  - lib/gravitext-util/perftest.rb
-  - lib/gravitext-util/unimap.rb
-  - test/setup.rb
-  - test/test_concurrent.rb
-  - test/test_ioutils.rb
-  - test/test_perftest.rb
-  - test/test_unimap.rb
-  - lib/gravitext-util/gravitext-util-1.6.2.jar
+extra_rdoc_files:
+- History.rdoc
+- README.rdoc
+files:
+- History.rdoc
+- Manifest.txt
+- NOTICE.txt
+- README.rdoc
+- Rakefile
+- pom.xml
+- bin/gravitext-ioutil-perftest
+- bin/gravitext-perftest
+- lib/gravitext-util/version.rb
+- lib/gravitext-util.rb
+- lib/gravitext-util/concurrent.rb
+- lib/gravitext-util/date_support.rb
+- lib/gravitext-util/perftest.rb
+- lib/gravitext-util/unimap.rb
+- test/setup.rb
+- test/test_concurrent.rb
+- test/test_date_support.rb
+- test/test_ioutils.rb
+- test/test_perftest.rb
+- test/test_unimap.rb
+- lib/gravitext-util/gravitext-util-1.7.0.jar
 homepage: http://gravitext.rubyforge.org
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-  - --main
-  - README.rdoc
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+post_install_message:
+rdoc_options:
+- --main
+- README.rdoc
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: A collection of core java utilities, many with jruby adaptions.
 test_files: []
-
+...