prx_client 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 132351a149412a73c95725da8f6bf242fb792a91
+  data.tar.gz: 1f5e1c92cc109f0837bc8f63e0142b27d42a06e1
+SHA512:
+  metadata.gz: 1c42a9531611a380a33112dc38f9a77fa5b0b1faba6d26760a2b8fe38ecd834819f05a3eb83b1c236f0fd18fd837f2b7d20cf7e3f92aabaee6be575463ab834f
+  data.tar.gz: 5201923083bec40d37013788680c53195830c85ebb79255b6218db42d1e13059c002fe461fe2c6fac7aa3109b7e5663e3e945d32940922ddc455c1db84968ba0

data/.gitignore

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

data/Rakefile

@@ -1,4 +1,5 @@
 require "bundler/gem_tasks"
+require 'dotenv/tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
@@ -6,3 +7,5 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/test_*.rb']
   t.verbose = true
 end
+
+task :default => "test"

data/lib/prx/client.rb

@@ -12,10 +12,6 @@ module PRX
       
       attr_accessor :key, :secret, :scheme, :host, :port, :version, :token
 
-      def piece_create(piece)
-        access_token.post(create_url('pieces'), :body=>{:piece=>piece.as_json})
-      end
-
       def request(opts={})
         # puts "PRX::Client::request - opts: #{opts.inspect}"
         path = opts.delete(:path) || ''

data/lib/prx/client/version.rb

@@ -1,5 +1,5 @@
 module PRX
   module Client
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/prx_client.gemspec

@@ -17,19 +17,20 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # s.add_runtime_dependency "iconv"
-  s.add_runtime_dependency 'yajl-ruby'
-  s.add_runtime_dependency "i18n"
-  s.add_runtime_dependency "json"
+  # s.add_runtime_dependency 'yajl-ruby'
+  # 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 'faraday', '~> 0.8.0'
+  s.add_runtime_dependency 'faraday'
   s.add_runtime_dependency 'faraday_middleware'
-  s.add_runtime_dependency "roar", "~> 0.11.12"
+  s.add_runtime_dependency "roar"
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_development_dependency "test-unit"
-  s.add_development_dependency 'fakeweb'
-
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency "dotenv"
+  
 end

data/test/helper.rb

@@ -1,6 +1,11 @@
 require 'rubygems'
+
+require 'dotenv'
+Dotenv.load
+
 require 'test/unit'
 require 'net/http'
+require 'webmock/test_unit'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -10,9 +15,9 @@ 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'
+PRX::Client.key     = ENV['PRX_KEY']
+PRX::Client.secret  = ENV['PRX_SECRET']
+PRX::Client.host    = ENV['PRX_HOST']    || 'www.prx.org'
+PRX::Client.port    = ENV['PRX_PORT']    || 80
+PRX::Client.version = ENV['PRX_VERSION'] || 'v2'
+PRX::Client.token   = ENV['PRX_TOKEN']

data/test/test_client.rb

@@ -2,60 +2,81 @@ require File.dirname(__FILE__) + '/helper'
 
 require 'prx/client'
 require 'prx/model'
-require 'fakeweb'
 
 class PRX::TestClient < Test::Unit::TestCase
   
-  # 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)
-
-  # end
-
-  # def test_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 setup 
+    PRX::Client.key     = 'WlziaXf34NighkX24LjnE9JgpEmEQkP8nWkBmh9J'
+    PRX::Client.secret  = 'iuUWEb3AfS5DQiOVpqH1juAacQ0vr3aIhNGWfIW9'
+    PRX::Client.host    = "development.prx.org"
+    PRX::Client.port    = 3001
+    PRX::Client.version = 'v2'
+    PRX::Client.token   = 'iW7qgZSQq4ryQRks1G57X7B1appJLOWeF4yZz6jn'
+
+    @user_info = {
+      :uid      => '1001',
+      :provider => 'PRX',
+      :info     => {
+        :id         => '1001',
+        :login      => 'test_login',
+        :email      => 'test@prx.org',
+        :first_name => 'first',
+        :last_name  => 'last'
+      }
+    }
+  end
+
+  def test_me
+    stub_request(:get, "http://development.prx.org:3001/me").
+      with(:headers => {'Authorization'=>'Bearer iW7qgZSQq4ryQRks1G57X7B1appJLOWeF4yZz6jn', 'Host'=>'development.prx.org:3001', 'User-Agent'=>'Faraday v0.8.9'}).
+      to_return(:status => 200, :body => @user_info.to_json, :headers => {})
+
+    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')])
                               
-  #   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=>"#{File.dirname(__FILE__)}/files/test.mp2", :content_type=>'audio/mpeg')
+    # puts p.inspect
+
+    stub_request(:post, "http://development.prx.org:3001/api/v2/pieces").
+      to_return(
+        :status => 200,
+        :body => "{\"short_description\":\"Episode 12345 of the new Public Radio Remix Select series. Based on Remix 24 episode 54321.\",\"length\":0,\"series\":{\"title\":\"Public Radio Remix Select\",\"id\":32346},\"creator\":{\"first_name\":\"PRX\",\"last_name\":\"Administrator\",\"login\":\"admin\",\"email\":\"admin@prx.org\",\"id\":8},\"publish_on_valid\":true,\"description\":\"this is the description, and it is very long\",\"license\":{\"allow_edit\":\"only with permission\",\"id\":169778,\"website_usage\":\"as a free MP3 download and stream\"},\"promos\":{\"label\":\"Promos\",\"id\":200467,\"audio_files\":[]},\"point_level\":0,\"account_id\":98822,\"title\":\"Remix Select: Episode 12345\",\"id\":88474,\"is_shareable\":true,\"allow_comments\":true,\"episode_number\":12345,\"networks\":[{\"id\":23,\"path\":\"remix-select\",\"name\":\"Public Radio Remix Select\"}],\"account\":{\"id\":98822,\"type\":\"Group\",\"path\":\"remix\",\"name\":\"Public Radio Remix\"},\"network_only\":true,\"producers\":[{\"user\":{\"first_name\":\"PRX\",\"last_name\":\"Administrator\",\"login\":\"admin\",\"email\":\"admin@prx.org\",\"id\":8},\"id\":100458}],\"audio_versions\":[{\"label\":\"Piece Audio\",\"id\":200467,\"audio_files\":[]}],\"created_at\":\"2014-03-18T10:20:11-04:00\"}",
+        :headers => {"Content-Length"=>"1118", "Set-Cookie"=>"_prx_session_development=BAh7BzoPc2Vzc2lvbl9pZCIlZDk1NGFmZWQzNDhkZDI4ZDBmMmEzN2YwMzhmZjRiODc6DHVzZXJfaWRpDQ%3D%3D--c307c1d85dacd9d35aead604008e10064684065f; path=/; HttpOnly", "ETag"=>"\"7444da1c82c7cac604f9bc2b94cd6e7b\"", "Cache-Control"=>"private, max-age=0, must-revalidate", "Content-Type"=>"application/json; charset=utf-8", "X-Runtime"=>"985", "Connection"=>"keep-alive"}
+      )
+
+    response = PRX::Client.request({:action => :post, :path => 'pieces', :body => p.as_json})
+
+    assert response
+
+    # 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
+
+
+    stub_request(:post, "http://development.prx.org:3001/api/v2/pieces").
+      to_return(
+        :status => 200,
+        :body => "{\"short_description\":\"Episode 12345 of the new Public Radio Remix Select series. Based on Remix 24 episode 54321.\",\"length\":0,\"series\":{\"title\":\"Public Radio Remix Select\",\"id\":32346},\"creator\":{\"first_name\":\"PRX\",\"last_name\":\"Administrator\",\"login\":\"admin\",\"email\":\"admin@prx.org\",\"id\":8},\"publish_on_valid\":true,\"description\":\"this is the description, and it is very long\",\"license\":{\"allow_edit\":\"only with permission\",\"id\":169778,\"website_usage\":\"as a free MP3 download and stream\"},\"promos\":{\"label\":\"Promos\",\"id\":200467,\"audio_files\":[]},\"point_level\":0,\"account_id\":98822,\"title\":\"Remix Select: Episode 12345\",\"id\":88474,\"is_shareable\":true,\"allow_comments\":true,\"episode_number\":12345,\"networks\":[{\"id\":23,\"path\":\"remix-select\",\"name\":\"Public Radio Remix Select\"}],\"account\":{\"id\":98822,\"type\":\"Group\",\"path\":\"remix\",\"name\":\"Public Radio Remix\"},\"network_only\":true,\"producers\":[{\"user\":{\"first_name\":\"PRX\",\"last_name\":\"Administrator\",\"login\":\"admin\",\"email\":\"admin@prx.org\",\"id\":8},\"id\":100458}],\"audio_versions\":[{\"label\":\"Piece Audio\",\"id\":200467,\"audio_files\":[]}],\"created_at\":\"2014-03-18T10:20:11-04:00\"}",
+        :headers => {"Content-Length"=>"1118", "Set-Cookie"=>"_prx_session_development=BAh7BzoPc2Vzc2lvbl9pZCIlZDk1NGFmZWQzNDhkZDI4ZDBmMmEzN2YwMzhmZjRiODc6DHVzZXJfaWRpDQ%3D%3D--c307c1d85dacd9d35aead604008e10064684065f; path=/; HttpOnly", "ETag"=>"\"7444da1c82c7cac604f9bc2b94cd6e7b\"", "Cache-Control"=>"private, max-age=0, must-revalidate", "Content-Type"=>"application/json; charset=utf-8", "X-Runtime"=>"985", "Connection"=>"keep-alive"}
+      )
+
+    response = PRX::Client.request({:action => :post, :path => 'pieces', :body => p.as_json})
+
+    assert response
+
+    # puts response.parsed.inspect
+  end
 
 end

data/test/test_piece.rb

@@ -66,6 +66,14 @@ class PRX::TestPiece < Test::Unit::TestCase
     )
     # piece.add_audio(:label=>'audio', :attach_file=>"s3://#{remix_bucket}/#{audio_s3_key}", :size=>1)
     # puts "\n\npiece before saved: #{piece.to_json}"
+
+      stub_request(:post, "http://development.prx.org:3001/api/v2/pieces").
+        to_return(
+          :status => 200,
+          :body => "{\"short_description\":\"Episode 12345 of the new Public Radio Remix Select series. Based on Remix 24 episode 54321.\",\"length\":0,\"series\":{\"title\":\"Public Radio Remix Select\",\"id\":32346},\"creator\":{\"first_name\":\"PRX\",\"last_name\":\"Administrator\",\"login\":\"admin\",\"email\":\"admin@prx.org\",\"id\":8},\"publish_on_valid\":true,\"description\":\"this is the description, and it is very long\",\"license\":{\"allow_edit\":\"only with permission\",\"id\":169778,\"website_usage\":\"as a free MP3 download and stream\"},\"promos\":{\"label\":\"Promos\",\"id\":200467,\"audio_files\":[]},\"point_level\":0,\"account_id\":98822,\"title\":\"Remix Select: Episode 12345\",\"id\":88474,\"is_shareable\":true,\"allow_comments\":true,\"episode_number\":12345,\"networks\":[{\"id\":23,\"path\":\"remix-select\",\"name\":\"Public Radio Remix Select\"}],\"account\":{\"id\":98822,\"type\":\"Group\",\"path\":\"remix\",\"name\":\"Public Radio Remix\"},\"network_only\":true,\"producers\":[{\"user\":{\"first_name\":\"PRX\",\"last_name\":\"Administrator\",\"login\":\"admin\",\"email\":\"admin@prx.org\",\"id\":8},\"id\":100458}],\"audio_versions\":[{\"label\":\"Piece Audio\",\"id\":200467,\"audio_files\":[]}],\"created_at\":\"2014-03-18T10:20:11-04:00\"}",
+          :headers => {"Content-Length"=>"1118", "Set-Cookie"=>"_prx_session_development=BAh7BzoPc2Vzc2lvbl9pZCIlZDk1NGFmZWQzNDhkZDI4ZDBmMmEzN2YwMzhmZjRiODc6DHVzZXJfaWRpDQ%3D%3D--c307c1d85dacd9d35aead604008e10064684065f; path=/; HttpOnly", "ETag"=>"\"7444da1c82c7cac604f9bc2b94cd6e7b\"", "Cache-Control"=>"private, max-age=0, must-revalidate", "Content-Type"=>"application/json; charset=utf-8", "X-Runtime"=>"985", "Connection"=>"keep-alive"}
+        )
+
     piece.save
     assert piece.id && (piece.id > 0)
     # puts "\n\npiece after saved:  #{piece.to_json}"

metadata

@@ -1,206 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: prx_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: activesupport
   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: i18n
+  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: json
+  name: oauth2
   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: activesupport
+  name: faraday
   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: excon
+  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: oauth2
+  name: roar
   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: 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
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   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
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.12
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit
   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'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: webmock
   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'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: dotenv
   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: Client for PRX OAuth2 API (v2)
@@ -255,33 +202,26 @@ files:
 - test/test_user.rb
 homepage: http://www.prx.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 708665775415690492
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 708665775415690492
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client for PRX OAuth2 API (v2)
 test_files:
 - test/files/test.mp2