rivendell-import 0.9 → 0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rivendell-import (0.9)
+    rivendell-import (0.10)
       SyslogLogger (~> 2.0)
       activerecord (~> 3.2.8)
       activesupport (~> 3.2.8)
@@ -11,9 +11,10 @@ PATH
       listen (~> 1.3.1)
       mail
       rivendell-api (~> 0.0.5)
-      rivendell-db (~> 0.2)
+      rivendell-db (~> 0.3)
       sinatra
       sqlite3
+      taglib-ruby
       trollop
       will_paginate (~> 3.0.0)
 
@@ -21,38 +22,40 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.17)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
+    addressable (2.3.6)
     arel (3.0.3)
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.7)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     builder (3.0.4)
-    capistrano (2.14.2)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    cucumber (1.3.10)
+    capistrano (3.2.1)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    coderay (1.1.0)
+    colorize (0.7.3)
+    cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
+      multi_test (>= 0.1.1)
     daemons (1.1.9)
-    data_objects (0.10.13)
+    data_objects (0.10.14)
       addressable (~> 2.1)
-    database_cleaner (0.8.0)
-    diff-lcs (1.1.3)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
     dm-core (1.2.1)
       addressable (~> 2.3)
     dm-do-adapter (1.2.0)
@@ -77,106 +80,114 @@ GEM
       uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_mysql (0.10.13)
-      data_objects (= 0.10.13)
+    do_mysql (0.10.14)
+      data_objects (= 0.10.14)
+    docile (1.1.5)
     fastercsv (1.5.5)
-    ffi (1.9.3)
+    ffi (1.9.5)
+    formatador (0.2.5)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    guard (1.4.0)
-      listen (>= 0.4.2)
+    guard (1.8.3)
+      formatador (>= 0.2.4)
+      listen (~> 1.3)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-cucumber (1.2.0)
+    guard-cucumber (1.4.1)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (2.0.0)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    highline (1.6.16)
-    httmultiparty (0.3.14)
+    guard-rspec (3.1.0)
+      guard (>= 1.8)
+      rspec (~> 2.13)
+    httmultiparty (0.3.15)
       httparty (>= 0.7.3)
       mimemagic
       multipart-post
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json (1.8.1)
     json_pure (1.8.1)
-    libnotify (0.8.2)
+    libnotify (0.8.3)
       ffi (>= 1.0.11)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
+    lumberjack (1.0.9)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.3)
     mimemagic (0.2.1)
-    multi_json (1.8.2)
-    multi_test (0.0.3)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    net-scp (1.1.0)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.6.6)
-    net-ssh-gateway (1.2.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
     null_logger (0.0.1)
-    polyglot (0.3.5)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.1)
+    rack-protection (1.5.3)
       rack
-    rake (0.9.2.2)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    rdoc (3.12.2)
+    rdoc (4.1.2)
       json (~> 1.4)
     rivendell-api (0.0.5)
       activesupport
       httmultiparty
       null_logger
-    rivendell-db (0.2)
+    rivendell-db (0.3)
       dm-core
       dm-mysql-adapter
       dm-serializer
       dm-types
       dm-validations
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    simplecov (0.6.4)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.2)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    slop (3.6.0)
     sqlite3 (1.3.9)
+    sshkit (1.5.1)
+      colorize
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
     stringex (1.5.1)
-    thor (0.16.0)
+    taglib-ruby (0.7.0)
+    thor (0.19.1)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     trollop (2.0)
-    tzinfo (0.3.39)
-    uuidtools (2.1.4)
-    will_paginate (3.0.5)
+    tzinfo (0.3.41)
+    uuidtools (2.1.5)
+    will_paginate (3.0.7)
 
 PLATFORMS
   ruby

data/Guardfile

@@ -1,9 +1,6 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec' do
+guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
 

data/lib/rivendell/import/base.rb

@@ -35,7 +35,7 @@ module Rivendell::Import
         end
       end
 
-      Listen.to(directory).change(&callback).start!
+      Listen.to(directory, latency: 1, wait_for_delay: 5).change(&callback).start!
     end
 
     def process(*paths)

data/lib/rivendell/import/cart.rb

@@ -10,7 +10,7 @@ module Rivendell::Import
 
     def attributes
       attributes = {}
-      %w{number group clear_cuts title default_title import_options}.each do |attribute|
+      %w{number group clear_cuts title default_title scheduler_codes import_options}.each do |attribute|
         value = send attribute
         attributes[attribute] = value if value.present?
       end
@@ -32,13 +32,17 @@ module Rivendell::Import
 
     delegate :blank?, :to => :attributes
 
-    attr_accessor :number, :group, :title, :default_title
+    attr_accessor :number, :group, :title, :default_title, :scheduler_codes
     attr_reader :task
 
     def initialize(task = nil)
       @task = task
     end
 
+    def scheduler_codes
+      @scheduler_codes ||= []
+    end
+
     def xport
       task.xport
     end
@@ -51,44 +55,97 @@ module Rivendell::Import
     end
 
     def update
-      begin
-        update_by_api
-      rescue => e
-        Rivendell::Import.logger.debug "Update by API failed : #{e}"
-        update_by_db if Database.enabled?
+      updaters.any? do |updater|
+        updater.new(self).update
       end
     end
 
-    def empty_title?(title)
-      [ nil, "", "[new cart]" ].include? title
+    def updaters
+      [].tap do |updaters|
+        updaters << ApiUpdater if scheduler_codes.empty?
+        updaters << DbUpdater if Database.enabled?
+      end
+    end
+
+    class Updater
+
+      attr_accessor :cart
+      
+      def initialize(cart)
+        @cart = cart
+      end
+      delegate :number, :title, :default_title, :scheduler_codes, :to => :cart
+
+      def empty_title?(title)
+        [ nil, "", "[new cart]" ].include? title
+      end
+
+      def title_with_default
+        @title_with_default ||=
+          if title
+            title
+          else
+            default_title if default_title && empty_title?(current_title)
+          end
+      end
+      
+      def update
+        begin
+          update!
+        rescue => e
+          Rivendell::Import.logger.debug "#{self.class.name} failed : #{e}"
+          false
+        end
+      end
+
     end
 
-    def update_by_api
-      update_attributes = {}
+    class ApiUpdater < Updater
 
-      if title
-        update_attributes[:title] = title
-      else
-        update_attributes[:title] = default_title if default_title && empty_title?(xport.list_cart(number).title)
+      def update!
+        unless attributes.empty?
+          Rivendell::Import.logger.debug "Update Cart by API : #{attributes}"
+          xport.edit_cart number, attributes
+        else
+          true
+        end
       end
 
-      unless update_attributes.empty?
-        Rivendell::Import.logger.debug "Update Cart by API : #{update_attributes}"
-        xport.edit_cart number, update_attributes
+      delegate :xport, :to => :cart
+
+      def current_title
+        xport.list_cart(number).title
       end
+
+      def attributes
+        {}.tap do |attributes|
+          attributes[:title] = title_with_default if title_with_default
+        end
+      end
+
     end
 
-    def update_by_db
-      Database.init
+    class DbUpdater < Updater
 
-      Rivendell::Import.logger.debug "Update Cart by DB"
-      current_cart = Rivendell::DB::Cart.get(number)
-      if title
-        current_cart.title = title
-      else
-        current_cart.title = default_title if default_title && empty_title?(current_cart.title)
+      def current_cart
+        @current_cart ||= Rivendell::DB::Cart.get(number)
       end
-      current_cart.save
+
+      def current_title
+        current_cart.title
+      end
+
+      def update!
+        Database.init
+
+        if title_with_default or not scheduler_codes.empty?
+          Rivendell::Import.logger.debug "Update Cart by DB"
+          current_cart.title = title_with_default
+          current_cart.scheduler_codes = scheduler_codes
+          current_cart.save
+        end
+      end
+
     end
 
     def cut

data/lib/rivendell/import/context.rb

@@ -20,6 +20,10 @@ module Rivendell::Import
       end
     end
 
+    def log(message)
+      logger.info message if message
+    end
+
     def run(&block)
       instance_exec file, &block if block_given?
     end

data/lib/rivendell/import/file.rb

@@ -31,6 +31,16 @@ module Rivendell::Import
       ::File.extname(name).gsub(/^\./,'')
     end
 
+    def directories
+      filename = path
+      [].tap do |directories|
+        while (parent = ::File.dirname(filename)) != ::File::SEPARATOR
+          directories << ::File.basename(parent)
+          filename = parent
+        end
+      end.reverse
+    end
+
     def ==(other)
       other and path == other.path
     end
@@ -65,6 +75,32 @@ module Rivendell::Import
       ::File.exists? path
     end
 
+    def file_ref
+      @file_ref ||= 
+        if exists? and not (file_ref = TagLib::FileRef.new(path)).null?
+          file_ref
+        else
+          :null
+        end
+
+      @file_ref unless :null == @file_ref
+    end
+
+    def close
+      if @file_ref.respond_to?(:close)
+        @file_ref.close
+        @file_ref = nil
+      end
+    end
+
+    def tag
+      file_ref.tag if file_ref
+    end
+
+    def audio_properties
+      file_ref.audio_properties if file_ref
+    end
+    
     def destroy!
       Rivendell::Import.logger.debug "Delete file #{path}"
       ::File.delete(path) if exists?

data/lib/rivendell/import/task.rb

@@ -17,7 +17,11 @@ module Rivendell::Import
     end
 
     def self.ready
-      self.pending.select(&:ready?)
+      pending.by_priority.select(&:ready?)
+    end
+
+    def self.by_priority
+      order(["priority desc", "created_at"])
     end
 
     RAN_STATUSES = %w{completed failed canceled}.freeze
@@ -128,6 +132,8 @@ module Rivendell::Import
       logger.error "Task failed : #{e}"
       logger.debug e.backtrace.join("\n")
     ensure
+      close_file
+      
       unless ran?
         change_status! :failed
       end

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

@@ -22,5 +22,9 @@ module Rivendell::Import::Tasking
       self.delete_file = true
     end
 
+    def close_file
+      @file.close if @file
+    end
+
   end
 end

data/lib/rivendell/import/tasks.rb

@@ -14,8 +14,19 @@ module Rivendell::Import
     end
 
     def create(file, &block)
-      Rivendell::Import::Task.create({:file => file}, {}, &block).tap do |task|
-        Rivendell::Import.logger.debug "Created task #{task.inspect}"
+      retry_count = 3
+      begin
+        Rivendell::Import::Task.create({:file => file}, {}, &block).tap do |task|
+          Rivendell::Import.logger.debug "Created task #{task.inspect}"
+        end
+      rescue Exception => e
+        Rivendell::Import.logger.error "Can't create Task: #{e}"
+        retry_count -= 1
+        if retry_count > 0
+          Rivendell::Import.logger.error "Retry in 5s"
+          sleep 5
+          retry
+        end
       end
     end
 

data/lib/rivendell/import/version.rb

@@ -1,5 +1,5 @@
 module Rivendell
   module Import
-    VERSION = "0.9"
+    VERSION = "0.10"
   end
 end

data/lib/rivendell/import/views/index.erb

@@ -45,7 +45,7 @@
             <td><%= distance_of_time_in_words_from_now(task.updated_at) %></td>
             <td><%= truncate_filename(task.file, 60) %></td>
             <td><%= task.destination %></td>
-            <td>default</td>
+            <td><%= task.priority or "default" %></td>
           </tr>
           <% end %>
         </table>

data/lib/rivendell/import/worker.rb

@@ -8,9 +8,9 @@ module Rivendell::Import
     end
 
     def start
-      Thread.new do 
+      Thread.new do
         Rivendell::Import.logger.debug "Start Worker"
-        run 
+        run
       end
 
       self
@@ -18,16 +18,19 @@ module Rivendell::Import
 
     def run
       loop do
-        task = import.tasks.pop
-        if task
-          task.run
-        else
-          # Rivendell::Import.logger.debug "No pending task, sleep 10s"
+        begin
+          task = import.tasks.pop
+          if task
+            task.run
+          else
+            # Rivendell::Import.logger.debug "No pending task, sleep 10s"
+            sleep 10
+          end
+        rescue Exception => e
+          Rivendell::Import.logger.error "Worker failed : #{e}"
           sleep 10
         end
       end
-    rescue => e
-      Rivendell::Import.logger.error "Worker failed : #{e}"
     end
 
   end

data/lib/rivendell/import.rb

@@ -4,6 +4,7 @@ require "null_logger"
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/enumerable"
+require 'taglib'
 
 require "rivendell/import/config"
 

data/rivendell-import.gemspec

@@ -27,13 +27,14 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'mail'
   gem.add_runtime_dependency 'sqlite3'
   gem.add_runtime_dependency 'SyslogLogger', '~> 2.0'
+  gem.add_runtime_dependency 'taglib-ruby'
 
   gem.add_runtime_dependency 'sinatra'
   gem.add_runtime_dependency 'will_paginate', '~> 3.0.0'
 
   gem.add_runtime_dependency 'daemons'
 
-  gem.add_runtime_dependency 'rivendell-db', '~> 0.2'
+  gem.add_runtime_dependency 'rivendell-db', '~> 0.3'
 
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "rspec"

data/spec/rivendell/import/base_spec.rb

@@ -120,7 +120,7 @@ describe Rivendell::Import::Base do
     end
 
     it "should invoke Listen.to with given directory" do
-      Listen.should_receive(:to).with(directory)
+      Listen.should_receive(:to).with(directory, anything)
       subject.listen directory
     end
 

data/spec/rivendell/import/cart_spec.rb

@@ -188,6 +188,11 @@ describe Rivendell::Import::Cart do
       subject.attributes["cut"].should == { "days" => %{mon} }
     end
 
+    it "should include scheduler codes" do
+      subject.scheduler_codes << "dummy"
+      subject.attributes["scheduler_codes"].should == ["dummy"]
+    end
+    
   end
 
   describe "#to_json" do
@@ -208,6 +213,60 @@ describe Rivendell::Import::Cart do
 
   end
 
+  describe "#updaters" do
+
+    it "should contain ApiUpdater" do
+      subject.updaters.should include(Rivendell::Import::Cart::ApiUpdater)
+    end
+ 
+    it "should not contain ApiUpdater if scheduler codes is defined" do
+      subject.scheduler_codes << "dummy"
+      subject.updaters.should_not include(Rivendell::Import::Cart::ApiUpdater)
+    end
+   
+    it "should contain DbUpdater if Database is enabled" do
+      Rivendell::Import::Database.stub :enabled? => true
+      subject.updaters.should include(Rivendell::Import::Cart::DbUpdater)
+    end
+
+    it "should not contain DbUpdater if Database isn't enabled" do
+      Rivendell::Import::Database.stub :enabled? => false
+      subject.updaters.should_not include(Rivendell::Import::Cart::DbUpdater)
+    end
+    
+  end
+
+  describe "#update" do
+
+    def updater(success = true)
+      double(:new => mock(:update => success))
+    end
+
+    it "should return true if an Updater is successful" do
+      subject.stub :updaters => [updater(false), updater(true)]
+      subject.update.should be_true
+    end
+
+    it "should return true if all Updaters are not successful" do
+      subject.stub :updaters => [updater(false)]
+      subject.update.should be_false
+    end
+
+    it "should return false when no Updater is available" do
+      subject.stub :updaters => []
+      subject.update.should be_false
+    end
+    
+  end
+  
+end
+
+describe Rivendell::Import::Cart::Updater do
+
+  let(:task) { mock }
+  let(:cart) { Rivendell::Import::Cart.new task }
+  subject { Rivendell::Import::Cart::Updater.new cart }
+
   describe "#empty_title?" do
 
     it "should true when title is nil" do
@@ -224,44 +283,170 @@ describe Rivendell::Import::Cart do
 
   end
 
-  describe "update" do
+  describe "#update" do
 
-    it "should invoke update_by_api" do
-      subject.should_receive :update_by_api
-      subject.update
+    it "should return false if update! raises an error" do
+      subject.stub(:update!).and_raise("fail")
+      subject.update.should be_false
     end
 
-    context "when when update_by_api fails" do
+    it "should return true if update! returns true" do
+      subject.stub :update! => true
+      subject.update.should be_true
+    end
 
-      before do
-        subject.stub(:update_by_api).and_raise("#fail")
+    it "should return false if update! returns false" do
+      subject.stub :update! => false
+      subject.update.should be_false
+    end
+    
+  end
+
+  describe "#title_with_default" do
+
+    context "when Cart title is defined" do
+
+      before { cart.title = "dummy" }
+
+      it "should use this Cart title" do
+        subject.title_with_default.should == cart.title
       end
 
-      context "when database is enabled" do
+    end
 
-        before do
-          Rivendell::Import::Database.stub :enabled? => true
-        end
+    context "when default title is defined" do
 
-        it "should invoke update_by_db " do
-          subject.should_receive :update_by_db
-          subject.update
-        end
+      before { cart.default_title = "dummy" }
+      
+      it "should default title if current title is empty" do
+        subject.stub current_title: "[new cart]"
+        subject.title_with_default.should == cart.default_title
+      end
 
+      it "should not use default title if current title is not empty" do
+        subject.stub current_title: "Dummy"
+        subject.title_with_default.should be_nil
       end
 
-      context "when database is disabled" do
+    end
+    
+  end
+  
+end
+
+describe Rivendell::Import::Cart::ApiUpdater do
+
+  let(:task) { mock }
+  let(:cart) { Rivendell::Import::Cart.new task }
+  subject { Rivendell::Import::Cart::ApiUpdater.new cart }
+
+  let(:xport) { mock }
 
