cage 0.0.2 → 0.1.0

data/lib/cage.rb

@@ -1,8 +1,9 @@
 require "pry"
 require "awesome_print"
+require "multi_xml"
+require "json"
 require "faraday"
-require "multi_json"
-require "nokogiri"
+require "faraday_middleware"
 
 require "cage/version"
 require "cage/response"

data/lib/cage/console.rb

@@ -15,8 +15,13 @@ module Cage
     end
 
     def reinitialize_connection
-      @connection = Faraday::Connection.new "#{scheme}://#{domain}/#{prefix}",
-      :headers => @headers
+      @connection = Faraday.new "#{@scheme}://#{@domain}/#{@prefix}",
+        :headers => @headers do |conn|
+          conn.use FaradayMiddleware::ParseXml,  :content_type => /\bxml$/
+          conn.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
+
+          conn.adapter Faraday.default_adapter
+        end
     end
 
     def method_missing sym, *args, &block
@@ -36,7 +41,8 @@ module Cage
     end
 
     def http method, *args, &block
-      @last_response = Cage::Response.new connection.send method, *args, &block
+      @last_response = Cage::Response.new connection.send method.downcase,
+        *args, &block
     end
 
     def set convar, value

data/lib/cage/response.rb

@@ -1,15 +1,13 @@
 module Cage
   class Response
-    JSON_MIME_REGEX = %r{(?:application/json|application/x-javascript|
-                          text/javascript|text/x-javascript|text/x-json)}x
-    XML_MIME_REGEX = %r{(?:application/xml|text/xml|application/atom)}x
+    attr_reader :faraday_response
 
     def initialize faraday_response
       @faraday_response = faraday_response
     end
 
     def body
-      @body ||= parsed_body
+      @faraday_response.body
     end
 
     def status
@@ -20,38 +18,22 @@ module Cage
       @faraday_response.headers
     end
 
-    def parsed_body
-      case format_for @faraday_response.headers["content-type"]
-      when :json
-        MultiJson.decode @faraday_response.body
-      when :xml
-        Nokogiri::XML::Document.new @faraday_response.body
-      else
-        @faraday_response.body
-      end
-    end
-
-    def format_for content_type_string
-      case content_type_string
-      when JSON_MIME_REGEX
-        :json
-      when XML_MIME_REGEX
-        :xml
-      end
+    def url
+      @faraday_response.env[:url].to_s
     end
 
     def inspect
       <<-PRETTY
 
-Status: #{@faraday_response.status}
+Status: #{status}
 
 Headers:
-#{@faraday_response.headers.map { |k, v| "  #{k}: #{v}" }.join "\n"}
+#{headers.map { |k, v| "  #{k}: #{v}" }.join "\n"}
 
 Body:
   #{body}
 
-#<Cage::Response>
+#<Cage::Response:(#{url})>
       PRETTY
     end
   end

data/lib/cage/version.rb

@@ -1,3 +1,3 @@
 module Cage
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/test/console_test.rb

@@ -0,0 +1,33 @@
+require "faraday"
+require "minitest/autorun"
+require "minitest/pride"
+require "cage/console"
+
+describe Cage::Console do
+  subject { Cage::Console.new }
+
+  it "responds to http methods" do
+    [:get, :GET, :post, :POST, :put, :PUT, :delete, :DELETE].each do |method|
+      subject.must_respond_to method
+    end
+  end
+
+  it "allows you to set connection variables" do
+    subject.set :scheme, "http"
+    subject.instance_variable_get(:@scheme).must_equal "http"
+
+    subject.set :domain, "ultrasaurus.com"
+    subject.instance_variable_get(:@domain).must_equal "ultrasaurus.com"
+
+    subject.set :prefix, "blog"
+    subject.instance_variable_get(:@prefix).must_equal "blog"
+
+    subject.set :headers, "X-Awesome" => true
+    subject.instance_variable_get(:@headers).must_equal "X-Awesome" => true
+  end
+
+  it "will raise an error if you set a nonsensical variable" do
+    proc { subject.set :foobar, "baz" }.must_raise ArgumentError
+  end
+end
+

