jeff 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc7500d3705d6bc173fce163daef3c66ee1c07d
-  data.tar.gz: 4c29a3f46984a8417788688efa96d88b894c278d
+  metadata.gz: cfe902c5b3047b523b062b2d60fef3fd9fc0a9c4
+  data.tar.gz: 3ee4e4b1218dc82a02f9861eaaed85469a49d9b9
 SHA512:
-  metadata.gz: 239389abf5e9a0664280c9d6b18dfbdfe4c6571c88290bd2c4d62f92ec885afc8c33d244eebfc19a81a1ed29ec9dcd9324b55c3bf0477e60980ee17305f6ef33
-  data.tar.gz: 7102abb02d17f719debe32800976fbe30757d825a7c0eab5a32cb8191062d6d2f1a1f6504a0d2b05366fa5b7519a43e6ea0d8a3ab0fcc1ca4c1b26764a9bc020
+  metadata.gz: 6eb8b274d4af06e24c873727414512702f689f9261cb97b16d9106f3ccdaaf3e452f27d105cce9815b260cba37c148177e676d013d205db2e513b8b07f33f953
+  data.tar.gz: 7d89bff0a31977696c623bc854f88689bb6dd17072276191b99150b5e83d681796221674336bb05a02d47d2afbb71bc2e6dbdd76bce77be9577f449216886b66

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
+
+gem 'rake'
 gem 'jruby-openssl', :platform => :jruby

data/README.md

@@ -1,14 +1,8 @@
 # Jeff
 
-[![travis][stat]][trav]
-
-**Jeff** mixes in [authentication][sign] and other client behaviour for some
-[Amazon Web Services (AWS)][aws].
+Jeff [signs][sign] Amazon Web Services requests.
 
 ![jeff][jeff]
 
-[stat]: https://secure.travis-ci.org/papercavalier/jeff.png
-[trav]: http://travis-ci.org/papercavalier/jeff
 [sign]: http://docs.amazonwebservices.com/general/latest/gr/signature-version-2.html
-[aws]:  http://aws.amazon.com/
 [jeff]: http://f.cl.ly/items/0a3R3J0k1R2f423k1q2l/jeff.jpg

data/Rakefile

@@ -1,10 +1,10 @@
-#!/usr/bin/env rake
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-desc 'Run all specs in spec directory'
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern    = 'spec/**/*_spec.rb'
+Rake::TestTask.new do |t|
+  t.libs.push 'lib'
+  t.test_files = FileList['spec/*_spec.rb']
+  t.verbose = true
 end
 
-task :default => [:spec]
+task :default => [:test]

data/jeff.gemspec

