faraday_middleware 0.1.4 → 0.1.5

data/.gitignore

@@ -1,24 +1,24 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-*.gem
-.yardopts
-.yardoc
-
-## PROJECT::SPECIFIC
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+*.gem
+.yardopts
+.yardoc
+
+## PROJECT::SPECIFIC

data/CHANGELOG.md

@@ -1,10 +1,10 @@
-# Changelog
-
-### 0.0.2 September 25, 2010
-
-* Mashify now handles arrays of non-hashes
-
-### 0.0.1 June 27, 2010
-
-* MultiJSON
+# Changelog
+
+### 0.0.2 September 25, 2010
+
+* Mashify now handles arrays of non-hashes
+
+### 0.0.1 June 27, 2010
+
+* MultiJSON
 * Mashify

data/Gemfile.lock

@@ -1,12 +1,8 @@
 PATH
   remote: .
   specs:
-    faraday_middleware (0.1.4)
+    faraday_middleware (0.1.5)
       faraday (~> 0.5.0)
-      hashie (~> 0.4.0)
-      multi_json (~> 0.0.4)
-      multi_xml (~> 0.1.0)
-      oauth2 (~> 0.1.0)
 
 GEM
   remote: http://rubygems.org/

data/Rakefile

@@ -1,14 +1,14 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require 'rake'
-require 'rake/testtask'
-require 'bundler'
-
-Bundler::GemHelper.install_tasks
-
-Rake::TestTask.new(:test) do |test|
-  test.ruby_opts = ["-rubygems"] if defined? Gem
-  test.libs << "lib" << "test"
-  test.pattern = "test/**/*_test.rb"
-end
-
-task :default => :test
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'rake'
+require 'rake/testtask'
+require 'bundler'
+
+Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new(:test) do |test|
+  test.ruby_opts = ["-rubygems"] if defined? Gem
+  test.libs << "lib" << "test"
+  test.pattern = "test/**/*_test.rb"
+end
+
+task :default => :test

data/faraday_middleware.gemspec

@@ -3,13 +3,12 @@ require File.expand_path("../lib/faraday_middleware/version", __FILE__)
 Gem::Specification.new do |s|
   s.add_development_dependency('hashie', ['~> 0.4.0'])
   s.add_development_dependency('json', ['~> 1.4.6'])
-  s.add_development_dependency('shoulda', ['~> 2.11.3'])
+  s.add_development_dependency('multi_json', ['~> 0.0.4'])
+  s.add_development_dependency('multi_xml', ['~> 0.1.0'])
+  s.add_development_dependency('oauth2', ['~> 0.1.0'])
   s.add_development_dependency('rake', ['~> 0.8.7'])
+  s.add_development_dependency('shoulda', ['~> 2.11.3'])
   s.add_runtime_dependency('faraday', ['~> 0.5.0'])
-  s.add_runtime_dependency('hashie', ['~> 0.4.0'])
-  s.add_runtime_dependency('multi_json', ['~> 0.0.4'])
-  s.add_runtime_dependency('multi_xml', ['~> 0.1.0'])
-  s.add_runtime_dependency('oauth2', ['~> 0.1.0'])
   s.authors = ["Wynn Netherland"]
   s.description = %q{Various middleware for Faraday}
   s.email = ['wynn.netherland@gmail.com']

data/lib/faraday/mashify.rb

@@ -1,7 +1,12 @@
-require 'hashie'
-
 module Faraday
   class Response::Mashify < Response::Middleware
+    begin
+      require 'hashie'
+    rescue LoadError, NameError => error
+      self.load_error = error
+      raise error
+    end 
+
     def self.register_on_complete(env)
       env[:response].on_complete do |response|
         json = response[:body]

data/lib/faraday/oauth2.rb

@@ -1,11 +1,11 @@
-require 'oauth2'
-
 module Faraday
   class Request::OAuth2 < Faraday::Middleware
-    def initialize(app, *args)
-      @app = app
-      @token = args.shift
-    end
+    begin
+      require 'oauth2'
+    rescue LoadError, NameError => error
+      self.load_error = error
+      raise error
+    end 
 
     def call(env)
       params = env[:url].query_values || {}
@@ -14,5 +14,10 @@ module Faraday
 
       @app.call env
     end
+
+    def initialize(app, *args)
+      @app = app
+      @token = args.shift
+    end
   end
 end

data/lib/faraday/parse_json.rb

@@ -1,7 +1,12 @@
-require 'multi_json'
-
 module Faraday
   class Response::ParseJson < Response::Middleware
+    begin
+      require 'multi_json'
+    rescue LoadError, NameError => error
+      self.load_error = error
+      raise error
+    end 
+
     def self.register_on_complete(env)
       env[:response].on_complete do |response|
         response[:body] = begin

data/lib/faraday/parse_xml.rb

@@ -1,7 +1,12 @@
-require 'multi_xml'
-
 module Faraday
   class Response::ParseXml < Response::Middleware
+    begin
+      require 'multi_xml'
+    rescue LoadError, NameError => error
+      self.load_error = error
+      raise error
+    end 
+
     def self.register_on_complete(env)
       env[:response].on_complete do |response|
         response[:body] = begin

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -51,117 +51,101 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: multi_json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 23
         segments: 
-        - 2
-        - 11
-        - 3
-        version: 2.11.3
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: multi_xml
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 27
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 1
+        - 0
+        version: 0.1.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: faraday
+  name: oauth2
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 27
         segments: 
         - 0
-        - 5
+        - 1
         - 0
-        version: 0.5.0
-  type: :runtime
+        version: 0.1.0
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hashie
+  name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 49
         segments: 
         - 0
-        - 4
-        - 0
-        version: 0.4.0
-  type: :runtime
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: multi_json
+  name: shoulda
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 37
         segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
-  type: :runtime
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+  type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: multi_xml
+  name: faraday
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 11
         segments: 
         - 0
-        - 1
+        - 5
         - 0
-        version: 0.1.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: oauth2
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-  type: :runtime
-  version_requirements: *id009
 description: Various middleware for Faraday
 email: 
 - wynn.netherland@gmail.com