schedulable 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf160baa485b91e6566ffb4a3d4914058237f634
-  data.tar.gz: edfc6d3c758cbdef642e633a1a32869f6a386327
+  metadata.gz: d5965f8d54d74a2e9dc9a3637bdac730fac29861
+  data.tar.gz: ee86cfa84c07e0ae273ae3d70e76f811cfb28a3f
 SHA512:
-  metadata.gz: 555836580530752b1eecf9cf85cf9b8f7a44f5d12fb62254555930f895608d7a644a3f555a5c98e09b1fdb366466733952eea3afd31d053a4567406d074145c7
-  data.tar.gz: a47bd73ac68eeff77a1dcecbcebab3d32c4e41a04fe429efe13d862d54397475f08f50f8a51ab3a2a8755e343c1d65090d031ed95b3904ca7593ec4fd98741a4
+  metadata.gz: f8cc72da05d83051a102e51fbc3a2ef5378e8f0d3529a1f715c7110820ccd361f28f2d7c638c5cb2b20b98e33db6adcd27f5f22ac621096905ee6ce79067486b
+  data.tar.gz: 49e83fe2ecaf68a9cbc12e361ec19c2c913447991c983d4e5afa0e57d12970bb327510a48f7ea84f3a3e87b2d21d002900dd84bfa87bfb134955bc1889ab82c9

data/lib/generators/schedulable/templates/inputs/schedule_input.rb

@@ -64,8 +64,8 @@ class ScheduleInput < SimpleForm::Inputs::Base
                 weekdays.reduce(''.html_safe) do | content, weekday | 
                   content << template.content_tag("div", nil, style: 'display: table-row') do 
                     template.content_tag("span", day_labels[weekday] || weekday, style: 'display: table-cell') <<
-                    db.collection_check_boxes(weekday.to_sym, [1, 2, 3, 4, -1], lambda { |i| i} , lambda { |i| "&nbsp;".html_safe}, checked: db.object.send(weekday), item_wrapper_tag: nil) do |cb|
-                      template.content_tag("span", cb.check_box(), style: 'display: table-cell; text-align: center')
+                    db.collection_check_boxes(weekday.to_sym, [1, 2, 3, 4, -1], lambda { |i| i} , lambda { |i| "&nbsp;".html_safe}, boolean_style: :inline, label: false, checked: db.object.send(weekday), inline_label: false, item_wrapper_tag: nil) do |cb|
+                      template.content_tag("span", style: 'display: table-cell; text-align: center;') { cb.check_box(class: "check_box") }
                     end 
                   end
                 end

data/lib/schedulable/acts_as_schedulable.rb

@@ -62,10 +62,15 @@ module Schedulable
             end
           end
         
+          define_method "build_#{occurrences_association}_after_update" do 
+            schedule = self.send(name)
+            if schedule.changes.any?
+              self.send("build_#{occurrences_association}")
+            end
+          end
+        
           define_method "build_#{occurrences_association}" do 
             
-            puts 'build occurrences...'
-            
             # build occurrences for events
             
             schedule = self.send(name)
@@ -87,9 +92,8 @@ module Schedulable
             max_count = terminating && schedule.remaining_occurrences.any? ? [max_count, schedule.remaining_occurrences.count].min : max_count
 
             if schedule.rule != 'singular'
-              
               # Get schedule occurrences
-              all_occurrences = schedule.occurrences(max_date)
+              all_occurrences = schedule.occurrences_between(Time.now, max_date.to_time)
               occurrences = []
               # Filter valid dates
               all_occurrences.each_with_index do |occurrence_date, index|
@@ -101,15 +105,23 @@ module Schedulable
                   end
                 end
               end
-            
             else
-              singular_date_time = schedule.date.to_datetime + schedule.time.seconds_since_midnight.seconds
+              # Get Singular occurrence
+              d = schedule.date
+              t = schedule.time
+              dt = d + t.seconds_since_midnight.seconds   
+              singular_date_time = (d + t.seconds_since_midnight.seconds).to_datetime
               occurrences = [singular_date_time]
             end
-            
+
             # Build occurrences
             update_mode = Schedulable.config.update_mode || :datetime
             
+            # Always use index as base for singular events
+            if schedule.rule == 'singular'
+              update_mode = :index
+            end
+            
             # Get existing remaining records
             occurrences_records = schedulable.send("remaining_#{occurrences_association}")
 
@@ -118,7 +130,6 @@ module Schedulable
             occurrences.each_with_index do |occurrence, index|
               
               # Pull an existing record
-              
               if update_mode == :index
                 existing_records = [occurrences_records[index]]
               elsif update_mode == :datetime
@@ -133,13 +144,13 @@ module Schedulable
                 # Overwrite existing records
                 existing_records.each do |existing_record|
                   if !occurrences_records.update(existing_record.id, date: occurrence.to_datetime)
-                    puts 'an error occurred while saving an existing occurrence record'
+                    puts 'An error occurred while saving an existing occurrence record'
                   end
                 end
               else
                 # Create new record
                 if !occurrences_records.create(date: occurrence.to_datetime)
-                  puts 'an error occurred while creating an occurrence record'
+                  puts 'An error occurred while creating an occurrence record'
                 end
               end
             end

data/lib/schedulable/schedule.rb

@@ -7,7 +7,7 @@ module Schedulable
     
       belongs_to :schedulable, polymorphic: true
     
-      after_initialize :init_schedule
+      after_initialize :update_schedule
       before_save :update_schedule
       
       validates_presence_of :rule
@@ -25,7 +25,7 @@ module Schedulable
       end
       
       def method_missing(meth, *args, &block)
-        if @schedule
+        if @schedule.present? && @schedule.respond_to?(meth)
           @schedule.send(meth, *args, &block)
         end
       end
@@ -35,13 +35,17 @@ module Schedulable
       end
     
       def update_schedule()
+        
+        self.rule||= "singular"
+        self.interval||= 1
+        self.count||= 0
 
-        date = self.date ? self.date.to_time : Time.now
-        if self.time
-          date = date.change({hour: self.time.hour, min: self.time.min})
+        time = Date.today.to_time 
+        if self.time.present? 
+          time = time + self.time.seconds_since_midnight.seconds   
         end
-        
-        @schedule = IceCube::Schedule.new(date)
+
+        @schedule = IceCube::Schedule.new(time)
         
         if self.rule && self.rule != 'singular'
           
@@ -98,18 +102,6 @@ module Schedulable
           errors.add(:day_of_week, :empty)
         end
       end
-      
-      
-      def init_schedule()
-        
-        self.rule||= "singular"
-        self.interval||= 1
-        self.count||= 0
-        
-        @schedule = IceCube::Schedule.new(date)
-        
-        self.update_schedule()
-      end
     end
   end
 end

data/lib/schedulable/version.rb

@@ -1,3 +1,3 @@
 module Schedulable
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/tasks/schedulable_tasks.rake

@@ -1,5 +1,5 @@
 require 'rake'
-desc 'builds occurrences for schedulable models'
+desc 'Builds occurrences for schedulable models'
 namespace :schedulable do
   task :build_occurrences => :environment do
     Schedule.group(:schedulable_type).each do |schedule|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schedulable
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Rafael Nowrotek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails