jactive_support 2.1.2 → 3.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39c8b3381d4475cc5972dd50f0966f14a4c833f
-  data.tar.gz: 165acb14634e466db40911642ec5754b70478e47
+  metadata.gz: 0297ee0a2e0b4672a75a7323a8b580cb0052b8a0
+  data.tar.gz: 8a5cbbe1f45df687f7895daf72156c2b8f4f8d43
 SHA512:
-  metadata.gz: e084b13988997fb597295bb670a0a20085ff2310bc351190fcf440a520b4372342ebf66913330274194899aa9c931a27c428f12eec88437834cb5c2cd6b315ad
-  data.tar.gz: 026e6aee94c4bcae70f5913e48d889e29f78fd5c8a25dcedbf097782ce9e77648beda3074c330dc321f2e46065683f7573aaf89c97ef131c7f1b0d89f1084b82
+  metadata.gz: a6e1ca038a4b8181f5edf6a15442be621e854f2ba86ab61fa8ec316896099cb2a9ad1bf34b8a628a5d2b87877b5bb8448e85f15262a81450f0e6d08856d0f528
+  data.tar.gz: df7b8f760490a155f85ace4721f12ca50f5dc125aaed4da9cc01a83220a2ea49d8240b84a954281e95f2808889a0c360ad4339bd50f9b6706a552348dc113d65

data/jactive_support.gemspec

@@ -4,7 +4,7 @@ require "jactive_support/version"
 
 Gem::Specification.new do |s|
   s.name        = "jactive_support"
-  s.version     = JActiveSupport::VERSION
+  s.version     = JactiveSupport::VERSION
   s.author      = "Brian Olsen"
   s.email       = "brian@maven-group.org"
   s.homepage    = "http://github.com/griff/jactive_support"

data/lib/jactive_support/core_ext/enum.rb

@@ -24,7 +24,7 @@ module JactiveSupport #:nodoc:
           begin
             other.find_value_of(self)
           rescue java::lang::IllegalArgumentException => e
-            raise TypeError, e.cause.message
+            raise TypeError, e.message
           end
         else
           to_java_without_enum(other)

data/lib/jactive_support/core_ext/ordering.rb

@@ -14,10 +14,4 @@ class NilClass #:nodoc:
   def <=>(other)
     other.nil? ? 0 : -1;
   end
-end
-
-class String #:nodoc:
-  def <=>(other)
-    other.nil? ? 1 : super;
-  end
 end

data/lib/jactive_support/core_ext/to_java_time_zone.rb

@@ -0,0 +1,13 @@
+require 'jactive_support/java_ext/to_java_time_zone'
+
+class String
+  def to_java_time_zone
+    java::util::TimeZone.getTimeZone(self)
+  end
+end
+
+class Symbol
+  def to_java_time_zone
+    to_s.to_java_time_zone
+  end
+end

data/lib/jactive_support/java_ext/date/calculations.rb

@@ -1,43 +1,37 @@
-module JactiveSupport #:nodoc:
-  module JavaExtensions #:nodoc:
-    module Date #:nodoc:
-      module Calculations
-        CALCULATION_FIELDS = {
-          :years => ::Java::JavaUtil::Calendar::YEAR,
-          :months => ::Java::JavaUtil::Calendar::MONTH,
-          :weeks => ::Java::JavaUtil::Calendar::WEEK_OF_YEAR,
-          :days => ::Java::JavaUtil::Calendar::DAY_OF_MONTH,
-          :hours => ::Java::JavaUtil::Calendar::HOUR_OF_DAY,
-          :minutes => ::Java::JavaUtil::Calendar::MINUTE,
-          :seconds => ::Java::JavaUtil::Calendar::SECOND,
-          :millis => ::Java::JavaUtil::Calendar::MILLISECOND
-        }
-        
-        def advance(options)
-          cal = ::Java::JavaUtil::Calendar.getInstance
-          cal.setTime(self)
-          options.each do |field, value|
-            cal.add(CALCULATION_FIELDS[field], value)
-          end
-          cal.getTime
-        end
-        
-        def age(since=java.util.Date.new)
-          difference(:years, since)
-        end
-        
-        def difference(field=:years, since=java.util.Date.new)
-          local_date = ::Java::OrgJodaTime::LocalDate.fromDateFields(self)
-          since_date = ::Java::OrgJodaTime::LocalDate.fromDateFields(since)
-          if field == :days
-            return ::Java::OrgJodaTime::Days.daysBetween(local_date, since_date).getDays
-          elsif field == :months
-            return ::Java::OrgJodaTime::Months.monthsBetween(local_date, since_date).getMonths
-          else
-            return ::Java::OrgJodaTime::Years.yearsBetween(local_date, since_date).getYears
-          end
-        end
-      end
+class java::util::Date
+  CALCULATION_FIELDS = {
+    years: java::util::Calendar::YEAR,
+    months: java::util::Calendar::MONTH,
+    weeks: java::util::Calendar::WEEK_OF_YEAR,
+    days: java::util::Calendar::DAY_OF_MONTH,
+    hours: java::util::Calendar::HOUR_OF_DAY,
+    minutes: java::util::Calendar::MINUTE,
+    seconds: java::util::Calendar::SECOND,
+    millis: java::util::Calendar::MILLISECOND
+  }
+
+  def advance(options)
+    cal = java::util::Calendar.instance
+    cal.time = self
+    options.each do |field, value|
+      cal.add(CALCULATION_FIELDS[field], value)
+    end
+    cal.time
+  end
+  
+  def age(since = Date.new)
+    difference(:years, since)
+  end
+  
+  def difference(field = :years, since = Date.new)
+    local_date = org::joda::time::LocalDate.fromDateFields(self)
+    since_date = org::joda::time::LocalDate.fromDateFields(since)
+    if field == :days
+      return org::joda::time::Days.daysBetween(local_date, since_date).days
+    elsif field == :months
+      return org::joda::time::Months.monthsBetween(local_date, since_date).months
+    else
+      return org::joda::time::Years.yearsBetween(local_date, since_date).years
     end
   end
 end

data/lib/jactive_support/java_ext/date/conversions.rb

@@ -1,137 +1,128 @@
 require 'active_support/core_ext/object/blank'
+require 'jactive_support/java_ext/date/localize'
 
-module JactiveSupport #:nodoc:
-  module JavaExtensions #:nodoc:
-    module Date #:nodoc:
-      # Converting dates to formatted strings, times, and datetimes.
-      module Conversions
-        DATE_FORMATS = {
-          :db           => "yyyy-MM-dd HH:mm:ss.SSS",
-          :i18n         => lambda { |clazz, locale| 
-                              format = I18n.translate(:"formats.timestamp", :default=>'')
-                              !format.blank? ? clazz.pattern_formatter(format) : clazz.date_time_instance(:default, :default, locale)
-                            },
-          :number       => "yyyyMMddHHmmssSSS",
-          :time         => "HH:mm",
-          :full         => lambda { |clazz, locale| clazz.date_time_instance(:full, :full, locale) },
-          :long         => lambda { |clazz, locale| clazz.date_time_instance(:long, :long, locale) },
-          :medium       => lambda { |clazz, locale| clazz.date_time_instance(:medium, :medium, locale) },
-          :short        => lambda { |clazz, locale| clazz.date_time_instance(:short, :short, locale) },
-          :default      => lambda { |clazz, locale| clazz.date_time_instance(:default, :default, locale) },
-          :long_ordinal => lambda { |clazz| clazz.pattern_formatter("MMMMMM #{time.day.ordinalize}, yyyy HH:mm") },
-          :rfc822       => "EEE, dd MMM yyyy HH:mm:ss Z",
-          :httpdate     => lambda { |clazz| clazz.pattern_formatter("EEE, dd MMM yyyy HH:mm:ss z", "GMT", "EN") }
-        }
+class java::util::Date
+  DATE_FORMATS = {
+    :db           => "yyyy-MM-dd HH:mm:ss.SSS",
+    :i18n         => lambda { |clazz, locale| clazz.i18n_formatter(locale: locale) },
+    :number       => "yyyyMMddHHmmssSSS",
+    :time         => "HH:mm:ss",
+    :full         => lambda { |clazz, locale| clazz.date_time_instance(:full, :full, locale) },
+    :long         => lambda { |clazz, locale| clazz.date_time_instance(:long, :long, locale) },
+    :medium       => lambda { |clazz, locale| clazz.date_time_instance(:medium, :medium, locale) },
+    :short        => lambda { |clazz, locale| clazz.date_time_instance(:short, :short, locale) },
+    :default      => lambda { |clazz, locale| clazz.date_time_instance(:default, :default, locale) },
+    :rfc822       => "EEE, dd MMM yyyy HH:mm:ss Z",
+    :httpdate     => lambda { |clazz, locale|
+      fmt = clazz.pattern_formatter("EEE, dd MMM yyyy HH:mm:ss z", locale || 'EN')
+      fmt.time_zone = 'GMT'.to_java_time_zone
+      fmt
+    }
+  }
 
-        def self.included(other) #:nodoc:
-          other.class_eval do
-            alias_method :to_default_s, :to_s
-            alias_method :to_s, :to_formatted_s
-          end
-          other.extend ClassMethods
-        end
+  def self.formatter(format = :i18n, options = {})
+    formatter = self::DATE_FORMATS[format] || formatter(:default, options)
+    if formatter.respond_to?(:call)
+      if formatter.arity == 2
+        formatter = formatter.call(self, options[:locale])
+      else
+        formatter = formatter.call(self)
+      end
+    elsif formatter.is_a?(String)
+      formatter = self.pattern_formatter(formatter, options[:locale])
+    end
+
+    if options[:time_zone] && formatter.respond_to?(:time_zone)
+      formatter.time_zone = options[:time_zone].to_java_time_zone
+    end
 
-        module ClassMethods
-          def format(format=:i18n, locale=nil)
-            return format(:default, locale) unless formatter = self::DATE_FORMATS[format]
-            locale = locale.to_locale
-            formatter = formatter.respond_to?(:call) ? (formatter.arity==2 ? formatter.call(self, locale) : formatter.call(self)) : self.pattern_formatter(formatter)
-            formatter.to_pattern
-          end
+    formatter
+  end
 
-          def formatter(format=:i18n, locale=nil)
-            return formatter(:default, locale) unless formatter = self::DATE_FORMATS[format]
-            locale = locale.to_locale
-            formatter.respond_to?(:call) ? (formatter.arity==2 ? formatter.call(self, locale) : formatter.call(self)) : self.pattern_formatter(formatter)
-          end
+  def self.format(format = :i18n, options = {})
+    formatter(format, options).to_pattern
+  end
 
