iso8601 0.8.7 → 0.9.0

data/spec/iso8601/time_spec.rb

@@ -68,9 +68,6 @@ 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
@@ -78,9 +75,6 @@ describe ISO8601::Time 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

data/spec/iso8601/weeks_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+RSpec.describe ISO8601::Weeks do
+  describe 'Atomic' do
+    let(:subject) { ISO8601::Weeks.new(1) }
+
+    it "should respond to the Atomic interface" do
+      [:factor,
+       :to_seconds,
+       :symbol,
+       :to_i,
+       :to_f,
+       :to_s,
+       :value,
+       :<=>,
+       :eql?,
+       :hash,
+       :valid_atom?].each { |m| expect(subject).to respond_to(m) }
+    end
+  end
+
+  describe '#factor' do
+    it "should return the Week factor" do
+      expect(ISO8601::Weeks.new(2).factor).to eq(604800)
+    end
+  end
+
+  describe '#to_seconds' do
+    it "should return the amount of seconds" do
+      expect(ISO8601::Weeks.new(2).to_seconds).to eq(1209600)
+      expect(ISO8601::Weeks.new(-2).to_seconds).to eq(-1209600)
+    end
+  end
+
+  describe '#symbol' do
+    it "should return the ISO symbol" do
+      expect(ISO8601::Weeks.new(1).symbol).to eq(:W)
+    end
+  end
+
+  describe '#hash' do
+    it "should build hash identity by value" do
+      expect(ISO8601::Weeks.new(3).hash).to eq(ISO8601::Weeks.new(3).hash)
+    end
+  end
+end

