dvdplm-taskr 0.3.1 → 0.3.2

data/lib/taskr/controllers.rb

@@ -176,7 +176,7 @@ module Taskr::Controllers
     
     # Create and schedule a new task.
     def create
-      puts @input.inspect
+      $LOG.debug @input.inspect
       begin
         # the "0" is for compatibility with PHP's Zend_Rest_Client
         task_data = @input[:task] || @input["0"] || @input
@@ -204,10 +204,12 @@ module Taskr::Controllers
         if actions_data.kind_of?(Array)
           actions = actions_data
         elsif actions_data["0"]
+          $LOG.debug "Hash-ish"
           actions = []
           actions_data.each do |i,a|
             actions << a
           end
+          $LOG.debug "Converted hash into: #{actions.inspect}"
         else
           actions = actions_data[:action] || actions_data[:actions] || actions_data
         end
@@ -233,7 +235,7 @@ module Taskr::Controllers
           end
           
           action = TaskAction.new(:order => a[:order] || i, :action_class_name => action_class_name)
-          
+          $LOG.debug "Action should be initialized and ready for creation: #{action.inspect}"
           
           action_class.parameters.each do |p|
             value = a[p]
@@ -255,7 +257,7 @@ module Taskr::Controllers
         
         @task.schedule! Taskr.scheduler
         
-        if @task.save
+        if @task.save!
           location = "/tasks/#{@task.id}?format=#{@format}"
           $LOG.debug "#{@task} saved successfuly. Setting Location header to #{location.inspect}."
           @headers['Location'] = location

data/lib/taskr/models.rb

@@ -62,13 +62,29 @@ module Taskr::Models
       
       $LOG.debug "Scheduling task #{name.inspect}: #{self.inspect}"
       
-      if task_actions(true).length > 0
-        action = prepare_action
+      if self.new_record? # Need to distinguish between the edit/create cases. "Edit" needs to reload the task_actions or nothing works; "Create" needs NOT to relaod the actions, or the validations kick in and nothing works. FIXME!!!!!
+        if task_actions.length > 0
+          action = prepare_action
+        else
+          $LOG.warn "Task #{name.inspect} has no actions and as a result will not be scheduled!"
+          return false
+        end
       else
-        $LOG.warn "Task #{name.inspect} has no actions and as a result will not be scheduled!"
-        return false
+        if task_actions(true).length > 0
+          action = prepare_action
+        else
+          $LOG.warn "Task #{name.inspect} has no actions and as a result will not be scheduled!"
+          return false
+        end
       end
       
+      # if task_actions(true).length > 0
+      #   action = prepare_action
+      # else
+      #   $LOG.warn "Task #{name.inspect} has no actions and as a result will not be scheduled!"
+      #   return false
+      # end
+      
       job_id = scheduler.send(method, t || schedule_when, :schedulable => action)
       
       if job_id

data/lib/taskr/version.rb

@@ -2,7 +2,7 @@ module Taskr #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dvdplm-taskr
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Matt Zukowski