-          def pattern_formatter(pattern, timezone=nil, locale=nil)
-            formatter = ::Java::JavaText::SimpleDateFormat.new(pattern, locale.to_locale)
-            timezone = ::Java::JavaUtil::TimeZone.getTimeZone(timezone) unless timezone.nil? || timezone.is_a?(::Java::JavaUtil::TimeZone)
-            formatter.setTimeZone(timezone) if timezone
-            formatter
-          end
-        end
+  # Converts to a formatted string. See DATE_FORMATS for builtin formats.
+  #
+  # This method is aliased to <tt>to_s</tt>.
+  #
+  #   time = java::util::Date.new         # => Thu Jan 18 06:10:17 CST 2007
+  #
+  #   time.to_formatted_s(:time)          # => "06:10:17"
+  #   time.to_s(:time)                    # => "06:10:17"
+  #
+  #   time.to_formatted_s(:db)            # => "2007-01-18 06:10:17.100"
+  #   time.to_formatted_s(:number)        # => "20070118061017100"
+  #   time.to_formatted_s(:short)         # => "18 Jan 06:10"
+  #   time.to_formatted_s(:long)          # => "January 18, 2007 06:10"
+  #   time.to_formatted_s(:rfc822)        # => "Thu, 18 Jan 2007 06:10:17 -0600"
+  #
+  # == Adding your own time formats to +to_formatted_s+
+  # You can add your own formats to the Time::DATE_FORMATS hash.
+  # Use the format name as the hash key and either a strftime string
+  # or Proc instance that takes a time argument as the value.
+  #
+  #   # config/initializers/time_formats.rb
+  #   Time::DATE_FORMATS[:month_and_year] = "%B %Y"
+  #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
+  def to_formatted_s(format = :i18n, options = {})
+    return to_default_s unless self.class::DATE_FORMATS[format]
+    self.class.formatter(format, options).format(self)
+  end
+  alias_method :to_default_s, :to_s
+  alias_method :to_s, :to_formatted_s
 
-        # Converts to a formatted string. See DATE_FORMATS for builtin formats.
-        #
-        # This method is aliased to <tt>to_s</tt>.
-        #
-        #   time = Time.now                     # => Thu Jan 18 06:10:17 CST 2007
-        #
-        #   time.to_formatted_s(:time)          # => "06:10:17"
-        #   time.to_s(:time)                    # => "06:10:17"
-        #
-        #   time.to_formatted_s(:db)            # => "2007-01-18 06:10:17"
-        #   time.to_formatted_s(:number)        # => "20070118061017"
-        #   time.to_formatted_s(:short)         # => "18 Jan 06:10"
-        #   time.to_formatted_s(:long)          # => "January 18, 2007 06:10"
-        #   time.to_formatted_s(:long_ordinal)  # => "January 18th, 2007 06:10"
-        #   time.to_formatted_s(:rfc822)        # => "Thu, 18 Jan 2007 06:10:17 -0600"
-        #
-        # == Adding your own time formats to +to_formatted_s+
-        # You can add your own formats to the Time::DATE_FORMATS hash.
-        # Use the format name as the hash key and either a strftime string
-        # or Proc instance that takes a time argument as the value.
-        #
-        #   # config/initializers/time_formats.rb
-        #   Time::DATE_FORMATS[:month_and_year] = "%B %Y"
-        #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
-        def to_formatted_s(format=:i18n, locale=nil)
-          return to_default_s unless formatter = self.class::DATE_FORMATS[format]
-          locale = locale.to_locale
-          formatter = formatter.respond_to?(:call) ? (formatter.arity==2 ? formatter.call(self.class, locale) : formatter.call(self.class)) : self.class.pattern_formatter(formatter)
-          (formatter.respond_to?(:format) ? formatter.format(self) : formatter).to_s
-        end
-        
-        def format(format=:i18n, locale=nil)
-          self.class.format(format, locale)
-        end
-        
-        def formatter(format=:i18n, locale=nil)
-          self.class.formatter(format, locale)
-        end
+  # Converts a java.util.Date object to a string using the given format pattern.
+  # The pattern syntax is from java.text.SimpleDateFormat
+  #
+  #  my_time = java.util.Date.new  # => Mon Nov 12 22:59:51 -0500 2007
+  #  my_time.strformat('yyyy MMMMM') # => "2007 November"
+  def strformat(pattern, options = {})
+    formatter = self.class.pattern_formatter(pattern, options[:locale])
+    if options[:time_zone] && formatter.respond_to?(:time_zone)
+      formatter.time_zone = options[:time_zone].to_java_time_zone
+    end
+    formatter.format(self)
+  end
 
-        def pattern_formatter(pattern, timezone=nil, locale=nil)
-          self.class.pattern_formatter(pattern, timezone, locale)
-        end
+  # Converts a java.util.Date object to a ruby Date, dropping hour, minute, and second precision.
+  #
+  #   my_time = java.util.Date.new  # => Mon Nov 12 22:59:51 -0500 2007
+  #   my_time.to_date     # => Mon, 12 Nov 2007
+  def to_date
+    to_time.to_date
+  end
 
