disqussion 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,4 @@
+script: "bundle exec rake test"
+rvm:
+  - 1.8.7
+  - 1.9.2

data/.yardopts

@@ -0,0 +1,9 @@
+--no-private
+--protected
+--tag format:"Supported formats"
+--tag authenticated:"Requires Authentication"
+--tag rate_limited:"Rate Limited"
+--markup markdown
+-
+HISTORY.md
+LICENSE.md

data/HISTORY.mkd

@@ -1,6 +1,10 @@
 HISTORY
 =======
 
+0.0.5 - May 23, 2011
+----------------------
+* Fixes conflicts with the `twitter` gem (@mathieuravaux).
+
 0.0.4 - May 19, 2011
 ----------------------
 * Added following features: Categories, Exports, Imports, Reports

data/lib/disqussion/connection.rb

@@ -1,6 +1,6 @@
 require 'faraday_middleware'
-require 'faraday/response/raise_http_4xx'
-require 'faraday/response/raise_http_5xx'
+require 'faraday/disqussion/raise_http_4xx'
+require 'faraday/disqussion/raise_http_5xx'
 
 module Disqussion
   # @private
@@ -18,7 +18,7 @@ module Disqussion
       Faraday.new(options) do |builder|
         builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
-        builder.use Faraday::Response::RaiseHttp4xx
+        builder.use Faraday::Disqussion::RaiseHttp4xx
         builder.use Faraday::Response::Rashify unless raw
         unless raw
           case format.to_s.downcase
@@ -28,7 +28,7 @@ module Disqussion
             builder.use Faraday::Response::ParseXml
           end
         end
-        builder.use Faraday::Response::RaiseHttp5xx
+        builder.use Faraday::Disqussion::RaiseHttp5xx
         builder.adapter(adapter)
       end
     end

data/lib/disqussion/version.rb

@@ -1,3 +1,3 @@
 module Disqussion
-  VERSION = '0.0.4'.freeze unless defined?(::Disqussion::VERSION)
+  VERSION = '0.0.5'.freeze unless defined?(::Disqussion::VERSION)
 end

data/lib/faraday/disqussion/raise_http_4xx.rb

@@ -0,0 +1,37 @@
+require 'faraday'
+
+# @private
+module Faraday
+  module Disqussion
+    # @private
+    class RaiseHttp4xx < ::Faraday::Response::Middleware
+      def on_complete(env)
+        case env[:status].to_i
+        when 400
+          raise ::Disqussion::BadRequest.new(error_message(env), env[:response_headers])
+        when 401
+          raise ::Disqussion::Unauthorized.new(error_message(env), env[:response_headers])
+        when 403
+          raise ::Disqussion::Forbidden.new(error_message(env), env[:response_headers])
+        when 404
+          raise ::Disqussion::NotFound.new(error_message(env), env[:response_headers])
+        end
+      end
+
+      private
+
+      def error_message(env)
+        "#{env[:method].to_s.upcase} #{env[:url].to_s}: (#{env[:status]}) #{error_body(env[:body])}"
+      end
+
+      def error_body(body)
+        if body['code'] && body['response']
+          "Disqus Error #{body['code']}: #{body['response']}"
+        else
+          nil
+        end
+      end
+    end
+  end
+
+end

data/lib/faraday/disqussion/raise_http_5xx.rb

@@ -0,0 +1,23 @@
+require 'faraday'
+
+# @private
+module Faraday
+  module Disqussion
+    # @private
+    class RaiseHttp5xx < ::Faraday::Response::Middleware
+      def on_complete(env)
+        case env[:status].to_i
+        when 500
+          raise ::Disqussion::InternalServerError.new(error_message(env, "Something is technically wrong."), env[:response_headers])
+        end
+      end
+  
+      private
+
+      def error_message(env, body=nil)
+        "#{env[:method].to_s.upcase} #{env[:url].to_s}: #{[env[:status].to_s + ':', body].compact.join(' ')} Check http://status.disqus.com/ for updates on the status of the Disqus service."
+      end
+
+    end    
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: disqussion
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - "J\xC3\xA9r\xC3\xA9my Van de Wyngaert"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +02:00
+date: 2011-05-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -189,6 +189,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
+- .yardopts
 - Gemfile
 - Gemfile.lock
 - HISTORY.mkd
@@ -221,8 +223,8 @@ files:
 - lib/disqussion/version.rb
 - lib/disqussion/view_helpers.rb
 - lib/disqussion/widget.rb
-- lib/faraday/response/raise_http_4xx.rb
-- lib/faraday/response/raise_http_5xx.rb
+- lib/faraday/disqussion/raise_http_4xx.rb
+- lib/faraday/disqussion/raise_http_5xx.rb
 - spec/disqussion/api_spec.rb
 - spec/disqussion/client/.DS_Store
 - spec/disqussion/client/applications_spec.rb

data/lib/faraday/response/raise_http_4xx.rb

@@ -1,34 +0,0 @@
-require 'faraday'
-
-# @private
-module Faraday
-  # @private
-  class Response::RaiseHttp4xx < Response::Middleware
-    def on_complete(env)
-      case env[:status].to_i
-      when 400
-        raise Disqussion::BadRequest.new(error_message(env), env[:response_headers])
-      when 401
-        raise Disqussion::Unauthorized.new(error_message(env), env[:response_headers])
-      when 403
-        raise Disqussion::Forbidden.new(error_message(env), env[:response_headers])
-      when 404
-        raise Disqussion::NotFound.new(error_message(env), env[:response_headers])
-      end
-    end
-
-    private
-
-    def error_message(env)
-      "#{env[:method].to_s.upcase} #{env[:url].to_s}: (#{env[:status]}) #{error_body(env[:body])}"
-    end
-
-    def error_body(body)
-      if body['code'] && body['response']
-        "Disqus Error #{body['code']}: #{body['response']}"
-      else
-        nil
-      end
-    end
-  end
-end

data/lib/faraday/response/raise_http_5xx.rb

@@ -1,20 +0,0 @@
-require 'faraday'
-
-# @private
-module Faraday
-  # @private
-  class Response::RaiseHttp5xx < Response::Middleware
-    def on_complete(env)
-      case env[:status].to_i
-      when 500
-        raise Disqussion::InternalServerError.new(error_message(env, "Something is technically wrong."), env[:response_headers])
-      end
-    end
-
-    private
-
-    def error_message(env, body=nil)
-      "#{env[:method].to_s.upcase} #{env[:url].to_s}: #{[env[:status].to_s + ':', body].compact.join(' ')} Check http://status.disqus.com/ for updates on the status of the Disqus service."
-    end
-  end
-end