amqparty 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5da03512190acc7740d2ea81063633a39fd7e5d
-  data.tar.gz: 01ddc064677659835cd11b1b3274b8147d52b9fd
+  metadata.gz: 24f1ff05a43649e133ef937f72d0a87abcb3940f
+  data.tar.gz: be5500567394b7cdbc674dda48efc8be80a59bb1
 SHA512:
-  metadata.gz: f2bc2d849584b93ebdcf4a119e578ed6dede21f2198837a5e98fece0f1dbf2cb7ad8272c4d13b74d45cf927cc18422490f5934ac2ee3e0296454a8f70e588e50
-  data.tar.gz: f782b39950d4f76eeae2fce9abdd618abc724ee9e2c04e2a3d7a91d43ea98f4650971b853dd9cf131d6a258c53804e9f3c296f4a384dae3c9a9306bd83cff684
+  metadata.gz: 5912b578d5d002737d15d5abe83314e58aa470f688fd28f14e935801adf6bbf4263c3712d58ca7d20257d120baf05c28d2ffdad34b23b12c1481e63bd2fb05d6
+  data.tar.gz: 297bf404bc4cac06adbbcc3fc86a2904538385722e287ce2ea43e055e8b3c96c385436c1b1b5aa193db78af6716b88b0e848bf280458727c5a7597305738e7d3

data/.rspec

@@ -1,2 +0,0 @@
---require emoji-rspec
---format hearts

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
+  # Decided not to support 1.9.2 because HTTParty won't support it - 1.9.2
   - jruby-19mode # JRuby in 1.9 mode
   - ruby-head
   - jruby-head
-  - rbx
+  # Not trying to test because Travis doesn't like it - rbx

data/README.md

@@ -2,6 +2,8 @@
 
 A AMQP-HTTP compliant modification of HTTParty for use with jackalope
 
+![Travis CI](https://travis-ci.org/rack-amqp/amqparty.svg?branch=master)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -37,6 +39,21 @@ Uri scheme must be amqp or amqps. Hostname is actually the queue name.
 
 Post and put also work. Delete, head, options are untested.
 
+Valid configuration parameters are shown below:
+
+| Parameters            |                               Description                              | Default Value |
+|-----------------------|:----------------------------------------------------------------------:|--------------:|
+| amqp\_host            |             host name or IP address of the rabbitmq server             |     localhost |
+| port                  |                          rabbitmq server port                          |          5672 |
+| username              |           username to use for the rabbitmq server connection           |         guest |
+| password              |           password to use for the rabbitmq server connection           |         guest |
+| tls                   |             use TLS when connecting to the rabbitmq server             |         false |
+| tls\_ca\_certificates |           an array of paths to CA certificates in pem format           |            [] |
+| tls\_cert             |    path to the client certificate for SSL connections in pem format    |           nil |
+| tls\_key              |    path to the client private key for SSL connections in pem format    |           nil |
+| verify\_peer          |            disable/enable peer verification (used with TLS)            |         false |
+| request\_timeout      | value in seconds indicating the reply wait timeout for an amqp request |             5 |
+
 ## Contributing
 
 1. Fork it

data/amqparty.gemspec

@@ -19,12 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "httparty", ">=0.10.0"
-  spec.add_dependency "rack-amqp-client"
+  spec.add_dependency "rack-amqp-client", ">=0.0.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "emoji-rspec"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
 end

data/lib/amqparty.rb

@@ -28,18 +28,40 @@ module AMQParty
     def self.perform_request(http_method, path, options, &block)
       raise AMQParty::UnconfiguredError.new if configuration.amqp_host.nil?
 
-      options = default_options.dup.merge(options)
+      options = configuration.default_options.dup.merge(options)
       # TODO cookies support
       path = "#{path}/" if path =~ /\Aamqp?:\/\/([^\/])+\Z/
       Request.new(http_method, path, options).perform(&block)
     end
 
-    def self.default_options
-      {amqp_client_options: {host: configuration.amqp_host}}
-    end
-
     class Configuration
       attr_accessor :amqp_host
+      attr_accessor :port
+      attr_accessor :request_timeout
+      attr_accessor :tls_ca_certificates
+      attr_accessor :verify_peer
+      attr_accessor :tls
+      attr_accessor :tls_key
+      attr_accessor :tls_cert
+      attr_accessor :username
+      attr_accessor :password
+
+      def default_options
+        {
+          amqp_client_options: {
+            host: amqp_host,
+            port: port || 5672,
+            tls_ca_certificates: tls_ca_certificates || [],
+            verify_peer: verify_peer || false,
+            tls: tls || false,
+            tls_key: tls_key,
+            tls_cert: tls_cert,
+            username: username || 'guest',
+            password: password || 'guest'
+          },
+          request_timeout: request_timeout || 5
+        }
+      end
     end
 end
 

data/lib/amqparty/request.rb

@@ -13,26 +13,40 @@ module AMQParty
       chunked_body = nil
 
       path = "#{uri.host}#{uri.path}"
+      path = "#{path}?#{uri.query}" if uri.query
       connection_options = options[:amqp_client_options]
-
-      #connection_options[:user]     = uri.user     if uri.user
-      #connection_options[:password] = uri.password if uri.password
+      async              = options[:async]
 
       Rack::AMQP::Client.with_client(connection_options) do |client|
         method_name = http_method.name.split(/::/).last.upcase
         body = options[:body] || ""
-        body = HTTParty::HashConversions.to_params(options[:body]) if body.is_a?(Hash)
+
+        if body.is_a?(Hash)
+          body = HTTParty::HashConversions.to_params(options[:body])
+        end
+
         headers = options[:headers] || {}
+        timeout = options[:request_timeout]
 
-        response = client.request(path, {body: body, http_method: method_name, headers: headers, timeout: 5})
+        response = client.request(path, {
+            body: body,
+            http_method: method_name,
+            headers: headers,
+            timeout: timeout,
+            async: !!async
+          }
+        )
 
-        klass = Net::HTTPResponse.send(:response_class,response.response_code.to_s)
-        http_response = klass.new("1.1", response.response_code, "Found")
+        response_code = response.response_code
+        klass = Net::HTTPResponse.send(:response_class, response_code.to_s)
+        http_response = klass.new("1.1", response_code, "Found")
         response.headers.each_pair do |key, value|
           http_response.add_field key, value
         end
         http_response.body = response.payload
-        http_response.send(:instance_eval, "def body; @body; end") # TODO GIANT HACK
+        
+        # TODO GIANT HACK
+        http_response.send(:instance_eval, "def body; @body; end")
         self.last_response = http_response
       end
 

data/lib/amqparty/version.rb

@@ -1,3 +1,3 @@
 module AMQParty
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/amqparty_classmethods_spec.rb

@@ -38,34 +38,80 @@ describe AMQParty do
       end
       expect(AMQParty.configuration.amqp_host).to eq('localhost')
     end
+
+    it "allows configuration of a request timeout" do
+      AMQParty.configure do |c|
+        c.request_timeout = 10
+      end
+      expect(AMQParty.configuration.request_timeout).to eq(10)
+    end
+
   end
 
   describe '#get' do
 
+    before :each do
+      AMQParty.configure do |c|
+        c.amqp_host = 'localhost'
+        c.request_timeout = 55
+      end
+    end
+
+    let(:client) { double('Rack::AMQP::Client') }
+    let(:params) {
+      {
+        body: '',
+        http_method: 'GET',
+        headers: {},
+        timeout: 55,
+        async: false
+      }
+    }
+
+    let(:client_params) {
+      {
+        host: 'localhost',
+        port: 5672,
+        tls_ca_certificates: [],
+        verify_peer: false,
+        tls: false,
+        tls_key: nil,
+        tls_cert: nil,
+        username: 'guest',
+        password: 'guest'
+      }
+    }
+
     it_behaves_like 'all request methods', 'get'
 
     it 'calls Rack::AMQP::Client with the proper options' do
       # this method is a lot of stubbing, but I guess it's ok?
-      fake_with_client = -> {
-        fake_client = double()
-        fake_client.should_receive(:request).with('test.simple/users.json', {
-          body: '',
-          http_method: 'GET',
-          headers: {},
-          timeout: 5
-        }) do
-          fake_response = double()
-          fake_response.stub(:response_code) { 200 }
-          fake_response.stub(:headers) { {'response_header' => 'foo'} }
-          fake_response.stub(:payload) { 'Hello World' }
-          fake_response
-        end
-        fake_client
-      }
-      expect(Rack::AMQP::Client).to receive(:client).with({host: 'localhost'}).and_return(&fake_with_client)
+      expect(client).to receive(:request).with('test.simple/users.json', params) do
+        response = double()
+        allow(response).to receive(:response_code) { 200 }
+        allow(response).to receive(:headers) { {'response_header' => 'foo'} }
+        allow(response).to receive(:payload) { 'Hello World' }
+        response
+      end
+
+      expect(Rack::AMQP::Client).to receive(:client).with(client_params).and_return(client)
       AMQParty.get('amqp://test.simple/users.json')
     end
 
+    it 'calls Rack::AMQP::Client with the correct path' do
+      # this mthod is a lot of stubbing, but I guess it's ok?
+      expect(client).to receive(:request).with('test.simple/users.json?login=foo', params) do
+        response = double()
+        allow(response).to receive(:response_code) { 200 }
+        allow(response).to receive(:headers) { {'response_header' => 'foo'} }
+        allow(response).to receive(:payload) { 'Hello World' }
+        response
+      end
+
+      expect(Rack::AMQP::Client).to receive(:client).with(client_params).and_return(client)
+      AMQParty.get('amqp://test.simple/users.json?login=foo')
+    end
+
   end
 
   it "integrates", brittle: true do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqparty
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Joshua Szmajda
@@ -9,118 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rack-amqp-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: emoji-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'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: pry
   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: AMQP-HTTP compliant replacement for HTTParty
@@ -130,9 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -156,12 +142,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []