rivendell-import 1.01 → 1.02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rivendell-import (1.01)
+    rivendell-import (1.02)
       SyslogLogger (~> 2.0)
       activerecord (~> 3.2.8)
       activesupport (~> 3.2.8)
@@ -10,7 +10,7 @@ PATH
       httparty (= 0.11.0)
       listen (~> 1.3.1)
       mail
-      rivendell-api (~> 0.8)
+      rivendell-api (~> 0.9)
       rivendell-db (~> 0.3)
       sinatra
       sqlite3
@@ -33,9 +33,9 @@ GEM
     activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.6)
+    addressable (2.3.7)
     arel (3.0.3)
-    bcrypt (3.1.9)
+    bcrypt (3.1.10)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     builder (3.0.4)
@@ -52,7 +52,7 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
     daemons (1.1.9)
-    data_objects (0.10.14)
+    data_objects (0.10.15)
       addressable (~> 2.1)
     database_cleaner (1.3.0)
     diff-lcs (1.2.5)
@@ -80,8 +80,8 @@ GEM
       uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_mysql (0.10.14)
-      data_objects (= 0.10.14)
+    do_mysql (0.10.15)
+      data_objects (= 0.10.15)
     docile (1.1.5)
     fastercsv (1.5.5)
     ffi (1.9.5)
@@ -107,9 +107,9 @@ GEM
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
-    i18n (0.6.11)
+    i18n (0.7.0)
     json (1.8.1)
-    json_pure (1.8.1)
+    json_pure (1.8.2)
     libnotify (0.8.3)
       ffi (>= 1.0.11)
     listen (1.3.1)
@@ -134,7 +134,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-protection (1.5.3)
       rack
     rake (10.3.2)
@@ -145,11 +145,11 @@ GEM
       ffi (>= 0.5.0)
     rdoc (4.1.2)
       json (~> 1.4)
-    rivendell-api (0.8)
+    rivendell-api (0.9)
       activesupport
       httmultiparty
       null_logger
-    rivendell-db (0.3)
+    rivendell-db (0.4)
       dm-core
       dm-mysql-adapter
       dm-serializer
@@ -185,7 +185,7 @@ GEM
     thor (0.19.1)
     tilt (1.4.1)
     trollop (2.1.1)
-    tzinfo (0.3.42)
+    tzinfo (0.3.43)
     uuidtools (2.1.5)
     will_paginate (3.0.7)
 

data/lib/rivendell/import/cart.rb

@@ -10,7 +10,7 @@ module Rivendell::Import
 
     def attributes
       attributes = {}
-      %w{number group clear_cuts title default_title scheduler_codes import_options}.each do |attribute|
+      %w{number group clear_cuts title default_title scheduler_codes artist album import_options}.each do |attribute|
         value = send attribute
         attributes[attribute] = value if value.present?
       end
@@ -32,7 +32,7 @@ module Rivendell::Import
 
     delegate :blank?, :to => :attributes
 
-    attr_accessor :number, :group, :title, :default_title, :scheduler_codes
+    attr_accessor :number, :group, :title, :default_title, :scheduler_codes, :artist, :album
     attr_reader :task
 
     def initialize(task = nil)
@@ -74,7 +74,7 @@ module Rivendell::Import
       def initialize(cart)
         @cart = cart
       end
-      delegate :number, :title, :default_title, :scheduler_codes, :to => :cart
+      delegate :number, :title, :default_title, :scheduler_codes, :artist, :album, :to => :cart
 
       def empty_title?(title)
         [ nil, "", "[new cart]" ].include? title
@@ -120,6 +120,8 @@ module Rivendell::Import
       def attributes
         {}.tap do |attributes|
           attributes[:title] = title_with_default if title_with_default
+          attributes[:artist] = artist if artist
+          attributes[:album] = album if album
         end
       end
 
@@ -138,10 +140,12 @@ module Rivendell::Import
       def update!
         Database.init
 
-        if title_with_default or not scheduler_codes.empty?
+        if title_with_default or artist or album or not scheduler_codes.empty?
           Rivendell::Import.logger.debug "Update Cart by DB"
           current_cart.title = title_with_default if title_with_default
           current_cart.scheduler_codes = scheduler_codes unless scheduler_codes.empty?
+          current_cart.artist = artist if artist
+          current_cart.album = album if album
           current_cart.save
         end
       end

data/lib/rivendell/import/version.rb

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

data/rivendell-import.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'httmultiparty'
   # 0.12.0 requires ruby 1.9.3
   gem.add_runtime_dependency 'httparty', '0.11.0'
-  gem.add_runtime_dependency 'rivendell-api', '~> 0.8'
+  gem.add_runtime_dependency 'rivendell-api', '~> 0.9'
   gem.add_runtime_dependency 'trollop'
   gem.add_runtime_dependency 'activerecord', '~> 3.2.8'
   gem.add_runtime_dependency 'activesupport', '~> 3.2.8'

data/spec/rivendell/import/cart_spec.rb

@@ -192,7 +192,7 @@ describe Rivendell::Import::Cart do
       subject.scheduler_codes << "dummy"
       subject.attributes["scheduler_codes"].should == ["dummy"]
     end
-    
+
   end
 
   describe "#to_json" do
@@ -218,12 +218,12 @@ describe Rivendell::Import::Cart 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)
@@ -233,7 +233,7 @@ describe Rivendell::Import::Cart do
       Rivendell::Import::Database.stub :enabled? => false
       subject.updaters.should_not include(Rivendell::Import::Cart::DbUpdater)
     end
-    
+
   end
 
   describe "#update" do
@@ -256,9 +256,9 @@ describe Rivendell::Import::Cart do
       subject.stub :updaters => []
       subject.update.should be_false
     end
-    
+
   end
-  
+
 end
 
 describe Rivendell::Import::Cart::Updater do
@@ -299,7 +299,7 @@ describe Rivendell::Import::Cart::Updater do
       subject.stub :update! => false
       subject.update.should be_false
     end
-    
+
   end
 
   describe "#title_with_default" do
@@ -317,7 +317,7 @@ describe Rivendell::Import::Cart::Updater do
     context "when default title is defined" do
 
       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
@@ -329,9 +329,9 @@ describe Rivendell::Import::Cart::Updater do
       end
 
     end
-    
+
   end
-  
+
 end
 
 describe Rivendell::Import::Cart::ApiUpdater do
@@ -353,7 +353,7 @@ describe Rivendell::Import::Cart::ApiUpdater do
       xport.should_receive(:list_cart).with(cart.number).and_return(xport_cart)
       subject.current_title.should == xport_cart.title
     end
-    
+
   end
 
   describe "#attributes" do
@@ -367,7 +367,27 @@ describe Rivendell::Import::Cart::ApiUpdater do
       subject.stub title_with_default: nil
       subject.attributes.should == {}
     end
-    
+
+    it "should contain artist if defined" do
+      cart.artist = "dummy"
+      subject.attributes[:artist].should == subject.artist
+    end
+
+    it "should not contain artist if not defined" do
+      cart.artist = nil
+      subject.attributes.should_not have_key(:artist)
+    end
+
+    it "should contain album if defined" do
+      cart.album = "dummy"
+      subject.attributes[:album].should == subject.album
+    end
+
+    it "should not contain album if not defined" do
+      cart.album = nil
+      subject.attributes.should_not have_key(:album)
+    end
+
   end
 
   describe "#update!" do
@@ -379,7 +399,7 @@ describe Rivendell::Import::Cart::ApiUpdater do
         xport.should_receive(:edit_cart).with(cart.number, subject.attributes)
         subject.update!
       end
-      
+
     end
 
     context "when attributes is empty" do
@@ -389,11 +409,11 @@ describe Rivendell::Import::Cart::ApiUpdater do
         xport.should_not_receive(:edit_cart)
         subject.update!.should be_true
       end
-      
+
     end
-    
+
   end
-  
+
 end
 
 describe Rivendell::Import::Cart::DbUpdater do
@@ -416,7 +436,7 @@ describe Rivendell::Import::Cart::DbUpdater 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
@@ -425,7 +445,7 @@ describe Rivendell::Import::Cart::DbUpdater do
       db_cart.stub title: "dummy"
       subject.current_title.should == db_cart.title
     end
-    
+
   end
 
   describe "#update!" do
@@ -441,12 +461,24 @@ describe Rivendell::Import::Cart::DbUpdater do
       db_cart.title.should == subject.title_with_default
     end
 
+    it "should use artist as Cart artist" do
+      subject.stub artist: "dummy"
+      subject.update!
+      db_cart.artist.should == subject.artist
+    end
+
+    it "should use album as Cart album" do
+      subject.stub album: "dummy"
+      subject.update!
+      db_cart.album.should == subject.album
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivendell-import
 version: !ruby/object:Gem::Version
-  version: '1.01'
+  version: '1.02'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -503,7 +503,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1683844090419105726
+      hash: 2132046489375508529
 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: -1683844090419105726
+      hash: 2132046489375508529
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23