@@ -5,20 +5,17 @@ require File.expand_path('../lib/jeff/version.rb', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ['Hakan Ensari']
   gem.email         = ['hakan.ensari@papercavalier.com']
-  gem.description   = %q{Minimum-viable Amazon Web Services (AWS) client}
+  gem.description   = %q{An Amazon Web Services client}
   gem.summary       = %q{AWS client}
   gem.homepage      = 'https://github.com/papercavalier/jeff'
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'jeff'
   gem.require_paths = ['lib']
   gem.version       = Jeff::VERSION
 
-  gem.add_dependency             'excon', '~> 0.20.0'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_dependency 'excon', '~> 0.22.0'
 
   gem.required_ruby_version = '>= 1.9'
 end

data/lib/jeff/version.rb

@@ -1,3 +1,3 @@
 module Jeff
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/jeff.rb

@@ -111,7 +111,7 @@ module Jeff
 
   def build_options(opts)
     opts[:headers] ||= {}
-    opts[:headers].update('Host' => connection_host)
+    opts[:headers].update('Host' => connection.data[:host])
 
     if opts[:body]
       opts[:headers].update('Content-MD5' => calculate_md5(opts[:body]))
@@ -124,14 +124,6 @@ module Jeff
     Base64.encode64(Digest::MD5.digest(body)).strip
   end
 
-  def connection_host
-    connection.data[:host]
-  end
-
-  def connection_path
-    connection.data[:path]
-  end
-
   def escape(val)
     val.to_s.gsub(UNRESERVED) do
       '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
@@ -143,8 +135,8 @@ module Jeff
 
     string_to_sign = [
       opts[:method].upcase,
-      connection_host,
-      opts[:path] || connection_path,
+      connection.data[:host],
+      opts[:path] || connection.data[:path],
       query
     ].join("\n")
     signature = secret.sign(string_to_sign)

data/spec/jeff_spec.rb

@@ -1,167 +1,95 @@
-require 'spec_helper'
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'jeff'
 
-describe Jeff do
-  let(:klass)  { Class.new { include Jeff } }
-  let(:client) { klass.new }
-
-  describe '.headers' do
-    subject { klass.headers }
-
-    it { should have_key 'User-Agent' }
+Excon.defaults[:mock] = true
 
-    it 'should be configurable' do
-      klass.instance_eval do
-        headers 'Foo' => 'bar'
-      end
-
-      should have_key 'Foo'
+describe Jeff do
+  before do
+    @klass = Class.new do
+      include Jeff
     end
   end
 
-  describe '.params' do
-    subject { klass.params }
-
-    it { should have_key 'AWSAccessKeyId' }
-
-    it { should have_key 'SignatureMethod' }
-
-    it { should have_key 'SignatureVersion' }
-
-    it { should have_key 'Timestamp' }
-
-    it 'should be configurable' do
-      klass.instance_eval do
-        params 'Foo' => 'bar'
-      end
-
-      should have_key 'Foo'
-    end
+  it 'has a User-Agent request header' do
+    assert @klass.headers.has_key?('User-Agent')
   end
 
-  describe '#endpoint' do
-    it 'should require a value' do
-      expect { client.endpoint }.to raise_error Jeff::MissingEndpoint
+  it 'configures request headers' do
+    @klass.instance_eval do
+      headers 'Foo' => 'bar'
     end
-  end
 
-  describe '#key' do
-    it 'should require a value' do
-      expect { client.key }.to raise_error Jeff::MissingKey
-    end
+    assert @klass.headers.has_key?('Foo')
   end
 
-  describe '#secret' do
-    it 'should require a value' do
-      expect { client.secret }.to raise_error Jeff::MissingSecret
-    end
+  it 'has the required request query parameters' do
+    %w(AWSAccessKeyId SignatureMethod SignatureVersion Timestamp)
+      .each { |key| assert @klass.params.has_key?(key) }
   end
 
-  context 'given a key' do
-    before do
-      client.key = 'key'
+  it 'configures the request query parameters' do
+    @klass.instance_eval do
+      params 'Foo' => 'bar'
     end
 
-    describe '#params' do
-      subject { client.params }
-
-      it 'should include the key' do
-        subject['AWSAccessKeyId'].should eql client.key
-      end
-
-      it 'should generate a timestamp' do
-        subject['Timestamp'].should be_a String
-      end
-    end
-
-    describe '#build_query' do
-      subject { client.build_query 'A10' => 1, 'A1' => 1 }
+    assert @klass.params.has_key?('Foo')
+  end
 
-      it 'should include default parameters' do
-        should match(/Timestamp/)
-      end
+  it 'requires an endpoint' do
+    proc { @klass.new.endpoint }.must_raise Jeff::MissingEndpoint
+  end
 
-      it 'should sort lexicographically' do
-        should match(/^A1=1&A10=/)
-      end
-    end
+  it 'requires a key' do
+    proc { @klass.new.key }.must_raise Jeff::MissingKey
   end
 
-  context 'given an endpoint' do
-    before do
-      client.endpoint = 'http://slowapi.com/delay/0'
-    end
+  it 'requires a secret' do
+    proc { @klass.new.secret }.must_raise Jeff::MissingSecret
+  end
 
-    describe "#connection" do
-      subject { client.connection }
-      let(:headers) { subject.data[:headers] }
+  it 'sorts the request query parameters of the client lexicographically' do
+    client = @klass.new
+    client.key = 'foo'
+    query = client.build_query 'A10' => 1, 'A1' => 1
 
-      it { should be_an Excon::Connection }
+    query.must_match(/^A1=1&A10=.*Timestamp/)
+  end
 
-      it 'should set default headers' do
-        headers.should eq klass.headers
-      end
+  it 'sets the request headers of the client connection' do
+    client = @klass.new
+    client.endpoint = 'http://example.com/'
 
-      it 'should cache itself' do
-        subject.should be client.connection
-      end
-    end
+    client.connection.data[:headers].must_equal @klass.headers
   end
 
-  context 'given an endpoint, key, and secret' do
-    before do
-      client.endpoint = 'http://slowapi.com/delay/0'
-      client.key = 'key'
-      client.secret = 'secret'
-    end
-
-    Excon::HTTP_VERBS.each do |method|
-      describe "##{method}" do
-        subject { client.send(method, mock: true).body }
+  Excon::HTTP_VERBS.each do |method|
+    it "makes a #{method.upcase} request" do
+      Excon.stub({ }, { status: 200 })
 
-        before do
-          Excon.stub({ method: method.to_sym }) do
-            { body: method, status: 200 }
-          end
-        end
+      client = @klass.new
+      client.endpoint = 'http://example.com/'
+      client.key = 'foo'
+      client.secret = 'bar'
 
-        after { Excon.stubs.clear }
+      client.send(method).status.must_equal 200
 
-        it "should make a #{method.upcase} request" do
-          should eql method
-        end
-      end
+      Excon.stubs.clear
     end
+  end
 
-    context 'given a request body' do
-      subject { client.get(mock: true, body: 'foo').body }
-
-      before do
-        Excon.stub({ method: :get }) do |params|
-          { status: 200, body: params[:headers]['Content-MD5'] }
-        end
-      end
-
-      after { Excon.stubs.clear }
-
-      it "should add an Content-MD5 header" do
-        should_not be_empty
-      end
+  it 'adds a Content-MD5 request header if there is a request body' do
+    Excon.stub({ }) do |params|
+      { body: params[:headers]['Content-MD5'] }
     end
 
-    context 'given an HTTP status error' do
-      before do
-        Excon.stub({ method: :get }) do
-          { status: 503 }
-        end
-      end
+    client = @klass.new
+    client.endpoint = 'http://example.com/'
+    client.key = 'foo'
+    client.secret = 'bar'
 
-      after { Excon.stubs.clear }
+    client.post(body: 'foo').body.wont_be_empty
 
-      it "should raise an error" do
-        expect {
-          client.get mock: true
-        }.to raise_error Excon::Errors::HTTPStatusError
-      end
-    end
+    Excon.stubs.clear
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jeff
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,43 +16,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Minimum-viable Amazon Web Services (AWS) client
+        version: 0.22.0
+description: An Amazon Web Services client
 email:
 - hakan.ensari@papercavalier.com
 executables: []
@@ -69,9 +41,7 @@ files:
 - lib/jeff.rb
 - lib/jeff/secret.rb
 - lib/jeff/version.rb
-- spec/jeff/secret_spec.rb
 - spec/jeff_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/papercavalier/jeff
 licenses: []
 metadata: {}
@@ -91,11 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: AWS client
 test_files:
-- spec/jeff/secret_spec.rb
 - spec/jeff_spec.rb
-- spec/spec_helper.rb

data/spec/jeff/secret_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-module Jeff
-  describe Secret do
-    let(:secret) { Secret.new 'key' }
-
-    describe '#sign' do
-      after { secret.sign 'message' }
-
-      it 'should digest' do
-        secret.should_receive(:digest)
-              .and_return double.as_null_object
-      end
-
-      it 'should Base64-encode' do
-        Base64.should_receive(:encode64)
-              .and_return double.as_null_object
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,6 +0,0 @@
-require 'rspec'
-require 'jeff'
-
-RSpec.configure do |c|
-  c.order = :random
-end