prx_client 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132351a149412a73c95725da8f6bf242fb792a91
-  data.tar.gz: 1f5e1c92cc109f0837bc8f63e0142b27d42a06e1
+  metadata.gz: c7988641f39e2cfad35055585508a8413745176f
+  data.tar.gz: 94bf0842283ca1155792cb107eeee55eb787b9cf
 SHA512:
-  metadata.gz: 1c42a9531611a380a33112dc38f9a77fa5b0b1faba6d26760a2b8fe38ecd834819f05a3eb83b1c236f0fd18fd837f2b7d20cf7e3f92aabaee6be575463ab834f
-  data.tar.gz: 5201923083bec40d37013788680c53195830c85ebb79255b6218db42d1e13059c002fe461fe2c6fac7aa3109b7e5663e3e945d32940922ddc455c1db84968ba0
+  metadata.gz: dd49376ad7c10236b49b301f108eb58bbfa2e5e857e7d090879e643718770ce73a98e3abb7b7375cacb7bf0d8137fbcecaab8728d660eeef098394121742ad2f
+  data.tar.gz: 3ab7782e4d901d37ec64b8a0c0b59c801a4c1812dec552a5aca15556ec7429fa4c270fbf8ff83012804044da212eadfd10d75eb7d92ea863969d84eaf2cef9de

data/lib/prx/client/version.rb

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

data/lib/prx/client.rb

@@ -1,17 +1,20 @@
 require 'prx/model'
 require 'prx/representer'
 require 'faraday'
-require 'faraday_middleware'
+require 'prx/middleware/json'
+
+Faraday::Request.register_middleware(:prx_json => PRX::Middleware::Json)
 
 module PRX
   module Client
-    
+
     class << self
       
       include PRX::Model
       
       attr_accessor :key, :secret, :scheme, :host, :port, :version, :token
 
+
       def request(opts={})
         # puts "PRX::Client::request - opts: #{opts.inspect}"
         path = opts.delete(:path) || ''
@@ -38,7 +41,7 @@ module PRX
         OAuth2::Client.new(key, secret, {:site=>site})  do |b|
           b.request :multipart
           b.request :url_encoded
-          b.request :json
+          b.request :prx_json
 
           # b.response :logger
 

data/lib/prx/middleware/json.rb

@@ -0,0 +1,63 @@
+require 'faraday'
+require 'faraday/middleware'
+
+# Request middleware that encodes the body as JSON.
+#
+# Processes only requests with matching Content-type or those without a type.
+# If a request doesn't have a type but has a body, it sets the Content-type
+# to JSON MIME-type.
+#
+# Doesn't try to encode bodies that already are in string form.
+
+module PRX
+  module Middleware
+    class Json < Faraday::Middleware
+
+      CONTENT_TYPE = 'Content-Type'.freeze unless defined? CONTENT_TYPE
+
+      class << self
+        attr_accessor :mime_type
+      end
+
+      self.mime_type = 'application/json'.freeze
+
+      dependency do
+        require 'json' unless defined?(::JSON)
+      end
+
+      def call(env)
+        match_content_type(env) do |data|
+          env.body = encode(data)
+        end
+        @app.call env
+      end
+
+      def encode(data)
+        ::JSON.dump(data)
+      end
+
+      def match_content_type(env)
+        if process_request?(env)
+          env.request_headers[CONTENT_TYPE] ||= self.class.mime_type
+          yield(env.body) unless env.body.respond_to?(:to_str)
+        end
+      end
+
+      def process_request?(env)
+        type = request_type(env)
+        has_body?(env) and (type.empty? or type == self.class.mime_type)
+      end
+
+      def request_type(env)
+        type = env.request_headers[CONTENT_TYPE].to_s
+        type = type.split(';', 2).first if type.index(';')
+        type
+      end
+
+      def has_body?(env)
+        body = env.body and !(body.respond_to?(:to_str) and body.empty?)
+      end
+
+    end
+  end
+end

data/prx_client.gemspec

@@ -16,15 +16,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   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 "json"
   s.add_runtime_dependency "activesupport"
   s.add_runtime_dependency "excon"
   s.add_runtime_dependency "oauth2"
   s.add_runtime_dependency 'faraday'
-  s.add_runtime_dependency 'faraday_middleware'
   s.add_runtime_dependency "roar"
 
   # specify any dependencies here; for example:

data/test/test_client.rb

@@ -28,7 +28,7 @@ class PRX::TestClient < Test::Unit::TestCase
 
   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'}).
+      with(:headers => {'Authorization'=>'Bearer iW7qgZSQq4ryQRks1G57X7B1appJLOWeF4yZz6jn', 'Host'=>'development.prx.org:3001'}).
       to_return(:status => 200, :body => @user_info.to_json, :headers => {})
 
     response = PRX::Model::User.me

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prx_client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -162,6 +162,7 @@ files:
 - Rakefile
 - lib/prx/client.rb
 - lib/prx/client/version.rb
+- lib/prx/middleware/json.rb
 - lib/prx/model.rb
 - lib/prx/model/account.rb
 - lib/prx/model/audio_file.rb