-        # Converts a java.util.Date object to a ruby Date, dropping hour, minute, and second precision.
-        #
-        #   my_time = java.util.Date.new  # => Mon Nov 12 22:59:51 -0500 2007
-        #   my_time.to_date     # => Mon, 12 Nov 2007
-        def to_date
-          to_time.to_date
-        end
+  # Converts a java.util.Date instance to a Time.
+  #
+  # ==== Examples
+  #   date = java.util.Date.new  # => Mon Nov 12 22:59:51 -0500 2007
+  #   date.to_time               # => Mon Nov 12 22:59:51 -0500 2007
+  def to_time
+    ::Time.at(self.getTime/1000)
+  end
 
-        # Converts a java.util.Date instance to a Time.
-        #
-        # ==== Examples
-        #   date = java.util.Date.new  # => Mon Nov 12 22:59:51 -0500 2007
-        #   date.to_time               # => Mon Nov 12 22:59:51 -0500 2007
-        def to_time
-          ::Time.at(self.getTime/1000)
-        end
+  # Converts a java.util.Date instance to a Ruby DateTime instance, preserving UTC offset.
+  #
+  #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
+  #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
+  #
+  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+  #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
+  def to_datetime
+    to_time.to_datetime
+  end
+  
+  def to_java_sqldate
+    java::sql::Date.new(time)
+  end
+  
+  def httpdate
+    to_formatted_s(:httpdate)
+  end
 
-        # Converts a java.util.Date instance to a Ruby DateTime instance, preserving UTC offset.
-        #
-        #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
-        #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
-        #
-        #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
-        #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
-        def to_datetime
-          to_time.to_datetime
-        end
-        
-        def to_java_sqldate
-          java.sql.Date.new(getTime)
-        end
-        
-        def httpdate
-          to_formatted_s(:httpdate)
-        end
-      end
-    end
+  def acts_like_time?
+    true
   end
-end
+end

data/lib/jactive_support/java_ext/date/formatters.rb

@@ -0,0 +1,37 @@
+require 'jactive_support/core_ext/locale'
+
+class java::util::Date
+  FULL_STYLE = java::text::DateFormat::FULL
+  LONG_STYLE = java::text::DateFormat::LONG
+  MEDIUM_STYLE = java::text::DateFormat::MEDIUM
+  SHORT_STYLE = java::text::DateFormat::SHORT
+  DEFAULT_STYLE = java::text::DateFormat::DEFAULT
+  
+  STYLE = {
+    :full => FULL_STYLE,
+    :long => LONG_STYLE,
+    :medium => MEDIUM_STYLE,
+    :short => SHORT_STYLE,
+    :default => DEFAULT_STYLE
+  }
+
+  def self.default_formatter(locale)
+    date_time_instance(:default, :default, locale)
+  end
+
+  def self.date_time_instance(date_style = :default, time_style = :default, locale = nil)
+    java::text::DateFormat.getDateTimeInstance(STYLE[date_style], STYLE[time_style], locale.to_locale)
+  end
+
+  def self.time_instance(time_style = :default, locale = nil)
+    java::text::DateFormat.getTimeInstance(STYLE[time_style], locale.to_locale)
+  end
+
+  def self.date_instance(date_style = :default, locale = nil)
+    java::text::DateFormat.getDateInstance(STYLE[date_style], locale.to_locale)
+  end
+
+  def self.pattern_formatter(pattern, locale=nil)
+    java::text::SimpleDateFormat.new(pattern, locale.to_locale)
+  end
+end

data/lib/jactive_support/java_ext/date/localize.rb

@@ -0,0 +1,12 @@
+require 'jactive_support/localize'
+require 'jactive_support/java_ext/date/formatters'
+require 'jactive_support/core_ext/to_java_time_zone'
+require 'i18n'
+
+class java::util::Date
+  include JactiveSupport::Localize
+
+  def self.i18n_scope
+    :java_date
+  end
+end

data/lib/jactive_support/java_ext/date.rb

@@ -1,37 +1,4 @@
-require 'jactive_support/java_ext/date/calculations'
+require 'jactive_support/java_ext/date/formatters'
+require 'jactive_support/java_ext/date/localize'
 require 'jactive_support/java_ext/date/conversions'
-
-class java::util::Date
-  include JactiveSupport::JavaExtensions::Date::Calculations
-  include JactiveSupport::JavaExtensions::Date::Conversions
-
-  FULL_STYLE = java::text::DateFormat::FULL
-  LONG_STYLE = java::text::DateFormat::LONG
-  MEDIUM_STYLE = java::text::DateFormat::MEDIUM
-  SHORT_STYLE = java::text::DateFormat::SHORT
-  DEFAULT_STYLE = java::text::DateFormat::DEFAULT
-  
-  STYLE = {
-    :full => FULL_STYLE,
-    :long => LONG_STYLE,
-    :medium => MEDIUM_STYLE,
-    :short => SHORT_STYLE,
-    :default => DEFAULT_STYLE
-  }
-  
-  def acts_like_time?
-    true
-  end
-  
-  def self.date_time_instance(date_style=:default, time_style=:default, locale=nil)
-    java::text::DateFormat.getDateTimeInstance(STYLE[date_style], STYLE[time_style], locale.to_locale)
-  end
-
-  def self.time_instance(time_style=:default, locale=nil)
-    java::text::DateFormat.getTimeInstance(STYLE[time_style], locale.to_locale)
-  end
-
-  def self.date_instance(date_style=:default, locale=nil)
-    java::text::DateFormat.getDateInstance(STYLE[date_style], locale.to_locale)
-  end
-end
+require 'jactive_support/java_ext/date/calculations'

data/lib/jactive_support/java_ext/sql_date/conversions.rb

@@ -1,35 +1,28 @@
-require 'active_support/core_ext/object/blank'
+require 'jactive_support/java_ext/date/conversions'
 
-module JactiveSupport #:nodoc:
-  module JavaExtensions #:nodoc:
-    module SqlDate #:nodoc:
-      # Converting dates to formatted strings, times, and datetimes.
-      module Conversions
-        DATE_FORMATS = {
-          :db           => "yyyy-MM-dd",
-          :i18n         => lambda { |clazz, locale| 
-                              format = I18n.translate(:"formats.date", :default=>'')
-                              !format.blank? ? clazz.pattern_formatter(format) : clazz.date_instance(:default, locale)
-                            },
-          :number       => "yyyyMMdd",
-          :full         => lambda { |clazz, locale| clazz.date_instance(:full, locale) },
-          :long         => lambda { |clazz, locale| clazz.date_instance(:long, locale) },
-          :medium       => lambda { |clazz, locale| clazz.date_instance(:medium, locale) },
-          :short        => lambda { |clazz, locale| clazz.date_instance(:short, locale) },
-          :default      => lambda { |clazz, locale| clazz.date_instance(:default, locale) },
-          :long_ordinal => lambda { |clazz| clazz.pattern_formatter("MMMMMM #{time.day.ordinalize}, yyyy HH:mm") },
-          :rfc822       => "EEE, dd MMM yyyy HH:mm:ss Z",
-          :httpdate     => lambda { |clazz| clazz.pattern_formatter("EEE, dd MMM yyyy HH:mm:ss z", "GMT", "EN") }
-        }
-        
-        def to_java_sqldate
-          self
-        end
-        
-        def acts_like_time?
-          false
-        end
-      end
-    end
+class java::sql::Date
+  DATE_FORMATS = {
+    :db           => "yyyy-MM-dd",
+    :i18n         => lambda { |clazz, locale| clazz.i18n_formatter(locale) },
+    :number       => "yyyyMMdd",
+    :full         => lambda { |clazz, locale| clazz.date_instance(:full, locale) },
+    :long         => lambda { |clazz, locale| clazz.date_instance(:long, locale) },
+    :medium       => lambda { |clazz, locale| clazz.date_instance(:medium, locale) },
+    :short        => lambda { |clazz, locale| clazz.date_instance(:short, locale) },
+    :default      => lambda { |clazz, locale| clazz.date_instance(:default, locale) },
+    :rfc822       => "EEE, dd MMM yyyy HH:mm:ss Z",
+    :httpdate     => lambda { |clazz, locale|
+      fmt = clazz.pattern_formatter("EEE, dd MMM yyyy HH:mm:ss z", locale || 'EN')
+      fmt.time_zone = 'GMT'.to_java_time_zone
+      fmt
+    }
+  }
+
+  def to_java_sqldate
+    self
+  end
+  
+  def acts_like_time?
+    false
   end
-end
+end

data/lib/jactive_support/java_ext/sql_date/localize.rb

@@ -0,0 +1,21 @@
+require 'jactive_support/java_ext/date/localize'
+
+class java::sql::Date
+  def self.i18n_scope
+    :sql_date
+  end
+
+  def self.default_formatter(locale)
+    date_instance(:default, locale)
+  end
+
+  def self.parse(str, options = {})
+    date = super
+    self.new(date.time)
+  end
+
+  def self.parse_i18n(str, options = {})
+    date = super
+    self.new(date.time)
+  end
+end

data/lib/jactive_support/java_ext/sql_date.rb

@@ -1,5 +1,2 @@
 require 'jactive_support/java_ext/sql_date/conversions'
-
-class java::sql::Date
-  include JactiveSupport::JavaExtensions::SqlDate::Conversions
-end
+require 'jactive_support/java_ext/sql_date/localize'

data/lib/jactive_support/java_ext/to_java_time_zone.rb

@@ -0,0 +1,5 @@
+class java::util::TimeZone
+  def to_java_time_zone
+    self
+  end
+end

data/lib/jactive_support/localize.rb

@@ -0,0 +1,70 @@
+require 'active_support/concern'
+
+module JactiveSupport
+  # Makes a class support localize and class parse method
+  # It expects class 3 methods be implemented on the class.
+  #   i18n_scope - The scope to use for translations
+  #   pattern_formatter(format, locale) - returns a formatter based on a pattern
+  #   default_formatter(locale) - returns a default formatter when the format is blank
+  module Localize
+    extend ActiveSupport::Concern
+
+    included do
+      class << self
+        alias :parse_original :parse
+        alias :parse :parse_i18n
+      end
+    end
+
+    module ClassMethods
+      def i18n_formatter(options = {})
+        format = options[:format] || :default
+        locale = options.fetch(:locale, ::I18n.locale)
+        if Symbol === format
+          key  = format
+          options = options.merge(raise: true, object: self)
+          format = ::I18n.t("#{self.i18n_scope}.formats.#{key}", options)
+        end
+        if format.blank?
+          formatter = default_formatter(locale)
+        else
+          formatter = pattern_formatter(format, locale)
+        end
+
+        if options[:time_zone] && formatter.respond_to?(:time_zone)
+          formatter.time_zone = options[:time_zone].to_java_time_zone
+        end
+
+        formatter
+      end
+
+      def parse_i18n(str, options = {})
+        unless options[:format]
+          defaults = [
+            :"#{self.i18n_scope}.formats.default", 
+            options.delete(:default)]
+          defaults.compact!
+          defaults.flatten!
+          options[:default] = defaults unless defaults.empty?
+          options[:format] = :input
+        end
+        formatter = i18n_formatter(options)
+        formatter.parse(str)
+      end
+    end
+
+    def localize(options = {})
+      unless options[:format]
+        defaults = [
+          :"#{self.class.i18n_scope}.formats.default", 
+          options.delete(:default)]
+        defaults.compact!
+        defaults.flatten!
+        options[:default] = defaults unless defaults.empty?
+        options[:format] = :output
+      end
+      formatter = self.class.i18n_formatter(options)
+      formatter.format(self)
+    end
+  end
+end

data/lib/jactive_support/version.rb

@@ -1,3 +1,3 @@
-module JActiveSupport
-  VERSION = "2.1.2"
+module JactiveSupport
+  VERSION = "3.0.0.pre1"
 end

data/lib/jactive_support.rb

@@ -5,3 +5,4 @@ require 'jactive_support/core_ext'
 require 'jactive_support/json'
 require 'jactive_support/rescuable'
 require 'jactive_support/constantize'
+require 'jactive_support/java_blamable'

data/spec/java_ext/date/localize_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path('../../../shared/fixtures', __FILE__)
+require 'jactive_support/java_ext/date/localize'
+
+setup_date_translations
+describe "java::util::Date#localize" do
+  it "localizes date with format" do
+    date = java::util::Date.new(1192140000000)
+    date.localize(format: 'yyyy').should == '2007'
+  end
+
+  it "localizes date with symbol format" do
+    date = java::util::Date.new(1192140000000)
+    date.localize(format: :short).should == '12. Oct'
+  end
+
+  it "localizes date with default date time format" do
+    date = java::sql::Date.new(1192140000000)
+    date.localize(format: '').should == 'Oct 12, 2007 12:00:00 AM'
+  end
+
+  it "fails with missing symbol format" do
+    date = java::util::Date.new(1192140000000)
+    expect { date.localize(format: :miss) }.to raise_error(I18n::MissingTranslationData)
+  end
+
+  it "localizes date with default" do
+    date = java::util::Date.new(1192140000000)
+    date.localize(default: 'yyyy', locale: :da).should == '2007'
+  end
+
+  it "localizes date" do
+    date = java::util::Date.new(1192140000000)
+    date.localize.should == '00:00:00.000 12/10/2007'
+  end
+
+  it "localizes date ignores default when localized" do
+    date = java::util::Date.new(1192140000000)
+    date.localize(default: 'yyyy').should == '00:00:00.000 12/10/2007'
+  end
+
+  it "localizes with time zone" do
+    date = java::util::Date.new(1192140000000)
+    date.localize(time_zone: 'GMT').should == '22:00:00.000 11/10/2007'
+  end
+
+  it "localizes using output format first" do
+    date = java::util::Date.new(1192140000000)
+    date.localize(format: :default, locale: :sv).should == '00:00:00.000 12-10-07'
+    date.localize(locale: :sv).should == '00:00:00.000 12-10-2007'
+  end
+end

data/spec/java_ext/date/parse_spec.rb

@@ -0,0 +1,55 @@
+require File.expand_path('../../../shared/fixtures', __FILE__)
+require 'jactive_support/java_ext/date/localize'
+
+setup_date_translations
+describe "java::util::Date.parse" do
+  it "parses date with format" do
+    date = java::util::Date.parse('2007', format: 'yyyy')
+    date.localize.should == '00:00:00.000 01/01/2007'
+  end
+
+  it "parses date with symbol format" do
+    date = java::util::Date.parse('12. Oct', format: :short)
+    date.localize.should == '00:00:00.000 12/10/1970'
+  end
+
+  it "fails with missing symbol format" do
+    expect { java::util::Date.parse('12. Oct', format: :miss) }.to raise_error(I18n::MissingTranslationData)
+  end
+
+  it "parses date with default" do
+    date = java::util::Date.parse('2007', default: 'yyyy', locale: :da)
+    date.localize.should == '00:00:00.000 01/01/2007'
+  end
+
+  it "parses date" do
+    date = java::util::Date.parse('00:00:00.000 12/10/2007')
+    date.localize.should == '00:00:00.000 12/10/2007'
+  end
+
+  it "parses date with suffix" do
+    date = java::util::Date.parse('00:00:00.000 12/10/2007muh')
+    date.localize.should == '00:00:00.000 12/10/2007'
+  end
+
+  it "parses date ignores default when localized" do
+    date = java::util::Date.parse('00:00:00.000 12/10/2007', default: 'yyyy')
+    date.localize.should == '00:00:00.000 12/10/2007'
+  end
+
+  it "parses with time zone" do
+    date = java::util::Date.parse('00:00:00.000 12/10/2007', time_zone: 'GMT')
+    date.localize.should == '02:00:00.000 12/10/2007'
+  end
+
+  it "parses using input format first" do
+    date = java::util::Date.parse('00:00:00.000 12.10.07', format: :default, locale: :fr)
+    date.localize.should == '00:00:00.000 12/10/0007'
+    date = java::util::Date.parse('00:00:00.000 12.10.07', locale: :fr)
+    date.localize.should == '00:00:00.000 12/10/2007'
+  end
+
+  it "fails with parse exception on wrong format" do
+    expect { java::util::Date.parse('12. Oct') }.to raise_error(java::text::ParseException)
+  end
+end

