andyw8-acts_as_event_owner 1.1.15 → 1.1.16

data/README.textile

@@ -7,7 +7,6 @@ Reasons for this fork:
 * Fix compatibility with Rails >= 3.09 (https://github.com/dburkes/acts_as_event_owner/issues/14)
 * Use Bundler instead of Jeweler for gem releases (Jeweler appears to be abandoned)
 * Add CI via Travis
-* The rake task for `acts_as_event_owner:generate_events` appeared incomplete/broken. I've fixed it for the simplified case I need where no arguments are required, and it will default to events from now to 30 days in the future.
 
 One test was failing for me, which I don't have time to look into at the moment (event_specificiation_spec.rb) so I have marked it as pending.
 

data/lib/acts_as_event_owner/event_specification.rb

@@ -98,9 +98,8 @@ module ActsAsEventOwner
       raise ActsAsEventOwner::Exception.new("Invalid Event Specification") if !valid?
 
       opts = options.clone
-      opts[:from] = Time.now
-
-      opts[:to] ||= (opts[:from] + 90.days) if opts[:from]
+      opts[:from] ||= self.start_at
+      opts[:to] ||= (opts[:from] + 30.days) if opts[:from]
       opts[:from] -= 1.second
       opts[:to] -= 1.second
       opts[:from] = opts[:to] = nil if opts[:count]
@@ -129,15 +128,15 @@ module ActsAsEventOwner
           additional[column] = self.attributes[column] if @@OCCURRENCE_COLUMNS.include?(column)
           additional
         end
-
+        
         # puts "*********** #{occurrence.start_time} : #{occurrence.start_time.zone}"
         # puts "*********** #{Time.zone.at(occurrence.start_time.to_i)}"
-
+        
         hash = {
           :owner_id => self.owner_id, :owner_type => self.owner_type, :event_specification_id => self.id,
           :description => occurrence.description, :start_at => occurrence.start_time.utc,
           :end_at => occurrence.finish_time.utc}.stringify_keys.merge(additional_columns).merge(attribute_overrides.stringify_keys)
-
+          
         EventOccurrence.find_or_create_by_owner_id_and_owner_type_and_event_specification_id_and_start_at_and_end_at(hash)
       end
     end
@@ -147,7 +146,7 @@ module ActsAsEventOwner
         spec.generate_events(options)
       }
     end
-
+    
     def repeat
       self.attributes["repeat"].try(:to_sym)
     end

data/lib/acts_as_event_owner/version.rb

@@ -1,3 +1,3 @@
 module ActsAsEventOwner
-  VERSION = "1.1.15" unless defined? ActsAsEventOwner::VERSION
+  VERSION = "1.1.16" unless defined? ActsAsEventOwner::VERSION
 end

data/lib/tasks/acts_as_event_owner_tasks.rake

@@ -1,6 +1,14 @@
 namespace :acts_as_event_owner do
+  task :require_from do
+    raise "Set FROM to something understandable by Time.parse" if !ENV['FROM']
+  end
+
+  task :require_to do
+    raise "Set TO to something understandable by Time.parse" if !ENV['TO']
+  end
+
   desc "Generate all events within a certain time window"
-  task :generate_events => [:environment] do
-    ActsAsEventOwner::EventSpecification.all(:conditions => "until IS NULL OR until >= '#{Time.zone.now.to_s(:db)}'").each {|spec| spec.generate_events}
+  task :generate_events => [:environment, :require_from, :require_to] do
+    ActsAsEventOwner::EventSpecification.all(:conditions => "until IS NULL OR until >= '#{Time.zone.now.to_s(:db)}'").each {|spec| spec.generate_events(options)}
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: andyw8-acts_as_event_owner
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.16
   prerelease: 
 platform: ruby
 authors: