redd 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3926dca6aabc517fcbc74ca6a5dbb9455b4ba7e2
-  data.tar.gz: eea4c39a875a1020dad663edcf77bf96fcac8d1a
+  metadata.gz: 1ed185709399c5e0bf0984f8323b710b977b8b24
+  data.tar.gz: 51d437dfc4f6d2477e33db31e5ef3c340f36e34c
 SHA512:
-  metadata.gz: f5f649f74ca1fcef2ec2d5bd885cd993a0c85c89b9423cc9eeb77a80cdea56a01735c2e59d4a6e5d94d718ef1ee52240628f5ee749e47e4df750ab32107fef15
-  data.tar.gz: bd87e00808c774e53f60dbba84c6185e875e5c6643d9abb6cf43bbb2854365faa097ff30edab91a0d4a3c6bf3ba15c6cff2f18de33a6bbfce85f84fbcd3d2d87
+  metadata.gz: 772c63c331ccfdb175ab743f36a994147d949f2cbc16179eede313b87985f2a0ed450498f6a170d6e69bda234cc610a23c4dd1ffc0b05aaa3908fc1b97e24bce
+  data.tar.gz: 86330606ecb14b4ec43d834af0f48bc47495761a9d3c5ae30e5411422ec7c10d0ddf66cd1dc8c8f404370d7e9dce5f12789399d53fc31a469fc71e95768a336e

data/README.md

@@ -3,6 +3,7 @@
   <a href="https://rubygems.org/gems/redd"><img src="http://img.shields.io/gem/v/redd.svg?style=flat-square" alt="Gem Version"></a>
   <a href="https://travis-ci.org/avidw/redd"><img src="http://img.shields.io/travis/avidw/redd.svg?style=flat-square" alt="Build Status"></a>
   <a href="https://rubygems.org/gems/redd"><img src="http://img.shields.io/badge/license-MIT-blue.svg?style=flat-square" alt="MIT License"></a>
+  <a href="https://gitter.im/avidw/redd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge"><img src="https://img.shields.io/badge/GITTER-JOIN%20CHAT%20%E2%86%92-1dce73.svg?style=flat-square" alt="Chat on Gitter"></a>
 </p>
 
 **redd** is an API wrapper for [reddit](http://www.reddit.com/dev/api) written in ruby that focuses on being consistent and extensible. **Check out the latest documentation on [RubyDoc](http://www.rubydoc.info/github/avidw/redd/master/frames/Redd.it).**
@@ -88,6 +89,7 @@ hot.each { |link| puts "#{link.title} by /u/#{link.author}" }
 # Streaming
 def stream_all!
   r.stream :get_comments, "all" do |comment|
+    reddit.refresh_access! if reddit.access.expired? # for :web
     comment.reply("World!") if comment.body == "Hello?"
   end
 end

data/lib/redd/access.rb

@@ -44,7 +44,7 @@ module Redd
 
     # @return [Boolean] Whether the access has expired.
     def expired?
-      Time.now > @expires_at
+      Time.now > (@expires_at + 60)
     end
 
     # Refresh the object with the new response body.

data/lib/redd/clients/base/read.rb

@@ -81,7 +81,7 @@ module Redd
         # @param params [Hash] A list of params to send with the request.
         # @option params [String] :after Return results after the given
         #   fullname.
-        # @option params [String :before Return results before the given
+        # @option params [String] :before Return results before the given
         #   fullname.
         # @option params [Integer] :count The number of items already seen in
         #   the listing.

data/lib/redd/clients/script.rb

@@ -33,6 +33,9 @@ module Redd
 
         @access = Access.new(response.body)
       end
+
+      alias_method :refresh_access!, :authorize!
+
     end
   end
 end

data/lib/redd/error.rb

@@ -1,5 +1,6 @@
 module Redd
   # An error from reddit
+  # TODO: Move Error to an Errors module in next minor version?
   class Error < StandardError
     attr_reader :code
     attr_reader :headers
@@ -27,7 +28,7 @@ module Redd
         when /wrong_password/i            then InvalidCredentials
         when /bad_captcha/i               then InvalidCaptcha
         when /ratelimit/i                 then RateLimited
-        when /quota_filled/i              then RateLimited
+        when /quota_filled/i              then QuotaFilled
         when /bad_css_name/i              then InvalidClassName
         when /too_old/i                   then Archived
         when /too_much_flair_css/i        then TooManyClassNames
@@ -104,6 +105,9 @@ module Redd
     # You don't have the proper scope to perform this request.
     InvalidScope = Class.new(Error)
 
+    # Looks like we didn't get a JSON response. Raise this error.
+    JSONError = Class.new(Error)
+
     # Four, oh four! The thing you're looking for wasn't found.
     NotFound = Class.new(Error)
 
@@ -121,8 +125,16 @@ module Redd
       attr_reader :time
 
       def initialize(env)
-        @time = env[:body][:json][:ratelimit] || 60*60
         super
+        @time = env[:body][:json][:ratelimit] || 3600
+      end
+    end
+
+    # This seems to be a more OAuth2-focused error.
+    class QuotaFilled < RateLimited
+      def initialize(env)
+        super
+        @time = 3600
       end
     end
 

data/lib/redd/response/parse_json.rb

@@ -1,4 +1,5 @@
 require "faraday/response"
+require_relative "../error"
 
 module Redd
   # The module that contains middleware that alters the Faraday response.
@@ -7,10 +8,10 @@ module Redd
     class ParseJson < Faraday::Response::Middleware
       dependency "multi_json"
 
-      def parse(body)
-        MultiJson.load(body, symbolize_keys: true)
+      def on_complete(env)
+        env[:body] = MultiJson.load(env[:body], symbolize_keys: true)
       rescue MultiJson::ParseError
-        body
+        raise JSONError.new(env), env[:body]
       end
     end
   end

data/lib/redd/version.rb

@@ -1,4 +1,4 @@
 module Redd # rubocop:disable Style/Documentation
   # The semantic version number.
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end

data/redd.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.9.4"
+  spec.add_development_dependency "bundler", "~> 1.10.6"
   spec.add_development_dependency "rake", "~> 10.4.2"
   spec.add_development_dependency "rspec", "~> 3.2.0"
   spec.add_development_dependency "vcr", "~> 2.9.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redd
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Avinash Dwarapu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,6 @@ files:
 - lib/redd/version.rb
 - redd.gemspec
 - spec/redd/objects/base_spec.rb
-- spec/redd/response/parse_json_spec.rb
 - spec/redd/response/raise_error_spec.rb
 - spec/redd_spec.rb
 - spec/spec_helper.rb
@@ -218,13 +217,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A Reddit API Wrapper for Ruby.
 test_files:
 - spec/redd/objects/base_spec.rb
-- spec/redd/response/parse_json_spec.rb
 - spec/redd/response/raise_error_spec.rb
 - spec/redd_spec.rb
 - spec/spec_helper.rb

data/spec/redd/response/parse_json_spec.rb

@@ -1,12 +0,0 @@
-RSpec.describe Redd::Response::ParseJson do
-  it "parses valid JSON" do
-    parsed = subject.parse('{"hello": "world", "foo": {"bar": 2}}')
-    expect(parsed).to eq(hello: "world", foo: {bar: 2})
-  end
-
-  it "returns the JSON string if it's invalid" do
-    error = "comparision with banana failed."
-    parsed = subject.parse(error)
-    expect(parsed).to eq(error)
-  end
-end