artic 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e18da08890902ac99b52b4ee952434f9d9baef93
-  data.tar.gz: 606c1607c71979d04b61911d218c7a0ecaaae49a
+SHA256:
+  metadata.gz: 9b52794a1039644f03d1cb60c9144ef80b55f035801d7878be046706549fdebd
+  data.tar.gz: b79ac5ce424566b1971c64d485340e1f27638d00781cad84eee8366efbac122e
 SHA512:
-  metadata.gz: 67f52f2416b9970a1d700a8983d3e733d86556d15e703b9abac15c8609e5ad97afe64856df71a3606db0377e297f1e40b3d8e30edb82f1a79600f8ca408d9f42
-  data.tar.gz: c5efdc1b8f7aa7f2e6526034968143f3dcb9880ef401f66d89daef5fab910e69feb602b0c10bea36d964b1993089eb08fe4999bc479b507278f06b0744de21a4
+  metadata.gz: 3a84e8f0f353b98f3f5e4f86af2821e7bacde6327dd04a8ea0f80efcffc68b8bc99ce37b00bbf5ed6a6fecba6a7f06975172b763108abcdeb05370ed15fef830
+  data.tar.gz: 05e5cd7002ffe467261477d145463acccb0952beca0e7754573eb62f72bfc02f882db20b6424bb4a31a68d7bb5d57d9642c7b0ae393d109559e637b534caf04a

data/.rubocop.yml

@@ -13,33 +13,37 @@ AllCops:
    - 'spec/rails_helper.rb'
    - 'spec/support/**/*'
    - 'config/**/*'
-   - 'Rakefile'
-   - 'Gemfile'
+   - '**/Rakefile'
+   - '**/Gemfile'
+
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/requests/**/*'
 
 Style/BlockDelimiters:
   Exclude:
     - 'spec/**/*'
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
   Enabled: false
 
 Metrics/LineLength:
   Max: 100
   AllowURI: true
 
-Style/FirstParameterIndentation:
+Layout/FirstParameterIndentation:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Style/IndentArray:
+Layout/IndentArray:
   EnforcedStyle: consistent
 
-Style/IndentHash:
+Layout/IndentHash:
   EnforcedStyle: consistent
 
 Style/SignalException:
@@ -49,14 +53,53 @@ Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
   AutoCorrect: true
 
 Style/AndOr:
   EnforcedStyle: conditionals
 
+Style/MultilineBlockChain:
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: false
+
 Metrics/MethodLength:
-  Max: 15
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Naming/MethodName:
+  Enabled: false
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+RSpec/MessageSpies:
+  EnforcedStyle: receive
 
-RSpec/MessageExpectation:
+Style/GuardClause:
   Enabled: false

data/.travis.yml

@@ -1,9 +1,5 @@
+sudo: false
+language: ruby
 rvm:
-  - 2.3.0
-before_install:
-  - gem update --system
-  - gem update bundler
-  - gem cleanup bundler
-branches:
-  only:
-    - master
+  - 2.5.0
+before_install: gem install bundler -v 1.16.1

data/CHANGELOG.md

@@ -0,0 +1,50 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project 
+adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.0.5]
+
+### Changed
+
+- Updated and linted codebase
+
+## [1.0.4]
+
+### Fixed
+
+- Fixed `Calendar#free_slots_on` using occupations from other dates
+
+## [1.0.3]
+
+### Fixed
+
+- Fixed glitches in `OccupationCollection#bisect`
+
+## [1.0.2]
+
+### Fixed
+
+- Fixed `OccupationCollection#bisect` when accumulator is empty
+
+## [1.0.1]
+
+### Fixed
+
+- Switched to `Range#begin` and `Range#end` instead of `#min` and `#max`
+
+## [1.0.0]
+
+First stable release.
+
+[Unreleased]: https://github.com/aldesantis/artic/compare/v1.0.5...HEAD
+[1.0.5]: https://github.com/aldesantis/artic/compare/v1.0.4...v1.0.5
+[1.0.4]: https://github.com/aldesantis/artic/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/aldesantis/artic/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/aldesantis/artic/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/aldesantis/artic/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/aldesantis/artic/tree/v1.0.0

data/README.md

@@ -1,9 +1,9 @@
 # A.R.TI.C.
 
-[![Gem Version](https://img.shields.io/gem/v/artic.svg?maxAge=3600&style=flat-square)](https://rubygems.org/gems/artic)
-[![Build Status](https://img.shields.io/travis/alessandro1997/artic.svg?maxAge=3600&style=flat-square)](https://travis-ci.org/alessandro1997/artic)
-[![Dependency Status](https://img.shields.io/gemnasium/alessandro1997/artic.svg?maxAge=3600&style=flat-square)](https://gemnasium.com/github.com/alessandro1997/artic)
-[![Code Climate](https://img.shields.io/codeclimate/github/alessandro1997/artic.svg?maxAge=3600&style=flat-square)](https://codeclimate.com/github/alessandro1997/artic)
+[![Build Status](https://travis-ci.org/aldesantis/artic.svg?branch=master)](https://travis-ci.org/aldesantis/artic)
+[![Dependency Status](https://gemnasium.com/badges/github.com/aldesantis/artic.svg)](https://gemnasium.com/github.com/aldesantis/artic)
+[![Maintainability](https://api.codeclimate.com/v1/badges/bfcbbf050bd58ab46798/maintainability)](https://codeclimate.com/github/aldesantis/artic/maintainability)
+[![Coverage Status](https://coveralls.io/repos/github/aldesantis/artic/badge.svg?branch=master)](https://coveralls.io/github/aldesantis/artic?branch=master)
 
 **A** **R**uby gem for **TI**me **C**omputations.
 
@@ -134,7 +134,7 @@ will create a git tag for the version, push git commits and tags, and push the `
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/alessandro1997/artic.
+Bug reports and pull requests are welcome on GitHub at https://github.com/aldesantis/artic.
 
 ## License
 

data/artic.gemspec

@@ -1,33 +1,35 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'artic/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "artic"
+  spec.name          = 'artic'
   spec.version       = Artic::VERSION
-  spec.authors       = ["Alessandro Desantis"]
-  spec.email         = ["desa.alessandro@gmail.com"]
+  spec.authors       = ['Alessandro Desantis']
+  spec.email         = ['desa.alessandro@gmail.com']
 
-  spec.summary       = %q{A Ruby gem for time computations.}
-  spec.homepage      = "https://github.com/alessandro1997/artic"
-  spec.license       = "MIT"
+  spec.summary       = 'A Ruby gem for time computations.'
+  spec.homepage      = 'https://github.com/alessandro1997/artic'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency 'tzinfo', '~> 1.2.2'
-  spec.add_dependency 'tzinfo-data', '~> 1.2016.7'
+  spec.add_dependency 'tzinfo', '~> 1.2'
+  spec.add_dependency 'tzinfo-data', '~> 1.2017'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'fuubar'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'fuubar', '~> 2.3'
+  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.22'
 end

data/lib/artic.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'tzinfo'
 
 require 'artic/version'

data/lib/artic/availability.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 module Artic
   # Availability represents a slot of time in a givn day of the week or date when you're available.
   #
   # @author Alessandro Desantis
   class Availability
-    DAYS_OF_WEEK = %i(monday tuesday wednesday thursday friday saturday sunday).freeze
+    DAYS_OF_WEEK = %i[monday tuesday wednesday thursday friday saturday sunday].freeze
 
     # @!attribute [r] day_of_week
     #   @todo Rename to +wday+
@@ -80,6 +81,7 @@ module Artic
       return -1 if date.nil? && !other.date.nil?
       return 1 if !date.nil? && other.date.nil?
 
+      # rubocop:disable Style/IfInsideElse
       if date.nil? && other.date.nil? # both availabilities are for a weekday
         if day_of_week == other.day_of_week # availabilities are for the same weekday
           time_range.min <=> other.time_range.min # compare times
@@ -96,15 +98,15 @@ module Artic
           date <=> other.date # compare dates
         end
       end
+      # rubocop:enable Style/IfInsideElse
     end
 
     private
 
     def validate_day_of_week
-      fail(
-        ArgumentError,
-        "#{day_of_week} is not a valid day of the week"
-      ) unless DAYS_OF_WEEK.include?(day_of_week)
+      unless DAYS_OF_WEEK.include?(day_of_week)
+        fail ArgumentError, "#{day_of_week} is not a valid day of the week"
+      end
     end
   end
 end

data/lib/artic/calendar.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Artic
   # A calendar keeps track of both your availabilities and your occupations.
   #
@@ -34,9 +35,11 @@ module Artic
     #
     # @see Collection::AvailabilityCollection#normalize
     def available_slots_on(dow_or_date)
+      # rubocop:disable Metrics/LineLength
       if !availabilities.identifier?(dow_or_date) && dow_or_date.is_a?(Date) && availabilities.identifier?(dow_or_date.strftime('%A').downcase)
         return available_slots_on(dow_or_date.strftime('%A').downcase)
       end
+      # rubocop:enable Metrics/LineLength
 
       availabilities.normalize dow_or_date
     end

data/lib/artic/collection/availability_collection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Artic
   module Collection
     # Keeps a collection of availabilities and performs calculations on them.
@@ -46,9 +47,11 @@ module Artic
 
           last_availability = accumulator.pop
 
-          next (
-            accumulator + [last_availability, availability]
-          ) unless last_availability.time_range.overlaps?(availability.time_range)
+          unless last_availability.time_range.overlaps?(availability.time_range)
+            next (
+              accumulator + [last_availability, availability]
+            )
+          end
 
           new_time_range = Range.new(
             [last_availability.time_range.min, availability.time_range.min].min,

data/lib/artic/collection/occupation_collection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Artic
   module Collection
     # Keeps a collection of occupations.
@@ -45,9 +46,11 @@ module Artic
 
           last_occupation = accumulator.pop
 
-          next (
-            accumulator + [last_occupation, occupation]
-          ) unless last_occupation.time_range.overlaps?(occupation.time_range)
+          unless last_occupation.time_range.overlaps?(occupation.time_range)
+            next (
+              accumulator + [last_occupation, occupation]
+            )
+          end
 
           new_time_range = Range.new(
             [last_occupation.time_range.min, occupation.time_range.min].min,

data/lib/artic/occupation.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Artic
   # An occupation represents a slot of time in a given date where you are not available.
   #
@@ -15,7 +16,7 @@ module Artic
       @time_range = TimeRange.build(time_range)
     end
 
-    # Converts the occupation to a range of +DateTime+ objects.
+    # Converts the occupation to a range of +Time+ objects.
     #
     # @return [Range]
     #

data/lib/artic/time_range.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Artic
   # Represents a range of two times in the same day (e.g. 09:00-17:00).
   #
@@ -49,15 +50,15 @@ module Artic
       self.begin <= other.begin && self.end >= other.end
     end
 
-    # Returns a range of +DateTime+ objects for this time range.
+    # Returns a range of +Time+ objects for this time range.
     #
     # @param date [Date] the date to use for the range
     #
     # @return [Range]
     def with_date(date)
       Range.new(
-        DateTime.parse("#{date} #{self.begin}"),
-        DateTime.parse("#{date} #{self.end}")
+        Time.parse("#{date} #{self.begin}"),
+        Time.parse("#{date} #{self.end}")
       )
     end
 
@@ -113,20 +114,26 @@ module Artic
     private
 
     def validate_range
-      fail(
-        ArgumentError,
-        "#{self.begin} is not a valid time"
-      ) unless self.begin =~ TIME_REGEX
+      unless self.begin =~ TIME_REGEX
+        fail(
+          ArgumentError,
+          "#{self.begin} is not a valid time"
+        )
+      end
 
-      fail(
-        ArgumentError,
-        "#{self.end} is not a valid time"
-      ) unless self.end =~ TIME_REGEX
+      unless self.end =~ TIME_REGEX
+        fail(
+          ArgumentError,
+          "#{self.end} is not a valid time"
+        )
+      end
 
-      fail(
-        ArgumentError,
-        "#{self.begin} is greater than #{self.end}"
-      ) if self.begin > self.end
+      if self.begin > self.end
+        fail(
+          ArgumentError,
+          "#{self.begin} is greater than #{self.end}"
+        )
+      end
     end
   end
 end

data/lib/artic/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Artic
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artic
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -16,126 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2016.7
+        version: '1.2017'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2016.7
+        version: '1.2017'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.52'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.22'
 description: 
 email:
 - desa.alessandro@gmail.com
@@ -147,6 +161,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -182,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for time computations.