rivendell-api 0.0.5 → 0.6

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 *~
 log/*
+.ruby-version

data/lib/rivendell/api/cart.rb

@@ -13,10 +13,6 @@ module Rivendell::API
       @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=
 

data/lib/rivendell/api/version.rb

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

data/lib/rivendell/api/xport.rb

@@ -102,26 +102,30 @@ module Rivendell::API
       options[:group_name] ||= options.delete(:group)
 
       response = post COMMAND_LISTCARTS, options
-      response["cartList"]["cart"].collect do |cart_xml|
+      elements(response["cartList"]["cart"]).collect do |cart_xml|
         Rivendell::API::Cart.new(cart_xml)
       end
     end
 
+    def elements(response)
+      case response
+      when Array
+        response
+      when nil
+        []
+      else
+        [ response ]
+      end
+    end
+
     def remove_cart(cart_number)
       post COMMAND_REMOVECART, :cart_number => cart_number
     end
 
     def list_cuts(cart_number)
       response = post COMMAND_LISTCUTS, :cart_number => cart_number
-      case cuts_xml = response["cutList"]["cut"]
-      when Array
-        cuts_xml.collect do |cut_xml|
-          Rivendell::API::Cut.new(cut_xml)
-        end
-      when nil
-        []
-      else
-        [ Rivendell::API::Cut.new(cuts_xml) ]
+      elements(response["cutList"]["cut"]).collect do |cut_xml|
+        Rivendell::API::Cut.new cut_xml
       end
     end
 

data/spec/fixtures/rdxport_list_carts-single-cart.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<cartList>
+<cart>
+  <number>10037</number>
+  <type>audio</type>
+  <groupName>MUSIC</groupName>
+  <title>Rivendell 1</title>
+  <artist>Trust</artist>
+  <album>AntiBest of</album>
+  <year></year>
+  <label></label>
+  <client></client>
+  <agency></agency>
+  <publisher></publisher>
+  <composer></composer>
+  <userDefined></userDefined>
+  <usageCode>0</usageCode>
+  <forcedLength>0:05:05.8</forcedLength>
+  <averageLength>0:05:05.8</averageLength>
+  <lengthDeviation>0:00:00.0</lengthDeviation>
+  <averageSegueLenth>0:05:05.8</averageSegueLenth>
+  <averageHookLength>0:00:00.0</averageHookLength>
+  <cutQuantity>1</cutQuantity>
+  <lastCutPlayed>0</lastCutPlayed>
+  <validity>2</validity>
+  <enforceLength>false</enforceLength>
+  <asyncronous>false</asyncronous>
+  <owner></owner>
+  <metadataDatetime>Mon, 29 Aug 2011 15:15:56 GMT</metadataDatetime>
+<cutList>
+<cut>
+  <cutName>010037_001</cutName>
+  <cartNumber>10037</cartNumber>
+  <cutNumber>1</cutNumber>
+  <evergreen>false</evergreen>
+  <description>Antisocial</description>
+  <outcue></outcue>
+  <isrc></isrc>
+  <isci></isci>
+  <length>305842</length>
+  <originDatetime>Sat, 14 May 2011 09:51:00 GMT</originDatetime>
+  <startDatetime></startDatetime>
+  <endDatetime></endDatetime>
+  <sun>true</sun>
+  <mon>true</mon>
+  <tue>true</tue>
+  <wed>true</wed>
+  <thu>true</thu>
+  <fri>true</fri>
+  <sat>true</sat>
+  <startDaypart></startDaypart>
+  <endDaypart></endDaypart>
+  <originName>hyppo</originName>
+  <weight>1</weight>
+  <lastPlayDatetime>Mon, 29 Aug 2011 19:45:08 GMT</lastPlayDatetime>
+  <playCounter>1</playCounter>
+  <localCounter>1</localCounter>
+  <validity>2</validity>
+  <codingFormat>0</codingFormat>
+  <sampleRate>44100</sampleRate>
+  <bitRate>0</bitRate>
+  <channels>2</channels>
+  <playGain>0</playGain>
+  <startPoint>117</startPoint>
+  <endPoint>305959</endPoint>
+  <fadeupPoint>-1</fadeupPoint>
+  <fadedownPoint>-1</fadedownPoint>
+  <segueStartPoint>-1</segueStartPoint>
+  <segueEndPoint>-1</segueEndPoint>
+  <segueGain>-3000</segueGain>
+  <hookStartPoint>-1</hookStartPoint>
+  <hookEndPoint>-1</hookEndPoint>
+  <talkStartPoint>-1</talkStartPoint>
+  <talkEndPoint>0</talkEndPoint>
+</cut>
+</cutList>
+</cart>
+</cartList>

data/spec/rivendell/api/cart_spec.rb

@@ -2,28 +2,4 @@ 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

@@ -222,6 +222,18 @@ describe Rivendell::API::Xport do
       FakeWeb.last_request["GROUP_NAME"] == "TEST"
     end
 
+    context "when a single cart is found" do
+
+      before(:each) do
+        FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => fixture_content("rdxport_list_carts-single-cart.xml"))
+      end
+
+      it "should return Cast" do
+        subject.list_carts.map(&:title).should == ["Rivendell 1"]
+      end
+
+    end
+
   end
 
   describe "#list_cuts" do

metadata

@@ -1,158 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rivendell-api
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: '0.6'
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Alban Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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
+date: 2014-05-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httmultiparty
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  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: activesupport
+  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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: null_logger
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  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: rspec
+  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
+  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: guard-rspec
+  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: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: fakeweb
-description: Use the rdxport interface to retrieve Groups, create/edit/retrieve Carts and Cuts, import Cut sound.
-email: 
+  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:
 - alban@tryphon.eu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - COPYING
 - COPYRIGHT
@@ -161,7 +171,6 @@ files:
 - README.md
 - Rakefile
 - lib/rivendell-api.rb
-- lib/rivendell-api/version.rb
 - lib/rivendell/api.rb
 - lib/rivendell/api/cart.rb
 - lib/rivendell/api/cut.rb
@@ -173,6 +182,7 @@ files:
 - spec/fixtures/rdxport_add_cut.xml
 - spec/fixtures/rdxport_edit_cart.xml
 - spec/fixtures/rdxport_import.xml
+- spec/fixtures/rdxport_list_carts-single-cart.xml
 - spec/fixtures/rdxport_list_carts.xml
 - spec/fixtures/rdxport_list_cuts.xml
 - spec/fixtures/rdxport_list_groups.xml
@@ -184,43 +194,41 @@ 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4594079732758632000
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4594079732758632000
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 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-single-cart.xml
 - spec/fixtures/rdxport_list_carts.xml
 - spec/fixtures/rdxport_list_cuts.xml
 - spec/fixtures/rdxport_list_groups.xml

data/lib/rivendell-api/version.rb

@@ -1,5 +0,0 @@
-module Rivendell
-  module Api
-    VERSION = "0.0.1"
-  end
-end