date_time_precision 0.4.0 → 0.5.0

data/README.md

@@ -76,6 +76,13 @@ JSON.parse(json).to_date.precision
  => 2
 ```
 
+```ruby
+require 'date_time_precision/format/iso8601'
+
+Date.new(2000, 5).iso8601
+ => "2000-05"
+```
+
 ## Ruby Compatibility
 
 Tested in MRI 1.8.7/1.9.2/1.9.3/2.0.0, REE, JRuby 1.8/1.9, and Rubinius 1.8/1.9.
@@ -118,10 +125,11 @@ Or install it yourself as:
 ## Wishlist
 
  - [x] Support Time::mktime
- - [ ] Support Time::utc
- - [ ] Support Time::local
+ - [x] Support Time::utc and Time#utc
+ - [x] Support Time::local
+ - [.] Support correct generation (done) and parsing (not done) of the ISO 8601 format, which supports partial dates
+ - [ ] Support the various time zone methods (partially done)
  - [ ] Support easy string formatting based on precision
- - [ ] Support correct parsing and generation of ISO 8601 format, which supports partial dates
 
 ## Contributing
 

data/lib/date_time_precision/format/iso8601.rb

@@ -0,0 +1,50 @@
+[Date, Time, DateTime].each do |klass|
+  klass.class_eval do
+    ISO8601_DATE_FRAGMENTS = %w(%0*d %02d %02d)
+    ISO8601_TIME_FRAGMENTS = %w(%02d %02d %02d)
+
+    if method_defined?(:xmlschema)
+      alias_method :xmlschema_without_precision, :xmlschema
+    end
+    
+    def xmlschema
+      iso8601
+    end
+
+    if method_defined?(:iso8601)
+      alias_method :iso8601_without_precision, :iso8601
+    end
+    def iso8601
+      precision = self.precision || 0
+      format = ""
+      if precision > DateTimePrecision::NONE
+        # Add date part to format
+        format << ISO8601_DATE_FRAGMENTS.take([3,self.precision].min).join('-')
+      end
+
+      if precision > DateTimePrecision::DAY
+        format << "T#{ISO8601_TIME_FRAGMENTS.take(precision - 3).join(':')}"
+      end
+
+      output = sprintf(format, year < 0 ? 5 : 4, *self.fragments)
+
+      # Fractional seconds
+      if sec_frac? && sec_frac > 0
+        output << '.' + sprintf('%0*d', sec_frac, (subsec * 10**sec_frac).floor)
+      end
+
+      # Timezone
+      if precision > DateTimePrecision::DAY
+        if utc?
+          output << 'Z'
+        else
+          off = utc_offset
+          sign = off < 0 ? '-' : '+'
+          output << sprintf('%s%02d:%02d', sign, *(off.abs / 60).divmod(60))
+        end
+      end
+      
+      output
+    end
+  end
+end

data/lib/date_time_precision/lib.rb

@@ -1,11 +1,25 @@
 if defined?(ActiveSupport)
-  ['active_support/core_ext/date', 'active_support/core_ext/datetime', 'active_support/core_ext/time', 'active_support/time'].each do |f|
+  ['active_support/core_ext/date', 'active_support/core_ext/datetime', 'active_support/core_ext/time', 'active_support/time', 'active_support/time_with_zone'].each do |f|
     begin
       require f
     rescue LoadError; end
   end
 end
 
+class Date
+  unless method_defined?(:utc?)
+    def utc?
+      offset == 0
+    end
+  end
+  
+  unless method_defined?(:utc_offset)
+    def utc_offset
+      offset.numerator*3600
+    end
+  end
+end
+
 module DateTimePrecision
   unless constants.include? "NONE"
     FRAC  = 7

data/lib/date_time_precision/patch/1.8.7/time.rb

@@ -31,6 +31,38 @@ class Time
       t
     end
     private :make_time
+    
+    alias_method :utc_without_prec, :utc
+    def utc(*args)
+      orig_args = args.shift(Time::MAX_PRECISION)
+      precision = self.precision(orig_args)
+      time_args = normalize_new_args(orig_args)
+      
+      t = utc_without_prec(*[time_args, args].flatten)
+      t.precision = precision
+      t.attributes_set(orig_args)
+      t
+    end
+    alias_method :gm, :utc
+    
+    alias_method :local_without_prec, :local
+    def local(*args)
+      orig_args = args.shift(Time::MAX_PRECISION)
+      precision = self.precision(orig_args)
+      time_args = normalize_new_args(orig_args)
+      
+      t = local_without_prec(*[time_args, args].flatten)
+      t.precision = precision
+      t.attributes_set(orig_args)
+      t
+    end
+  end
+  
+  alias_method :utc_without_prec, :utc
+  def utc(*args)
+    t = utc_without_prec(*args)
+    t.precision = self.precision
+    t
   end
 
   #def self.strptime(str='-4712-01-01', fmt='%F', sg=Date::ITALY)

data/lib/date_time_precision/version.rb

@@ -1,3 +1,3 @@
 module DateTimePrecision
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/date_time_precision/date_time_precision_spec.rb

@@ -77,6 +77,22 @@ describe DateTimePrecision do
       Time.mktime(2000, 1, 1, nil, nil).precision.should == DateTimePrecision::DAY
     end
   end
+  
+  context 'Time Zones' do
+    it 'should retain precision when switching to UTC' do
+      Time.mktime(2000).utc.precision.should == DateTimePrecision::YEAR
+      Time.mktime(2000).gmtime.precision.should == DateTimePrecision::YEAR
+    end
+    
+    it 'should track precision when creating a time in UTC' do
+      Time.utc(1945, 10).precision.should == DateTimePrecision::MONTH
+      Time.gm(1945, 10).precision.should == DateTimePrecision::MONTH
+    end
+    
+    it 'should track precision when creating a time in the local timezone' do
+      Time.local(2004, 5, 6).precision.should == DateTimePrecision::DAY
+    end
+  end
 
   context 'Parsing' do
     it 'should have second/frac precision when parsing a timestamp' do
@@ -167,6 +183,34 @@ describe DateTimePrecision do
       Time.mktime(*args)
     end
     
+    context 'ISO 8601' do
+      require 'date_time_precision/format/iso8601'
+      
+      it 'should convert a date to ISO 8601' do
+        date.iso8601.should == "1989-03-11"
+        Date.new(1990, 5).iso8601.should == "1990-05"
+        Date.new(1800).iso8601.should == "1800"
+      end
+      
+      it 'should convert a datetime to ISO 8601' do
+        datetime.iso8601.should == "1989-03-11T08:30:15Z"
+        DateTime.new(1900).iso8601.should == "1900"
+        DateTime.new(1990, 5).iso8601.should == "1990-05"
+        DateTime.new(1990, 5, 2).iso8601.should == "1990-05-02"
+        DateTime.new(1990, 5, 2, 12).iso8601.should == "1990-05-02T12Z"
+        DateTime.new(1990, 5, 2, 12, 30).iso8601.should == "1990-05-02T12:30Z"
+      end
+      
+      it 'should convert a time to ISO 8601' do
+        Time.utc(1900).utc.iso8601.should == "1900"
+        Time.mktime(1990, 5).utc.iso8601.should == "1990-05"
+        Time.mktime(1990, 5, 2).utc.iso8601.should == "1990-05-02"
+        Time.utc(1990, 5, 2, 12).iso8601.should == "1990-05-02T12Z"
+        Time.utc(1990, 5, 2, 12, 30).utc.iso8601.should == "1990-05-02T12:30Z"
+        Time.utc(1990, 5, 2, 12, 30, 45).utc.iso8601.should == "1990-05-02T12:30:45Z"
+      end
+    end
+    
     context 'Hash' do
       require 'date_time_precision/format/hash'
     

metadata

@@ -1,129 +1,122 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: date_time_precision
-version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 11
+  prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
-authors:
+authors: 
 - David Butler
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+
+date: 2013-03-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+  name: rake
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+  name: rspec
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: json
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+  name: activesupport
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: virtus
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.4
+  name: json
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 5
+        - 4
         version: 0.5.4
-    none: false
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: coercible
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
+  name: virtus
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
-    none: false
   prerelease: false
   type: :development
+  name: coercible
+  requirement: *id006
 description: Patches Date, Time, and DateTime ruby classes to keep track of precision
-email:
+email: 
 - dwbutler@ucla.edu
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README
@@ -137,6 +130,7 @@ files:
 - lib/date_time_precision/compat/coercible.rb
 - lib/date_time_precision/compat/virtus.rb
 - lib/date_time_precision/format/hash.rb
+- lib/date_time_precision/format/iso8601.rb
 - lib/date_time_precision/format/json.rb
 - lib/date_time_precision/format/nil.rb
 - lib/date_time_precision/lib.rb
@@ -157,37 +151,38 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/Spokeo/date_time_precision
 licenses: []
-post_install_message:
+
+post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      segments:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      segments:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      version: "0"
 requirements: []
-rubyforge_project:
+
+rubyforge_project: 
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: Patches Date, Time, and DateTime ruby classes to keep track of precision
-test_files:
+test_files: 
 - spec/date_time_precision/active_support_spec.rb
 - spec/date_time_precision/compatibility_spec.rb
 - spec/date_time_precision/date_time_precision_spec.rb