data/test/response_test.rb

@@ -1,7 +1,5 @@
 require "minitest/autorun"
 require "minitest/pride"
-require "multi_json"
-require "nokogiri"
 require "cage/response"
 
 describe Cage::Response do
@@ -13,60 +11,5 @@ describe Cage::Response do
   it "is created with a response as the constructor argument" do
     subject.must_be_kind_of Cage::Response
   end
-
-  describe "detects format from content type header" do
-    it "detects json" do
-      %w[application/json application/x-javascript text/javascript
-      text/x-javascript text/x-json].each do |json_content_type|
-        subject.format_for(json_content_type).must_equal :json
-      end
-    end
-
-    it "detects xml" do
-      %w[application/xml text/xml application/atom+xml].each do |xml_content_type|
-        subject.format_for(xml_content_type).must_equal :xml
-      end
-    end
-  end
-
-  describe "parses body text for known body types" do
-    let(:json_response) do
-      m = MiniTest::Mock.new
-      m.expect :headers, { "content-type" => "application/json" }
-      m.expect :body, File.read("test/rails-gem.json")
-    end
-
-    let(:xml_response) do
-      m = MiniTest::Mock.new
-      m.expect :headers, { "content-type" => "application/atom+xml; charset=UTF-8" }
-      m.expect :body, File.read("test/day9.xml")
-      m
-    end
-
-    let(:html_response) do
-      m = MiniTest::Mock.new
-      m.expect :headers, { "content-type" => "text/html" }
-      m.expect :body, <<-HTML
-<html>
-  <head><title>Win</title></head>
-  <body>Win</body>
-</html>
-      HTML
-      m
-    end
-
-    it "parses JSON into a hash" do
-      Cage::Response.new(json_response).body.must_be_instance_of Hash
-    end
-
-    it "parses XML into a Nokogiri::XML::Document" do
-      Cage::Response.new(xml_response).body.must_be_instance_of(
-        Nokogiri::XML::Document)
-    end
-
-    it "keeps the original body string when the filetype isn't detected" do
-      Cage::Response.new(html_response).body.must_be_instance_of String
-    end
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cage
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7681480 !ruby/object:Gem::Requirement
+  requirement: &22188940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7681480
+  version_requirements: *22188940
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &7681040 !ruby/object:Gem::Requirement
+  requirement: &22188500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7681040
+  version_requirements: *22188500
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &7680620 !ruby/object:Gem::Requirement
+  requirement: &22188080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7680620
+  version_requirements: *22188080
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &7680200 !ruby/object:Gem::Requirement
+  requirement: &22187660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7680200
+  version_requirements: *22187660
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &7679780 !ruby/object:Gem::Requirement
+  name: faraday_middleware
+  requirement: &22187240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7679780
+  version_requirements: *22187240
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: &22186820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *22186820
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &22186400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *22186400
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &7679360 !ruby/object:Gem::Requirement
+  requirement: &22185980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7679360
+  version_requirements: *22185980
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &7678940 !ruby/object:Gem::Requirement
+  requirement: &22185560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7678940
+  version_requirements: *22185560
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &7678520 !ruby/object:Gem::Requirement
+  requirement: &22185140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7678520
+  version_requirements: *22185140
 description: ! 'Curl can be a bit unfriendly, especially to developers just starting
   out. Cage
 
@@ -121,6 +143,7 @@ files:
 - test/day9.xml
 - test/rails-gem.json
 - test/response_test.rb
+- test/console_test.rb
 - bin/cage
 homepage: https://github.com/nuclearsandwich/cage
 licenses: []
@@ -150,3 +173,4 @@ test_files:
 - test/day9.xml
 - test/rails-gem.json
 - test/response_test.rb
+- test/console_test.rb