prx_client 0.1.3 → 0.2.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.DS_Store

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['test/test_*.rb']
+  t.verbose = true
+end

data/lib/prx/client/version.rb

@@ -1,5 +1,5 @@
 module PRX
   module Client
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/lib/prx/client.rb

@@ -1,5 +1,7 @@
 require 'prx/model'
 require 'prx/representer'
+require 'faraday'
+require 'faraday_middleware'
 
 module PRX
   module Client
@@ -8,41 +10,44 @@ module PRX
       
       include PRX::Model
       
-      attr_accessor :key, :secret, :scheme, :host, :port, :version, :token, :client_options, :access_token_options
-      
-      # get information about the current user
-      def me
-        access_token.get('/me', default_options)
-      end
-      
+      attr_accessor :key, :secret, :scheme, :host, :port, :version, :token
+
       def piece_create(piece)
-        client_options[:multipart] = true
-        access_token.post(create_url('pieces'), :body=>{:piece=>piece.as_json}, 'Content-Type' => 'application/json')
+        access_token.post(create_url('pieces'), :body=>{:piece=>piece.as_json})
       end
-      
-      def client_options; @client_options ||= {}; end
-      def access_token_options; @access_token_options ||= {}; end
-      
+
+      def request(opts={})
+        # puts "PRX::Client::request - opts: #{opts.inspect}"
+        path = opts.delete(:path) || ''
+        action = opts.delete(:action) || :get
+        opts = default_options.merge(opts)
+
+        path = api_path(path) unless path.starts_with?('/')
+        response = access_token.send(action, path, opts)
+        # puts response.inspect
+        response
+      end
+
       protected
       
-      def create_url(path)
+      def api_path(path)
         "/api/#{version}/#{path}"
       end
       
+      def access_token
+        OAuth2::AccessToken.new(client, token, {})
+      end
+
       def client
-        options = client_options.clone
-        options[:site] = site unless options.has_key?(:site)
         OAuth2::Client.new(key, secret, {:site=>site})  do |b|
           b.request :multipart
           b.request :url_encoded
           b.request :json
+
           # b.response :logger
-          b.adapter  :net_http
-        end
-      end
 
-      def access_token
-        OAuth2::AccessToken.new(client, token, access_token_options.clone)
+          b.adapter  :excon
+        end
       end
 
       def site
@@ -50,7 +55,10 @@ module PRX
       end
       
       def default_options
-        {'Accept' => 'application/json'}
+        {
+          'Accept' => 'application/json',
+          'Content-Type' => 'application/json'
+        }
       end
       
     end

data/lib/prx/model/account.rb

@@ -1,12 +1,15 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/account_representer'
 
 module PRX
   module Model
     class Account < PRX::Model::Base
 
+	  include Roar::Representer::JSON
       include PRX::Representer::Full::AccountRepresenter
 
-      attr_accessor :id, :name, :path, :type_name
+      attr_accessor :name, :path, :type_name
 
     end
   end

data/lib/prx/model/audio_file.rb

@@ -1,12 +1,15 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/audio_file_representer'
 
 module PRX
   module Model
     class AudioFile < PRX::Model::Base
 
+      include Roar::Representer::JSON
       include PRX::Representer::Full::AudioFileRepresenter
 
-      attr_accessor :id, :label, :content_type, :size, :status, :length
+      attr_accessor :label, :content_type, :size, :status, :length, :url
       attr_reader :attach_file
       
       def attach_file=(f)

data/lib/prx/model/audio_version.rb

@@ -1,12 +1,15 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/audio_version_representer'
 
 module PRX
   module Model
     class AudioVersion < PRX::Model::Base
 
+      include Roar::Representer::JSON
       include PRX::Representer::Full::AudioVersionRepresenter
 
-      attr_accessor :id,:label,:content_advisory,:timing_and_cues,:transcript,:news_hole_break,:floating_break,:bottom_of_hour_break,:twenty_forty_break,:audio_files
+      attr_accessor :label,:content_advisory,:timing_and_cues,:transcript,:news_hole_break,:floating_break,:bottom_of_hour_break,:twenty_forty_break,:audio_files
 
       def initialize(*args)
         super

data/lib/prx/model/base.rb

@@ -1,11 +1,8 @@
-require 'roar/representer'
-require 'roar/representer/json'
-
 module PRX
   module Model
     class Base
 
-      include Roar::Representer::JSON
+      attr_accessor :id
 
       def initialize(*args)
         return unless args
@@ -13,7 +10,33 @@ module PRX
           args[0].each{|k,v| self.send("#{k.to_s}=", v)}
         end
       end
-      
+
+      def find_by_id(id)
+        request(:path => "#{class_path_part}/#{id}")
+      end
+
+      def save
+        opts = {
+          :action => (id ? :put : :post),
+          :path   => (id ? "#{class_path_part}/#{id}" : class_path_part),
+          :body   => as_json
+        }
+        response = request(opts)
+        self.from_json(response.response.body)
+      end
+
+      def class_path_part
+        self.class.name.demodulize.underscore.pluralize
+      end
+
+      def request(opts)
+        self.class.request(opts)
+      end
+
+      def self.request(opts)
+        PRX::Client.request(opts)
+      end
+
     end
   end
 end

data/lib/prx/model/license.rb

@@ -1,12 +1,15 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/license_representer'
 
 module PRX
   module Model
     class License < PRX::Model::Base
 
+      include Roar::Representer::JSON
       include PRX::Representer::Full::LicenseRepresenter
 
-      attr_accessor :id, :website_usage, :allow_edit, :additional_terms
+      attr_accessor :website_usage, :allow_edit, :additional_terms
 
       WEBSITE_USAGE = ['as a free MP3 download and stream', 'as a stream only', 'only with permission']
       ALLOW_EDIT = ['only with permission', 'without further permission', 'never']

data/lib/prx/model/network.rb

@@ -1,12 +1,15 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/network_representer'
 
 module PRX
   module Model
     class Network < PRX::Model::Base
 
-      include PRX::Representer::Full::AccountRepresenter
+      include Roar::Representer::JSON
+      include PRX::Representer::Full::NetworkRepresenter
 
-      attr_accessor :id, :name, :path
+      attr_accessor :name, :path
 
     end
   end

data/lib/prx/model/piece.rb

@@ -1,13 +1,17 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/piece_representer'
 
 module PRX
   module Model
     class Piece < PRX::Model::Base
 
+      include Roar::Representer::JSON
       include PRX::Representer::Full::PieceRepresenter
 
-      attr_accessor :id, :title, :short_description, :description, :account_id, :published_at, :created_at, :produced_on
-      attr_accessor :episode_number, :length, :language, :related_website, :credits, :broadcast_history, :intro, :outro
+      attr_accessor :title, :short_description, :description, :account_id, :published_at, :created_at, :produced_on
+      attr_accessor :episode_number, :episode_identifier, :episode_date
+      attr_accessor :length, :language, :related_website, :credits, :broadcast_history, :intro, :outro
       attr_accessor :allow_comments, :is_shareable, :point_level, :network_only
       attr_accessor :promos, :license, :audio_versions, :producers, :creator, :account, :series, :networks
       attr_accessor :publish_on_valid

data/lib/prx/model/producer.rb

@@ -1,12 +1,15 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/producer_representer'
 
 module PRX
   module Model
     class Producer < PRX::Model::Base
 
+      include Roar::Representer::JSON
       include PRX::Representer::Full::ProducerRepresenter
 
-      attr_accessor :id, :name, :email, :user
+      attr_accessor :name, :email, :user
 
     end
   end

data/lib/prx/model/series.rb

@@ -1,12 +1,23 @@
+require 'prx/model/base'
 require 'prx/representer/full/series_representer'
 
+require 'roar/representer/json'
+
 module PRX
   module Model
     class Series < PRX::Model::Base
 
+      include Roar::Representer::JSON
       include PRX::Representer::Full::SeriesRepresenter
 
-      attr_accessor :id, :title
+      attr_accessor :title, :subscribable
+
+      def pieces(refresh=false)
+      	@_pieces = nil if refresh
+        opts = {:path=>"series/#{id}/pieces", :action=>:get}
+      	@_pieces ||= request(opts)
+      	@_pieces
+      end
 
     end
   end

data/lib/prx/model/user.rb

@@ -1,12 +1,19 @@
+require 'roar/representer/json'
+require 'prx/model/base'
 require 'prx/representer/full/user_representer'
 
 module PRX
   module Model
     class User < PRX::Model::Base
 
+      include Roar::Representer::JSON
       include PRX::Representer::Full::UserRepresenter
 
-      attr_accessor :id, :login, :email, :first_name, :last_name
+      attr_accessor :login, :email, :first_name, :last_name
+
+      def self.me
+      	request(:path=>'/me')
+      end
 
     end
   end

data/lib/prx/representer/full/account_representer.rb

@@ -1,4 +1,3 @@
-require 'roar/representer'
 require 'roar/representer/json'
 require 'roar/representer/feature/hypermedia'
 
@@ -7,8 +6,8 @@ module PRX
     module Full
       module AccountRepresenter
         
-        include Roar::Representer::JSON
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :name

data/lib/prx/representer/full/audio_file_representer.rb

@@ -6,8 +6,9 @@ module PRX
   module Representer
     module Full
       module AudioFileRepresenter
-        include Roar::Representer::JSON
+
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
       
         property :id
         property :label
@@ -16,6 +17,7 @@ module PRX
         property :size
         property :status
         property :length
+        property :url
       
       end
     end

data/lib/prx/representer/full/audio_version_representer.rb

@@ -7,8 +7,9 @@ module PRX
   module Representer
     module Full
       module AudioVersionRepresenter
-        include Roar::Representer::JSON
+
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :label

data/lib/prx/representer/full/license_representer.rb

@@ -6,8 +6,9 @@ module PRX
   module Representer
     module Full
       module LicenseRepresenter
-        include Roar::Representer::JSON
+
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :website_usage

data/lib/prx/representer/full/network_representer.rb

@@ -7,8 +7,8 @@ module PRX
     module Full
       module NetworkRepresenter
         
-        include Roar::Representer::JSON
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :name

data/lib/prx/representer/full/piece_representer.rb

@@ -15,8 +15,9 @@ module PRX
   module Representer
     module Full
       module PieceRepresenter
-        include Roar::Representer::JSON
+
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :title
@@ -27,6 +28,8 @@ module PRX
         property :created_at
         property :produced_on
         property :episode_number
+        property :episode_date
+        property :episode_identifier
         property :length
         property :language
         property :related_website

data/lib/prx/representer/full/producer_representer.rb

@@ -8,8 +8,9 @@ module PRX
   module Representer
     module Full
       module ProducerRepresenter
-        include Roar::Representer::JSON
+
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :name

data/lib/prx/representer/full/series_representer.rb

@@ -7,8 +7,8 @@ module PRX
     module Full
       module SeriesRepresenter
         
-        include Roar::Representer::JSON
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :title

data/lib/prx/representer/full/user_representer.rb

@@ -7,8 +7,8 @@ module PRX
     module Full
       module UserRepresenter
         
-        include Roar::Representer::JSON
         include Roar::Representer::Feature::Hypermedia
+        include Roar::Representer::JSON
 
         property :id
         property :login

data/lib/prx/representer/min/account_representer.rb

@@ -7,7 +7,7 @@ module PRX
     module Min
       module AccountRepresenter
         include Roar::Representer::JSON
-        include Roar::Representer::Feature::Hypermedia
+        # include Roar::Representer::Feature::Hypermedia
 
         property :id
         property :name

data/prx_client.gemspec

@@ -7,8 +7,9 @@ Gem::Specification.new do |s|
   s.version     = PRX::Client::VERSION
   s.authors     = ["Andrew Kuklewicz"]
   s.email       = ["andrew@prx.org"]
-  s.homepage    = "http://labs.prx.org"
-  s.summary     = %q{Client for PRX OAuth2 API (v2) }
+  s.homepage    = "http://www.prx.org"
+  s.summary     = %q{Client for PRX OAuth2 API (v2)}
+  s.description = %q{Client for PRX OAuth2 API (v2)}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -20,12 +21,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "activesupport"
+  s.add_runtime_dependency "excon"
   s.add_runtime_dependency "oauth2"
-  s.add_runtime_dependency "roar", "~> 0.9.1"
+  s.add_runtime_dependency 'faraday', '~> 0.8.0'
+  s.add_runtime_dependency 'faraday_middleware'
+  s.add_runtime_dependency "roar", "~> 0.11.12"
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_development_dependency "test-unit"
   s.add_development_dependency 'fakeweb'
-  
+
 end

data/test/helper.rb

@@ -1,9 +1,18 @@
 require 'rubygems'
 require 'test/unit'
+require 'net/http'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'prx_client'
+require 'prx/client'
 
 class Test::Unit::TestCase
 end
+
+PRX::Client.key     = 'WlziaXf34NighkX24LjnE9JgpEmEQkP8nWkBmh9J'
+PRX::Client.secret  = 'iuUWEb3AfS5DQiOVpqH1juAacQ0vr3aIhNGWfIW9'
+PRX::Client.host    = "development.prx.org"
+PRX::Client.port    = 3000
+PRX::Client.version = 'v2'
+PRX::Client.token   = 'iW7qgZSQq4ryQRks1G57X7B1appJLOWeF4yZz6jn'

data/test/test_account.rb

@@ -1,7 +1,7 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
+
 require 'prx/client'
 require 'prx/model'
-require 'net/http'
 
 class PRX::TestAccount < Test::Unit::TestCase
 

data/test/test_audio_file.rb

@@ -1,4 +1,4 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
 require 'prx/client'
 require 'prx/model'
 require 'net/http'
@@ -17,7 +17,7 @@ class PRX::TestAudioFile < Test::Unit::TestCase
   end
 
   def test_prepare_upload
-    af = PRX::Model::AudioFile.new(:attach_file=>'/Users/akuklewicz/test.mp2')
+    af = PRX::Model::AudioFile.new(:attach_file=>"#{File.dirname(__FILE__)}/files/test.mp2")
     assert af.attach_file.is_a?(Faraday::UploadIO)
   end
   

data/test/test_audio_version.rb

@@ -1,7 +1,7 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
+
 require 'prx/client'
 require 'prx/model'
-require 'net/http'
 
 class PRX::TestAudioVersion < Test::Unit::TestCase
 

data/test/test_client.rb

@@ -1,61 +1,61 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
+
 require 'prx/client'
 require 'prx/model'
-require 'net/http'
 require 'fakeweb'
 
 class PRX::TestClient < Test::Unit::TestCase
   
-  def setup 
-    PRX::Client.key     = 'bZG3A36fAVa9UTD3TlUN2L17Q2loTAN3G9tyOfVF'
-    PRX::Client.secret  = 'rGrSNofeaJCbfDjJtYMFAQSfUIQhtr1vkNnaZQvf'
-    PRX::Client.host    = "development.prx.org"
-    PRX::Client.port    = 3001
-    PRX::Client.version = 'v2'
-    PRX::Client.token   = 'Kq4FhSK3arQ7jZ9xhiVAbDKw30mvXv4C8sl2CzCV'
-
-    user = {
-      :uid      => '1001',
-      :provider => 'PRX',
-      :info     => {
-        :id         => '1001',
-        :login      => 'test_login',
-        :email      => 'test@prx.org',
-        :first_name => 'first',
-        :last_name  => 'last'
-      }
-    }
-
-    FakeWeb.register_uri(:get, "http://development.prx.org:3001/me", :body=>user.to_json)
+  # def setup 
+  #   PRX::Client.key     = 'WlziaXf34NighkX24LjnE9JgpEmEQkP8nWkBmh9J'
+  #   PRX::Client.secret  = 'iuUWEb3AfS5DQiOVpqH1juAacQ0vr3aIhNGWfIW9'
+  #   PRX::Client.host    = "development.prx.org"
+  #   PRX::Client.port    = 3000
+  #   PRX::Client.version = 'v2'
+  #   PRX::Client.token   = 'iW7qgZSQq4ryQRks1G57X7B1appJLOWeF4yZz6jn'
+
+  #   user = {
+  #     :uid      => '1001',
+  #     :provider => 'PRX',
+  #     :info     => {
+  #       :id         => '1001',
+  #       :login      => 'test_login',
+  #       :email      => 'test@prx.org',
+  #       :first_name => 'first',
+  #       :last_name  => 'last'
+  #     }
+  #   }
+
+  #   FakeWeb.register_uri(:get, "http://development.prx.org:3001/me", :body=>user.to_json)
     
-    FakeWeb.register_uri(:post, "http://development.prx.org:3001/api/v2/pieces", :body=>{}.to_json)
+  #   FakeWeb.register_uri(:post, "http://development.prx.org:3001/api/v2/pieces", :body=>{}.to_json)
 
-  end
+  # end
 
   # def test_me
-  #   response = PRX::Client.me
+  #   response = PRX::Model::User.me
   #   puts response.parsed.inspect
   # end
 
-  def test_piece_create_with_local_file
-    p = PRX::Model::Piece.new(:title=>'test title',
-                              :short_description=>'test short description',
-                              :description=>'test description',
-                              :account=>PRX::Model::Account.new(:id=>8),
-                              :producers=>[PRX::Model::Producer.new(:name=>'Producer')])
+  # def test_piece_create_with_local_file
+  #   p = PRX::Model::Piece.new(:title=>'test title',
+  #                             :short_description=>'test short description',
+  #                             :description=>'test description',
+  #                             :account=>PRX::Model::Account.new(:id=>8),
+  #                             :producers=>[PRX::Model::Producer.new(:name=>'Producer')])
                               
-    p.add_audio(:label=>'test', :attach_file=>'/Users/akuklewicz/test.mp2', :content_type=>'audio/mpeg')
-    puts p.inspect
-    response = PRX::Client.piece_create(p)
-    puts response.parsed.inspect
-  end
-
-  def test_piece_create_with_remote_url
-    p = PRX::Model::Piece.new(:title=>'test title', :short_description=>'test short description', :description=>'test description', :account_id=>8)
-    p.add_audio(:label=>'test', :attach_file=>'s3://andrew-s3.prx.org/public/audio_files/118091/Baronowski.mp2')
-    puts p.inspect
-    response = PRX::Client.piece_create(p)
-    puts response.parsed.inspect
-  end
+  #   p.add_audio(:label=>'test', :attach_file=>'/Users/akuklewicz/test.mp2', :content_type=>'audio/mpeg')
+  #   puts p.inspect
+  #   response = PRX::Client.piece_create(p)
+  #   puts response.parsed.inspect
+  # end
+
+  # def test_piece_create_with_remote_url
+  #   p = PRX::Model::Piece.new(:title=>'test title', :short_description=>'test short description', :description=>'test description', :account_id=>8)
+  #   p.add_audio(:label=>'test', :attach_file=>'s3://andrew-s3.prx.org/public/audio_files/118091/Baronowski.mp2')
+  #   puts p.inspect
+  #   response = PRX::Client.piece_create(p)
+  #   puts response.parsed.inspect
+  # end
 
 end

data/test/test_license.rb

@@ -1,7 +1,7 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
+
 require 'prx/client'
 require 'prx/model'
-require 'net/http'
 
 class PRX::TestLicense < Test::Unit::TestCase
 

data/test/test_network.rb

@@ -1,7 +1,7 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
+
 require 'prx/client'
 require 'prx/model'
-require 'net/http'
 
 class PRX::TestNetwork < Test::Unit::TestCase
 

data/test/test_piece.rb

@@ -1,7 +1,7 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
+
 require 'prx/client'
 require 'prx/model'
-require 'net/http'
 
 class PRX::TestPiece < Test::Unit::TestCase
 
@@ -18,19 +18,19 @@ class PRX::TestPiece < Test::Unit::TestCase
   end
 
   def test_initialize_with_account_object
-    a = PRX::Model::Piece.from_json({:title=>'t', :id=>1, :account=>PRX::Model::Account.new(:id=>2)})
+    a = PRX::Model::Piece.from_json({:title=>'t', :id=>1, :account=>PRX::Model::Account.new(:id=>2)}.to_json)
     assert a.account.is_a?(PRX::Model::Account)
   end
 
-  def test_piece_create_with_local_file
+  def test_piece_with_local_file
     p = PRX::Model::Piece.new(:title=>'test title')
-    p.add_audio(:label=>'test', :attach_file=>'/Users/akuklewicz/test.mp2', :content_type=>'audio/mpeg')
+    p.add_audio(:label=>'test', :attach_file=>"#{File.dirname(__FILE__)}/files/test.mp2", :content_type=>'audio/mpeg')
     af = p.audio_versions[0].audio_files[0]
     assert af.is_a?(PRX::Model::AudioFile)
     assert af.attach_file.is_a?(Faraday::UploadIO)
   end
 
-  def test_piece_create_with_remote_url
+  def test_piece_with_remote_url
     p = PRX::Model::Piece.new(:title=>'test title')
     p.add_audio(:label=>'test', :attach_file=>'s3://andrew-s3.prx.org/test/test_short_download.mp3')
     af = p.audio_versions[0].audio_files[0]
@@ -38,4 +38,37 @@ class PRX::TestPiece < Test::Unit::TestCase
     assert af.attach_file.is_a?(String)
   end
 
+  # def test_piece_create_with_local_file
+  #   p = PRX::Model::Piece.new(:title=>'test title')
+  #   p.add_audio(:label=>'test', :attach_file=>"#{File.dirname(__FILE__)}/files/test.mp2", :content_type=>'audio/mpeg')
+  #   p.save
+  # end
+
+  def test_piece_create
+    prx_remix = { :account_id  => 98822,
+                  :series_id   => 32346,
+                  :network_id  => 23 }
+
+    piece = PRX::Model::Piece.new(
+      :title             => "Remix Select: Episode 12345",
+      :episode_number    => 12345,
+      :episode_identifier=> '12345',
+      :short_description => "Episode 12345 of the new Public Radio Remix Select series. Based on Remix 24 episode 54321.",
+      :description       => "this is the description, and it is very long",
+      :account           => PRX::Model::Account.new(:id=>prx_remix[:account_id]),
+      :series            => PRX::Model::Series.new(:id=>prx_remix[:series_id]),
+      :producers         => [PRX::Model::Producer.new(:user=>PRX::Model::User.new(:id=>8))],
+      :license           => PRX::Model::License.new(:website_usage=>'as a free MP3 download and stream', :allow_edit=>'only with permission'),
+      :networks          => [PRX::Model::Network.new(:id=>prx_remix[:network_id])],
+      :network_only      => true,
+      :point_level       => 0,
+      :publish_on_valid  => true
+    )
+    # piece.add_audio(:label=>'audio', :attach_file=>"s3://#{remix_bucket}/#{audio_s3_key}", :size=>1)
+    # puts "\n\npiece before saved: #{piece.to_json}"
+    piece.save
+    assert piece.id && (piece.id > 0)
+    # puts "\n\npiece after saved:  #{piece.to_json}"
+  end
+
 end

data/test/test_series.rb

@@ -1,7 +1,8 @@
-load './helper.rb'
-require 'prx/client'
-require 'prx/model'
-require 'net/http'
+require File.dirname(__FILE__) + '/helper'
+
+# require 'prx/client'
+# require 'prx/model'
+require 'prx/model/series'
 
 class PRX::TestSeries < Test::Unit::TestCase
 
@@ -17,4 +18,8 @@ class PRX::TestSeries < Test::Unit::TestCase
     assert_equal s.to_hash, {"title"=>"t", "id"=>1}
   end
   
+  def test_to_json
+    s = PRX::Model::Series.new(:title=>'t', :id=>1)
+  end
+
 end

data/test/test_user.rb

@@ -1,7 +1,7 @@
-load './helper.rb'
+require File.dirname(__FILE__) + '/helper'
+
 require 'prx/client'
 require 'prx/model'
-require 'net/http'
 
 class PRX::TestUser < Test::Unit::TestCase
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prx_client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: excon
+  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: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  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: roar
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +203,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Client for PRX OAuth2 API (v2)
 email:
 - andrew@prx.org
 executables: []
@@ -194,6 +242,7 @@ files:
 - lib/prx/representer/min/user_representer.rb
 - lib/prx_client.rb
 - prx_client.gemspec
+- test/files/test.mp2
 - test/helper.rb
 - test/test_account.rb
 - test/test_audio_file.rb
@@ -204,7 +253,7 @@ files:
 - test/test_piece.rb
 - test/test_series.rb
 - test/test_user.rb
-homepage: http://labs.prx.org
+homepage: http://www.prx.org
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -218,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1343733480629456016
+      hash: -289814948412368014
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,14 +276,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1343733480629456016
+      hash: -289814948412368014
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client for PRX OAuth2 API (v2)
 test_files:
+- test/files/test.mp2
 - test/helper.rb
 - test/test_account.rb
 - test/test_audio_file.rb