faraday_middleware-reddit 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1718b47002e61165ef63b3f1f5bbff6bd7cdba7
-  data.tar.gz: 6d217bf1fa38587e94d37c359752a316bdfe3041
+  metadata.gz: 126f0eb8d05054996da34d5bd58dbdc0f4382bf6
+  data.tar.gz: a74cfa20ebc7484a892ecf8a22b49a64c23fed0f
 SHA512:
-  metadata.gz: 2a49a065608873ce2313d66bfe931de7782999b295094a1b9e9c52cf8f584036dd702e08a735950ea9d50516a87696347aacdafe029d14d8ca6db24743384b51
-  data.tar.gz: f54ce650af7e67d80b67383638058f3144808a8d802381fcaeda72f2c5ee1ddfc2f3a2a1b49ea4c924fcddab61b12fc826b0be86e512f99d389e5e4e044292a8
+  metadata.gz: 2e00559891603a725434bdee4edc9bf87ec36f8493a5387ba6cbfa49cbabd2309e09f8613d871229b5ab264c27f5ed6a05d24fba186ee3bcc8c1fff40213f21b
+  data.tar.gz: 886f50b45522fdf140b6dc5c250d369d68cbcba1855df2fc90d207d0bbbeeaeba0f4dcd2bad535d91447aee8f1f3ba4171562c625a4fdc31c3b8376d419c0059

data/lib/faraday_middleware/reddit.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'faraday'
+require 'faraday_middleware/reddit/helpers/modhash'
 
 module FaradayMiddleware
   module Reddit

data/lib/faraday_middleware/reddit/helpers/modhash.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+module FaradayMiddleware
+  module Reddit
+    module ModhashHelpers
+      def self.included(base)
+        base.dependency do
+          require 'json' unless defined?(::JSON)
+        end
+      end
+
+      def extract_modhash(env)
+        return unless env[:body].include?('modhash')
+
+        body = env[:body]
+        body = JSON.parse(body) if body.is_a?(String) && !body.strip.empty?
+        body = body['json'] if body['json']
+        body['data']['modhash'] if body['data']
+      end
+    end
+  end
+end

data/lib/faraday_middleware/reddit/request/authentication.rb

@@ -10,11 +10,9 @@ module FaradayMiddleware
     # pre-generated `cookie`. Performs an additional login request when no
     # valid login cookie is available.
     class Authentication < Faraday::Middleware
-      AUTH_URL = 'https://ssl.reddit.com/post/login'.freeze
+      include ModhashHelpers
 
-      dependency do
-        require 'json' unless defined?(::JSON)
-      end
+      AUTH_URL = 'https://ssl.reddit.com/api/login'.freeze
 
       def initialize(app, options)
         super(app)
@@ -37,6 +35,7 @@ module FaradayMiddleware
           apply_cookie(env)
         else
           authenticate(env)
+          apply_cookie(env)
         end
 
         @app.call(env)
@@ -56,6 +55,7 @@ module FaradayMiddleware
 
       def authenticate(env)
         response = Faraday.post AUTH_URL, user: @user, passwd: @passwd, rem: @rem, api_type: 'json'
+        env[:modhash] = extract_modhash(response.env)
         @cookie = response.headers['set-cookie']
       end
     end

data/lib/faraday_middleware/reddit/use/modhash.rb

@@ -10,9 +10,7 @@ module FaradayMiddleware
     # most POST and PUT requests. Modhashes are currently provided in response
     # to listing GET requests.
     class Modhash < Faraday::Middleware
-      dependency do
-        require 'json' unless defined?(::JSON)
-      end
+      include ModhashHelpers
 
       def initialize(app, options = nil)
         super(app)
@@ -28,17 +26,8 @@ module FaradayMiddleware
         end
       end
 
-      def from_json(data)
-        if data.is_a?(String) && !data.strip.empty? && data.include?('modhash')
-          JSON.parse(data)
-        else
-          data
-        end
-      end
-
       def update_modhash(env)
-        body = from_json(env[:body])
-        @modhash = body['data']['modhash'] if body['data']
+        @modhash = extract_modhash(env)
       rescue JSON::JSONError
         # Ignore -- modhash can be acquired lazily.
       end

data/lib/faraday_middleware/reddit/version.rb

@@ -2,6 +2,6 @@
 
 module FaradayMiddleware
   module Reddit
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware-reddit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Daniel O'Brien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - faraday_middleware-reddit.gemspec
 - lib/faraday_middleware/reddit.rb
+- lib/faraday_middleware/reddit/helpers/modhash.rb
 - lib/faraday_middleware/reddit/request/authentication.rb
 - lib/faraday_middleware/reddit/use/force_json.rb
 - lib/faraday_middleware/reddit/use/modhash.rb
@@ -107,9 +108,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A collection of Faraday middleware for use with the Reddit API.
 test_files:
 - spec/helper.rb
+has_rdoc: