magnum-pi 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWE5Y2ZlZmRhNGRiZDA0YjllZDYxNTRjOTVkYWY5YWM1MWY1NDdiYw==
+    MzE1MzRhM2ZiZGYyOWVkN2Q3NmJhMjY5OTc5NjMyNjY1MjRhYTllMQ==
   data.tar.gz: !binary |-
-    M2EyZmFmYjc1NTZkNjcwNTBjNDYwNDg2MGFiYmIyZThmODAwYjg0Yg==
+    OTBlNjUzOTM3NTE0NWMwMTQwYTdiZTU5YTI4NjdiZDEzNDE5YWFlZg==
 SHA512:
   metadata.gz: !binary |-
-    YmQ4NWIzNTFjYzhiYmJkN2NmNDc4MGNiZjZlZjk2ODMxZGNjYWNjMjJkZTE4
-    ODIwZDcyMjU1NDVjMjNmNWQyNWYwYzdjMzY1MGQwZjMwZjM5OGUwYzY2ZTQw
-    ZDgxNGZlMDljYzgxNGJhNTMwNzA0ODIxMjk5M2Q1YTE0MTA4MWY=
+    OTYzZWI2MmMxZDEwOTJhZTY3MzI1NWRjODU2ZTQ4ZWMxYjkyNDU2ZTdmMDRm
+    YjQwYjQ0MzQ4MTAwYTUzMzEyMTZjYmFlNWU3ZmM3NmFmYzM5Yzg5NmNiNjll
+    OGI1M2FlYTE3ZjdmZWIzODFiMWI5MGZjMTQ1YjFkMDI0M2RkZjA=
   data.tar.gz: !binary |-
-    NTg1NTM2ODU3NzY2NjBiNjFmYjI5NTA3Mzc2ODkzNjlhOGI0OWJiNTIzOTc2
-    YmFjNGY4ZWI2NGQxZDVjN2I3MWJjNjEyYTg2ZTg0NzVlOGZkMmFkMzIzNDNl
-    NTE1MzlkZDc1NjNmNTRmZjBjYTljNjc3MDIzZGIxNjM0ZmRhOWE=
+    ZDYwZTA4MDE2NjE0MTZhMDIzZTIyYjQ3NTllODQ5N2NiN2MzZDY4N2RjMDk1
+    NWRlZWNhMjQ1NmZiYzc4MWNmYWNiZTEwYzljNzNjMDc3YjUwNDdkNTEyMzJm
+    ZDVkZWYyZTk0NDY0N2E0YTczYjE3M2I2OTY3MTE3ODAzZWZjY2U=

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
+  - 2.1.2
   - 2.0.0
-  - 1.9.3
-  - 1.9.2
+  - 1.9.3

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = MagnumPI CHANGELOG
 
+== Version 0.2.9 (October 29, 2014)
+
+* Being able to add request headers
+* Being able to pass StringIO’s directly to Aj and Ax
+
 == Version 0.2.8 (August 14, 2014)
 
 * Corrected parameters when downloading with POST requests

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2014 Paul Engel
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/magnum-pi/api/consumer.rb

@@ -19,7 +19,7 @@ module MagnumPI
         FileUtils.mkdir_p File.dirname(target)
         file = File.open target, "w"
         begin
-          options = {:method => method, :headers => {"User-Agent" => agent.user_agent}}
+          options = {:method => method, :headers => {"User-Agent" => agent.user_agent}.merge(request_headers(method, url, params))}
           if method.to_s.downcase == "get"
             options[:params] = params
           else
@@ -49,11 +49,15 @@ module MagnumPI
 
       def request(method, url, params)
         puts "#{method.upcase} #{url} #{"(#{params.inspect[1..-2]})" if params && params.size > 0}" if MagnumPI.debug_output?
-        agent.send method, url, params
+        agent.send method, url, params, nil, request_headers(method, url, params)
       rescue Mechanize::ResponseCodeError => e
         raise Error, e.message, e.backtrace
       end
 
+      def request_headers(method, url, params)
+        {}
+      end
+
       def agent
         @agent ||= begin
           Mechanize.new.tap do |agent|

data/lib/magnum-pi/gem_ext/oj/aj.rb

@@ -3,7 +3,7 @@ require "stringio"
 class Aj < Oj::Saj
 
   def initialize(json)
-    @stringio = StringIO.new json
+    @stringio = json.is_a?(StringIO) ? json : StringIO.new(json)
   end
 
   def each(pattern, &block)

data/lib/magnum-pi/gem_ext/ox/ax.rb

@@ -3,7 +3,7 @@ require "stringio"
 class Ax < Ox::Sax
 
   def initialize(xml)
-    @stringio = StringIO.new xml
+    @stringio = xml.is_a?(StringIO) ? xml : StringIO.new(xml)
   end
 
   def each(pattern, &block)

data/lib/magnum-pi/version.rb

@@ -1,7 +1,7 @@
 module MagnumPI
   MAJOR = 0
   MINOR = 2
-  TINY  = 8
+  TINY  = 9
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/test_helper.rb

@@ -10,6 +10,4 @@ end
 
 require "bundler"
 Bundler.require :default, :development, :test
-require "xmlsimple"
-
-require_relative "test_helper/minitest"
+require "xmlsimple"

data/test/unit/api/test_consumer.rb

@@ -43,16 +43,43 @@ module Unit
           end
         end
         describe "#download" do
-          it "downloads using the Mechanize agent" do
-            file, request = mock, mock
-            FileUtils.expects(:mkdir_p).with("path/to")
-            File.expects(:open).with("path/to/target", "w").returns(file)
-            Typhoeus::Request.expects(:new).with("http://foo.bar", :method => :get, :params => {:foo => "bar"}).returns(request)
-            file.expects(:close)
-            request.expects(:on_headers)
-            request.expects(:on_body)
-            request.expects(:run)
-            @consumer.download "path/to/target", :get, :foo => "bar"
+          describe "using GET method" do
+            it "downloads using Typhoeus" do
+              file, request = mock, mock
+              FileUtils.expects(:mkdir_p).with("path/to")
+              File.expects(:open).with("path/to/target", "w").returns(file)
+              Mechanize::HTTP::Agent.any_instance.expects(:user_agent).returns("FooBar v.1.2.3")
+              Typhoeus::Request.expects(:new).with(
+                "http://foo.bar",
+                :method => :get,
+                :headers => {"User-Agent" => "FooBar v.1.2.3"},
+                :params => {:foo => "bar"}
+              ).returns(request)
+              file.expects(:close)
+              request.expects(:on_headers)
+              request.expects(:on_body)
+              request.expects(:run)
+              @consumer.download "path/to/target", :get, :foo => "bar"
+            end
+          end
+          describe "using POST method" do
+            it "downloads using Typhoeus" do
+              file, request = mock, mock
+              FileUtils.expects(:mkdir_p).with("path/to")
+              File.expects(:open).with("path/to/target", "w").returns(file)
+              Mechanize::HTTP::Agent.any_instance.expects(:user_agent).returns("FooBar v.1.2.3")
+              Typhoeus::Request.expects(:new).with(
+                "http://foo.bar",
+                :method => :post,
+                :headers => {"User-Agent" => "FooBar v.1.2.3"},
+                :body => {:foo => "bar"}
+              ).returns(request)
+              file.expects(:close)
+              request.expects(:on_headers)
+              request.expects(:on_body)
+              request.expects(:run)
+              @consumer.download "path/to/target", :post, :foo => "bar"
+            end
           end
         end
         describe "#resource" do
@@ -82,7 +109,7 @@ module Unit
         end
         describe "#request" do
           it "is delegated to the Mechanize agent" do
-            @consumer.send(:agent).expects(:send).with(:get, :foo, :bar)
+            @consumer.send(:agent).expects(:send).with(:get, :foo, :bar, nil, {})
             @consumer.send(:request, :get, :foo, :bar)
           end
           it "raises an error when a Mechanize::ResponseCodeError occurs" do

data/test/unit/test_magnum-pi.rb

@@ -9,7 +9,7 @@ module Unit
 
     describe MagnumPI do
       it "has the current version" do
-        version = File.read path("VERSION")
+        version = File.read(path("VERSION")).strip
         assert_equal version, MagnumPI::VERSION
         assert File.read(path "CHANGELOG.rdoc").include?("Version #{version}")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnum-pi
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -175,6 +175,7 @@ files:
 - .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
+- MIT-LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
@@ -203,7 +204,6 @@ files:
 - script/console
 - test/test_helper.rb
 - test/test_helper/coverage.rb
-- test/test_helper/minitest.rb
 - test/unit/api/test_consumer.rb
 - test/unit/api/test_instance.rb
 - test/unit/api/test_resources.rb
@@ -240,7 +240,6 @@ summary: Create an easy interface to talk with APIs
 test_files:
 - test/test_helper.rb
 - test/test_helper/coverage.rb
-- test/test_helper/minitest.rb
 - test/unit/api/test_consumer.rb
 - test/unit/api/test_instance.rb
 - test/unit/api/test_resources.rb

data/test/test_helper/minitest.rb

@@ -1,10 +0,0 @@
-# class MiniTest::Test
-#   def setup
-#     $stringio ||= StringIO.new
-#     $stdout = $stringio
-#   end
-#   def teardown
-#     $stdout = STDOUT
-#     $stringio.truncate $stringio.rewind
-#   end
-# end