repeatable 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49614dbb77808403fec7ce7b17f8e6b4c5c6ee99
-  data.tar.gz: 19759e4931d334759c54f6a80c9856fe92bc01e3
+  metadata.gz: 7810dbdca8bf11e8e30101cc1bd22afbcaf698a0
+  data.tar.gz: e1408eb13dbf184b1115d90ae814db6582b0a640
 SHA512:
-  metadata.gz: 89a121c2ecf46fbb6cd89bf150a00dff53452fa2cbfddaf4bff89255455f7bab86aa09d50ea0e5a4d60de7306f70096657dfb2f63a59b2092aa2fe5bb9bb149c
-  data.tar.gz: f0c55a63c03e9055b40cc90183ad176eb75027411a71de000a4f95c0f57a6dd85b9ee98a4c581539475c9712fb08f4e59c13f765b3711abb9b2c5719ecf65416
+  metadata.gz: ebd63d839565ebe7971e5566462dad20d851a9a110eee829d1f53ec8868559fa6b46f14c8528e067827daa95da6e9929a479ca852d69e54884b4a6c071a3b139
+  data.tar.gz: b623c8e4040e6a8276f86c7b71078019fb830dd2ff88b0d5e784618580350cd5b8c51e45ce3846126765a97a1c448ea3e9d9d1f2261ded030cb7ad7ee195dcab

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.2.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+sudo: false
 addons:
   code_climate:
     repo_token:

data/CHANGELOG.md

@@ -2,7 +2,15 @@
 
 ### Unreleased
 
-[Commits](https://github.com/molawson/repeatable/compare/v0.4.0...master)
+[Commits](https://github.com/molawson/repeatable/compare/v0.5.0...master)
+
+### 0.5.0 (2016-01-27)
+
+Features:
+
+* Add `Expression::Biweekly` for "every other week" recurrence
+
+[Commits](https://github.com/molawson/repeatable/compare/v0.4.0...v0.5.0)
 
 ### 0.4.0 (2015-06-29)
 

data/README.md

@@ -84,6 +84,10 @@ Repeatable::Expression::Weekday.new(weekday: 0)
 { weekday_in_month: { weekday: 1, count: 3 } }
 Repeatable::Expression::WeekdayInMonth.new(weekday: 1, count: 3)
 
+# Every other Monday, starting from December 1, 2015
+{ biweekly: { weekday: 1, start_date: '2015-12-01' } }
+Repeatable::Expression::Biweekly.new(weekday: 1, start_date: Date.new(2015, 12, 1))
+
 # The 13th of every month
 { day_in_month: { day: 13 } }
 Repeatable::Expression::DayInMonth.new(day: 13)

data/lib/repeatable/expression/biweekly.rb

@@ -0,0 +1,28 @@
+module Repeatable
+  module Expression
+    class Biweekly < Date
+      def initialize(weekday:, start_after: ::Date.today)
+        @weekday = weekday
+        @start_after = Date(start_after)
+      end
+
+      def include?(date)
+        date >= start_after && (date - first_occurrence) % 14 == 0
+      end
+
+      private
+
+      attr_reader :weekday, :start_after
+
+      def first_occurrence
+        @first_occurrence ||= find_first_occurrence
+      end
+
+      def find_first_occurrence
+        days_away = weekday - start_after.wday
+        days_away += 7 if days_away <= 0
+        start_after + days_away
+      end
+    end
+  end
+end

data/lib/repeatable/expression/date.rb

@@ -19,7 +19,19 @@ module Repeatable
       protected
 
       def attributes
-        Hash[instance_variables.map { |name| [name[1..-1].to_sym, instance_variable_get(name)] }]
+        instance_variables.each_with_object({}) do |name, hash|
+          key = name.to_s.gsub(/^@/, '').to_sym
+          hash[key] = normalize_attribute_value(instance_variable_get(name))
+        end
+      end
+
+      def normalize_attribute_value(value)
+        case value
+        when ::Date
+          value.to_s
+        else
+          value
+        end
       end
     end
   end

data/lib/repeatable/version.rb

@@ -1,3 +1,3 @@
 module Repeatable
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/repeatable.rb

@@ -15,6 +15,7 @@ require 'repeatable/expression/base'
 
 require 'repeatable/expression/date'
 require 'repeatable/expression/weekday'
+require 'repeatable/expression/biweekly'
 require 'repeatable/expression/weekday_in_month'
 require 'repeatable/expression/day_in_month'
 require 'repeatable/expression/range_in_year'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repeatable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mo Lawson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - lib/repeatable/conversions.rb
 - lib/repeatable/expression.rb
 - lib/repeatable/expression/base.rb
+- lib/repeatable/expression/biweekly.rb
 - lib/repeatable/expression/date.rb
 - lib/repeatable/expression/day_in_month.rb
 - lib/repeatable/expression/intersection.rb