rivendell-import 1.02 → 1.03

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rivendell-import (1.02)
+    rivendell-import (1.03)
       SyslogLogger (~> 2.0)
       activerecord (~> 3.2.8)
       activesupport (~> 3.2.8)
@@ -51,7 +51,7 @@ GEM
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
-    daemons (1.1.9)
+    daemons (1.2.2)
     data_objects (0.10.15)
       addressable (~> 2.1)
     database_cleaner (1.3.0)
@@ -184,7 +184,7 @@ GEM
     taglib-ruby (0.7.0)
     thor (0.19.1)
     tilt (1.4.1)
-    trollop (2.1.1)
+    trollop (2.1.2)
     tzinfo (0.3.43)
     uuidtools (2.1.5)
     will_paginate (3.0.7)

data/features/step_definitions/import_steps.rb

@@ -37,3 +37,7 @@ end
 Then /^the task should have tag "([^"]*)"$/ do |tag|
   import.tasks.pop.tags.should include(tag)
 end
+
+Then /^the task should have status "([^"]*)"$/ do |status|
+  Rivendell::Import::Task.last.status.should == status
+end

data/lib/rivendell/import/task.rb

@@ -63,6 +63,7 @@ module Rivendell::Import
         Context.new(self).run(&block)
       rescue => e
         logger.error "Task preparation failed : #{e}"
+        change_status! :failed
       end
       self
     end
@@ -133,7 +134,7 @@ module Rivendell::Import
       logger.debug e.backtrace.join("\n")
     ensure
       close_file
-      
+
       unless ran?
         change_status! :failed
       end

data/lib/rivendell/import/tasking/status.rb

@@ -22,9 +22,15 @@ module Rivendell::Import::Tasking
 
     def change_status!(status)
       logger.debug "Change status to #{status}"
-      update_attribute :status, status.to_s
+      if persisted?
+        update_attribute :status, status.to_s
+      else
+        self.status = status.to_s
+      end
       # notify! if ran?
       invoke_status_changed_callbacks
+
+      self
     end
 
     def invoke_status_changed_callbacks

data/lib/rivendell/import/version.rb

@@ -1,5 +1,5 @@
 module Rivendell
   module Import
-    VERSION = "1.02"
+    VERSION = "1.03"
   end
 end

data/spec/rivendell/import/task_spec.rb

@@ -63,6 +63,13 @@ describe Rivendell::Import::Task do
       given_file.should == subject.file
     end
 
+    it "should change task status to failed if prepare fails" do
+      subject.prepare do |file|
+        raise "Error"
+      end
+      subject.status.should == "failed"
+    end
+
   end
 
   describe "#run" do
@@ -252,8 +259,8 @@ describe Rivendell::Import::Task do
   describe "#change_status!" do
 
     it "should update_attribute :status" do
-      subject.should_receive(:update_attribute).with(:status, "completed")
       subject.change_status! :completed
+      subject.status.should == "completed"
     end
 
     it "should notify change when status is completed" do
@@ -344,17 +351,17 @@ describe Rivendell::Import::Task do
   describe ".ran" do
 
     it "should return completed tasks" do
-      subject.change_status! "completed"
+      subject.change_status!("completed").save
       expect(Rivendell::Import::Task.ran).to include(subject)
     end
 
     it "should return failed tasks" do
-      subject.change_status! "failed"
+      subject.change_status!("failed").save
       expect(Rivendell::Import::Task.ran).to include(subject)
     end
 
     it "should return canceled tasks" do
-      subject.change_status! "canceled"
+      subject.change_status!("canceled").save
       expect(Rivendell::Import::Task.ran).to include(subject)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivendell-import
 version: !ruby/object:Gem::Version
-  version: '1.02'
+  version: '1.03'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -503,7 +503,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2132046489375508529
+      hash: 3840553868177619647
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -512,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2132046489375508529
+      hash: 3840553868177619647
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23