ice_t 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13f0fe91bed8959c30d2dc2d7efa25ce008d786
-  data.tar.gz: e01f4d86a9a77f8c69490419a22333dcd434f81d
+  metadata.gz: d8e5c60f76bdb1ad7b2049048d09dee5340877f0
+  data.tar.gz: 4be987e668b83e626613a8c0645847df609da866
 SHA512:
-  metadata.gz: 2a9d5ca8528f1b860948f4e324d59334de0636c7e5ac4aed893113926939f747630673d01a96355e54073ea9c97771278ec5ac0272a9fca3631571878d2f7254
-  data.tar.gz: 8bd0331ae1c83baee2ecbab4deec042132eda737b4de778d03aa6f66c004634f0d328552a0ba890c00effb7f726cc8bb5a73de9ef8ede252117293e6cb5755df
+  metadata.gz: 3b5de3773639ff1a9447b4ad554dd5c5c0ff5f8fae125f3ea52abbe55a931e74bceb26426ad3bfe199fa1f2b7aa9439756247cd370b3f9c98a97d6d40f6d497f
+  data.tar.gz: 24b97f276216e3d69c7b8b0eb4b1ca6c868f541cc48ecc63f0eaf210df86e2db2ff31047deabe15815aa8fcf87cb83af0104039a9c557adafe8676270901be0e

data/lib/ice_t/conversions.rb

@@ -23,12 +23,6 @@
 
 module IceT
   module Conversions
-    # module Helper
-    #   module_function
-    #   def recursive_instance_values(object)
-    #   end
-    # end
-    
     module Common
       module InstanceMethods
       end
@@ -64,31 +58,5 @@ module IceT
         end
       end
     end
-
-    module 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/rule/base.rb

@@ -46,7 +46,6 @@ module IceT
 
       include Comparable
       def <=>(other)
-        return unless other.class.respond_to?(:to_i)
         if self.class == other.class
           case
           when self.interval == other.interval
@@ -64,6 +63,8 @@ module IceT
             +1
           end
         end
+      rescue
+        nil
       end
 
       def occurrences(start_time, end_time)

data/lib/ice_t/version.rb

@@ -1,3 +1,3 @@
 module IceT
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/ice_t.rb

@@ -13,7 +13,6 @@ module IceT
   
   require 'ice_t/conversions'
   require 'ice_t/rule'
-  require 'ice_t/schedule'
 
   # module Rule
   #   autoload :Repository, 'ice_t/rule/repository'

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'coveralls'
+Coveralls.wear!
 require 'ice_t'
 
-Coveralls.wear!
 
 Dir.glob(File.expand_path("spec/support/**/*.rb")).each{ |f| require f }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_t
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Christian Nennemann
@@ -97,7 +97,6 @@ files:
 - lib/ice_t/rule/secondly.rb
 - lib/ice_t/rule/weekly.rb
 - lib/ice_t/rule/yearly.rb
-- lib/ice_t/schedule.rb
 - lib/ice_t/time_helper.rb
 - lib/ice_t/version.rb
 - lib/locales/de.yml
@@ -112,7 +111,6 @@ files:
 - spec/rules/secondly_rule_spec.rb
 - spec/rules/weekly_rule_spec.rb
 - spec/rules/yearly_rule_spec.rb
-- spec/schedule_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/rule_example.rb
 homepage: https://github.com/XORwell/ice_t
@@ -150,6 +148,5 @@ test_files:
 - spec/rules/secondly_rule_spec.rb
 - spec/rules/weekly_rule_spec.rb
 - spec/rules/yearly_rule_spec.rb
-- spec/schedule_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/rule_example.rb

data/lib/ice_t/schedule.rb

@@ -1,62 +0,0 @@
-#--
-# 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
-  class Schedule
-    
-    extend Forwardable    
-    def_delegator :@rules, :add, :add_rule
-    def_delegator :@rules, :remove, :remove_rule
-    def_delegator :@rules, :rules, :rules
-
-    include IceT::Conversions::Schedule
-
-    attr_reader :start_time
-    attr_reader :end_time
-
-    def initialize(opts={})
-      opts = {
-        start_time: nil,
-        end_time: nil
-      }.merge(opts)
-      @start_time = opts[:start_time]
-      @end_time   = opts[:end_time]
-
-      @rules = IceT::Rule::Repository.new
-    end
-    
-    def occurrences
-      return [] if @rules.empty?
-      
-      # TODO: better error message      
-      fail('this needs start_time and end_time') if @start_time.nil? && @end_time.nil?
-
-      @rules.collect{ |rule|
-        rule.occurrences(@start_time, @end_time)
-      }.flatten
-    end
-
-  end
-end

data/spec/schedule_spec.rb

@@ -1,84 +0,0 @@
-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) }
-  let!(:daily_rule) { IceT::Rule::Daily.new(1) }
-  let!(:monthly_rule) { IceT::Rule::Monthly.new(1) }
-  let(:repo) { schedule.instance_variable_get(:@rules) }
-
-  describe '#add_rule' do
-    it "delegates to repository.add" do
-      expect(repo).to receive(:add).with(daily_rule)
-      schedule.add_rule(daily_rule)
-    end
-  end
-
-  describe '#remove_rule' do
-    it "delegates to repository.remove" do
-      expect(repo).to receive(:remove).with(daily_rule)
-      schedule.remove_rule(daily_rule)
-    end
-  end
-
-  describe '#rules' do
-    it "delegates to repository.rules" do
-      expect(repo).to receive(:rules)
-      schedule.rules
-    end
-  end
-
-  describe '#to_json' do
-    it { expect(subject).to respond_to(:to_json) }
-    it { expect(subject.to_json).to be_an(String) }
-  end
-  
-  describe '#to_yaml' do
-    it { expect(subject).to respond_to(:to_yaml) }
-    it { expect(subject.to_json).to be_an(String) }
-  end
-
-  describe '::from_json' do
-    context "the created object" do
-      before do
-        schedule.add_rule(daily_rule)
-        schedule.add_rule(monthly_rule)      
-      end
-      let(:json) { schedule.to_json }
-      let(:object) { IceT::Schedule.from_json(json) }
-
-      it "is a Schedule" do
-        expect(object).to be_an(IceT::Schedule)
-      end
-      it "contains the same rules as before" do
-        expect(object.rules.map(&:to_json)).to eql(schedule.rules.map(&:to_json))
-      end
-
-      [:start_time, :end_time].each { |time|
-        it "does have the same #{time} as before" do
-          expect(object.send(time).to_i).to eql(eval("#{time}").to_i)
-        end
-      }
-
-    end
-  end
-  
-  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