-        before do
-          Rivendell::Import::Database.stub :enabled? => false
-        end
+  before do
+    subject.stub xport: xport
+  end
+
+  describe "#current_title" do
+
+    it "should retrive the current title via the API" do
+      xport_cart = mock(title: "dummy")
+      xport.should_receive(:list_cart).with(cart.number).and_return(xport_cart)
+      subject.current_title.should == xport_cart.title
+    end
+    
+  end
+
+  describe "#attributes" do
+
+    it "should use title with default" do
+      subject.stub title_with_default: "dummy"
+      subject.attributes.should == { title: subject.title_with_default }
+    end
+
+    it "should not contain title when title_with_default is nil" do
+      subject.stub title_with_default: nil
+      subject.attributes.should == {}
+    end
+    
+  end
+
+  describe "#update!" do
+
+    context "when attributes is not empty" do
+
+      it "should invoke xport edit_cart with attributes" do
+        subject.stub attributes: { title: "dummy" }
+        xport.should_receive(:edit_cart).with(cart.number, subject.attributes)
+        subject.update!
+      end
+      
+    end
 
-        it "should not invoke update_by_db " do
-          subject.should_not_receive :update_by_db
-          subject.update
-        end
+    context "when attributes is empty" do
 
+      it "should not invoke xport edit_cart" do
+        subject.stub attributes: {}
+        xport.should_not_receive(:edit_cart)
+        subject.update!.should be_true
       end
+      
+    end
+    
+  end
+  
+end
+
+describe Rivendell::Import::Cart::DbUpdater do
+
+  let(:task) { mock }
+  let(:cart) { Rivendell::Import::Cart.new task }
+  subject { Rivendell::Import::Cart::DbUpdater.new cart }
+
+  let(:db_cart) { Rivendell::DB::Cart.new }
+
+  before do
+    Rivendell::Import::Database.stub init: true
+    db_cart.stub save: true
+    Rivendell::DB::Cart.stub get: db_cart
+  end
+
+  describe "#current_cart" do
+
+    it "should get cart with its number" do
+      Rivendell::DB::Cart.should_receive(:get).with(cart.number).and_return(db_cart)
+      subject.current_cart.should == db_cart
+    end
+    
+  end
+
+  describe "#current_title" do
+
+    it "should return current_cart title" do
+      db_cart.stub title: "dummy"
+      subject.current_title.should == db_cart.title
+    end
+    
+  end
+
+  describe "#update!" do
+
+    it "should init database" do
+      Rivendell::Import::Database.should_receive :init
+      subject.update!
+    end
+
+    it "should use title_with_default as Cart title" do
+      subject.stub title_with_default: "dummy"
+      subject.update!
+      db_cart.title.should == subject.title_with_default
+    end
+
+    it "should define scheduler_codes" do
+      subject.stub scheduler_codes: ["dummy"]
+      subject.update!
+      db_cart.scheduler_codes.should == subject.scheduler_codes
     end
+    
   end
+  
 end

data/spec/rivendell/import/context_spec.rb

@@ -8,7 +8,7 @@ describe Rivendell::Import::Context do
   subject { Rivendell::Import::Context.new task }
 
   describe "#notify" do
-    
+
     it "should add the specified notifier to the task" do
       subject.notify 'recipient@domain', :by => :email
       subject.task.notifiers.first.to.should == 'recipient@domain'
@@ -16,4 +16,15 @@ describe Rivendell::Import::Context do
 
   end
 
+  describe "#log" do
+
+    let(:message) { "dummy" }
+
+    it "should log the given message with info level" do
+      subject.logger.should_receive(:info).with(message)
+      subject.log message
+    end
+
+  end
+
 end

data/spec/rivendell/import/file_spec.rb

@@ -2,10 +2,14 @@ require 'spec_helper'
 
 describe Rivendell::Import::File do
 
-  subject { Rivendell::Import::File.new "/path/to/dummy.wav", :base_directory => "/path/to" }
+  subject { Rivendell::Import::File.new fixture_file("audio.ogg"), :base_directory => fixture_directory }
+
+  after do
+    subject.close
+  end
 
   describe "initialization" do
-    
+
     it "should use given base_directory to compute relative name" do
       Rivendell::Import::File.new("/path/to/dummy.wav", :base_directory => "/path/to").name.should == "dummy.wav"
     end
@@ -13,7 +17,7 @@ describe Rivendell::Import::File do
   end
 
   describe "#to_s" do
-    
+
     it "should use name" do
       subject.to_s.should == subject.name
     end
@@ -21,7 +25,7 @@ describe Rivendell::Import::File do
   end
 
   describe ".relative_filename" do
-    
+
     it "should return '/subdirectory/file' from '/base/subdirectory/file'" do
       Rivendell::Import::File.relative_filename('/base/subdirectory/file', '/base').should == 'subdirectory/file'
     end
@@ -29,7 +33,7 @@ describe Rivendell::Import::File do
   end
 
   describe "match" do
-    
+
     it "should match a given regexp" do
       subject.stub :name => "dummy"
       subject.should match(/^dum/)
@@ -43,7 +47,7 @@ describe Rivendell::Import::File do
   end
 
   describe "#basename" do
-    
+
     it "should return 'dummy' for 'path/to/dummy.wav'" do
       subject.stub :name => "path/to/dummy.wav"
       subject.basename.should == "dummy"
@@ -52,7 +56,7 @@ describe Rivendell::Import::File do
   end
 
   describe "#extension" do
-    
+
     it "should 'wav' for 'path/to/dummy.wav'" do
       subject.stub :name => "path/to/dummy.wav"
       subject.extension.should == "wav"
@@ -60,4 +64,38 @@ describe Rivendell::Import::File do
 
   end
 
+  describe "#directories" do
+
+    it "should return 'path' and 'to' for 'path/to/dummy.wav'" do
+      subject.stub :path => "/path/to/dummy.wav"
+      subject.directories.should == %w{path to}
+    end
+
+  end
+
+  describe "#tag" do
+
+    it "should return tags contained by file metadata" do
+      subject.tag.title.should == "Audio Test Content"
+    end
+
+  end
+
+  describe "#audio_properties" do
+
+    it "should file audio properties" do
+      subject.audio_properties.length.should == 60
+    end
+
+  end
+
+  describe "#close" do
+
+    it "should close TaLib file_ref" do
+      subject.file_ref.should_receive :close
+      subject.close
+    end
+    
+  end
+
 end

data/spec/rivendell/import/task_spec.rb

@@ -108,6 +108,11 @@ describe Rivendell::Import::Task do
       subject.status.should be_completed
     end
 
+    it "should close the used file" do
+      subject.file.should_receive :close
+      subject.run
+    end
+
     it "should change the status to failed if an error is raised" do
       subject.cart.stub(:create).and_raise("dummy")
       subject.run
@@ -364,4 +369,25 @@ describe Rivendell::Import::Task do
 
   end
 
+  describe "#ready" do
+
+    def task(attributes = {})
+      attributes = { :file => file }.merge(attributes)
+      Rivendell::Import::Task.create attributes
+    end
+
+    it "should return Task order by priority" do
+      lower_priority_task = task priority: 1, created_at: 5.minutes.ago
+      higher_priority_task = task priority: 2
+      Rivendell::Import::Task.ready.should == [ higher_priority_task, lower_priority_task ]
+    end
+
+    it "should return Task order by creation date" do
+      new_task = task
+      old_task = task created_at: 5.minutes.ago
+      Rivendell::Import::Task.ready.should == [ old_task, new_task ]
+    end
+
+  end
+
 end

data/spec/support/fixtures.rb

@@ -1,3 +1,7 @@
+def fixture_directory
+  File.expand_path "../../fixtures", __FILE__
+end
+
 def fixture_file(name)
-  File.expand_path "../../fixtures/#{name}", __FILE__
+  File.join fixture_directory, name
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivendell-import
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -171,6 +171,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: taglib-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +242,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +250,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -441,6 +457,7 @@ files:
 - lib/rivendell/import/worker.rb
 - log/.gitkeep
 - rivendell-import.gemspec
+- spec/fixtures/audio.ogg
 - spec/fixtures/mail-body.erb
 - spec/rivendell/import/base_spec.rb
 - spec/rivendell/import/cart_finder_spec.rb
@@ -482,7 +499,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1053952433249090038
+      hash: 3604849735216139138
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -491,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1053952433249090038
+      hash: 3604849735216139138
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -504,6 +521,7 @@ test_files:
 - features/step_definitions/import_steps.rb
 - features/support/env.rb
 - features/support/mock_xport.rb
+- spec/fixtures/audio.ogg
 - spec/fixtures/mail-body.erb
 - spec/rivendell/import/base_spec.rb
 - spec/rivendell/import/cart_finder_spec.rb