jeff 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26d4ecc099e2a707deb20d81eb0e99c146f4e4a4
-  data.tar.gz: c3c7d33f9cad57ec5bcfe55dacb7cc44f1175bfb
+  metadata.gz: 2256dcb03eb1bf6ce825c9cf1b2f1de192dff544
+  data.tar.gz: 29d63828239369329ffab1120d8beb0c18570277
 SHA512:
-  metadata.gz: dd29ac1f134dd1a98c841e63e7c1f17e1a8a82282abde2ccc0e694daf1dc347d853d477e87a929f2f4982e49acaaea88cf41c59b22f3f3bef30389cb6c9b5281
-  data.tar.gz: bbab285296bf3ddee692e21337ea04540af2104c9bfe6eb98d0b6939fdc20e0f93a19002845355b89f4b91031d2a1f8d3d7c2aefeb11a8868a968c31ea021cf4
+  metadata.gz: e30ba915c8f8f2be48ff203d6187330ee03eaacc51290aeb6c980cf91a8f8e46acecc8d05805b7e735c05fcd3cf5b4bb7bd49915f8346d64f4f2b5c88c665452
+  data.tar.gz: 1a15572f7d538ab793f45da18de98e7ce8fdfd609da3aea93c01fccc41746ca3f6ce54fcfe154628d849f3a09d11ae2ceacb3ba46208fe83f932c8d33c501ac6

data/.rubocop.yml

@@ -0,0 +1,2 @@
+StringLiterals:
+  EnforcedStyle: double_quotes

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 # 1.3.0 15/4/2015
 
 - Handle overly long request queries
+  See https://github.com/hakanensari/peddler/issues/36
 
 # 1.2.0 23/1/2015
 

data/lib/jeff.rb

@@ -13,7 +13,7 @@ require "jeff/version"
 module Jeff
   # Converts query field-value pairs to a sorted query string.
   class Query
-    attr :values
+    attr_reader :values
 
     def initialize(values)
       @values = values
@@ -22,13 +22,13 @@ module Jeff
     def to_s
       values
         .sort { |a, b| a[0].to_s <=> b[0].to_s }
-        .map { |k, v| "#{k}=#{ Utils.escape(v) }" }.join("&")
+        .map { |k, v| "#{k}=#{Utils.escape(v)}" }.join("&")
     end
   end
 
   # Calculates an MD5sum for file being uploaded.
   class Content
-    attr :body
+    attr_reader :body
 
     def initialize(body)
       @body = body
@@ -41,7 +41,7 @@ module Jeff
 
   # Signs an AWS request.
   class Signer
-    attr :method, :host, :path, :query_string
+    attr_reader :method, :host, :path, :query_string
 
     def initialize(method, host, path, query_string)
       @method = method.upcase
@@ -72,7 +72,7 @@ module Jeff
     end
 
     def secret
-      @secret or raise ArgumentError.new("Missing secret")
+      @secret || fail(ArgumentError, "Missing secret")
     end
   end
 
@@ -82,7 +82,8 @@ module Jeff
 
     def self.escape(val)
       val.to_s.gsub(UNRESERVED) do
-        "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+        match = Regexp.last_match[1]
+        "%" + match.unpack("H2" * match.bytesize).join("%").upcase
       end
     end
   end
@@ -104,11 +105,11 @@ module Jeff
 
   # A reusable HTTP connection.
   def connection
-    @connection ||= Excon.new(aws_endpoint,
-      headers: { "User-Agent" => self.class.user_agent },
-      expects: 200,
-      omit_default_port: true
-    )
+    @connection ||= Excon.new(aws_endpoint, connection_params)
+  end
+
+  def connection_params
+    @connection_params ||= default_connection_params
   end
 
   attr_accessor :aws_endpoint
@@ -144,8 +145,16 @@ module Jeff
 
   private
 
+  def default_connection_params
+    {
+      headers: { "User-Agent" => self.class.user_agent },
+      expects: 200,
+      omit_default_port: true
+    }
+  end
+
   def add_md5_digest(options)
-    return unless options.has_key?(:body)
+    return unless options.key?(:body)
     md5 = Content.new(options[:body]).md5
     (options[:headers] ||= {}).store("Content-MD5", md5)
   end
@@ -165,18 +174,19 @@ module Jeff
   end
 
   def move_query_to_body(options)
-    (options[:headers] ||= {}).store("Content-Type", "application/x-www-form-urlencoded")
+    options[:headers] ||= {}
+    options[:headers].store("Content-Type", "application/x-www-form-urlencoded")
     options.store(:body, options.delete(:query))
   end
 
   def default_query_values
     self.class.params
-      .reduce({}) { |qv, (k, v)|
+      .reduce({}) do |qv, (k, v)|
         v = v.respond_to?(:call) ? instance_exec(&v) : v
 
         # Ignore keys with nil values
         v.nil? ? qv : qv.update(k => v)
-      }
+      end
   end
 
   module ClassMethods
@@ -187,12 +197,9 @@ module Jeff
 
     def user_agent
       @user_agent ||= default_user_agent
-
     end
 
-    def user_agent=(user_agent)
-      @user_agent = user_agent
-    end
+    attr_writer :user_agent
 
     private
 

data/lib/jeff/version.rb

@@ -1,3 +1,3 @@
 module Jeff
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/test/test_jeff.rb

@@ -20,13 +20,13 @@ class TestJeff < Minitest::Test
 
   def test_has_required_request_query_parameters
     %w(AWSAccessKeyId SignatureMethod SignatureVersion Timestamp).each do |key|
-      assert @klass.params.has_key?(key)
+      assert @klass.params.key?(key)
     end
   end
 
   def test_configures_request_query_parameters
     @klass.params "Foo" => "bar"
-    assert @klass.params.has_key?("Foo")
+    assert @klass.params.key?("Foo")
   end
 
   def test_allows_dynamic_values_for_request_query_parameters
@@ -92,7 +92,7 @@ class TestJeffInAction < Minitest::Test
 
   Excon::HTTP_VERBS.each do |method|
     define_method "test_makes_#{method}_request" do
-      Excon.stub({}, { status: 200 })
+      Excon.stub({}, status: 200)
       assert_equal 200, @client.send(method, mock: true).status
     end
   end
@@ -123,7 +123,16 @@ class TestJeffInAction < Minitest::Test
 
   def test_gets_from_an_actual_endpoint
     @client.aws_endpoint = "https://mws.amazonservices.com/Sellers/2011-07-01"
-    res = @client.post(query: { "Action" => "GetServiceStatus"})
+    res = @client.post(query: { "Action" => "GetServiceStatus" })
     assert_equal 200, res.status
   end
+
+  def test_has_no_proxy_by_default
+    refute @client.connection.proxy
+  end
+
+  def test_sets_proxy
+    @client.connection_params.store(:proxy, "http://my.proxy:4321")
+    assert @client.connection.proxy
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jeff
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -96,4 +97,3 @@ specification_version: 4
 summary: An AWS client
 test_files:
 - test/test_jeff.rb
-has_rdoc: