rivendell-api 0.0.4 → 0.0.5

data/lib/rivendell/api/cart.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/string/inflections'
 
 module Rivendell::API
   class Cart
-   
+
     attr_accessor :number, :type, :group_name, :title, :artist, :album, :year, :label, :client, :agency, :publisher, :composer, :user_defined, :usage_code, :forced_length, :average_length, :length_deviation, :average_segue_lenth, :average_hook_length, :cut_quantity, :last_cut_played, :validity, :enforce_length, :asyncronous, :owner, :metadata_datetime
 
     def initialize(attributes = {})
@@ -12,16 +12,20 @@ module Rivendell::API
     def number=(number)
       @number = (number ? number.to_i : nil)
     end
-    
+
+    def has_title?
+      not [ nil, "", "[new cart]" ].include? title
+    end
+
     alias_method :group, :group_name
     alias_method :group=, :group_name=
-      
+
     def cut_list=(cuts)
-      
+
     end
 
     def macro_list=(cuts)
-      
+
     end
 
     def method_missing(name, *arguments)
@@ -32,6 +36,6 @@ module Rivendell::API
         super
       end
     end
- 
+
   end
 end

data/lib/rivendell/api/version.rb

@@ -1,5 +1,5 @@
 module Rivendell
   module Api
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/rivendell/api/xport.rb

@@ -39,8 +39,8 @@ module Rivendell::API
     def login_name
       @login_name ||= "user"
     end
-    
-    def password 
+
+    def password
       @password ||= ""
     end
 
@@ -49,10 +49,10 @@ module Rivendell::API
     end
 
     def query(command, attributes = {})
-      attributes = { 
-        :command => command, 
-        :login_name => login_name, 
-        :password => password 
+      attributes = {
+        :command => command,
+        :login_name => login_name,
+        :password => password
       }.merge(attributes)
 
       attributes.inject({}) do |map, (key, value)|
@@ -65,7 +65,7 @@ module Rivendell::API
       logger.debug "Post #{command} #{attributes.inspect}"
 
       options = options.merge :query => query(command, attributes)
-      
+
       response = self.class.post rdxport_uri, options
       response.error! unless response.success?
       response
@@ -83,10 +83,24 @@ module Rivendell::API
       Rivendell::API::Cart.new(response["cartAdd"]["cart"])
     end
 
+    def edit_cart(number, attributes = {})
+      attributes[:cart_number] = number
+      attributes.delete(:number)
+      attributes[:group_name] ||= attributes.delete(:group)
+
+      response = post COMMAND_EDITCART, attributes
+      Rivendell::API::Cart.new(response["cartList"]["cart"])
+    end
+
+    def list_cart(cart_number)
+      response = post COMMAND_LISTCART, :cart_number => cart_number
+      Rivendell::API::Cart.new response["cartList"]["cart"]
+    end
+
     # FIXME accents in carts create invalid UTF-8 response
     def list_carts(options = {})
       options[:group_name] ||= options.delete(:group)
-      
+
       response = post COMMAND_LISTCARTS, options
       response["cartList"]["cart"].collect do |cart_xml|
         Rivendell::API::Cart.new(cart_xml)
@@ -123,8 +137,8 @@ module Rivendell::API
     end
 
     def import(cart_number, cut_number, file, options = {})
-      arguments = { 
-        :channels => 2, 
+      arguments = {
+        :channels => 2,
         :normalization_level => -13,
         :autotrim_level => -30,
         :use_metadata => true,

data/spec/fixtures/rdxport_edit_cart.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<cartList>
+<cart>
+  <number>1005</number>
+  <type>audio</type>
+  <groupName>TEST</groupName>
+  <title>[new cart]</title>
+  <artist></artist>
+  <album></album>
+  <year></year>
+  <label></label>
+  <client></client>
+  <agency></agency>
+  <publisher></publisher>
+  <composer></composer>
+  <userDefined></userDefined>
+  <usageCode>0</usageCode>
+  <forcedLength>0:00:00.0</forcedLength>
+  <averageLength>0:00:00.0</averageLength>
+  <lengthDeviation>0:00:00.0</lengthDeviation>
+  <averageSegueLenth>0:00:00.0</averageSegueLenth>
+  <averageHookLength>0:00:00.0</averageHookLength>
+  <cutQuantity>0</cutQuantity>
+  <lastCutPlayed>0</lastCutPlayed>
+  <validity>2</validity>
+  <enforceLength>false</enforceLength>
+  <asyncronous>false</asyncronous>
+  <owner></owner>
+  <metadataDatetime></metadataDatetime>
+</cart>
+</cartList>

data/spec/rivendell/api/cart_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Rivendell::API::Cart do
+
+  describe "has_title?" do
+
+    it "should return false if title is nil" do
+      subject.title = nil
+      subject.should_not have_title
+    end
+
+    it "should return false if title is empty" do
+      subject.title = ""
+      subject.should_not have_title
+    end
+
+    it "should return false if title is '[new cart]'" do
+      subject.title = "[new cart]"
+      subject.should_not have_title
+    end
+
+    it "should return true if title is something else" do
+      subject.title = "dummy"
+      subject.should have_title
+    end
+
+  end
+
+end

data/spec/rivendell/api/xport_spec.rb

@@ -15,7 +15,7 @@ describe Rivendell::API::Xport do
   end
 
   describe "initialization" do
-    
+
     it "should use specified attributes" do
       Rivendell::API::Xport.new(:login_name => "dummy").login_name.should == "dummy"
     end
@@ -53,7 +53,7 @@ describe Rivendell::API::Xport do
         list_groups
       end
     end
-    
+
     it "should be '' by default" do
       subject.password.should == ''
     end
@@ -78,7 +78,7 @@ describe Rivendell::API::Xport do
         list_groups
       end
     end
-    
+
     it "should used host specified in constructor" do
       subject.make_request
     end
@@ -91,7 +91,7 @@ describe Rivendell::API::Xport do
       subject.host = "dummy"
       subject.rdxport_uri.should == "http://dummy/rd-bin/rdxport.cgi"
     end
-    
+
   end
 
   describe "#list_groups" do
@@ -136,13 +136,13 @@ describe Rivendell::API::Xport do
   end
 
   describe "#add_cart" do
-    
+
     before(:each) do
       FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => fixture_content("rdxport_add_cart.xml"))
     end
 
     it "should use COMMAND 12" do
-      subject.add_cart 
+      subject.add_cart
       FakeWeb.last_request["COMMAND"] == "12"
     end
 
@@ -162,8 +162,31 @@ describe Rivendell::API::Xport do
 
   end
 
+  describe "#edit_cart" do
+
+    before(:each) do
+      FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => fixture_content("rdxport_edit_cart.xml"))
+    end
+
+    it "should use COMMAND 14" do
+      subject.edit_cart 123
+      FakeWeb.last_request["COMMAND"] == "14"
+    end
+
+    it "should use specified number" do
+      subject.edit_cart 123
+      FakeWeb.last_request["CART_NUMBER"] == 123
+    end
+
+    it "should use group as group_name" do
+      subject.edit_cart 123, :group => "TEST"
+      FakeWeb.last_request["GROUP_NAME"] == "TEST"
+    end
+
+  end
+
   describe "#add_cut" do
-    
+
     before(:each) do
       FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => fixture_content("rdxport_add_cut.xml"))
     end
@@ -180,7 +203,7 @@ describe Rivendell::API::Xport do
   end
 
   describe "#list_carts" do
-    
+
     before(:each) do
       FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => fixture_content("rdxport_list_carts.xml"))
     end
@@ -202,7 +225,7 @@ describe Rivendell::API::Xport do
   end
 
   describe "#list_cuts" do
-    
+
     before(:each) do
       FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => fixture_content("rdxport_list_cuts.xml"))
     end
@@ -227,7 +250,7 @@ describe Rivendell::API::Xport do
     end
 
     let(:cuts) { [ cut(1), cut(2) ]}
-    
+
     it "should load specified Cart" do
       subject.should_receive(:list_cuts).with(number).and_return(cuts)
       subject.clear_cuts number
@@ -243,7 +266,7 @@ describe Rivendell::API::Xport do
   end
 
   describe "#remove_cut" do
-    
+
     before(:each) do
       FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => xml_response)
     end
@@ -274,7 +297,7 @@ describe Rivendell::API::Xport do
       subject.class.should_receive(:post).with(anything, hash_including(:option => "value")).and_return(mock(:success? => true))
       subject.post "dummy", {}, :option => "value"
     end
-    
+
     it "should raise an error when http response is an error" do
       FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :status => ["403", "Error"])
       lambda { subject.post("dummy") }.should raise_error(Net::HTTPServerException)

metadata

@@ -1,168 +1,158 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rivendell-api
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Alban Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: httmultiparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2013-08-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  name: httmultiparty
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  name: activesupport
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: null_logger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  name: null_logger
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  name: simplecov
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+  name: rspec
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+  name: guard
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  name: guard-rspec
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+  name: rake
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Use the rdxport interface to retrieve Groups, create/edit/retrieve Carts
-  and Cuts, import Cut sound.
-email:
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+  name: fakeweb
+description: Use the rdxport interface to retrieve Groups, create/edit/retrieve Carts and Cuts, import Cut sound.
+email: 
 - alban@tryphon.eu
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - COPYING
 - COPYRIGHT
@@ -181,10 +171,12 @@ files:
 - spec/fixtures/empty.wav
 - spec/fixtures/rdxport_add_cart.xml
 - spec/fixtures/rdxport_add_cut.xml
+- spec/fixtures/rdxport_edit_cart.xml
 - spec/fixtures/rdxport_import.xml
 - spec/fixtures/rdxport_list_carts.xml
 - spec/fixtures/rdxport_list_cuts.xml
 - spec/fixtures/rdxport_list_groups.xml
+- spec/rivendell/api/cart_spec.rb
 - spec/rivendell/api/xport_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb
@@ -192,42 +184,47 @@ files:
 - tasks/rspec.rake
 homepage: http://projects.tryphon.eu/rivendell-api
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4025858966392152939
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4025858966392152939
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Pilots Rivendell via http/xml API
-test_files:
+test_files: 
 - spec/fixtures/empty.wav
 - spec/fixtures/rdxport_add_cart.xml
 - spec/fixtures/rdxport_add_cut.xml
+- spec/fixtures/rdxport_edit_cart.xml
 - spec/fixtures/rdxport_import.xml
 - spec/fixtures/rdxport_list_carts.xml
 - spec/fixtures/rdxport_list_cuts.xml
 - spec/fixtures/rdxport_list_groups.xml
+- spec/rivendell/api/cart_spec.rb
 - spec/rivendell/api/xport_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb