instapaper_full 0.0.4 → 0.1.0

data/instapaper_full.gemspec

@@ -19,7 +19,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_dependency("faraday", ">=0.5.5")
-  s.add_dependency("simple_oauth", ">=0.1.4")
-  s.add_dependency("yajl-ruby",">=0.8.1")
+  s.add_dependency("faraday", "~> 0.7.5")
+  s.add_dependency("faraday_middleware", "~> 0.7.0")
+  s.add_dependency("simple_oauth", "~> 0.1")
+  s.add_dependency("multi_json", "~> 1.0.4")
+  s.add_dependency("yajl-ruby", "~> 1.1.0")
+
+  s.add_development_dependency("rake")
 end

data/lib/instapaper_full/version.rb

@@ -1,3 +1,3 @@
 module InstapaperFull
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/instapaper_full.rb

@@ -1,4 +1,6 @@
-require 'faraday/oauth'
+require 'json'
+require 'faraday/request/oauth'
+require 'faraday/response/parse_json'
 
 module InstapaperFull
   class API
@@ -17,16 +19,19 @@ module InstapaperFull
         :consumer_key => @options[:consumer_key],
         :consumer_secret => @options[:consumer_secret]
       }
+
       if authenticated?
         oauth_options[:token] = @options[:oauth_token]
         oauth_options[:token_secret] = @options[:oauth_token_secret]
       end
       
-      Faraday::Connection.new(options) do |builder|
+      Faraday.new(options) do |builder|
         builder.use Faraday::Request::OAuth, oauth_options
+        builder.use Faraday::Request::UrlEncoded
+        builder.use Faraday::Response::Logger 
         builder.adapter Faraday.default_adapter
         if authenticated?
-          builder.response :yajl
+          builder.use Faraday::Response::ParseJson
         end
       end
     end

metadata

@@ -1,123 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: instapaper_full
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Matt Biddulph
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-03 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: faraday
+  requirement: &70355479122060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70355479122060
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: &70355479121500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        - 5
-        version: 0.5.5
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70355479121500
+- !ruby/object:Gem::Dependency
   name: simple_oauth
+  requirement: &70355479121000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70355479121000
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70355479120540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70355479120540
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70355479120080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
-        version: 0.8.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70355479120080
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70355479119700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70355479119700
 description: See http://www.instapaper.com/api/full
-email: 
+email:
 - mb@hackdiary.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - instapaper_full.gemspec
-- lib/faraday/oauth.rb
 - lib/instapaper_full.rb
 - lib/instapaper_full/version.rb
-has_rdoc: true
 homepage: https://github.com/mattb/instapaper_full
 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: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: instapaper_full
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Wrapper for the Instapaper Full Developer API
 test_files: []
-
+has_rdoc: 

data/lib/faraday/oauth.rb

@@ -1,24 +0,0 @@
-# from https://github.com/jnunemaker/twitter/blob/master/lib/faraday/oauth.rb
-      
-require 'faraday'
-require 'simple_oauth'
-
-# @private
-module Faraday
-  # @private
-  class Request::OAuth < Faraday::Middleware
-    def call(env)
-      params = env[:body].is_a?(Hash) ? env[:body] : {}
-      signature_params = params.reject{|k,v| v.respond_to?(:content_type) }
-      header = SimpleOAuth::Header.new(env[:method], env[:url], signature_params, @options)
-
-      env[:request_headers]['Authorization'] = header.to_s
-
-      @app.call(env)
-    end
-
-    def initialize(app, options)
-      @app, @options = app, options
-    end
-  end
-end