iso8601 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a95ef6cc71f2a2e5af6466a026f86b790f51893
-  data.tar.gz: 9c656534277c2fd381b03838543b251163f5b274
+  metadata.gz: 1e579f970989da55f7fdabad30b90b62efbccbd4
+  data.tar.gz: 30dd1505c5fe85a5c8c38a95754c20eb84bdd76a
 SHA512:
-  metadata.gz: da5afe9beda6d394dd1a8e827d6fbf229f0c6648dd9493de4e223c23735a7c47757981a320d221d2caec14c97306a7e745ae078eec8495efe97e716b569ba03e
-  data.tar.gz: e76c0d4bac7906ba82098b4820658c68dca660b5d7493fd00ba5ec111b57b537a4d3c71034afeb70ae9b6090026dace9a6a122980c2da41834f26a1a5ac8c11a
+  metadata.gz: 3cff9b5a96b76ccdc52abde7cc29d4d565f9e4aa228a194262b65b591c73c158f65897d4407500182a7f4d4b9a8e0a3d7522123e65cbed314e1b4653807933e9
+  data.tar.gz: 6b652966595cf6e441d5479963b80d418994b9062819c9b84a0130a656c7e4a657dd54515076b3a84592f4c8683f89ab039d8fb0021b25ab5406841cc4e104d2

data/.editorconfig

@@ -0,0 +1,9 @@
+[Makefile]
+indent_style = tab
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

data/.gitignore

@@ -2,6 +2,10 @@
 .DS_Store
 .*.swp
 
+# development side effects
+.vagrant
+sandbox
+
 # files created by running the specs
 tmp
 

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.2.0
   - ruby-head
   - rbx-2
   - jruby-head

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.5
+
+* Fix `DateTime#hash`
+* Fix `DateTime#second` and `Time#second` precision.  Now it's rounded to the
+first decimal.
+
 ## 0.8.4
 
 * Remove unwanted log.

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.2
+MAINTAINER Arnau Siches <asiches@gmail.com>
+
+RUN mkdir -p /usr/src/iso8601
+WORKDIR /usr/src/iso8601
+
+COPY . /usr/src/iso8601
+RUN bundle update
+
+CMD ["bundle", "exec", "rspec"]

data/Gemfile

@@ -1,3 +1,8 @@
 source 'http://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'pry'
+  gem 'pry-doc'
+end

data/Makefile

@@ -0,0 +1,20 @@
+TAG ?= latest
+IMAGE_NAME ?= arnau/iso8601
+IMAGE = $(IMAGE_NAME):$(TAG)
+ORPHAN_IMAGES = `docker images -f 'dangling=true'`
+
+build :
+	docker build -t $(IMAGE) .
+
+rmo :
+	docker rmi $(ORPHAN_IMAGES)
+
+rmi :
+	docker rmi $(IMAGE)
+
+run :
+	docker run -t --rm -v $$(pwd):/usr/src/iso8601 $(IMAGE)
+
+shell :
+	docker run -it --rm -v $$(pwd):/usr/src/iso8601 $(IMAGE) \
+    pry -r ./lib/iso8601

data/README.md

@@ -14,9 +14,7 @@ times) standard.
 
 ## Supported versions
 
-* MRI 1.9.3
-* MRI 2.0
-* MRI 2.1
+* MRI 1.9.3, 2.0, 2.1, 2.2
 * RBX 2
 
 Check the [changelog](https://github.com/arnau/ISO8601/blob/master/CHANGELOG.md) if you are upgrading from an older version.
@@ -32,6 +30,14 @@ sign to be able to represent negative values:
     (ISO8601::Duration.new('PT10S') - ISO8601::Duration.new('PT12S')).to_s  #=> '-PT2S'
     (ISO8601::Duration.new('-PT10S') + ISO8601::Duration.new('PT12S')).to_s #=> 'PT2S'
 
+### Fractional seconds precision
+
+Fractional seconds for `ISO8601::DateTime` and `ISO8601::Time` are rounded to
+one decimal.
+
+    ISO8601::DateTime.new('2015-02-03T10:11:12.12').second #=> 12.1
+    ISO8601::Time.new('T10:11:12.16').second #=> 12.2
+
 
 ## Differences with core Date, Time and DateTime
 
@@ -88,6 +94,32 @@ Week dates raise an error when two digit days provied instead of return monday:
     DateTime.new('2014-W15-02')  # => #<Date: 2014-04-07 ((2456755j,0s,0n),+0s,2299161j)>
 
 
+## Testing
+
+### Raw
+
+    # Install a Ruby flavour
+    $ bundle install
+    $ bundle exec rspec
+
+### Docker (experimental)
+
+This way is in an early stage so for now it's only possible to test one Ruby
+version (currently Ruby 2.2.)
+
+    # Install Docker
+    $ make build
+    $ make run
+
+### Vagrant (experimental)
+
+This way is in an early stage so for now it's only possible to test one Ruby
+version (currently Ruby 2.2.)
+
+    # Install Vagrant and Virtualbox
+    $ vagrant up mri-2.2
+
+
 ## Contributing
 
 [Contributors](https://github.com/arnau/ISO8601/graphs/contributors)

data/Vagrantfile

@@ -0,0 +1,41 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.require_version '>= 1.6.0'
+Vagrant.configure(2) do |config|
+  config.vm.define 'iso8601' do |c|
+    c.vm.box = "coreos-alpha"
+    c.vm.box_version = '>= 561.0.0'
+    c.vm.box_url = "http://alpha.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
+
+    c.vm.network :private_network, ip: '10.10.1.100'
+    # Allows dynamic synced folders with docker as it seems Vagrant doesn't
+    # work well with coreOS (?)
+    c.vm.synced_folder '.', '/home/core/share', {
+      id: 'core',
+      nfs: true,
+      mount_options: ['nolock,vers=3,udp']
+    }
+
+    c.vm.provider :virtualbox do |vb|
+      vb.check_guest_additions = false
+      vb.functional_vboxsf = false
+      vb.memory = 1024
+      vb.cpus = 1
+      vb.customize ["modifyvm", :id, "--uart1", "0x3F8", "4"]
+    end
+  end
+
+  config.vm.define 'mri-2.2' do |c|
+    c.vm.provider 'docker' do |d|
+      d.vagrant_machine = 'iso8601'
+      d.vagrant_vagrantfile = './Vagrantfile'
+      d.build_dir = '.'
+      d.build_args = ['-t', 'arnau/iso8601:2.2']
+      d.create_args = [
+        '-v', '/home/core/share:/usr/src/iso8601',
+      ]
+      d.remains_running = false
+    end
+  end
+end

data/lib/iso8601/date_time.rb

@@ -18,47 +18,49 @@ module ISO8601
 
     attr_reader :second
 
-    FORMAT = '%Y-%m-%dT%H:%M:%S%:z'
-    FORMAT_WITH_FRACTION = '%Y-%m-%dT%H:%M:%S.%2N%:z'
-
     ##
     # @param [String] date_time The datetime pattern
     def initialize(date_time)
       @original = date_time
       @date_time = parse(date_time)
-      @second = @date_time.second + @date_time.second_fraction.to_f
+      @second = @date_time.second + @date_time.second_fraction.to_f.round(1)
     end
     ##
     # Addition
     #
     # @param [Numeric] other The seconds to add
     def +(other)
-      moment = @date_time.to_time.localtime(zone) + other
-      format = moment.subsec.zero? ? FORMAT : FORMAT_WITH_FRACTION
+      moment = @date_time.to_time.localtime(zone) + other.round(1)
 
-      self.class.new(moment.strftime(format))
+      self.class.new(moment.strftime('%Y-%m-%dT%H:%M:%S.%N%:z'))
     end
     ##
     # Substraction
     #
     # @param [Numeric] other The seconds to substract
     def -(other)
-      moment = @date_time.to_time.localtime(zone) - other
-      format = moment.subsec.zero? ? FORMAT : FORMAT_WITH_FRACTION
+      moment = @date_time.to_time.localtime(zone) - other.round(1)
 
-      self.class.new(moment.strftime(format))
+      self.class.new(moment.strftime('%Y-%m-%dT%H:%M:%S.%N%:z'))
     end
     ##
     # Converts DateTime to a formated string
     def to_s
-      format = @date_time.second_fraction.zero? ? FORMAT : FORMAT_WITH_FRACTION
-      @date_time.strftime(format)
+      second_format = (second % 1).zero? ? '%02d' % second : '%04.1f' % second
+
+      "%04d-%02d-%02dT%02d:%02d:#{second_format}#{zone}" % atoms
     end
     ##
     # Converts DateTime to an array of atoms.
     def to_a
       [year, month, day, hour, minute, second, zone]
     end
+    alias_method :atoms, :to_a
+    ##
+    # Converts DateTime to a floating point number of seconds since the Epoch.
+    def to_f
+      to_time.to_f
+    end
     ##
     # @param [#hash] other The contrast to compare against
     #
@@ -76,7 +78,7 @@ module ISO8601
     ##
     # @return [Fixnum]
     def hash
-      [second, self.class].hash
+      [to_f, self.class].hash
     end
 
     private

data/lib/iso8601/time.rb

@@ -27,9 +27,6 @@ module ISO8601
     # The original atoms
     attr_reader :atoms
 
-    FORMAT = 'T%H:%M:%S%:z'
-    FORMAT_WITH_FRACTION = 'T%H:%M:%S.%2N%:z'
-
     ##
     # @param [String] input The time pattern
     # @param [Date] base The base date to determine the time
@@ -38,7 +35,7 @@ module ISO8601
       @base = base
       @atoms = atomize(input)
       @time = compose(@atoms, @base)
-      @second = @time.second + @time.second_fraction.to_f
+      @second = @time.second + @time.second_fraction.to_f.round(1)
     end
     ##
     # @param [#hash] other The contrast to compare against
@@ -66,11 +63,10 @@ module ISO8601
     #
     # @return [ISO8601::Time] New time resulting of the addition
     def +(other)
-      moment = @time.to_time.localtime(zone) + other
-      format = moment.subsec.zero? ? FORMAT : FORMAT_WITH_FRACTION
+      moment = @time.to_time.localtime(zone) + other.round(1)
       base = ::Date.parse(moment.strftime('%Y-%m-%d'))
 
-      ISO8601::Time.new(moment.strftime(format), base)
+      self.class.new(moment.strftime('T%H:%M:%S.%L%:z'), base)
     end
     ##
     # Backwards the date the given amount of seconds.
@@ -79,17 +75,17 @@ module ISO8601
     #
     # @return [ISO8601::Time] New time resulting of the substraction
     def -(other)
-      moment = @time.to_time.localtime(zone) - other
-      format = moment.subsec.zero? ? FORMAT : FORMAT_WITH_FRACTION
+      moment = @time.to_time.localtime(zone) - other.round(1)
       base = ::Date.parse(moment.strftime('%Y-%m-%d'))
 
-      ISO8601::Time.new(moment.strftime(format), base)
+      self.class.new(moment.strftime('T%H:%M:%S.%L%:z'), base)
     end
     ##
     # Converts self to a time component representation.
     def to_s
-      format = @time.second_fraction.zero? ? FORMAT : FORMAT_WITH_FRACTION
-      @time.strftime(format)
+      second_format = (second % 1).zero? ? '%02d' % second : '%04.1f' % second
+
+      "T%02d:%02d:#{second_format}#{zone}" % atoms
     end
     ##
     # Converts self to an array of atoms.

data/lib/iso8601/version.rb

@@ -1,5 +1,5 @@
 module ISO8601
   ##
   # The gem version
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/spec/iso8601/date_time_spec.rb

@@ -104,8 +104,12 @@ describe ISO8601::DateTime do
   describe '#+' do
     it "should return the result of the addition" do
       expect((ISO8601::DateTime.new('2012-07-07T20:20:20Z') + 10).to_s).to eq('2012-07-07T20:20:30+00:00')
-      expect((ISO8601::DateTime.new('2012-07-07T20:20:20.5Z') + 10).to_s).to eq('2012-07-07T20:20:30.50+00:00')
-      expect((ISO8601::DateTime.new('2012-07-07T20:20:20+02:00') + 10).to_s).to eq('2012-07-07T20:20:30+02:00')
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20.5Z') + 10).to_s).to eq('2012-07-07T20:20:30.5+00:00')
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20+02:00') + 10.09).to_s).to eq('2012-07-07T20:20:30.1+02:00')
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20+02:00') + 10.1).to_s).to eq('2012-07-07T20:20:30.1+02:00')
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20+02:00') + 10).second).to eq(30)
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20.5Z') + 10).second).to eq(30.5)
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20+02:00') + 10.09).second).to eq(30.1)
     end
   end
 
@@ -132,4 +136,22 @@ describe ISO8601::DateTime do
       expect(subject.hash).to eq(contrast.hash)
     end
   end
+
+  describe '#==' do
+    it "should identify loose precision datetimes" do
+      expect(ISO8601::DateTime.new('2014') == ISO8601::DateTime.new('2014')).to be_truthy
+      expect(ISO8601::DateTime.new('2014') == ISO8601::DateTime.new('2015')).to be_falsy
+      expect(ISO8601::DateTime.new('2014-10') == ISO8601::DateTime.new('2014-11')).to be_falsy
+      expect(ISO8601::DateTime.new('2014-10') == ISO8601::DateTime.new('2014-11')).to be_falsy
+      expect(ISO8601::DateTime.new('2014-10-11T12') == ISO8601::DateTime.new('2014-10-11T13')).to be_falsy
+      expect(ISO8601::DateTime.new('2014-10-11T12:13') == ISO8601::DateTime.new('2014-10-11T12:14')).to be_falsy
+      expect(ISO8601::DateTime.new('2014-10-11T12:13:10') == ISO8601::DateTime.new('2014-10-11T12:13:10.0')).to be_truthy
+      expect(ISO8601::DateTime.new('2014-10-11T12:13:10.1') == ISO8601::DateTime.new('2014-10-11T12:13:10.2')).to be_falsy
+    end
+
+    it "should identify as the same when two dates with different timezones are the same timestamp" do
+      expect(ISO8601::DateTime.new('2014-10-11T12:13:14Z') == ISO8601::DateTime.new('2014-10-11T13:13:14+01:00')).to be_truthy
+
+    end
+  end
 end

data/spec/iso8601/time_spec.rb

@@ -57,15 +57,21 @@ describe ISO8601::Time do
 
   describe '#+' do
     it "should return the result of the addition" do
-      expect((ISO8601::Time.new('T20:20:20+02:00') + 10).to_s).to eq('T20:20:30+02:00')
-      expect((ISO8601::Time.new('T20:20:20.11+02:00') + 10).to_s).to eq('T20:20:30.11+02:00')
+      expect((ISO8601::Time.new('T20:20:20Z') + 10).to_s).to eq('T20:20:30+00:00')
+      expect((ISO8601::Time.new('T20:20:20.5Z') + 10).to_s).to eq('T20:20:30.5+00:00')
+      expect((ISO8601::Time.new('T20:20:20+02:00') + 10.09).to_s).to eq('T20:20:30.1+02:00')
+      expect((ISO8601::Time.new('T20:20:20+02:00') + 10.1).to_s).to eq('T20:20:30.1+02:00')
+      expect((ISO8601::Time.new('T20:20:20+02:00') + 10).second).to eq(30)
+      expect((ISO8601::Time.new('T20:20:20.5Z') + 10).second).to eq(30.5)
+      expect((ISO8601::Time.new('T20:20:20+02:00') + 10.09).second).to eq(30.1)
     end
+
   end
 
   describe '#-' do
     it "should return the result of the substraction" do
       expect((ISO8601::Time.new('T20:20:20+01:00') - 10).to_s).to eq('T20:20:10+01:00')
-      expect((ISO8601::Time.new('T20:20:20.11+02:00') - 10).to_s).to eq('T20:20:10.11+02:00')
+      expect((ISO8601::Time.new('T20:20:20.11+02:00') - 10).to_s).to eq('T20:20:10.1+02:00')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso8601
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Arnau Siches
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -47,14 +47,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
+- Vagrantfile
 - iso8601.gemspec
 - lib/iso8601.rb
 - lib/iso8601/atoms.rb