data/spec/iso8601/years_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+RSpec.describe ISO8601::Years do
+  let(:common_year) { ISO8601::DateTime.new('2010-01-01') }
+  let(:leap_year) { ISO8601::DateTime.new('2000-01-01') }
+
+  describe 'Atomic' do
+    let(:subject) { ISO8601::Years.new(1) }
+
+    it "should respond to the Atomic interface" do
+      [:factor,
+       :to_seconds,
+       :symbol,
+       :to_i,
+       :to_f,
+       :to_s,
+       :value,
+       :<=>,
+       :eql?,
+       :hash,
+       :valid_atom?].each { |m| expect(subject).to respond_to(m) }
+    end
+  end
+
+  describe '#factor' do
+    it "should return the Year factor" do
+      expect { ISO8601::Years.new(1).factor }.to_not raise_error
+      expect(ISO8601::Years.new(2).factor).to eq(31536000)
+      expect(ISO8601::Years.new(1).factor).to eq(31536000)
+    end
+
+    it "should return the Year factor for a common year" do
+      expect(ISO8601::Years.new(1).factor(common_year)).to eq(31536000)
+    end
+
+    it "should return the Year factor for a leap year" do
+      expect(ISO8601::Years.new(1).factor(leap_year)).to eq(31622400)
+    end
+  end
+
+  describe '#to_seconds' do
+    it "should return the amount of seconds" do
+      expect(ISO8601::Years.new(2).to_seconds).to eq(63072000)
+      expect(ISO8601::Years.new(-2).to_seconds).to eq(-63072000)
+    end
+
+    it "should return the amount of seconds for a common year" do
+      expect(ISO8601::Years.new(2).to_seconds(common_year)).to eq(63072000)
+      expect(ISO8601::Years.new(12).to_seconds(common_year)).to eq(378691200)
+    end
+
+    it "should return the amount of seconds for a leap year" do
+      expect(ISO8601::Years.new(2).to_seconds(leap_year)).to eq(63158400)
+      expect(ISO8601::Years.new(15).to_seconds(leap_year)).to eq(473385600)
+    end
+  end
+
+  describe '#symbol' do
+    it "should return the ISO symbol" do
+      expect(ISO8601::Years.new(1).symbol).to eq(:Y)
+    end
+  end
+
+  describe '#hash' do
+    it "should build hash identity by value" do
+      expect(ISO8601::Years.new(3).hash).to eq(ISO8601::Years.new(3).hash)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso8601
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Arnau Siches
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.35'
 description: |2
       ISO8601 is a simple implementation in Ruby of the ISO 8601 (Data elements and
       interchange formats - Information interchange - Representation of dates
@@ -47,33 +47,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dockerignore"
-- ".editorconfig"
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Dockerfile
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
-- Makefile
 - README.md
 - Rakefile
-- circle.yml
+- docs/date-time.md
+- docs/duration.md
+- docs/time-interval.md
 - iso8601.gemspec
 - lib/iso8601.rb
-- lib/iso8601/atoms.rb
+- lib/iso8601/atomic.rb
 - lib/iso8601/date.rb
 - lib/iso8601/date_time.rb
+- lib/iso8601/days.rb
 - lib/iso8601/duration.rb
 - lib/iso8601/errors.rb
+- lib/iso8601/hours.rb
+- lib/iso8601/minutes.rb
+- lib/iso8601/months.rb
+- lib/iso8601/seconds.rb
 - lib/iso8601/time.rb
+- lib/iso8601/time_interval.rb
 - lib/iso8601/version.rb
-- spec/iso8601/atoms_spec.rb
+- lib/iso8601/weeks.rb
+- lib/iso8601/years.rb
 - spec/iso8601/date_spec.rb
 - spec/iso8601/date_time_spec.rb
+- spec/iso8601/days_spec.rb
 - spec/iso8601/duration_spec.rb
+- spec/iso8601/hours_spec.rb
+- spec/iso8601/minutes_spec.rb
+- spec/iso8601/months_spec.rb
+- spec/iso8601/seconds_spec.rb
+- spec/iso8601/time_interval_spec.rb
 - spec/iso8601/time_spec.rb
+- spec/iso8601/weeks_spec.rb
+- spec/iso8601/years_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/arnau/ISO8601
 licenses:
@@ -87,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -95,15 +106,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iso8601
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ruby parser to work with ISO 8601 dateTimes and durations - http://en.wikipedia.org/wiki/ISO_8601
 test_files:
-- spec/iso8601/atoms_spec.rb
 - spec/iso8601/date_spec.rb
 - spec/iso8601/date_time_spec.rb
+- spec/iso8601/days_spec.rb
 - spec/iso8601/duration_spec.rb
+- spec/iso8601/hours_spec.rb
+- spec/iso8601/minutes_spec.rb
+- spec/iso8601/months_spec.rb
+- spec/iso8601/seconds_spec.rb
+- spec/iso8601/time_interval_spec.rb
 - spec/iso8601/time_spec.rb
+- spec/iso8601/weeks_spec.rb
+- spec/iso8601/years_spec.rb
 - spec/spec_helper.rb
 has_rdoc: yard

data/.dockerignore

@@ -1,7 +0,0 @@
-.git
-.editorconfig
-.rubocop.yml
-.travis.yml
-.vagrant
-.yardoc
-pkg

data/.editorconfig

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

data/.gitignore

@@ -1,19 +0,0 @@
-# system crap
-.DS_Store
-.*.swp
-
-# development side effects
-.vagrant
-sandbox
-
-# files created by running the specs
-tmp
-
-# built gems
-pkg
-*.gem
-Gemfile.lock
-
-# documentation
-.yardoc
-doc

data/.rubocop.yml

@@ -1,38 +0,0 @@
-Documentation:
-  Enabled: false
-
-Lint/UselessComparison:
-  Enabled: false
-
-Metrics/ClassLength:
-  Max: 150
-
-# Work in progress
-Metrics/LineLength:
-  Max: 183
-
-# Work in progress
-Metrics/MethodLength:
-  Max: 24
-
-# Work in progress
-Metrics/PerceivedComplexity:
-  Max: 8
-
-Style/Blocks:
-  Enabled: false
-
-Style/NumericLiterals:
-  MinDigits: 10
-
-Style/RegexpLiteral:
-  MaxSlashes: 0
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/Encoding:
-  EnforcedStyle: when_needed
-
-Style/BracesAroundHashParameters:
-  EnforcedStyle: braces

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - 2.2.0
-  - ruby-head
-  - rbx-2
-  - jruby-head
-script: bundle exec rspec spec
-matrix:
-  include:
-    - rvm: jruby
-      env: JRUBY_OPTS='--2.0'
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: rbx-2
-  fast_finish: true

data/Dockerfile

@@ -1,10 +0,0 @@
-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 install
-
-CMD ["bundle", "exec", "rspec"]

data/Makefile

@@ -1,19 +0,0 @@
-TAG ?= latest
-IMAGE_NAME ?= arnau/iso8601
-IMAGE = $(IMAGE_NAME):$(TAG)
-
-install: build
-
-build:
-	docker build -t $(IMAGE) .
-
-test:
-	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
-
-gem:
-	docker run -t --rm -v $$(pwd):/usr/src/iso8601 $(IMAGE) \
-		bundle exec rake build

data/circle.yml

@@ -1,13 +0,0 @@
-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/atoms.rb

@@ -1,279 +0,0 @@
-# encoding: utf-8
-
-module ISO8601
-  ##
-  # A generic atom in a {ISO8601::Duration}
-  #
-  # @abstract
-  class Atom
-    include Comparable
-    ##
-    # @param [Numeric] atom The atom value
-    # @param [ISO8601::DateTime, nil] base (nil) The base datetime to compute
-    #   the atom factor.
-    def initialize(atom, base = nil)
-      fail TypeError, "The atom argument for #{inspect} should be a Numeric value." unless atom.is_a?(Numeric)
-      fail TypeError, "The base argument for #{inspect} should be a ISO8601::DateTime instance or nil." unless base.is_a?(ISO8601::DateTime) || base.nil?
-      @atom = atom
-      @base = base
-    end
-    attr_reader :atom
-    attr_reader :base
-    ##
-    # The integer representation
-    #
-    # @return [Integer]
-    def to_i
-      atom.to_i
-    end
-    ##
-    # The float representation
-    #
-    # @return [Float]
-    def to_f
-      atom.to_f
-    end
-    ##
-    # Returns the ISO 8601 representation for the atom
-    #
-    # @return [String]
-    def to_s
-      (value.zero?) ? '' : "#{value}#{symbol}"
-    end
-    ##
-    # The simplest numeric representation. If modulo equals 0 returns an
-    # integer else a float.
-    #
-    # @return [Numeric]
-    def value
-      (atom % 1).zero? ? atom.to_i : atom
-    end
-    ##
-    # The amount of seconds
-    #
-    # @return [Numeric]
-    def to_seconds
-      atom * factor
-    end
-    ##
-    # @param [Atom] other The contrast to compare against
-    #
-    # @return [-1, 0, 1]
-    def <=>(other)
-      return nil unless other.kind_of?(self.class)
-
-      to_f <=> other.to_f
-    end
-    ##
-    # @param [#hash] other The contrast to compare against
-    #
-    # @return [Boolean]
-    def eql?(other)
-      (hash == other.hash)
-    end
-    ##
-    # @return [Fixnum]
-    def hash
-      [atom, self.class].hash
-    end
-    ##
-    # The atom factor to compute the amount of seconds for the atom
-    def factor
-      fail NotImplementedError,
-           "The #factor method should be implemented by each subclass"
-    end
-  end
-  ##
-  # A Years atom in a {ISO8601::Duration}
-  #
-  # A "calendar year" is the cyclic time interval in a calendar which is
-  # required for one revolution of the Earth around the Sun and approximated to
-  # an integral number of "calendar days".
-  #
-  # A "duration year" is the duration of 365 or 366 "calendar days" depending
-  # on the start and/or the end of the corresponding time interval within the
-  # specific "calendar year".
-  class Years < ISO8601::Atom
-    ##
-    # The Year factor
-    #
-    # The "duration year" average is calculated through time intervals of 400
-    # "duration years". Each cycle of 400 "duration years" has 303 "common
-    # years" of 365 "calendar days" and 97 "leap years" of 366 "calendar days".
-    #
-    # @return [Integer]
-    def factor
-      if base.nil?
-        ((365 * 303 + 366 * 97) / 400) * 86400
-      elsif atom.zero?
-        year = (base.year).to_i
-        (::Time.utc(year) - ::Time.utc(base.year))
-      else
-        year = (base.year + atom).to_i
-        (::Time.utc(year) - ::Time.utc(base.year)) / atom
-      end
-    end
-    ##
-    # The atom symbol.
-    #
-    # @return [Symbol]
-    def symbol
-      :Y
-    end
-  end
-  ##
-  # A Months atom in a {ISO8601::Duration}
-  #
-  # A "calendar month" is the time interval resulting from the division of a
-  # "calendar year" in 12 time intervals.
-  #
-  # A "duration month" is the duration of 28, 29, 30 or 31 "calendar days"
-  # depending on the start and/or the end of the corresponding time interval
-  # within the specific "calendar month".
-  class Months < ISO8601::Atom
-    ##
-    # The Month factor
-    #
-    # The "duration month" average is calculated through time intervals of 400
-    # "duration years". Each cycle of 400 "duration years" has 303 "common
-    # years" of 365 "calendar days" and 97 "leap years" of 366 "calendar days".
-    def factor
-      if base.nil?
-        nobase_calculation
-      elsif atom.zero?
-        zero_calculation
-      else
-        calculation
-      end
-    end
-    ##
-    # The atom symbol.
-    #
-    # @return [Symbol]
-    def symbol
-      :M
-    end
-
-    private
-
-    def nobase_calculation
-      (((365 * 303 + 366 * 97) / 400) * 86400) / 12
-    end
-
-    def zero_calculation
-      month = (base.month <= 12) ? base.month : (base.month % 12)
-      year = base.year + ((base.month) / 12).to_i
-
-      (::Time.utc(year, month) - ::Time.utc(base.year, base.month))
-    end
-
-    def calculation
-      initial = base.month + atom
-      if initial <= 0
-        month = base.month + atom
-
-        if initial % 12 == 0
-          year = base.year + (initial / 12) - 1
-          month = 12
-        else
-          year = base.year + (initial / 12).floor
-          month = (12 + initial > 0) ? (12 + initial) : (12 + (initial % -12))
-        end
-      else
-        month = (initial <= 12) ? initial : (initial % 12)
-        month = 12 if month.zero?
-        year = base.year + ((base.month + atom) / 12).to_i
-      end
-
-      (::Time.utc(year, month) - ::Time.utc(base.year, base.month)) / atom
-    end
-  end
-  ##
-  # A Weeks atom in a {ISO8601::Duration}
-  class Weeks < ISO8601::Atom
-    ##
-    # The Week factor
-    def factor
-      604800
-    end
-    ##
-    # The atom symbol.
-    #
-    # @return [Symbol]
-    def symbol
-      :W
-    end
-  end
-  ##
-  # The Days atom in a {ISO8601::Duration}
-  #
-  # A "calendar day" is the time interval which starts at a certain time of day
-  # at a certain "calendar day" and ends at the same time of day at the next
-  # "calendar day".
-  class Days < ISO8601::Atom
-    ##
-    # The Day factor
-    def factor
-      86400
-    end
-    ##
-    # The atom symbol.
-    #
-    # @return [Symbol]
-    def symbol
-      :D
-    end
-  end
-  ##
-  # The Hours atom in a {ISO8601::Duration}
-  class Hours < ISO8601::Atom
-    ##
-    # The Hour factor
-    def factor
-      3600
-    end
-    ##
-    # The atom symbol.
-    #
-    # @return [Symbol]
-    def symbol
-      :H
-    end
-  end
-  ##
-  # The Minutes atom in a {ISO8601::Duration}
-  class Minutes < ISO8601::Atom
-    ##
-    # The Minute factor
-    def factor
-      60
-    end
-    ##
-    # The atom symbol.
-    #
-    # @return [Symbol]
-    def symbol
-      :M
-    end
-  end
-  ##
-  # The Seconds atom in a {ISO8601::Duration}
-  #
-  # The second is the base unit of measurement of time in the International
-  # System of Units (SI) as defined by the International Committee of Weights
-  # and Measures.
-  class Seconds < ISO8601::Atom
-    ##
-    # The Second factor
-    def factor
-      1
-    end
-    ##
-    # The atom symbol.
-    #
-    # @return [Symbol]
-    def symbol
-      :S
-    end
-  end
-end