data/spec/java_ext/date/strformat_spec.rb

@@ -0,0 +1,39 @@
+require 'jactive_support/java_ext/date/conversions'
+
+describe "java::util::Date#strformat" do
+  it "formats year" do
+    date = java::util::Date.new(1192140000000)
+    date.strformat('yyyy').should == '2007'
+  end
+
+  it "formats month" do
+    date = java::util::Date.new(1192140000000)
+    date.strformat('MM').should == '10'
+  end
+
+  it "formats abbreviated month" do
+    date = java::util::Date.new(1192140000000)
+    date.strformat('MMM', locale: 'en').should == 'Oct'
+  end
+
+  it "formats danish abbreviated month" do
+    date = java::util::Date.new(1192140000000)
+    date.strformat('MMM', locale: 'da_DK'.to_locale).should == 'okt'
+  end
+
+  it "formats fulle month" do
+    date = java::util::Date.new(1192140000000)
+    date.strformat('MMMM', locale: 'en').should == 'October'
+  end
+
+  it "formats danish full month" do
+    date = java::util::Date.new(1192140000000)
+    date.strformat('MMMM', locale: 'da_DK'.to_locale).should == 'oktober'
+  end
+
+  it "formats rfc822 date" do
+    date = java::util::Date.new(1192140000000)
+    date.strformat('EEE, dd MMM yyyy HH:mm:ss Z', locale: 'en', timezone: 'CET')
+      .should == 'Fri, 12 Oct 2007 00:00:00 +0200'
+  end
+end

data/spec/java_ext/date/to_formatted_s_spec.rb

@@ -0,0 +1,58 @@
+require File.expand_path('../../../shared/fixtures', __FILE__)
+require 'jactive_support/java_ext/date/conversions'
+
+describe "java::util::Date#to_formatted_s" do
+  it "formats using locale format" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:i18n).should == '00:00:00.000 12/10/2007'
+  end
+
+  it "formats using locale format using locale" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:i18n, locale: :de).should == '00:00:00.000 12.10.2007'
+  end
+
+  it "formats using locale format using locale and time zone" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:i18n, locale: :de, time_zone: 'GMT').should == '22:00:00.000 11.10.2007'
+  end
+
+  it "formats using default format" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:default).should == 'Oct 12, 2007 12:00:00 AM'
+  end
+
+  it "formats using default format using locale" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:default, locale: :de).should == '12.10.2007 00:00:00'
+  end
+
+  it "formats using default format using locale and time zone" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:default, locale: :de, time_zone: 'GMT').should == '11.10.2007 22:00:00'
+  end
+
+  it "formats unknown format using default" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:muh).should == date.to_default_s
+  end
+
+  it "formats db with string" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:db).should == '2007-10-12 00:00:00.000'
+  end
+
+  it "formats httpdate" do
+    setup_date_translations
+    date = java::util::Date.new(1192140000000)
+    date.to_formatted_s(:httpdate).should == 'Thu, 11 Oct 2007 22:00:00 GMT'
+  end
+end

data/spec/java_ext/sql_date/localize_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path('../../../shared/fixtures', __FILE__)
+require 'jactive_support/java_ext/sql_date/localize'
+
+setup_date_translations
+describe "java::sql::Date#localize" do
+  it "localizes sql date format" do
+    date = java::sql::Date.new(1192140000000)
+    date.localize.should == '12/10/2007'
+  end
+
+  it "localizes sql date with default date format" do
+    date = java::sql::Date.new(1192140000000)
+    date.localize(format: '').should == 'Oct 12, 2007'
+  end
+end

data/spec/java_ext/sql_date/parse_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path('../../../shared/fixtures', __FILE__)
+require 'jactive_support/java_ext/sql_date/localize'
+
+setup_date_translations
+describe "java::sql::Date.parse" do
+  it "parses sql date with format" do
+    date = java::sql::Date.parse('2007', format: 'yyyy')
+    date.localize.should == '01/01/2007'
+  end
+
+  it "localizes sql date with default date format" do
+    date = java::sql::Date.parse('Oct 12, 2007', format: '')
+    date.localize.should == '12/10/2007'
+  end
+end

data/spec/shared/fixtures.rb

@@ -1,7 +1,53 @@
+require 'i18n'
+
 def enumerator_class
   [].each.class
 end
 
 def ruby_bug(*args)
   yield
-end
+end
+
+I18n.locale = :en
+java::util::Locale.default = java::util::Locale.new('en')
+def setup_date_translations
+  I18n.backend.store_translations :en, {
+    :java_date => {
+      :formats => {
+        :default => 'HH:mm:ss.SSS dd/MM/yyyy',
+        :short => 'dd. MMM',
+        :long => 'dd. MMMM yyyy',
+      },
+    },
+    :sql_date => {
+      :formats => {
+        :default => 'dd/MM/yyyy'
+      }
+    }
+  }
+  I18n.backend.store_translations :de, {
+    :java_date => {
+      :formats => {
+        :default => 'HH:mm:ss.SSS dd.MM.yyyy',
+        :short => 'dd. MMM',
+        :long => 'dd. MMMM yyyy',
+      },
+    }
+  }
+  I18n.backend.store_translations :fr, {
+    :java_date => {
+      :formats => {
+        :default => 'HH:mm:ss.SSS dd.MM.yyyy',
+        :input => 'HH:mm:ss.SSS dd.MM.yy',
+      },
+    }
+  }
+  I18n.backend.store_translations :sv, {
+    :java_date => {
+      :formats => {
+        :default => 'HH:mm:ss.SSS dd-MM-yy',
+        :output => 'HH:mm:ss.SSS dd-MM-yyyy',
+      },
+    }
+  }
+end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: jactive_support
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0.pre1
 platform: ruby
 authors:
 - Brian Olsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activesupport
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
-  name: activesupport
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
-- !ruby/object:Gem::Dependency
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
+        version: 2.6.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
-  name: rspec
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
+        version: 0.9.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
-  name: rake
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: jruby-openssl
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Extensions to add some activesupport flavor to java classes
 email: brian@maven-group.org
 executables: []
@@ -108,11 +108,14 @@ files:
 - lib/jactive_support/core_ext/to_java_list.rb
 - lib/jactive_support/core_ext/to_java_map.rb
 - lib/jactive_support/core_ext/to_java_sqldate.rb
+- lib/jactive_support/core_ext/to_java_time_zone.rb
 - lib/jactive_support/java_blamable.rb
 - lib/jactive_support/java_ext.rb
 - lib/jactive_support/java_ext/date.rb
 - lib/jactive_support/java_ext/date/calculations.rb
 - lib/jactive_support/java_ext/date/conversions.rb
+- lib/jactive_support/java_ext/date/formatters.rb
+- lib/jactive_support/java_ext/date/localize.rb
 - lib/jactive_support/java_ext/enum.rb
 - lib/jactive_support/java_ext/iterable.rb
 - lib/jactive_support/java_ext/iterator.rb
@@ -125,11 +128,14 @@ files:
 - lib/jactive_support/java_ext/number.rb
 - lib/jactive_support/java_ext/sql_date.rb
 - lib/jactive_support/java_ext/sql_date/conversions.rb
+- lib/jactive_support/java_ext/sql_date/localize.rb
+- lib/jactive_support/java_ext/to_java_time_zone.rb
 - lib/jactive_support/json.rb
 - lib/jactive_support/json/encoders/collection.rb
 - lib/jactive_support/json/encoders/locale.rb
 - lib/jactive_support/json/encoders/map.rb
 - lib/jactive_support/json/encoding.rb
+- lib/jactive_support/localize.rb
 - lib/jactive_support/rescuable.rb
 - lib/jactive_support/version.rb
 - spec/constantize_spec.rb
@@ -137,6 +143,10 @@ files:
 - spec/core_ext/module_spec.rb
 - spec/core_ext/ordering_spec.rb
 - spec/enum_spec.rb
+- spec/java_ext/date/localize_spec.rb
+- spec/java_ext/date/parse_spec.rb
+- spec/java_ext/date/strformat_spec.rb
+- spec/java_ext/date/to_formatted_s_spec.rb
 - spec/java_ext/iterable/clear_spec.rb
 - spec/java_ext/iterable/delete_if_spec.rb
 - spec/java_ext/iterable/empty_spec.rb
@@ -216,6 +226,8 @@ files:
 - spec/java_ext/map/value_spec.rb
 - spec/java_ext/map/values_at_spec.rb
 - spec/java_ext/map/values_spec.rb
+- spec/java_ext/sql_date/localize_spec.rb
+- spec/java_ext/sql_date/parse_spec.rb
 - spec/locale_spec.rb
 - spec/shared/fixtures.rb
 - spec/shared/version.rb
@@ -234,9 +246,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9
@@ -249,6 +261,10 @@ test_files:
 - spec/core_ext/module_spec.rb
 - spec/core_ext/ordering_spec.rb
 - spec/enum_spec.rb
+- spec/java_ext/date/localize_spec.rb
+- spec/java_ext/date/parse_spec.rb
+- spec/java_ext/date/strformat_spec.rb
+- spec/java_ext/date/to_formatted_s_spec.rb
 - spec/java_ext/iterable/clear_spec.rb
 - spec/java_ext/iterable/delete_if_spec.rb
 - spec/java_ext/iterable/empty_spec.rb
@@ -328,6 +344,8 @@ test_files:
 - spec/java_ext/map/value_spec.rb
 - spec/java_ext/map/values_at_spec.rb
 - spec/java_ext/map/values_spec.rb
+- spec/java_ext/sql_date/localize_spec.rb
+- spec/java_ext/sql_date/parse_spec.rb
 - spec/locale_spec.rb
 - spec/shared/fixtures.rb
 - spec/shared/version.rb