clavius 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cddd4a79f948d7a8b39e5fe26e9e06b22c985730
-  data.tar.gz: 62686392677a4ab4063e86e23ac0f52045ed127a
+  metadata.gz: 9b16768a27ed6cdd9dcb9e63511f2e8fa8d3c76a
+  data.tar.gz: 269f56a5011606d2f3430b5260d5933ce49df454
 SHA512:
-  metadata.gz: a72d84b8e47b0b883e7f361e02e462a3304cabdfb82d8053c9b81277b8464b744abed04e22beec215df1d45c5467ea3c22e57e04ca6aa2123408056b146736ec
-  data.tar.gz: 07d526280f512b32388a84f3b368f4bf5d6f0160e6364ff872f16456dbde30e39164f253d0c20ccd66565deefdf4aa1df76ee45502a77088b271a913d43e72f5
+  metadata.gz: bf5622090868d74651191a6ade3d1f1ef2c3ebb3ba5c133db75d0ac6243b021e796651412b3936aeda200a0772e0a2b2438452ba6f3e31f46bffd42013142bf2
+  data.tar.gz: 000e1fa061968681cf7ed7282b0c988baec5fafdd152b909afaf12340cf746e50f43dc98b95474bd23bac6941140c7e51cfde20b676dbe654a36aeae7db28116

data/README.md

@@ -46,6 +46,6 @@ for commit messages.
 
 ## Copyright
 
-Copyright (c) 2015-2016 Craig Little. See [LICENSE][license] for details.
+Copyright (c) 2015-2017 Craig Little. See [LICENSE][license] for details.
 
 [license]: https://github.com/craiglittle/clavius/blob/master/LICENSE

data/lib/clavius/calculation/days_from.rb

@@ -2,23 +2,47 @@ module Clavius
   module Calculation
     class DaysFrom
 
-      def initialize(schedule, number_of_days)
-        @schedule       = schedule
-        @number_of_days = Integer(number_of_days)
+      def initialize(schedule, number)
+        @schedule = schedule
+        @number   = Integer(number)
+
+        fail ArgumentError, 'negative number' if @number < 0
       end
 
-      def before(date)
-        schedule.before(date).take(number_of_days).to_a.last
+      def before(origin)
+        calculated_day(:before, origin)
       end
 
-      def after(date)
-        schedule.after(date).take(number_of_days).to_a.last
+      def after(origin)
+        calculated_day(:after, origin)
       end
 
       protected
 
       attr_reader :schedule,
-                  :number_of_days
+                  :number
+
+      private
+
+      def calculated_day(direction, origin)
+        return zeroeth_day(direction, origin) if number.zero?
+
+        schedule.public_send(direction, origin).take(number).to_a.last
+      end
+
+      def zeroeth_day(direction, origin)
+        self
+          .class
+          .new(schedule, 1)
+          .public_send(direction, zeroeth_origin(direction, origin))
+      end
+
+      def zeroeth_origin(direction, origin)
+        case direction
+        when :before then origin.next_day
+        when :after  then origin.prev_day
+        end
+      end
 
     end
   end

data/lib/clavius/configuration.rb

@@ -9,39 +9,35 @@ module Clavius
       @weekdays ||= begin
         raw
           .weekdays
-          .select(&Time::WEEKDAYS.method(:include?))
-          .map(&Time::WEEKDAYS.method(:index))
+          .select { |weekday| Time::WEEKDAYS.include?(weekday) }
+          .map    { |weekday| Time::WEEKDAYS.index(weekday) }
           .to_set
           .freeze
       end
     end
 
     def included
-      @included ||= begin
-        raw
-          .included
-          .select { |date| date.respond_to?(:to_date) }
-          .map(&:to_date)
-          .to_set
-          .freeze
-      end
+      @included ||= exception_configuration(raw.included)
     end
 
     def excluded
-      @excluded ||= begin
-        raw
-          .excluded
-          .select { |date| date.respond_to?(:to_date) }
-          .map(&:to_date)
-          .to_set
-          .freeze
-      end
+      @excluded ||= exception_configuration(raw.excluded)
     end
 
     protected
 
     attr_reader :raw
 
+    private
+
+    def exception_configuration(dates)
+      dates
+        .select { |date| date.respond_to?(:to_date) }
+        .map(&:to_date)
+        .to_set
+        .freeze
+    end
+
     Raw = Struct.new(:weekdays, :included, :excluded) do
       module Default
         WEEKDAYS = Set.new(%i[mon tue wed thu fri]).freeze

data/lib/clavius/version.rb

@@ -1,3 +1,3 @@
 module Clavius
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: clavius
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Craig Little
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+date: 2017-08-30 00:00:00.000000000 Z
+dependencies: []
 description: Date calculations based on a schedule.
 email:
 - craiglttl@gmail.com
@@ -65,7 +37,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -73,9 +45,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Date calculations
 test_files: []
-has_rdoc: