rivendell-import 0.0.1 → 0.0.2

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-# gem "rivendell-api", :git => "git://projects.tryphon.priv/rivendell-api", :path => "~/Projects/RivendellApi"
+gem "rivendell-api" # , :git => "git://projects.tryphon.priv/rivendell-api", :ref => "b98a46fbb0c31d965853206a56500cea4a340044" # , :path => "~/Projects/RivendellApi"
 
 if RUBY_PLATFORM =~ /linux/
   gem 'libnotify' 

data/db/migrate/20121004194900_add_delete_file_to_task.rb

@@ -0,0 +1,9 @@
+class AddDeleteFileToTask < ActiveRecord::Migration
+  def self.up
+    add_column :tasks, :delete_file, :boolean
+  end
+
+  def self.down
+    drop_column :tasks, :delete_file
+  end
+end

data/db/migrate/2012100620361349548586_add_xport_options_to_task.rb

@@ -0,0 +1,9 @@
+class AddXportOptionsToTask < ActiveRecord::Migration
+  def self.up
+    add_column :tasks, :xport_options, :string
+  end
+
+  def self.down
+    drop_column :tasks, :xport_options
+  end
+end

data/examples/config.rb

@@ -15,17 +15,26 @@ end
 Rivendell::Import::Notifier::Mail.from = "root@tryphon.eu"
 
 Rivendell::Import.config do |config|
+
+  config.rivendell.host = "localhost"
+  config.rivendell.login_name = "user"
+  config.rivendell.password = ""
+
   config.to_prepare do |file|
     file.in("music") do
       cart.group = "MUSIC"
     end
 
     file.in("pad") do
+      cart.clear_cuts!
       cart.find_by_title file.basename
     end
     
     cart.group ||= "TEST"
 
+    # To delete file when task is completed
+    #task.delete_file!
+
     notify 'alban@tryphon.eu', :by => :email
   end
 end

data/lib/rivendell/import.rb

@@ -34,6 +34,8 @@ ActiveRecord::Base.include_root_in_json = false
 
 require "rivendell/api"
 
+require "rivendell/import/config"
+require "rivendell/import/config_loader"
 require "rivendell/import/worker"
 require "rivendell/import/task"
 require "rivendell/import/tasks"

data/lib/rivendell/import/application.rb

@@ -0,0 +1,53 @@
+require 'sinatra'
+
+require 'will_paginate'
+require 'will_paginate/active_record'
+
+module Rivendell::Import
+  class Application < Sinatra::Application
+
+    set :public_folder, ::File.expand_path('static', ::File.dirname(__FILE__))
+    # set :static_cache_control, [:public, :max_age => 3600]
+
+    get '/' do
+      redirect "/tasks", 302
+    end
+
+    get '/tasks' do
+      erb :index, :locals => { :tasks => tasks.paginate(:page => params[:page], :per_page => 15) }
+    end
+
+    get '/tasks.json' do
+      tasks.to_json
+    end
+
+    def tasks
+      Task.order("updated_at DESC")
+    end
+
+    helpers do
+      def distance_of_time_in_words_from_now(time)
+        distance = Time.now - time
+
+        if distance < 43200 # less than 12 hours
+          time.strftime("%H:%M")
+        else
+          time.strftime("%d/%m")
+        end
+      end
+
+      def truncate_filename(path, length)
+        path = path.to_s
+
+        if path.size < length
+          path
+        else
+          path[0..length] + "..."
+        end
+      end
+
+    end
+
+  end
+end
+

data/lib/rivendell/import/base.rb

@@ -10,7 +10,13 @@ module Rivendell::Import
       @workers = []
     end
 
+    @@default_to_prepare = nil
+    cattr_accessor :default_to_prepare
+
     attr_accessor :to_prepare
+    def to_prepare
+      @to_prepare or default_to_prepare
+    end
 
     def listen(directory, options = {})
       workers << Worker.new(self).start unless options[:dry_run]

data/lib/rivendell/import/cart.rb

@@ -5,7 +5,7 @@ module Rivendell::Import
     include ActiveModel::Serializers::JSON
 
     def attributes
-      %w{number group}.inject({}) do |map, attribute|
+      %w{number group clear_cuts?}.inject({}) do |map, attribute|
         value = send attribute
         map[attribute] = value if value
         map
@@ -48,6 +48,7 @@ module Rivendell::Import
       raise "File #{file.path} not found" unless file.exists?
 
       cut.create
+      xport.clear_cuts number if clear_cuts?
       xport.import number, cut.number, file.path
       cut.update
     end
@@ -58,6 +59,13 @@ module Rivendell::Import
       end
     end
 
+    attr_accessor :clear_cuts
+    alias_method :clear_cuts?, :clear_cuts
+
+    def clear_cuts!
+      self.clear_cuts = true
+    end
+
     def carts_cache
       @carts_cache ||= Rivendell::Import::CartsCache.new(xport)
     end

data/lib/rivendell/import/cli.rb

@@ -1,5 +1,6 @@
 require 'trollop'
 require 'logger'
+require 'syslog/logger'
 
 module Rivendell::Import
   class CLI
@@ -27,6 +28,10 @@ module Rivendell::Import
       options[:debug]
     end
 
+    def syslog?
+      options[:syslog]
+    end
+
     def database
       options[:database]
     end
@@ -37,6 +42,7 @@ module Rivendell::Import
         opt :listen, "Wait for files in given directory"
         opt :dry_run, "Just create tasks without executing them"
         opt :debug, "Enable debug messages (in stderr)"
+        opt :syslog, "Log messages to syslog"
         opt :database, "The database file used to store tasks", :type => String
       end
     end
@@ -62,8 +68,39 @@ module Rivendell::Import
       parsed_parser.leftovers
     end
 
+    def setup_logger 
+      new_logger =
+        if syslog?
+          Syslog::Logger.new('rivendell-import').tap do |syslog|
+            syslog.level = debug? ? Logger::DEBUG : Logger::INFO
+          end
+        elsif debug?
+          Logger.new($stderr)
+        end
+
+      Rivendell::Import.logger = new_logger if new_logger
+    end
+
+    def start_webserver
+      require 'rivendell/import/application'
+
+      Rivendell::Import.logger.debug "Start webserver"
+
+      Thread.new do
+        Rivendell::Import::Application.run!
+
+        # FIXME we don't see difference between normal quit and start error (EADDRINUSE, ...)
+        Rivendell::Import.logger.debug "Webserver is stopped"
+        exit 0
+      end
+    end
+
+    def config_loader
+      ConfigLoader.new(config_file, listen_mode?)
+    end
+      
     def run
-      Rivendell::Import.logger = Logger.new($stderr) if debug?
+      setup_logger
 
       if database
         Rivendell::Import.establish_connection database
@@ -71,12 +108,11 @@ module Rivendell::Import
         Rivendell::Import.establish_connection
       end
 
-      if config_file
-        load config_file 
-        import.to_prepare = Rivendell::Import.config.to_prepare
-      end
+      config_loader.load
 
       if listen_mode?
+        start_webserver 
+
         listen_options = {}
         listen_options[:dry_run] = true if dry_run?
 

data/lib/rivendell/import/config.rb

@@ -2,11 +2,29 @@ module Rivendell::Import
   class Config
 
     def to_prepare(&block)
-      if block_given?
-        @prepare = block
-      else
-        @prepare
+      Base.default_to_prepare = block
+    end
+
+    def rivendell
+      @rivendell ||= Rivendell.new
+    end
+    alias_method :xport_options, :rivendell
+
+    class Rivendell
+
+      def host=(host)
+        Task.default_xport_options[:host] = host
       end
+
+      def login_name=(login_name)
+        Task.default_xport_options[:login_name] = login_name
+      end
+      alias_method :user=, :login_name=
+
+      def password=(password)
+        Task.default_xport_options[:password] = password
+      end
+
     end
 
   end

data/lib/rivendell/import/config_loader.rb

@@ -0,0 +1,43 @@
+module Rivendell::Import
+  class ConfigLoader
+
+    attr_accessor :file, :auto_reload
+    alias_method :auto_reload?, :auto_reload
+
+    def initialize(file, auto_reload = false)
+      self.file = file
+      self.auto_reload = auto_reload
+
+      listen_file if auto_reload?
+    end
+
+    def load
+      Kernel.load file
+    end
+
+    def listen_file
+      callback = Proc.new do |modified, added, removed|
+        if modified.include? absolute_path
+          Rivendell::Import.logger.info "Configuration changed, reload it"
+          load 
+        end
+      end
+
+      Rivendell::Import.logger.info "Listen to config file changes (#{file})"
+      Listen.to(directory).filter(/^#{basename}$/).change(&callback).start(false)
+    end
+
+    def absolute_path
+      ::File.expand_path(file)
+    end
+
+    def basename
+      ::File.basename(file)
+    end
+
+    def directory
+      ::File.dirname(file)
+    end
+
+  end
+end

data/lib/rivendell/import/file.rb

@@ -53,5 +53,10 @@ module Rivendell::Import
       ::File.exists? path
     end
 
+    def destroy!
+      Rivendell::Import.logger.debug "Delete file #{path}"
+      ::File.delete(path) if exists?
+    end
+
   end
 end

data/lib/rivendell/import/notifier/base.rb

@@ -58,10 +58,15 @@ module Rivendell::Import::Notifier
 
     after_initialize :read_parameters
 
+    def parameters_hash
+      parameters_as_string = parameters.sort_by { |p| p.first.to_s }.flatten.join('-')
+      Digest::SHA256.hexdigest parameters_as_string
+    end
+
     def write_parameters
       if parameters.present?
         write_attribute :parameters, parameters.to_json
-        write_attribute :key, parameters.hash
+        write_attribute :key, parameters_hash
       else
         write_attribute :parameters, nil
         write_attribute :key, nil
@@ -76,7 +81,7 @@ module Rivendell::Import::Notifier
                        Mail.new options.merge(:to => target)
                      end
 
-      key = new_notifier.parameters.hash
+      key = new_notifier.parameters_hash
       if existing_notifier = where(:type => new_notifier.type, :key => key).first
         existing_notifier
       else

data/lib/rivendell/import/static/screen.css

@@ -0,0 +1,137 @@
+html {color:#000;}
+body,div,ul,li,p,th,td{margin:0;padding:0;}
+table {border-collapse:collapse;border-spacing:0;}
+img {border:0;}
+strong,b,i,em,th {font-style:normal;font-weight:normal;}
+li {list-style:none;}
+th {text-align:left;}
+body {
+  margin: 0;
+  padding: 0;
+  font-size: 14px;
+  font-family: Trebuchet MS, Verdana, sans-serif;
+}
+a {
+  color: #5884a6;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+hr {
+  display: none;
+  clear: both;
+}
+img {
+  border: none;
+  vertical-align: middle;
+}
+strong { font-weight: bold; }
+em { font-style: italic; }
+#access { display: none; }
+#header {
+  border-bottom: 4px solid #cccccc;
+  background: #333333;
+  margin-bottom: 20px;
+}
+#header div {
+  position: relative;
+  height: 100px;
+  width: 750px;
+  margin: 0 auto;
+  background: url("rivendell-import.png") no-repeat 0px 30px;
+}
+#menu {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+}
+#menu li {
+  float: left;
+  margin: 0 0 0 8px;
+  background-color: #7196c4;
+}
+#menu li a {
+  display: block;
+  padding: 6px 10px;
+  font-size: 105%;
+  color: #ffffff;
+}
+#menu li a:hover {
+  color: #333333;
+  text-decoration: none;
+}
+#frame {
+  width: 750px;
+  margin: 0 auto;
+}
+#frame:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+#content {
+  padding-top: 5px;
+}
+#content .empty {
+  margin-top: 10px;
+  font-style: italic;
+}
+#content .pagination {
+  clear: both;
+  padding: 4px 0;
+  font-size: 90%;
+  text-align: right;
+}
+#content .pagination .disabled { display: none; }
+#flash div {
+  margin: 6px 0;
+  padding: 12px 0;
+  font-size: 115%;
+  font-weight: bold;
+  text-indent: 54px;
+  border-top: 1px solid #979797;
+  border-bottom: 1px solid #979797;
+  background: #e7e7e7 url("../images/ui/notice.png") no-repeat 28px;
+}
+#flash .success {
+  color: #1e7a1b;
+  border-color: #4bb426;
+  background: #b7e1af url("../images/ui/success.png") no-repeat 28px;
+}
+#flash .failure {
+  color: #c01100;
+  border-color: #ca4f35;
+  background: #ffbdbd url("../images/ui/failure.png") no-repeat 28px;
+}
+#flash .warning {
+  color: #c67109;
+  border-color: #c67109;
+  background: #f8e694 url("../images/ui/warning.png") no-repeat 28px;
+}
+#footer {
+  display: none;
+  clear: both;
+  color: #333333;
+  line-height: 18px;
+  margin: 0;
+  padding: 24px 0;
+  background: #e7db9f;
+}
+#footer div {
+  width: 760px;
+  margin: 0 auto;
+  text-align: left;
+}
+#content table {
+    width: 100%;
+}
+#content table th {
+  font-weight: bold;
+}
+#content table td, #content table th {
+  padding: 5px 2px;
+}
+#content table tr.odd {
+  background-color: #EAEAEA;
+}

data/lib/rivendell/import/task.rb

@@ -24,8 +24,24 @@ module Rivendell::Import
       status.completed? or status.failed?
     end
 
+    @@default_xport_options = {}
+    cattr_accessor :default_xport_options
+
+    def raw_xport_options
+      read_attribute :xport_options
+    end
+
+    def xport_options
+      @xport_options ||= (raw_xport_options ? JSON.parse(raw_xport_options).with_indifferent_access : default_xport_options.dup)
+    end
+
+    def write_xport_options
+      write_attribute :xport_options, (xport_options.present? ? xport_options.to_json : nil)
+    end
+    before_save :write_xport_options
+
     def xport
-      @xport ||= Rivendell::API::Xport.new
+      @xport ||= Rivendell::API::Xport.new(xport_options)
     end
 
     def prepare(&block)
@@ -53,6 +69,11 @@ module Rivendell::Import
         notifier.notify
       end
     end
+    after_status_changed :notify!, :on => [:completed, :failed]
+
+    def destroy_file!
+      file.destroy! if delete_file?
+    end
 
     def run
       logger.debug "Run #{self.inspect}"
@@ -64,16 +85,18 @@ module Rivendell::Import
       cart.import file
       cart.update
 
-      save!
+      destroy_file!
       change_status! :completed
 
       logger.info "Imported Cart #{cart.number}"
     rescue Exception => e
       logger.error "Task failed : #{e}"
+      logger.debug e.backtrace.join("\n")
     ensure
       unless status.completed?
         change_status! :failed 
       end
+      save!
     end
 
   end

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

@@ -1,5 +1,6 @@
 module Rivendell::Import::Tasking
   module File
+
     def file=(file)
       if file
         @file = file
@@ -16,5 +17,10 @@ module Rivendell::Import::Tasking
     def file
       @file ||= Rivendell::Import::File.new(file_name, :path => file_path)
     end
+
+    def delete_file!
+      self.delete_file = true
+    end
+
   end
 end

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

@@ -9,6 +9,7 @@ module Rivendell::Import::Tasking
       base.class_eval do
         after_initialize :define_default_status
       end
+      base.extend ClassMethods
     end
 
     def raw_status
@@ -22,7 +23,27 @@ module Rivendell::Import::Tasking
     def change_status!(status)
       logger.debug "Change status to #{status}"
       update_attribute :status, status.to_s
-      notify! if ran?
+      # notify! if ran?
+      invoke_status_changed_callbacks
+    end
+
+    def invoke_status_changed_callbacks
+      callbacks = self.class.status_changed_callbacks.values_at(:all, status.to_sym).flatten
+      callbacks.each { |method| send method }
+    end
+
+    module ClassMethods
+
+      def status_changed_callbacks
+        @status_changed_callbacks ||= Hash.new { |h,k| h[k] = [] }
+      end
+
+      def after_status_changed(method, options = {})
+        Array(options[:on] || :all).each do |status|
+          status_changed_callbacks[status] << method
+        end
+      end
+
     end
 
   end

data/lib/rivendell/import/tasks.rb

@@ -1,10 +1,6 @@
 module Rivendell::Import
   class Tasks
 
-    def pending?
-      not Task.pending.empty?
-    end
-
     def pop
       Task.pending.first
     end

data/lib/rivendell/import/version.rb

@@ -1,5 +1,5 @@
 module Rivendell
   module Import
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

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

@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="fr">
+  <head>
+    <title>Rivendell Import</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link rel="shortcut icon" href="/favicon.ico" />
+    <link href="/screen.css" media="screen" rel="stylesheet" type="text/css" />
+  </head>
+  <body class="tasks index">
+    <ul id="access">
+      <li><a href="#content">Aller au contenu</a></li>
+      <li><a href="#sidebar">Aller au menu</a></li>
+    </ul>
+    <hr/>
+    <div id="header">
+      <div>
+        <ul id="menu">
+          <li><a href="http://wiki.tryphon.eu/rivendell-import/">Help</a></li>
+        </ul>
+      </div>
+    </div>
+    <hr/>
+    <div id="frame">
+      <div id="content">
+        <%= will_paginate tasks %>
+
+        <table>
+          <tr>
+            <th>#</th>
+            <th>Status</th>
+            <th>Since</th>
+            <th>File</th>
+            <th>Destination</th>
+            <th>Priority</th>
+          <tr/>
+          <% tasks.each_with_index do |task, index| %>
+          <tr class="<%= 'odd' if index.odd? %>">
+            <td><%= task.id %></td>
+            <td><%= task.status %></td>
+            <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>
+          </tr>
+          <% end %>
+        </table>
+      </div>
+    </div>
+    <hr/>
+    <div id="footer">
+      <div>
+        &nbsp;
+      </div>
+    </div>
+  </body>
+</html>

data/rivendell-import.gemspec

@@ -17,12 +17,16 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'listen'
   gem.add_runtime_dependency 'httmultiparty'
-  gem.add_runtime_dependency 'rivendell-api', '~> 0.0.2'
+  gem.add_runtime_dependency 'rivendell-api', '~> 0.0.3'
   gem.add_runtime_dependency 'trollop'
   gem.add_runtime_dependency 'activerecord', '~> 3.2.8'
   gem.add_runtime_dependency 'activesupport', '~> 3.2.8'
   gem.add_runtime_dependency 'mail'
   gem.add_runtime_dependency 'sqlite3'
+  gem.add_runtime_dependency 'SyslogLogger', '~> 2.0'
+
+  gem.add_runtime_dependency 'sinatra'
+  gem.add_runtime_dependency 'will_paginate', '~> 3.0.0'
 
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "rspec"

data/spec/rivendell/import/base_spec.rb

@@ -14,6 +14,17 @@ describe Rivendell::Import::Base do
 
   end
 
+  describe "#to_prepare" do
+
+    let(:block) { mock }
+
+    it "should use default_to_prepare if not defined" do
+      subject.stub :default_to_prepare => block
+      subject.to_prepare.should == block
+    end
+                           
+  end
+
   describe "#create_task" do
 
     let(:file) { Rivendell::Import::File.new "dummy.wav" }

data/spec/rivendell/import/cart_spec.rb

@@ -83,8 +83,7 @@ describe Rivendell::Import::Cart do
 
     before(:each) do
       subject.number = 123
-      subject.stub :xport => mock(:import => true)
-      subject.cut.stub :create => true, :number => 1, :update => true
+      subject.stub :cut => mock.as_null_object, :xport => mock.as_null_object
     end
     
     it "should create Cut" do
@@ -102,6 +101,25 @@ describe Rivendell::Import::Cart do
       subject.import file
     end
 
+    context "clear_cuts has been defined" do
+      before do
+        subject.clear_cuts!
+      end
+
+      it "should invoke Xport#clear_cuts before create a new cut" do
+        subject.xport.should_receive(:clear_cuts).ordered.with(subject.number)
+        subject.xport.should_receive(:import).ordered
+        subject.import file
+      end
+    end
+
+    context "clear_cuts hasn't been defined" do
+      it "should not invoke Xport#clear_cuts" do
+        subject.xport.should_not_receive(:create_cuts).with(subject.number)
+        subject.import file
+      end
+    end
+
   end
 
   describe "#find_by_title" do
@@ -129,4 +147,17 @@ describe Rivendell::Import::Cart do
 
   end
 
+  describe "#clear_cuts!" do
+
+    before do
+      subject.number = 123
+    end
+    
+    it "should set flag clear_cuts" do
+      subject.clear_cuts!
+      subject.clear_cuts.should be_true
+    end
+
+  end
+
 end

data/spec/rivendell/import/cli_spec.rb

@@ -40,6 +40,15 @@ describe Rivendell::Import::CLI do
 
   end
 
+  describe "syslog?" do
+    
+    it "should return true when --syslog is specified" do
+      subject.arguments << "--syslog"
+      subject.should be_syslog
+    end
+
+  end
+
   describe "#import" do
 
     it "should return a Rivendell::Import::Base instance" do
@@ -71,13 +80,18 @@ describe Rivendell::Import::CLI do
 
     before(:each) do
       subject.stub :paths => %w{file1 file2}
+      subject.stub :start_webserver
+      subject.stub :config_loader => mock(:load => true)
       subject.import.tasks.stub :run => true
     end
 
-    it "should load config_file" do
-      subject.stub :config_file => "dummy.rb"
-      subject.should_receive(:load).with(subject.config_file)
+    it "should setup logger" do
+      subject.should_receive(:setup_logger)
+      subject.run
+    end
 
+    it "should load config_file" do
+      subject.config_loader.should_receive(:load)
       subject.run
     end
 
@@ -146,4 +160,34 @@ describe Rivendell::Import::CLI do
     
   end
 
+  describe "#setup_logger" do
+    
+    context " with syslog option" do
+
+      before do
+        subject.stub :syslog? => true
+      end
+
+      it "should use a SyslogLogger" do
+        Rivendell::Import.should_receive(:logger=).with(kind_of(Syslog::Logger))
+        subject.setup_logger
+      end
+
+    end
+
+  end
+
+  describe "#config_loader" do
+    
+    it "should use config_file" do
+      subject.config_loader.file.should == subject.config_file
+    end
+
+    it "should be auto_reload if listen mode is enabled" do
+      subject.stub :listen_mode? => true, :config_file => "dummy"
+      subject.config_loader.should be_auto_reload
+    end
+
+  end
+
 end

data/spec/rivendell/import/config_spec.rb

@@ -1,16 +1,38 @@
 require 'spec_helper'
 
 describe Rivendell::Import::Config do
+ 
+  let(:config) { Rivendell::Import::Config.new }
 
   describe "#to_prepare" do
 
     let(:user_block) { Proc.new {} }
     
-    it "should define to_prepare proc with given block" do
+    it "should define Base.default_to_prepare with given block" do
       subject.to_prepare(&user_block)
-      subject.to_prepare.should == user_block
+      Rivendell::Import::Base.default_to_prepare.should == user_block
     end
 
   end
 
+  describe "#rivendell" do
+
+    subject { config.rivendell }
+
+    def self.it_should_define_task_default_xport_option(attribute)
+      describe "#{attribute}=" do
+        attribute = attribute.to_sym
+        it "should define Task.default_xport_options[:#{attribute}]" do
+          subject.send "#{attribute}=", "dummy"
+          Rivendell::Import::Task.default_xport_options[attribute].should == "dummy"
+        end
+      end
+    end
+
+    it_should_define_task_default_xport_option :host
+    it_should_define_task_default_xport_option :login_name
+    it_should_define_task_default_xport_option :password
+    
+  end
+
 end

data/spec/rivendell/import/notifier/base_spec.rb

@@ -55,9 +55,23 @@ describe Rivendell::Import::Notifier::Base do
       subject.key = nil
       subject.stub :parameters => { :dummy => true }
       subject.save!
-      subject.key.should == subject.parameters.hash
+      subject.key.should == subject.parameters_hash
     end
 
   end
 
+  describe "#parameters_hash" do
+
+    let(:other) { Rivendell::Import::Notifier::Test.new }
+
+    it "should be identical when parameters are identical" do
+      subject.stub :parameters => { :first => 1, :second => 2  }
+      other.stub :parameters => { :second => 2, :first => 1 }
+
+      subject.parameters_hash.should == other.parameters_hash
+    end
+    
+    
+  end
+
 end

data/spec/rivendell/import/task_spec.rb

@@ -27,6 +27,26 @@ describe Rivendell::Import::Task do
       subject.xport.should be_instance_of(Rivendell::API::Xport)
     end
 
+    it "should use xport_options" do
+      subject.xport_options[:host] = "dummy"
+      subject.xport.host.should == "dummy"
+    end
+
+  end
+
+  describe "#xport_options" do
+    
+    it "should use #default_xport_options" do
+      subject.stub :default_xport_options => { :host => "dummy" }  
+      subject.xport_options.should == { :host => "dummy" }
+    end
+
+    it "should not modified #default_xport_options" do
+      subject.stub :default_xport_options => { :host => "dummy" }  
+      subject.xport_options[:host] = "other"
+      subject.default_xport_options.should == { :host => "dummy" }
+    end
+
   end
 
   describe "#prepare" do
@@ -119,16 +139,29 @@ describe Rivendell::Import::Task do
       subject.destination.should == Rivendell::Import::Task.find(subject).destination
     end
 
+    def reloaded_task
+      subject.save
+      Rivendell::Import::Task.find(subject)
+    end
+
     it "should store tags separated with commas" do
       subject.tags << "tag1" << "tag2"
-      subject.save
-      Rivendell::Import::Task.find(subject).raw_tags.should == "tag1,tag2"
+      reloaded_task.raw_tags.should == "tag1,tag2"
     end
 
     it "should store cart" do
       subject.cart.number = 123
-      subject.save
-      Rivendell::Import::Task.find(subject).cart.number.should == 123
+      reloaded_task.cart.number.should == 123
+    end
+
+    it "should store cart" do
+      subject.cart.number = 123
+      reloaded_task.cart.number.should == 123
+    end
+
+    it "should store cart" do
+      subject.xport_options[:host] = "dummy"
+      reloaded_task.xport_options[:host].should == "dummy"
     end
     
   end
@@ -214,4 +247,37 @@ describe Rivendell::Import::Task do
 
   end
 
+  describe "#delete_file!" do
+    
+    it "should set flag delete_file" do
+      subject.delete_file!
+      subject.delete_file.should be_true
+    end
+
+    context "defined" do
+
+      before do
+        subject.stub :cart => mock.as_null_object
+      end
+      
+
+      it "should destroy! file when task is completed" do
+        subject.delete_file!
+        subject.file.should_receive(:destroy!)
+        subject.run
+      end
+                  
+    end
+
+    context "not defined" do
+
+      it "should destroy! file when task is completed" do
+        subject.file.should_not_receive(:destroy!)
+        subject.run
+      end
+                  
+    end
+
+  end
+
 end

data/spec/rivendell/import/tasks_spec.rb

@@ -4,19 +4,6 @@ describe Rivendell::Import::Tasks do
 
   let(:file) { Rivendell::Import::File.new "dummy.wav" }
 
-  describe "#pending?" do
-    
-    it "should be true when a task is pending" do
-      subject.create file
-      subject.should be_pending
-    end
-
-    it "should be false when queue is empty?" do
-      subject.should_not be_pending
-    end
-
-  end
-
   describe "#run" do
     
     it "should run each task" do

data/spec/rivendell/import/worker_spec.rb

@@ -16,6 +16,7 @@ describe Rivendell::Import::Worker do
   end
 
   it "should run Import tasks in a separated Thread" do
+    pending "Transaction masks changes for Worker"
     import.tasks.create file
     subject.start
     sleep 0.5

data/spec/support/database_cleaner.rb

@@ -3,7 +3,8 @@ require 'database_cleaner'
 RSpec.configure do |config|
 
   config.before(:suite) do
-    DatabaseCleaner.strategy = :truncation
+    # DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.strategy = :transaction
   end
 
   config.before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivendell-import
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: SyslogLogger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  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: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +333,8 @@ files:
 - db/migrate/20120920712200_create_tasks.rb
 - db/migrate/20120927194300_create_notifiers.rb
 - db/migrate/20120927203600_create_notifications.rb
+- db/migrate/20121004194900_add_delete_file_to_task.rb
+- db/migrate/2012100620361349548586_add_xport_options_to_task.rb
 - examples/.gitignore
 - examples/config.rb
 - features/manage_cart_attributes.feature
@@ -293,11 +343,13 @@ files:
 - features/support/env.rb
 - features/support/mock_xport.rb
 - lib/rivendell/import.rb
+- lib/rivendell/import/application.rb
 - lib/rivendell/import/base.rb
 - lib/rivendell/import/cart.rb
 - lib/rivendell/import/carts_cache.rb
 - lib/rivendell/import/cli.rb
 - lib/rivendell/import/config.rb
+- lib/rivendell/import/config_loader.rb
 - lib/rivendell/import/context.rb
 - lib/rivendell/import/cut.rb
 - lib/rivendell/import/file.rb
@@ -307,6 +359,8 @@ files:
 - lib/rivendell/import/notifier/mail-subject.erb
 - lib/rivendell/import/notifier/mail.rb
 - lib/rivendell/import/notifiers.rb
+- lib/rivendell/import/static/rivendell-import.png
+- lib/rivendell/import/static/screen.css
 - lib/rivendell/import/task.rb
 - lib/rivendell/import/tasking/cart.rb
 - lib/rivendell/import/tasking/destination.rb
@@ -315,6 +369,7 @@ files:
 - lib/rivendell/import/tasking/tags.rb
 - lib/rivendell/import/tasks.rb
 - lib/rivendell/import/version.rb
+- lib/rivendell/import/views/index.erb
 - lib/rivendell/import/worker.rb
 - log/.gitkeep
 - rivendell-import.gemspec
@@ -356,7 +411,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2415825681364958613
+      hash: 900421457418897316
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -365,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2415825681364958613
+      hash: 900421457418897316
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23