ice_t 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481cf81486c0337d36e8d288362cf9f1bcc014af
-  data.tar.gz: 714bd7d33b6395a021b5c82ef9899d1bf1d38ff7
+  metadata.gz: 7c009725229f52d779eb425bacef4333fcb74025
+  data.tar.gz: 8f8fc915b744889a3bc4aec06bc06832f7f7490f
 SHA512:
-  metadata.gz: b1ac6a8250be365dc49f9f1c56de9c6e0031890e2a985fb7f7aa621958ac8a3eb99f23ad2743f3ab844f9435f412d1a25f4eec8897415cf32e7b2c8a263a4172
-  data.tar.gz: 1678686562bbd8cf649bd3ac6f94c3b36da118336eef50ac8e04297ddfd4c0d34b8f0af919122d6e4ab53e9d25fffc8bb9e47b449ebc0f16c823cd7f6c222015
+  metadata.gz: af9172f70fa10c41705a4fcca1039d3452f49449310818fc35e99378cfeafe0e518658a702c2b0cb0e35a5cbc69e00c8d5c2afd91410eb76d9e981b040c6d59c
+  data.tar.gz: e0c3689e2d634f63ee95e9bd20427722401baffd1fdfbca5713307ae4d754e99f736b3772e4efe99002de6bb63b1fd48b2d9634bdc04b225a7fa63bad55eb01f

data/README.md

@@ -43,7 +43,10 @@ rule = IceT::Rule::Secondly.new      # => every second
 ### Get time occurrences
 
 ```ruby
-rule.occurrences # => Array of times
+rule.occurrences(2.days.ago, Time.now) # => Array of times
+
+IceT::Rule::Daily.new(14).occurrences(1.year.ago, Time.now).first(5)
+
 ```
 
 ### Schedule
@@ -61,29 +64,68 @@ schedule.occurrences        # => Merged occurrences
 
 ### Persistence
 
-Lets say you want to store and restore your Schedule. Do this:
+Store and restore your rule:
 
 ```ruby
-json = schedule.to_json
-schedule = IceT::Schedule.from_json(json)
+
+# JSON
+rule = IceT::Rule::Daily.new(42)
+json = rule.to_json
+restored = IceT::Rule::Base.from_json(json)
+
+# YAML
+rule = IceT::Rule::Daily.new(42)
+yaml = rule.to_yaml
+restored = IceT::Rule::Base.from_yaml(yaml)
+
+# Hash
+rule = IceT::Rule::Daily.new(42)
+hash = rule.to_hash
+restored = IceT::Rule::Base.from_hash(hash)
+
 ```
 
-## Tipps - section is under construction
 
-### Sorting rules:
 
-[r2,r1,r3].sort.collect(&:interval) 
+Store and restore your Schedule:
 
-### Comparing rules:
+```ruby
+json = schedule.to_json
+schedule = IceT::Schedule.from_json(json)
+```
+
+
+### Comparisons and sorting
 	
 ```ruby
 IceT::Rule::Daily.new(1) < IceT::Rule::Monthly.new(1) # => true
 ```
 
 ```ruby
-r2.between?(r1, r3)
+# compare different type of rules
+
+minutely = IceT::Rule::Minutely.new(1)
+hourly   = IceT::Rule::Hourly.new(1)
+daily    = IceT::Rule::Daily.new(1)
+
+hourly.between?(minutely, daily) # => true
+minutely.between?(hourly, daily) # => false
+
+
+# compare same type of rules
+
+r1 = IceT::Rule::Daily.new(1)
+r2 = IceT::Rule::Daily.new(2)
+r3 = IceT::Rule::Daily.new(3)
+
+r2.between?(r1, r2)	# => true
+r1.between?(r2, r3)	# => false
+
+# sort these rules
+
+[r2,r1,r3].sort.collect(&:interval) # => [1, 2, 3]
+
 ```
-IceT::Rule::Daily.new(14).occurrences(1.year.ago, Time.now).first(5)
 
 
 ## License

data/lib/ice_t/conversions.rb

@@ -1,54 +1,94 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Conversions
+    # module Helper
+    #   module_function
+    #   def recursive_instance_values(object)
+    #   end
+    # end
+    
+    module Common
+      module InstanceMethods
+      end
+      module ClassMethods
+        def from_yaml(yaml_string)
+          YAML::load(yaml_string)
+        end
+      end
+    end
+
     module Rule
 
       def self.included(klass)
         klass.extend ClassMethods
       end
-
+      
       def to_hash
         self.instance_values.symbolize_keys
-      end
+      end        
 
       module ClassMethods      
         def from_yaml(yaml_string)
-          rule = YAML::load(yaml_string)
+          YAML::load(yaml_string)
+        end
+        def from_json(json_string)
+          hash = ActiveSupport::JSON.decode(json_string).symbolize_keys
+          self.from_hash(hash)
+        end
+        def from_hash(hash)
+          rule_class = hash[:rule]
+          interval   = hash[:interval].to_i          
+          eval(rule_class + ".new(#{interval})")
         end
       end
     end
 
     module Schedule
-      def from_json(json_string)
-        data = ActiveSupport::JSON.decode(json_string).symbolize_keys
-        
-        options = {
-          start_time: data[:start_time].to_time,
-          end_time: data[:end_time].to_time
-        }
-        schedule = self.new(options)
-
-        data[:rules]["rules"].each{ |rule|
-          rule_class = rule['rule']
-          interval = rule['interval'].to_i
-          at = rule['at']  
-          init = if at.nil?
-                   rule_class + ".new(#{interval})"
-                 else
-                   rule_class + ".new(#{interval}, '#{at}')"
-                 end 
-          obj_rule = eval(init)
-          schedule.add_rule(obj_rule)
-        }
-        
-        schedule
-      end   
-
-
-      def from_yaml(yaml_string)
-        schedule = YAML::load(yaml_string)
-        return schedule if schedule.is_a?(IceT::Schedule)
+      
+      def self.included(klass)
+        klass.extend ClassMethods
       end
 
+      module ClassMethods
+        def from_yaml(yaml_string)
+          YAML::load(yaml_string)
+        end
+
+        def from_json(json_string)
+          return unless json_string
+          data = ActiveSupport::JSON.decode(json_string).symbolize_keys
+          schedule = self.new(start_time: data[:start_time].to_time, end_time: data[:end_time].to_time)
+          data[:rules]["rules"].each{ |rule|
+            schedule.add_rule(
+              IceT::Rule::Base.from_json(rule.to_json)
+            )
+          }        
+          schedule
+        end   
+      end
     end
+
   end
 end

data/lib/ice_t/exceptions.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT  
   class DuplicateRuleException < StandardError; end
 end

data/lib/ice_t/rule.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
   end

data/lib/ice_t/rule/base.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Base
@@ -12,44 +35,34 @@ module IceT
       include IceT::Conversions::Rule
 
       attr_reader :interval
-      attr_reader :at
 
-      def initialize(interval = 1, at_str = nil)
+      def initialize(interval = 1)
         raise ArgumentError.new('Positive integer required') if interval.nil? ||
                                                                 interval.to_i < 1 ||
                                                                 interval % 1 != 0
-        @interval = interval
-        @at = at_str
         @rule = self.class.name
-        self.at = at_str unless @at.nil?
-      end
-
-      # set time information
-      def at=(str)
-        return if str.nil?
-        if Time.parse(str.to_s)
-          @at = str.to_s
-        end
+        @interval = interval
       end
 
       include Comparable
       def <=>(other)
-        case
-        when self.class == other.class &&
-             self.interval == other.interval
-             0
-        when self.class == other.class &&
-             self.interval < other.interval
-             -1 
-        when self.class == other.class &&
-             self.interval > other.interval
-             +1             
-        when self.class.to_i < other.class.to_i
-             -1
-        when self.class.to_i > other.class.to_i
-             +1
+        return unless other.class.respond_to?(:to_i)
+        if self.class == other.class
+          case
+          when self.interval == other.interval
+            0
+          when self.interval < other.interval
+            -1 
+          when self.interval > other.interval
+            +1
+          end
         else
-          nil
+          case 
+          when self.class.to_i < other.class.to_i
+            -1
+          when self.class.to_i > other.class.to_i
+            +1
+          end
         end
       end
 
@@ -60,12 +73,6 @@ module IceT
         }
       end
 
-      # private
-      # def at_adjusted_time(time)
-      #   unless @at.nil?
-      #     t = Time.parse(@at)
-      #   end
-      # end
     end
   end
 end

data/lib/ice_t/rule/daily.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Daily < Base
@@ -5,13 +28,6 @@ module IceT
         def to_i; 1.day.to_i end
         def unit; :days end
       end
-      
-      def to_s
-        word = (@interval.eql?(2))? 'zweiten' : @interval
-        # "jeden #{@interval} tage"
-        "jeden #{word} tag"
-      end
-
     end
   end
 end

data/lib/ice_t/rule/hourly.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Hourly < Base

data/lib/ice_t/rule/minutely.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Minutely < Base

data/lib/ice_t/rule/monthly.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Monthly < Base

data/lib/ice_t/rule/repository.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 require 'forwardable'
 
 module IceT

data/lib/ice_t/rule/secondly.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Secondly < Base

data/lib/ice_t/rule/weekly.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Weekly < Base

data/lib/ice_t/rule/yearly.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module Rule
     class Yearly < Base

data/lib/ice_t/schedule.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 require 'forwardable'
 
 module IceT
@@ -8,7 +31,7 @@ module IceT
     def_delegator :@rules, :remove, :remove_rule
     def_delegator :@rules, :rules, :rules
 
-    extend IceT::Conversions::Schedule
+    include IceT::Conversions::Schedule
 
     attr_reader :start_time
     attr_reader :end_time

data/lib/ice_t/time_helper.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2013 Christian Nennemann
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
 module IceT
   module TimeHelper
     module_function

data/lib/ice_t/version.rb

@@ -1,3 +1,3 @@
 module IceT
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/rules/base_spec.rb

@@ -63,6 +63,10 @@ describe IceT::Rule::Base do
         }        
       end
     }
+
+    subject { IceT::Rule::Daily.new(1) }
+    it { expect{subject < "a"}.to raise_error }
+    it { expect{subject > 1}.to raise_error }
   end
 
 
@@ -78,18 +82,6 @@ describe IceT::Rule::Base do
         it { expect{subject.class.new("a")}.to raise_error }
       end  
     end
-
-    describe 'param: at' do
-      context 'when valid' do
-        it { expect{subject.class.new(1, "4pm")}.not_to raise_error }
-        it { expect{subject.class.new(1, nil)}.not_to raise_error }
-      end
-      context 'when invalid' do
-        it { expect{subject.class.new(1, "")}.to raise_error }
-        it { expect{subject.class.new(1, -1)}.to raise_error }
-        it { expect{subject.class.new(1, "a")}.to raise_error }
-      end
-    end
   end  
 
   context 'respond_to?' do

data/spec/schedule_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe IceT::Schedule do 
+  let!(:klass) { IceT::Schedule }
   let!(:start_time) { Time.now }
   let!(:end_time) { Time.now + 2.months }
   let!(:schedule) { IceT::Schedule.new(start_time: start_time, end_time: end_time) }
@@ -30,11 +31,13 @@ describe IceT::Schedule do
   end
 
   describe '#to_json' do
-    pending
+    it { expect(subject).to respond_to(:to_json) }
+    it { expect(subject.to_json).to be_an(String) }
   end
   
   describe '#to_yaml' do
-    pending
+    it { expect(subject).to respond_to(:to_yaml) }
+    it { expect(subject.to_json).to be_an(String) }
   end
 
   describe '::from_json' do
@@ -42,7 +45,6 @@ describe IceT::Schedule do
       before do
         schedule.add_rule(daily_rule)
         schedule.add_rule(monthly_rule)      
-        schedule.add_rule(IceT::Rule::Daily.new(12, "4pm"))      
       end
       let(:json) { schedule.to_json }
       let(:object) { IceT::Schedule.from_json(json) }
@@ -63,8 +65,20 @@ describe IceT::Schedule do
     end
   end
   
-  describe '::from_yaml' do
-    pending
+  describe '#to_hash' do
+    it "does respond_to :to_hash" do
+      pending "Conversions::Helper.recursive_instance_values"
+      expect(subject).to respond_to(:to_hash)
+    end    
+  end
+
+  describe '::from_yaml' do    
+    it { expect(subject).to respond_to(:to_yaml) }
+    it "does contain same values as before" do
+      pending "serialize Rule::Repository" do
+        expect(IceT::Schedule.from_yaml(schedule.to_yaml) == schedule).to be_true
+      end
+    end
   end
 
 end 

data/spec/support/shared_examples/rule_example.rb

@@ -1,4 +1,5 @@
 shared_examples 'a rule' do  
+  let(:rule){ klass.new(1) }
   
   describe '::to_i' do
     it { expect(klass).to respond_to(:to_i) }
@@ -10,7 +11,6 @@ shared_examples 'a rule' do
   describe '#occurrences' do
     it { expect(klass.new).to respond_to(:occurrences) }
     
-    let(:rule){ klass.new(1) }
     let(:start_time){ Time.now }
     let(:duration){ eval("2.#{klass.unit}") }
     let(:end_time){ start_time + duration }
@@ -24,14 +24,19 @@ shared_examples 'a rule' do
     end
   end
 
+
   describe '::from_json' do
-    pending
-    #it { expect(klass).to respond_to(:from_json) }    
+    it { expect(klass).to respond_to(:from_json) }
+    it { expect(klass.from_json(rule.to_json) == rule).to be_true }    
+  end
+  describe '::from_hash' do
+    it { expect(klass).to respond_to(:from_hash) }    
+    it { expect(klass.from_hash(rule.to_hash) == rule).to be_true }    
   end
 
   describe '::from_yaml' do
-    pending
-    #it { expect(klass).to respond_to(:from_yaml) }    
+    it { expect(klass).to respond_to(:from_yaml) }    
+    it { expect(klass.from_yaml(rule.to_yaml) == rule).to be_true }    
   end
 
   describe '#to_json' do
@@ -46,9 +51,4 @@ shared_examples 'a rule' do
     it { expect(klass.new).to respond_to(:to_hash) }
   end
 
-  describe '#@at' do
-    it {expect(klass.new(1, "4pm").at).to eql("4pm")}
-  end
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ice_t
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Christian Nennemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport