montrose 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2af0b4abedbea2421c73f457fcdbd66390870f1
-  data.tar.gz: dafba1cbbd0f14757bc95ffe81764a065947e2fa
+  metadata.gz: c6586fb7cc1e8bfb5bf4a60b01dc27687703b613
+  data.tar.gz: 2de01900143bb357b8250d7213b02f18d63f7f6e
 SHA512:
-  metadata.gz: f3c9e25c8f3e30cf8df3037e653f3c515ea25c3bf9d144da520a4e4a5e043a8a51c8b8eefe449d4c83ac0b87ab47d5a0c0e14a58e875846a1d9995a9472501c0
-  data.tar.gz: fb805c48e5e6d9880e6c3c091ea738bf2b6f4e21a59afa78cf3c467ad062cdf12f5802f46078138fbde9e74030f6d3893a83fee5877fc527b1c66da38c609312
+  metadata.gz: 97c05ddc454035a90a397d3aa0b498baedee44288a0e1488c57629e62ff5516542e023deac99ec2ac26b2ac3e612836e8f15d18da08403f77ef848564ea23b37
+  data.tar.gz: e8e8d506f11e6dade4915e3af9c4a518102a1eb5199a499485975020334744ba67a2943db5ccaa094cff05827c2172ec912c42d23dd69bd09107cf16c23e7843

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.6.0 - (2016-01-05)
+
+* enhancements
+  * Alias `every` to `frequency`
+  * Handle JSON and hashes in Recurrence serialization
+  * Handle blank and nil objects in Recurrence deserialization
+
 ### 0.5.0 - (2016-11-23)
 
 * enhancements

data/README.md

@@ -335,7 +335,7 @@ Montrose.every(:month, day: :friday, interval: 2)
 Montrose.r(every: :month, day: :friday, interval: 2)
 
 Montrose.monthly(day: { friday: [1] }) # 1st Friday of the month
-Montrose.monthly(day: { Sunday: [1, -1] }) # first and last Sunday of the month
+Montrose.monthly(day: { sunday: [1, -1] }) # first and last Sunday of the month
 
 Montrose.monthly(mday: 7..13, day: :saturday) # first Saturday that follow the first Sunday of the month
 

data/lib/montrose/options.rb

@@ -79,7 +79,6 @@ module Montrose
     def_option :month
     def_option :interval
     def_option :total
-    def_option :between
     def_option :at
     def_option :on
     def_option :except
@@ -147,6 +146,9 @@ module Montrose
       @every = parsed.fetch(:every)
     end
 
+    alias frequency every
+    alias frequency= every=
+
     def starts=(time)
       @starts = as_time(time) || self.class.default_starts
     end

data/lib/montrose/recurrence.rb

@@ -224,16 +224,27 @@ module Montrose
 
       def dump(obj)
         return nil if obj.nil?
-        unless obj.is_a?(self)
-          fail SerializationError,
-            "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
-        end
+        return dump(load(obj)) if obj.is_a?(String)
+
+        hash = case obj
+               when Hash
+                 obj
+               when self
+                 obj.to_hash
+               else
+                 fail SerializationError,
+                   "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
+               end
 
-        JSON.dump(obj.to_hash)
+        JSON.dump(hash)
       end
 
       def load(json)
+        return nil if json.blank?
+
         new JSON.parse(json)
+      rescue JSON::ParserError => e
+        fail SerializationError, "Could not parse JSON: #{e}"
       end
     end
 

data/lib/montrose/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Montrose
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: montrose
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ross Kaffenberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Recurring events in Ruby