date_time_precision 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cfd81b7cf64c7f1cde510e2b5a8224758bb9bdf7
-  data.tar.gz: bd625c14c4ba483ddf55210ebdc2785b0618c2fe
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTdkODVjOTc0YWNkOGI1ZTNiMTU5MmVlODBmNTY5MTFiMzMwZDE4ZQ==
+  data.tar.gz: !binary |-
+    YjIwYmMzODc3M2I3OGQ1NDFmYTkwZWZlYTkyN2RiZDE2MmEwYWU4ZQ==
 SHA512:
-  metadata.gz: 0447b421ed938b6d15662d9800f8475c25e6879afd67f488ab03d7b57a2f1f7bc17be88823417c675bb026fb58923c691573bd51e034a346c2751fe0ac677b86
-  data.tar.gz: a97c3006ba3a3f22e165025eb2cde9ed9b4358fb8cb2003003cb3d14b07197f858206f99e8b756fb0914137b9e6246379f6be32cbfc1c33db46c6ac4affb23f9
+  metadata.gz: !binary |-
+    MDE5ZTIwZTljOTQ2MTgyMGI1MDI3ZjdhN2I3ZWY4Zjc4MGQ2ZDJmZjE0YTk0
+    MDI4OWI3YzlkM2IxMTM2N2VhNjFlYzI0MmI0YzI4NDk5NjljMzE1OWNlZjMw
+    MThkZWI5YTE4OGFlODU0YWIyMWMwNTc5NjEzNjYxMmIyNDc3MGE=
+  data.tar.gz: !binary |-
+    OWQ4NmFhNjVhNWE0MGIzY2U4MWEwMjcwZDI3NDQ2Y2M2MzJiMjdkMzdlYWU4
+    ZTUxZDNkYWE2MTUyMjgzM2I5MmI4MTg5MDkxYjE5YTQ2MTkxMTk3YjMxNTll
+    MjhhZTkyYzRkOTMzZWE2ZGI0NzNlNWU2YmRkZThmODMyYWVjZjI=

data/date_time_precision.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
   
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '> 3'
   gem.add_development_dependency 'appraisal'
   
   gem.add_development_dependency 'activesupport'

data/lib/date_time_precision/format/string.rb

@@ -9,6 +9,10 @@ Date::DATE_FORMATS[:long] = lambda do |date|
       date.strftime("%B %Y")
     when date.precision == DateTimePrecision::YEAR
       date.strftime("%Y")
+    when date.precision == DateTimePrecision::DECADE
+      "#{date.decade}s"
+    when date.precision == DateTimePrecision::CENTURY
+      "#{date.century}s"
     when date.month? && date.day?
       date.strftime("%B %e")
     when date.month?
@@ -30,6 +34,10 @@ Time::DATE_FORMATS[:long] = lambda do |time|
       time.strftime("%B %Y")
     when time.precision == DateTimePrecision::YEAR
       time.strftime("%Y")
+    when time.precision == DateTimePrecision::DECADE
+      "#{time.decade}s"
+    when time.precision == DateTimePrecision::CENTURY
+      "#{time.century}s"
     when time.month? && time.day?
       time.strftime("%B %e")
     when time.month?

data/lib/date_time_precision/lib.rb

@@ -2,7 +2,7 @@ require 'date'
 require 'time'
 
 if defined?(ActiveSupport)
-  ['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|
+  ['active_support/core_ext/date', 'active_support/core_ext/datetime', 'active_support/core_ext/date_time', 'active_support/core_ext/time', 'active_support/time', 'active_support/time_with_zone'].each do |f|
     begin
       require f
     rescue LoadError; end
@@ -28,13 +28,15 @@ module DateTimePrecision
 
   unless constants.include? "NONE"
     USEC = FRAC  = 7
-    SEC   = 6
-    MIN   = 5
-    HOUR  = 4
-    DAY   = 3
-    MONTH = 2
-    YEAR  = 1
-    NONE  = 0
+    SEC     = 6
+    MIN     = 5
+    HOUR    = 4
+    DAY     = 3
+    MONTH   = 2
+    YEAR    = 1
+    DECADE  = 0.5
+    CENTURY = 0.25
+    NONE    = 0
   
     # Default values for y,m,d,h,m,s,frac
     NEW_DEFAULTS = [-4712,1,1,0,0,0,0]
@@ -50,6 +52,8 @@ module DateTimePrecision
     ]
     
     DATE_ATTRIBUTE_PRECISIONS = {
+      :century => CENTURY,
+      :decade => DECADE,
       :year => YEAR,
       :mon => MONTH,
       :day => DAY,
@@ -91,6 +95,10 @@ module DateTimePrecision
         MONTH
       when val[:year], val[:y]
         YEAR
+      when val[:decade]
+        DECADE
+      when val[:century]
+        CENTURY
       else
         NONE
       end
@@ -121,6 +129,17 @@ module DateTimePrecision
   def normalize_new_args(args)
     self.class.normalize_new_args(args)
   end
+
+  def decade
+    year_with_bce_adjustment = (self.year > 0) ? self.year : self.year + 10
+    (year_with_bce_adjustment - year_with_bce_adjustment % 10)
+  end
+
+  def century
+    year_with_bce_adjustment = (self.year > 0) ? self.year : self.year + 100
+    year_with_bce_adjustment - year_with_bce_adjustment % 100
+  end
+
   protected :normalize_new_args
   
   module ClassMethods
@@ -197,7 +216,7 @@ module DateTimePrecision
         protected :#{attribute_name}_set=
       EOM
     end
-    
+
     base.class_eval <<-EOM, __FILE__, __LINE__
       def attributes_set(*vals)
         #{DATE_ATTRIBUTES.map{|attribute| "@#{attribute}_set"}.join(', ')} = *(vals.flatten.map{|v| !!v})

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

@@ -45,8 +45,4 @@ class DateTime < Date
       Time.local(*args).to_datetime
     end
   end
-
-  def utc
-    self.to_time.utc.to_datetime
-  end
 end

data/lib/date_time_precision/patch/1.9.3/date_time.rb

@@ -50,9 +50,5 @@ class DateTime < Date
       Time.local(*args).to_datetime
     end
   end
-
-  def utc
-    self.to_time.utc.to_datetime
-  end
   
 end

data/lib/date_time_precision/patch/common/date_time.rb

@@ -19,4 +19,17 @@ class DateTime < Date
       (sec_fraction.to_f*1_000_000).to_i
     end
   end
+
+  if method_defined?(:utc)
+    alias_method :utc_orig, :utc
+    def utc
+      dt = utc_orig
+      dt.precision = precision
+      dt
+    end
+  else
+    def utc
+      self.to_time.utc.to_datetime
+    end
+  end
 end

data/lib/date_time_precision/version.rb

@@ -1,3 +1,3 @@
 module DateTimePrecision
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/active_support_spec.rb

@@ -68,5 +68,41 @@ describe DateTimePrecision, 'Conversions' do
       expect(Time.mktime(nil, 5, 13).to_s(:long)).to eq("May 13")
       expect(Time.mktime(nil, 6).to_s(:long)).to eq("June")
     end
+
+    it 'takes precision into account for decade and century' do
+      decade_date = Date.new(1853)
+      decade_date.precision = DateTimePrecision::DECADE
+      expect(decade_date.to_s(:long)).to eq("1850s")
+
+      century_date = Date.new(1853)
+      century_date.precision = DateTimePrecision::CENTURY
+      expect(century_date.to_s(:long)).to eq("1800s")
+
+      decade_date_time = DateTime.new(1853)
+      decade_date_time.precision = DateTimePrecision::DECADE
+      expect(decade_date_time.to_s(:long)).to eq("1850s")
+
+      century_date_time = DateTime.new(1853)
+      century_date_time.precision = DateTimePrecision::CENTURY
+      expect(century_date_time.to_s(:long)).to eq("1800s")
+
+      decade_time = Time.mktime(1853)
+      decade_time.precision = DateTimePrecision::DECADE
+      expect(decade_time.to_s(:long)).to eq("1850s")
+
+      century_time = Time.mktime(1853)
+      century_time.precision = DateTimePrecision::CENTURY
+      expect(century_time.to_s(:long)).to eq("1800s")
+    end
+  end
+
+  context 'UTC' do
+    it 'does not crash and burn when calling #utc' do
+      expect { DateTime.now.utc }.to_not raise_error
+    end
+
+    it 'preserves precision when converting to UTC' do
+      expect(DateTime.new(2000, 5).utc.precision).to eq DateTimePrecision::MONTH
+    end
   end
 end

data/spec/date_time_precision_spec.rb

@@ -6,11 +6,11 @@ describe DateTimePrecision do
     it 'has no precision for unspecified date' do
       d = Date.new
       expect(d.precision).to eq(DateTimePrecision::NONE)
-      expect(d.year?).to be_falsey
+      expect(d.year?).to be false
     
       dt = DateTime.new
       expect(dt.precision).to eq(DateTimePrecision::NONE)
-      expect(dt.year?).to be_falsey
+      expect(dt.year?).to be false
     end
   
     it 'has no precision for nil values' do
@@ -20,45 +20,47 @@ describe DateTimePrecision do
     it 'has year precision when only year is supplied' do
       d = Date.new(1982)
       expect(d.precision).to eq(DateTimePrecision::YEAR)
-      expect(d.year?).to be_truthy
-      expect(d.month?).to be_falsey
-      expect(d.day?).to be_falsey
+      expect(d.year?).to be true
+      expect(d.month?).to be false
+      expect(d.day?).to be false
     end
   
     it 'has month precision when year and month are supplied' do
       d = Date.new(1982, 11)
       expect(d.precision).to eq(DateTimePrecision::MONTH)
-      expect(d.year?).to be_truthy
-      expect(d.month?).to be_truthy
-      expect(d.day?).to be_falsey
+      expect(d.year?).to be true
+      expect(d.month?).to be true
+      expect(d.day?).to be false
     end
   
     it 'has day precision when year, month, and day are passed in' do
       dt = DateTime.new(1987,10,19)
       expect(dt.precision).to eq(DateTimePrecision::DAY)
-      expect(dt.year?).to be_truthy
-      expect(dt.month?).to be_truthy
-      expect(dt.day?).to be_truthy
-      expect(dt.hour?).to be_falsey
+      expect(dt.year?).to be true
+      expect(dt.month?).to be true
+      expect(dt.day?).to be true
+      expect(dt.hour?).to be false
     end
   
     it 'has hour precision' do
       dt = DateTime.new(1970, 1, 2, 3)
       expect(dt.precision).to eq(DateTimePrecision::HOUR)
-      expect(dt.year?).to be_truthy
-      expect(dt.month?).to be_truthy
-      expect(dt.day?).to be_truthy
-      expect(dt.hour?).to be_truthy
-      expect(dt.min?).to be_falsey
+      expect(dt.year?).to be true
+      expect(dt.month?).to be true
+      expect(dt.day?).to be true
+      expect(dt.hour?).to be true
+      expect(dt.min?).to be false
     end
     
     it 'tracks which attributes were explicitly set separately from precision' do
       [Date.new(nil, 11, 12), DateTime.new(nil, 10, 11, nil), Time.mktime(nil, 12, 13, nil, 14)].each do |d|
-        expect(d.year?).to be_falsey
-        expect(d.month?).to be_truthy
-        expect(d.day?).to be_truthy
-        expect(d.hour?).to be_falsey
-        expect(d.min?).to be_truthy if d.is_a? Time
+        expect(d.decade?).to be false
+        expect(d.century?).to be false
+        expect(d.year?).to be false
+        expect(d.month?).to be true
+        expect(d.day?).to be true
+        expect(d.hour?).to be false
+        expect(d.min?).to be true if d.is_a? Time
         expect(d.precision).to eq(DateTimePrecision::NONE)
       end
     end
@@ -172,9 +174,44 @@ describe DateTimePrecision do
     it 'should match when differing only in day precision' do
       d1 = Date.new(2001,3,2)
       d2 = Date.new(2001,3)
-      expect(d1.partial_match?(d2)).to be_truthy
-      expect(d2.partial_match?(d1)).to be_truthy
+      expect(d1.partial_match?(d2)).to be true
+      expect(d2.partial_match?(d1)).to be true
     end
   end
 
+  context 'Decades and Centuries' do
+    it 'should have the proper precision when outputting decades or centuries' do
+      no_date = Date.new
+      full_date = Date.new(1853,10,10)
+      century_date_time = DateTime.new(1853)
+      century_date_time.precision = DateTimePrecision::CENTURY
+      decade_time = Time.mktime(1853)
+      decade_time.precision = DateTimePrecision::DECADE
+      
+      expect(full_date.decade).to eq(1850)
+      expect(full_date.century).to eq(1800)
+
+      expect(decade_time.decade).to eq(1850)
+      expect(decade_time.century).to eq(1800)
+
+      expect(century_date_time.decade).to eq(1850)
+      expect(century_date_time.century).to eq(1800)
+
+      expect(no_date.decade?).to be false
+      expect(full_date.decade?).to be true
+      expect(decade_time.decade?).to be true
+      expect(century_date_time.decade?).to be false
+
+      expect(no_date.century?).to be false
+      expect(full_date.century?).to be true
+      expect(decade_time.century?).to be true
+      expect(century_date_time.century?).to be true
+    end
+    it 'properly handles negative years' do
+      date_bce = Date.new(-531, 10, 5)
+      expect(date_bce.decade).to eq(-530)
+      expect(date_bce.century).to eq(-500)
+    end
+
+  end
 end

data/spec/format_spec.rb

@@ -220,15 +220,15 @@ describe DateTimePrecision do
         [:date, :datetime, :time].each do |klass|
           it "accepts month and day without year when converting to a #{klass}" do
             date = { :month => 5, :day => 18, :min => 48 }.send("to_#{klass}")
-            expect(date.year?).to be_falsey
-            expect(date.month?).to be_truthy
+            expect(date.year?).to be false
+            expect(date.month?).to be true
             expect(date.month).to eq(5)
-            expect(date.day?).to be_truthy
+            expect(date.day?).to be true
             expect(date.day).to eq(18)
-            expect(date.hour?).to be_falsey
+            expect(date.hour?).to be false
             
             unless klass == :date
-              expect(date.min?).to be_truthy
+              expect(date.min?).to be true
               expect(date.min).to eq(48)
             end
           end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: date_time_precision
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - David Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Appraisals
 - Gemfile
 - LICENSE
@@ -167,12 +167,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []