faraday_middleware 0.8.2 → 0.8.3

data/lib/faraday_middleware.rb

@@ -1,34 +1,19 @@
 require 'faraday'
 
 module FaradayMiddleware
-  class << self
-    middleware = {
-      :OAuth        => 'request/oauth',
-      :OAuth2       => 'request/oauth2',
-      :EncodeJson   => 'request/encode_json',
-      :Mashify      => 'response/mashify',
-      :Rashify      => 'response/rashify',
-      :ParseJson    => 'response/parse_json',
-      :ParseXml     => 'response/parse_xml',
-      :ParseMarshal => 'response/parse_marshal',
-      :ParseYaml    => 'response/parse_yaml',
-      :Caching      => 'response/caching',
-      :RackCompatible  => 'rack_compatible',
-      :FollowRedirects => 'response/follow_redirects',
-      :Instrumentation => 'instrumentation'
-    }
-
-    # autoload without the autoload
-    define_method(:const_missing) { |const|
-      if middleware.member? const
-        require "faraday_middleware/#{middleware[const]}"
-        raise NameError, "missing #{const} middleware" unless const_defined? const
-        const_get const
-      else
-        super
-      end
-    }
-  end
+  autoload :OAuth,           'faraday_middleware/request/oauth'
+  autoload :OAuth2,          'faraday_middleware/request/oauth2'
+  autoload :EncodeJson,      'faraday_middleware/request/encode_json'
+  autoload :Mashify,         'faraday_middleware/response/mashify'
+  autoload :Rashify,         'faraday_middleware/response/rashify'
+  autoload :ParseJson,       'faraday_middleware/response/parse_json'
+  autoload :ParseXml,        'faraday_middleware/response/parse_xml'
+  autoload :ParseMarshal,    'faraday_middleware/response/parse_marshal'
+  autoload :ParseYaml,       'faraday_middleware/response/parse_yaml'
+  autoload :Caching,         'faraday_middleware/response/caching'
+  autoload :RackCompatible,  'faraday_middleware/rack_compatible'
+  autoload :FollowRedirects, 'faraday_middleware/response/follow_redirects'
+  autoload :Instrumentation, 'faraday_middleware/instrumentation'
 
   if Faraday.respond_to? :register_middleware
     Faraday.register_middleware :request,

data/lib/faraday_middleware/backwards_compatibility.rb

@@ -1,30 +1,15 @@
-deprecation_warning = lambda { |old, new, trace|
-  warn "Deprecation warning: #{old} is deprecated; use #{new}"
-  warn trace[0,10].join("\n") if $DEBUG
-}
+# deprecated constants
 
-Faraday::Request.extend Module.new {
-  legacy = [:OAuth, :OAuth2]
-  define_method(:const_missing) { |const|
-    if legacy.include? const
-      klass = FaradayMiddleware.const_get(const)
-      deprecation_warning.call "Faraday::Request::#{const}", klass.name, caller
-      const_set const, klass
-    else
-      super
-    end
-  }
-}
+Faraday::Request.class_eval do
+  autoload :OAuth,        'faraday_middleware/request/oauth'
+  autoload :OAuth2,       'faraday_middleware/request/oauth2'
+end
 
-Faraday::Response.extend Module.new {
-  legacy = [:Mashify, :Rashify, :ParseJson, :ParseMarshal, :ParseXml, :ParseYaml]
-  define_method(:const_missing) { |const|
-    if legacy.include? const
-      klass = FaradayMiddleware.const_get(const)
-      deprecation_warning.call "Faraday::Response::#{const}", klass.name, caller
-      const_set const, klass
-    else
-      super
-    end
-  }
-}
+Faraday::Response.class_eval do
+  autoload :Mashify,      'faraday_middleware/response/mashify'
+  autoload :Rashify,      'faraday_middleware/response/rashify'
+  autoload :ParseJson,    'faraday_middleware/response/parse_json'
+  autoload :ParseXml,     'faraday_middleware/response/parse_xml'
+  autoload :ParseMarshal, 'faraday_middleware/response/parse_marshal'
+  autoload :ParseYaml,    'faraday_middleware/response/parse_yaml'
+end

data/lib/faraday_middleware/request/oauth.rb

@@ -59,3 +59,6 @@ module FaradayMiddleware
     end
   end
 end
+
+# deprecated alias
+Faraday::Request::OAuth = FaradayMiddleware::OAuth

data/lib/faraday_middleware/request/oauth2.rb

@@ -57,3 +57,6 @@ module FaradayMiddleware
     end
   end
 end
+
+# deprecated alias
+Faraday::Request::OAuth2 = FaradayMiddleware::OAuth2

data/lib/faraday_middleware/response/mashify.rb

@@ -2,13 +2,14 @@ require 'faraday'
 
 module FaradayMiddleware
   class Mashify < Faraday::Response::Middleware
-    dependency 'hashie/mash'
-
     class << self
       attr_accessor :mash_class
     end
 
-    self.mash_class = ::Hashie::Mash
+    dependency do
+      require 'hashie/mash'
+      self.mash_class = ::Hashie::Mash
+    end
 
     def parse(body)
       case body
@@ -22,3 +23,6 @@ module FaradayMiddleware
     end
   end
 end
+
+# deprecated alias
+Faraday::Response::Mashify = FaradayMiddleware::Mashify

data/lib/faraday_middleware/response/parse_json.rb

@@ -33,3 +33,6 @@ module FaradayMiddleware
     end
   end
 end
+
+# deprecated alias
+Faraday::Response::ParseJson = FaradayMiddleware::ParseJson

data/lib/faraday_middleware/response/parse_marshal.rb

@@ -8,3 +8,6 @@ module FaradayMiddleware
     }
   end
 end
+
+# deprecated alias
+Faraday::Response::ParseMarshal = FaradayMiddleware::ParseMarshal

data/lib/faraday_middleware/response/parse_xml.rb

@@ -9,3 +9,6 @@ module FaradayMiddleware
     }
   end
 end
+
+# deprecated alias
+Faraday::Response::ParseXml = FaradayMiddleware::ParseXml

data/lib/faraday_middleware/response/parse_yaml.rb

@@ -8,3 +8,6 @@ module FaradayMiddleware
     define_parser { |body| ::YAML.load body }
   end
 end
+
+# deprecated alias
+Faraday::Response::ParseYaml = FaradayMiddleware::ParseYaml

data/lib/faraday_middleware/response/rashify.rb

@@ -2,8 +2,12 @@ require 'faraday_middleware/response/mashify'
 
 module FaradayMiddleware
   class Rashify < Mashify
-    dependency 'rash'
-
-    self.mash_class = ::Hashie::Rash
+    dependency do
+      require 'rash'
+      self.mash_class = ::Hashie::Rash
+    end
   end
 end
+
+# deprecated alias
+Faraday::Response::Rashify = FaradayMiddleware::Rashify

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70338088113740 !ruby/object:Gem::Requirement
+  requirement: &70166886053120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70338088113740
+  version_requirements: *70166886053120
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70338088112100 !ruby/object:Gem::Requirement
+  requirement: &70166886068140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70338088112100
+  version_requirements: *70166886068140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70338088111080 !ruby/object:Gem::Requirement
+  requirement: &70166886066400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70338088111080
+  version_requirements: *70166886066400
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70338088108700 !ruby/object:Gem::Requirement
+  requirement: &70166886064880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +58,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70338088108700
+  version_requirements: *70166886064880
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &70338088107120 !ruby/object:Gem::Requirement
+  requirement: &70166886062240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +69,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70338088107120
+  version_requirements: *70166886062240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70338088128460 !ruby/object:Gem::Requirement
+  requirement: &70166886080220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70338088128460
+  version_requirements: *70166886080220
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70338088148700 !ruby/object:Gem::Requirement
+  requirement: &70166886078240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70338088148700
+  version_requirements: *70166886078240
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70338088146280 !ruby/object:Gem::Requirement
+  requirement: &70166886075580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,7 +102,7 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70338088146280
+  version_requirements: *70166886075580
 description: Various middleware for Faraday
 email:
 - sferik@gmail.com