iso8601 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e579f970989da55f7fdabad30b90b62efbccbd4
-  data.tar.gz: 30dd1505c5fe85a5c8c38a95754c20eb84bdd76a
+  metadata.gz: 5334fbf980f84b7381e75406df4aa142096aa195
+  data.tar.gz: 60b7dc50b02cbf3814faa7403b6d0c569f0ff611
 SHA512:
-  metadata.gz: 3cff9b5a96b76ccdc52abde7cc29d4d565f9e4aa228a194262b65b591c73c158f65897d4407500182a7f4d4b9a8e0a3d7522123e65cbed314e1b4653807933e9
-  data.tar.gz: 6b652966595cf6e441d5479963b80d418994b9062819c9b84a0130a656c7e4a657dd54515076b3a84592f4c8683f89ab039d8fb0021b25ab5406841cc4e104d2
+  metadata.gz: ab405a0c6d9b7c7a82c17d11604ece0155632197ea1a91351df1953ee1aeb787ce7335d84a230604e3de636ef682d8e9dc042df4792ea99027fd5d98d50781e9
+  data.tar.gz: 74c27f8c93e799e6de99cd1564a91381d01bfafdf984c86445d03548377d6c3985cbf4b67a78cde4ce1751181126f47de2eae27761bc17af7c882f9176ca639d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.6
+
+* Fix #26 operations with Date, DateTime and Time with Duration (ex. `ISO8601::DateTime.new('2012-07-07T20:20:20Z') - ISO8601::Duration.new('PT10M')`.)
+* Fix #25 accept time components with timezone and only hour component (ex. `ISO8601::Time.new('T10+01:00')`.)
+* Fix Docker image for testing and inspecting.
+
 ## 0.8.5
 
 * Fix `DateTime#hash`

data/Dockerfile

@@ -5,6 +5,6 @@ RUN mkdir -p /usr/src/iso8601
 WORKDIR /usr/src/iso8601
 
 COPY . /usr/src/iso8601
-RUN bundle update
+RUN bundle install
 
 CMD ["bundle", "exec", "rspec"]

data/Makefile

@@ -17,4 +17,9 @@ run :
 
 shell :
 	docker run -it --rm -v $$(pwd):/usr/src/iso8601 $(IMAGE) \
-    pry -r ./lib/iso8601
+		pry -r ./lib/iso8601
+
+gem :
+	docker run -t --rm -v $$(pwd):/usr/src/iso8601 $(IMAGE) \
+		bundle exec rake build
+

data/README.md

@@ -19,6 +19,9 @@ times) standard.
 
 Check the [changelog](https://github.com/arnau/ISO8601/blob/master/CHANGELOG.md) if you are upgrading from an older version.
 
+## Documentation
+
+Check the [rubydoc documentation](http://www.rubydoc.info/gems/iso8601).
 
 ## Comments about this implementation
 

data/circle.yml

@@ -0,0 +1,13 @@
+machine:
+  ruby:
+    version: 2.2.0
+
+dependencies:
+  override:
+    - 'rvm-exec 2.1.0 bundle install'
+    - 'rvm-exec 2.2.0 bundle install'
+
+test:
+  override:
+    - 'rvm-exec 2.1.0 bundle exec rspec'
+    - 'rvm-exec 2.2.0 bundle exec rspec'

data/lib/iso8601/date.rb

@@ -47,6 +47,7 @@ module ISO8601
     #
     # @return [ISO8601::Date] New date resulting of the addition
     def +(other)
+      other = other.to_days if other.respond_to?(:to_days)
       ISO8601::Date.new((@date + other).iso8601)
     end
     ##
@@ -56,6 +57,7 @@ module ISO8601
     #
     # @return [ISO8601::Date] New date resulting of the substraction
     def -(other)
+      other = other.to_days if other.respond_to?(:to_days)
       ISO8601::Date.new((@date - other).iso8601)
     end
     ##

data/lib/iso8601/date_time.rb

@@ -30,7 +30,7 @@ module ISO8601
     #
     # @param [Numeric] other The seconds to add
     def +(other)
-      moment = @date_time.to_time.localtime(zone) + other.round(1)
+      moment = @date_time.to_time.localtime(zone) + other.to_f.round(1)
 
       self.class.new(moment.strftime('%Y-%m-%dT%H:%M:%S.%N%:z'))
     end
@@ -39,7 +39,7 @@ module ISO8601
     #
     # @param [Numeric] other The seconds to substract
     def -(other)
-      moment = @date_time.to_time.localtime(zone) - other.round(1)
+      moment = @date_time.to_time.localtime(zone) - other.to_f.round(1)
 
       self.class.new(moment.strftime('%Y-%m-%dT%H:%M:%S.%N%:z'))
     end

data/lib/iso8601/duration.rb

@@ -170,6 +170,21 @@ module ISO8601
       atoms = [years, months, weeks, days, hours, minutes, seconds]
       atoms.map(&:to_seconds).reduce(&:+)
     end
+    ##
+    # @return [Numeric] The duration in days
+    def to_days
+      (to_seconds / 86400)
+    end
+    ##
+    # @return [Integer] The integer part of the duration in seconds
+    def to_i
+      to_seconds.to_i
+    end
+    ##
+    # @return [Float] The duration in seconds coerced to float
+    def to_f
+      to_seconds.to_f
+    end
 
     private
 

data/lib/iso8601/time.rb

@@ -63,7 +63,7 @@ module ISO8601
     #
     # @return [ISO8601::Time] New time resulting of the addition
     def +(other)
-      moment = @time.to_time.localtime(zone) + other.round(1)
+      moment = @time.to_time.localtime(zone) + other.to_f.round(1)
       base = ::Date.parse(moment.strftime('%Y-%m-%d'))
 
       self.class.new(moment.strftime('T%H:%M:%S.%L%:z'), base)
@@ -75,7 +75,7 @@ module ISO8601
     #
     # @return [ISO8601::Time] New time resulting of the substraction
     def -(other)
-      moment = @time.to_time.localtime(zone) - other.round(1)
+      moment = @time.to_time.localtime(zone) - other.to_f.round(1)
       base = ::Date.parse(moment.strftime('%Y-%m-%d'))
 
       self.class.new(moment.strftime('T%H:%M:%S.%L%:z'), base)
@@ -115,22 +115,32 @@ module ISO8601
       fail ISO8601::Errors::UnknownPattern, @original if hour.nil?
 
       @separator = separator
+      require_separator = !minute.nil?
 
       hour = hour.to_i
       minute = minute.to_i
       second = second.nil? ? 0.0 : second.tr(',', '.').to_f
 
-      fail ISO8601::Errors::UnknownPattern, @original unless valid_zone?(zone)
+      atoms = [hour, minute, second, zone].compact
 
-      [hour, minute, second, zone].compact
-    end
 
-    def valid_zone?(zone)
+      fail ISO8601::Errors::UnknownPattern, @original unless valid_zone?(zone, require_separator)
+
+      atoms
+    end
+    ##
+    # @param [String] zone The timezone offset as Z or +-hh[:mm].
+    # @param [Boolean] require_separator Flag to determine if the separator
+    #   consistency check is required as patterns with only hour atom have no
+    #   separator but the timezone can.
+    def valid_zone?(zone, require_separator)
       zone_regexp = /^(Z|[+-]\d{2}(?:(:?)\d{2})?)$/
       _, offset, separator = zone_regexp.match(zone).to_a.compact
 
       wrong_pattern = !zone.nil? && offset.nil?
-      invalid_separators = zone.to_s.match(/^[+-]\d{2}:?\d{2}$/) && (@separator != separator)
+      if (require_separator)
+        invalid_separators = zone.to_s.match(/^[+-]\d{2}:?\d{2}$/) && (@separator != separator)
+      end
 
       !(wrong_pattern || invalid_separators)
     end

data/lib/iso8601/version.rb

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

data/spec/iso8601/date_spec.rb

@@ -54,15 +54,21 @@ describe ISO8601::Date do
   end
 
   describe '#+' do
-    it "should return the result of the addition" do
+    it "should return the result of the addition of a number" do
       expect((ISO8601::Date.new('2012-07-07') + 7).to_s).to eq('2012-07-14')
     end
+    it "should return the result of the addition of a Duration" do
+      expect((ISO8601::Date.new('2012-07-07') + ISO8601::Duration.new('P7D')).to_s).to eq('2012-07-14')
+    end
   end
 
   describe '#-' do
-    it "should return the result of the substraction" do
+    it "should return the result of the subtraction" do
       expect((ISO8601::Date.new('2012-07-07') - 7).to_s).to eq('2012-06-30')
     end
+    it "should return the result of the subtraction" do
+      expect((ISO8601::Date.new('2012-07-07') - ISO8601::Duration.new('P7D')).to_s).to eq('2012-06-30')
+    end
   end
 
   describe '#to_a' do

data/spec/iso8601/date_time_spec.rb

@@ -102,7 +102,7 @@ describe ISO8601::DateTime do
   end
 
   describe '#+' do
-    it "should return the result of the addition" do
+    it "should return the result of the addition of a number" 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.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')
@@ -111,12 +111,19 @@ describe ISO8601::DateTime do
       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
+    it "should return the result of the addition of a Duration" do
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20Z') + ISO8601::Duration.new("PT10S")).to_s).to eq('2012-07-07T20:20:30+00:00')
+      expect((ISO8601::DateTime.new('2015-07-07T20:20:20Z') + ISO8601::Duration.new("P10D")).to_s).to eq('2015-07-17T20:20:20+00:00')
+    end
   end
 
   describe '#-' do
-    it "should return the result of the substraction" do
+    it "should return the result of the subtraction of a number" do
       expect((ISO8601::DateTime.new('2012-07-07T20:20:20Z') - 10).to_s).to eq('2012-07-07T20:20:10+00:00')
     end
+    it "should return the result of the subtraction of a Duration" do
+      expect((ISO8601::DateTime.new('2012-07-07T20:20:20Z') - ISO8601::Duration.new(10)).to_s).to eq('2012-07-07T20:20:10+00:00')
+    end
   end
 
   describe '#to_a' do

data/spec/iso8601/duration_spec.rb

@@ -100,7 +100,7 @@ RSpec.describe ISO8601::Duration do
       expect { ISO8601::Duration.new('PT1H', ISO8601::DateTime.new('2000-01-01')) - ISO8601::Duration.new('PT1H') }.to raise_error(ISO8601::Errors::DurationBaseError)
     end
 
-    it "should return the result of the substraction" do
+    it "should return the result of the subtraction" do
       expect(ISO8601::Duration.new('P1Y1M1DT1H1M1S') - ISO8601::Duration.new('PT10S')).to be_an_instance_of(ISO8601::Duration)
       expect((ISO8601::Duration.new('P1Y1M1DT1H1M11S') - ISO8601::Duration.new('PT10S')).to_s).to eq('P1Y1M1DT1H1M1S')
       expect((ISO8601::Duration.new('P1Y1M1DT1H1M11S') - ISO8601::Duration.new('P1Y1M1DT1H1M11S')).to_s).to eq('PT0S')
@@ -111,6 +111,13 @@ RSpec.describe ISO8601::Duration do
     end
   end
 
+  describe "#to_days" do
+    it "should return the days of a duration" do
+      expect(ISO8601::Duration.new('P1Y', ISO8601::DateTime.new('2010-01-01')).to_days).to eq(365)
+      expect(ISO8601::Duration.new('P1D').to_days).to eq(1)
+    end
+  end
+
   describe '#to_seconds' do
     context 'positive durations' do
       it "should return the seconds of a P[n]Y duration in a common year" do

data/spec/iso8601/time_spec.rb

@@ -17,6 +17,8 @@ describe ISO8601::Time do
 
   it "should parse any allowed pattern" do
     expect { ISO8601::Time.new('T10') }.to_not raise_error
+    expect { ISO8601::Time.new('T10-00:00') }.to_not raise_error
+    expect { ISO8601::Time.new('T10Z') }.to_not raise_error
     expect { ISO8601::Time.new('T10:30') }.to_not raise_error
     expect { ISO8601::Time.new('T10:30Z') }.to_not raise_error
     expect { ISO8601::Time.new('T10:30:12') }.to_not raise_error
@@ -28,6 +30,7 @@ describe ISO8601::Time do
     expect { ISO8601::Time.new('T103012+04') }.to_not raise_error
     expect { ISO8601::Time.new('T10:30:12-00:00') }.to_not raise_error
     expect { ISO8601::Time.new('T16:26:10,5Z') }.to_not raise_error
+    expect { ISO8601::Time.new('T10+00:00') }.to_not raise_error
   end
 
   context 'reduced patterns' do
@@ -56,7 +59,7 @@ describe ISO8601::Time do
   end
 
   describe '#+' do
-    it "should return the result of the addition" do
+    it "should return the result of the addition of a number" do
       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')
@@ -65,14 +68,19 @@ describe ISO8601::Time do
       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
-
+    it "should return the result of the addition of a Duration" do
+      expect((ISO8601::Time.new('T20:20:20Z') + ISO8601::Duration.new("PT10S")).to_s).to eq('T20:20:30+00:00')
+    end
   end
 
   describe '#-' do
-    it "should return the result of the substraction" do
+    it "should return the result of the subtraction of a number" 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.1+02:00')
     end
+    it "should return the result of the subtraction of a Duration" do
+      expect((ISO8601::Time.new('T20:20:20+01:00') - ISO8601::Duration.new("PT10S")).to_s).to eq('T20:20:10+01:00')
+    end
   end
 
   describe '#to_a' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso8601
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Arnau Siches
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,6 +59,7 @@ files:
 - README.md
 - Rakefile
 - Vagrantfile
+- circle.yml
 - iso8601.gemspec
 - lib/iso8601.rb
 - lib/iso8601/atoms.rb
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iso8601
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby parser to work with ISO 8601 dateTimes and durations - http://en.wikipedia.org/wiki/ISO_8601