readability_parser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDkzYTkzOTU4Y2RmODhmYzVhMmE5YTA0MDc5MDU4OTMxZjIxMTczYQ==
+    ODE4OWYxN2E4NDdlNmM0ZWI0ZjlmYmM4MzRkOGE4OGQ5NjA5NTRiNg==
   data.tar.gz: !binary |-
-    MmIxYTNhMWU2OTY3NzAyMmQ5NmE2ZWM2NDllYjA3OTVkNTdjZmRlNw==
+    YTA5OTIyZTU1MmRiZTdkMWQ0YjFiYmEwNWE1ZWIwZTk2ZmY3NjIzYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDE1YzkwOTMxYzQ1N2QzZjE3YjhiNDE1YjQ4YzFjZWI3MTA4ZjQyY2FiODJi
-    ZDQ2ZmM2YzE1MjRjMzIxMmM5Y2I1YjJkYzUzMjI3YmUzNjc3MzYwNDZiYTMw
-    OTRiM2ZjMWI1YmRiOWI1ZWM0N2M5ZGU0NDQ4MGExOGYyZjc3YmY=
+    NDBlZDhjMWJhMDVjNGQzNmFjMzlkODExYzA2YTc3YjYyMzQzNjI2ZDFiMjBh
+    OTQ1MjllNGY4ZTJjMDg0MjYyOTMwYThmMGQ5M2VkZDRjYjM2NjMyMzRmMTkw
+    MDY0MDllOTdjMjY3ODcwYTVjMGQzN2UyOGZkNzE4NGRkMzNhNzg=
   data.tar.gz: !binary |-
-    ZWYwYTNhYmQ0NWYzNzIwOTg1ZWMzMzJmMWNmNjFkYzdlZTM0OGFkYmY4ODlj
-    MjFhYWMwYzVkNGVhMTI2OGMwZWM4ODE4MzIxYzZhMzRkNGRlNjU1NmVhZTg2
-    ZTgyMDdiYmY1ZTFlZDZlNjNkYjcwMmU4MDFmMmE1ZjcxNDVmY2Q=
+    Y2U0ZDk2YzlhNWU5M2YxYzgzNDQ3OTkzNjMxNmMzN2M1NDUwMzBhYzMyOGUx
+    ZGQwZjczMGFkODQxZGI2N2U0M2I3MTZhZDM5ODE2ZDg5MDM3NmM2YTQ5M2Mx
+    OTEyZDU2Yjc2YzdmYTI0YTU3MmUyNzAzMzIyNDEwMGU1MDA2YmY=

data/lib/readability_parser/configuration.rb

@@ -14,7 +14,7 @@ module ReadabilityParser
     attr_accessor *VALID_CONFIG_KEYS
 
     def self.extended(base)
-      base.reset
+      base.reset!
     end
 
     # Convenience method to allow configuration options to be set in a block
@@ -26,12 +26,14 @@ module ReadabilityParser
       Hash[ * VALID_CONFIG_KEYS.map { |key| [key, send(key)] }.flatten ]
     end
 
-    def reset
+    def reset!
       self.api_endpoint = DEFAULT_API_ENDPOINT
       self.user_agent   = DEFAULT_USER_AGENT
 
       self.api_token    = DEFAULT_API_TOKEN
       self.format       = DEFAULT_FORMAT
+
+      return true
     end
   end # Configuration
 end

data/lib/readability_parser/error.rb

@@ -1,8 +1,15 @@
+require 'multi_json'
+
 module ReadabilityParser
   class Error < StandardError
 
+    # Raised when Readability returns a 4xx or 500 HTTP status code
     class ClientError < Error
 
+      # Creates a new error from an HTTP environement
+      #
+      # @param response [Hash]
+      # @return [ReadabilityParser::Error::ClientError]
       def initialize(error=nil)
         parsed_error = parse_error(error)
         http_error = error.response[:status].to_i
@@ -14,13 +21,18 @@ module ReadabilityParser
         end
       end
 
-      def parse_error(error)
-        JSON.parse(error.response[:body], :symbolize_names => true)
-      end
+      private
+
+        def parse_error(error)
+          MultiJson.load(error.response[:body], :symbolize_keys => true)
+        end
     end # ClientError
 
     class ConfigurationError < ReadabilityParser::Error; end
 
+    # Raised when there's an error in Faraday
+    class RequestError < ReadabilityParser::Error; end
+
     # Raised when ReadabilityParser returns a 400 HTTP status code
     class BadRequest < ReadabilityParser::Error; end
 

data/lib/readability_parser/request.rb

@@ -29,7 +29,11 @@ module ReadabilityParser
           request.url(path, params)
         end
       rescue Faraday::Error::ClientError => error
-        raise ReadabilityParser::Error::ClientError.new(error)
+        if error.is_a?(Faraday::Error::ClientError)
+          raise ReadabilityParser::Error::ClientError.new(error)
+        else
+          raise ReadabilityParser::Error::RequestError.new(error)
+        end
       end
 
       # When using xml format the response is wrapped in a <response> node

data/lib/readability_parser/version.rb

@@ -1,3 +1,3 @@
 module ReadabilityParser
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/readability_parser.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "faraday_middleware", "~> 0.9.0"
   gem.add_dependency "hashie", "~> 1.2.0"
   gem.add_dependency "multi_xml", "~> 0.5.2"
+  gem.add_dependency "multi_json", "~> 1.7.2"
 
   gem.add_development_dependency "rspec"
 end

data/spec/helper.rb

@@ -1,2 +1,2 @@
-require 'readability'
+require 'readability_parser'
 require 'rspec'

data/spec/readability/api/content_spec.rb

@@ -1,23 +1,4 @@
 require 'helper'
 
-describe Readability::API::Content do
-
-  before do
-    @client = Readability::Client.new(:api_token => '12345678910')
-  end
-
-  after do
-    Readability.reset
-  end
-
-  describe ".parse" do
-    it "fetches the content of a given uri" do
-      pending
-    end
-
-    it "returns a Readability::Article" do
-      pending
-    end
-  end
-
+describe ReadabilityParser::API::Content do
 end

data/spec/readability/article_spec.rb

@@ -1,5 +1,4 @@
 require 'helper'
 
-describe Readability::Article do
-  pending
+describe ReadabilityParser::Article do
 end

data/spec/readability/client_spec.rb

@@ -1,32 +1,63 @@
 require 'helper'
 
-describe Readability::Client do
+describe ReadabilityParser::Client do
 
   after do
-    Readability.reset
+    ReadabilityParser.reset!
   end
 
-  context "when creating a client" do
-    describe "with no options" do
-      it "should assign client with default values" do
-        pending
+  context "with module configuration" do
+    before do
+      ReadabilityParser.configure do |config|
+        ReadabilityParser::Configuration::VALID_CONFIG_KEYS.each do |key|
+          config.send("#{key}=", key)
+        end
       end
     end
 
-    describe "with options" do
+    it "inherits the module configuration" do
+      ReadabilityParser::Configuration::VALID_CONFIG_KEYS.each do |key|
+        expect(ReadabilityParser.send(:"#{key}")).to eq(key)
+      end
+    end
+  end
 
-      it "should accept configuration options" do
-        pending
+  context "with class configuration" do
+    before do
+      @configuration = {
+        api_token: '1234',
+        format: :sriracha
+      }
+    end
+
+    it "overrides the module configuration after initialization" do
+      ReadabilityParser.configure do |config|
+        @configuration.each do |key, value|
+          config.send("#{key}=", value)
+        end
       end
 
-      it "should assign the client with overiden default values" do
-        pending
+      ReadabilityParser::Configuration::VALID_OPTIONS_KEYS.each do |key|
+        expect(ReadabilityParser.send(:"#{key}")).to eq(@configuration[key])
       end
     end
   end
 
-  context "when using a client" do
-    pending
+  describe "#connection" do
+    it "looks like Faraday connection" do
+      expect(subject.send(:connection)).to respond_to(:run_request)
+    end
   end
 
+  describe "#request" do
+    before { ReadabilityParser.api_token = '1234' }
+
+    it "catches Faraday connection errors" do
+      pending
+    end
+
+    it "catches Readability Parser API errors" do
+      pending
+    end
+  end
 end

data/spec/readability/error_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
-describe Readability::Error do
-  describe Readability::Error::ClientError do
+describe ReadabilityParser::Error do
+  it "raises the correct error based on api HTTP response code" do
     pending
   end
 end

data/spec/readability_spec.rb

@@ -1,22 +1,14 @@
 require 'helper'
 
-describe Readability do
+describe ReadabilityParser do
 
   after do
-    Readability.reset
+    ReadabilityParser.reset!
   end
 
-  describe ".new" do
-    it "is a Readability::Client" do
-      (Readability.new).should be_a_kind_of(Readability::Client)
+  describe "#new" do
+    it "is a ReadabilityParser::Client" do
+      (ReadabilityParser.new).should be_a_kind_of(ReadabilityParser::Client)
     end
   end
-
-  describe ".method_missing?" do
-    pending
-  end
-
-  describe ".respond_to?" do
-    pending
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: readability_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Philippe Dionne
@@ -38,7 +38,7 @@ cert_chain:
   aW9OckllMC8xNWRIcERvSUVESUxhNnpVNDZCClhEdHAxWXhkZVZHSUJ1Tm9Q
   MXZqRFN2TktZajBwTWpSQUVQcnFLMzlqS0U9Ci0tLS0tRU5EIENFUlRJRklD
   QVRFLS0tLS0K
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.2
   name: multi_xml
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  name: multi_json
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -138,10 +152,7 @@ files:
 - spec/readability/api/content_spec.rb
 - spec/readability/article_spec.rb
 - spec/readability/client_spec.rb
-- spec/readability/configuration_spec.rb
-- spec/readability/connection_spec.rb
 - spec/readability/error_spec.rb
-- spec/readability/request_spec.rb
 - spec/readability_spec.rb
 homepage: https://github.com/phildionne/readability_parser
 licenses:
@@ -173,9 +184,6 @@ test_files:
 - spec/readability/api/content_spec.rb
 - spec/readability/article_spec.rb
 - spec/readability/client_spec.rb
-- spec/readability/configuration_spec.rb
-- spec/readability/connection_spec.rb
 - spec/readability/error_spec.rb
-- spec/readability/request_spec.rb
 - spec/readability_spec.rb
 has_rdoc: 

data/spec/readability/configuration_spec.rb

@@ -1,17 +0,0 @@
-require 'helper'
-
-describe Readability::Configuration do
-
-  after do
-    Readability.reset
-  end
-
-  Readability::Configuration::VALID_CONFIG_KEYS.each do |key|
-    describe ":#{key}" do
-      it "should return the default value" do
-        Readability.send(key).should be(Readability::Configuration.const_get("DEFAULT_#{key.upcase}"))
-      end
-    end
-  end
-
-end

data/spec/readability/connection_spec.rb

@@ -1,5 +0,0 @@
-require 'helper'
-
-describe Readability::Connection do
-  pending
-end

data/spec/readability/request_spec.rb

@@ -1,5 +0,0 @@
-require 'helper'
-
-describe Readability::Request do
-  pending
-end