sunstone 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051c69bddb929215445466e39b7ab1195f980713
-  data.tar.gz: 33d67611b87dacf74d886c91a4d3cba1ff6bf9e6
+  metadata.gz: a0acc52add951c41b1a9af3b1c243e009db98025
+  data.tar.gz: 1138d06d272162568ec1aa5ab2a3a3e35d476c52
 SHA512:
-  metadata.gz: 7912c0cd5e1b05b8ed7b3ddf38084b712fbcb031f0cfd8e05ad5719266b637c022ad459389b9cf71b298771a1f270382a8d663a9d5117c0e6769fb4d945c2d3f
-  data.tar.gz: 4c0e36266c7381930baf325aaa9ab944dbfe09d27f65243dfb8968e9702ac53cb3a2b037988a384204062e901215316c58f6aad0580d3884f12ac5948a1644c7
+  metadata.gz: cd4b7ea3b2b5a6a5cc5bd6a71668b9735b9075d6a8273054e20dccb073b4a1a0a4b8caaa2d0d16b609f178ea6bbf17498ef46f04586b1585b942f26a0a000610
+  data.tar.gz: b6b389e1bcfc1281988f3d45883962340cdfc6b18015a218c591ad5c300c7c33f4f8158a74c7934822579430b22127baee7897ee3a55fc0222237e706d5c5f0e

data/lib/sunstone/connection.rb

@@ -7,11 +7,11 @@ require 'net/https'
 # checking of responses.
 module Sunstone
   class Connection
-    
+
     # Set the User-Agent of the client. Will be joined with other User-Agent info
     attr_writer :user_agent
     attr_accessor :api_key, :host, :port, :use_ssl
-    
+
     # Initialize a connection a Sunstone API server.
     #
     # Options:
@@ -30,15 +30,15 @@ module Sunstone
         config[:port]    ||= uri.port
         config[:use_ssl] ||= (uri.scheme == 'https')
       end
-      
+
       [:api_key, :host, :port, :use_ssl, :user_agent].each do |key|
         self.send(:"#{key}=", config[key])
       end
-      
+
       @connection = Net::HTTP.new(host, port)
       @connection.use_ssl = use_ssl
     end
-    
+
     # Ping the Sunstone. If everything is configured and operating correctly
     # <tt>"pong"</tt> will be returned. Otherwise and Sunstone::Exception should be
     # thrown.
@@ -61,7 +61,7 @@ module Sunstone
         RUBY_PLATFORM
       ].compact.join(' ')
     end
-   
+
     # Sends a Net::HTTPRequest to the server. The headers returned from
     # Sunestone#headers are automatically added to the request. The appropriate
     # error is raised if the response is not in the 200..299 range.
@@ -69,7 +69,7 @@ module Sunstone
     # Paramaters::
     #
     # * +request+ - A Net::HTTPRequest to send to the server
-    # * +body+ - Optional, a String, IO Object, or a Ruby object which is 
+    # * +body+ - Optional, a String, IO Object, or a Ruby object which is
     #            converted into JSON and sent as the body
     # * +block+ - An optional block to call with the +Net::HTTPResponse+ object.
     #
@@ -100,11 +100,11 @@ module Sunstone
     def send_request(request, body=nil, &block)
       request_uri = "http#{use_ssl ? 's' : ''}://#{host}#{port != 80 ? (port == 443 && use_ssl ? '' : ":#{port}") : ''}#{request.path}"
       request_headers.each { |k, v| request[k] = v }
-      
+
       if Thread.current[:sunstone_cookie_store]
         request['Cookie'] = Thread.current[:sunstone_cookie_store].cookie_header_for(request_uri)
       end
-      
+
       if body.is_a?(IO)
         request['Transfer-Encoding'] = 'chunked'
         request.body_stream =  body
@@ -128,14 +128,14 @@ module Sunstone
             Thread.current[:sunstone_cookie_store].set_cookie(request_uri, value)
           end
         end
-        
+
         if block_given?
           return_value =yield(response)
         else
           return_value =response
         end
       end
-      
+
       return_value
     end
 
@@ -170,10 +170,10 @@ module Sunstone
     def get(path, params='', &block)
       params ||= ''
       request = Net::HTTP::Get.new(path + '?' + params.to_param)
-    
+
       send_request(request, nil, &block)
     end
-    
+
     # Send a POST request to +path+ on the Sunstone Server via +Sunstone#send_request+.
     # See +Sunstone#send_request+ for more details on how the response is handled.
     #
@@ -205,10 +205,10 @@ module Sunstone
     #  end
     def post(path, body=nil, &block)
       request = Net::HTTP::Post.new(path)
-    
+
       send_request(request, body, &block)
     end
-    
+
     # Send a PUT request to +path+ on the Sunstone Server via +Sunstone#send_request+.
     # See +Sunstone#send_request+ for more details on how the response is handled.
     #
@@ -240,10 +240,10 @@ module Sunstone
     #  end
     def put(path, body=nil, *valid_response_codes, &block)
       request = Net::HTTP::Put.new(path)
-    
+
       send_request(request, body, &block)
     end
-  
+
     # Send a DELETE request to +path+ on the Sunstone Server via +Sunstone#send_request+.
     # See +Sunstone#send_request+ for more details on how the response is handled
     #
@@ -268,25 +268,25 @@ module Sunstone
     #  end
     def delete(path, &block)
       request = Net::HTTP::Delete.new(path)
-    
+
       send_request(request, nil, &block)
     end
 
     def server_config
       @server_config ||= Wankel.parse(get('/config').body, :symbolize_keys => true)
     end
-    
+
     private
-    
+
     def request_headers
       headers = {
         'Content-Type'            => 'application/json',
         'User-Agent'              => user_agent,
         'Api-Version' => '0.1.0'
       }
-    
-      headers['Api-Key'] = api_key if api_key
-    
+      request_api_key = Thread.current[:sunstone_api_key] || api_key
+
+      headers['Api-Key'] = request_api_key if request_api_key
       headers
     end
 
@@ -311,7 +311,7 @@ module Sunstone
     #  Sunstone.validate_response_code(<Net::HTTP::Response @code=500>) # => raises Sunstone::Exception
     def validate_response_code(response)
       code = response.code.to_i
-    
+
       if !(200..299).include?(code)
         case code
         when 400
@@ -335,6 +335,6 @@ module Sunstone
         end
       end
     end
-    
+
   end
 end

data/sunstone.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sunstone"
-  s.version     = '1.6.4'
+  s.version     = '1.6.5'
   s.authors     = ["Jon Bracy"]
   s.email       = ["jonbracy@gmail.com"]
   s.homepage    = "http://sunstonerb.com"

data/test/sunstone_test.rb

@@ -5,49 +5,49 @@ class SunstoneTest < Minitest::Test
   def setup
     Sunstone.site = "http://test_api_key@testhost.com"
   end
-  
+
   # Sunstone.site= ============================================================
-  
+
   test "setting the site sets the api_key" do
     Sunstone.site = 'https://my_api_key@localhost'
     assert_equal('my_api_key', Sunstone.api_key)
   end
-  
+
   test "setting the site sets the host" do
     Sunstone.site = 'https://my_api_key@example.com'
     assert_equal('example.com', Sunstone.host)
   end
-  
+
   test "setting the site sets the port" do
     Sunstone.site = 'http://my_api_key@example.com'
     assert_equal(80, Sunstone.port)
-    
+
     Sunstone.site = 'https://my_api_key@example.com'
     assert_equal(443, Sunstone.port)
-    
+
     Sunstone.site = 'https://my_api_key@example.com:4321'
     assert_equal(4321, Sunstone.port)
   end
-  
+
   test "setting the site sets the use_ssl option" do
     Sunstone.site = 'http://my_api_key@example.com'
     assert_equal(false, Sunstone.use_ssl)
-    
+
     Sunstone.site = 'https://my_api_key@example.com'
     assert_equal(true, Sunstone.use_ssl)
   end
-  
+
   # Sunstone.user_agent= ======================================================
   test "setting the user_agent appends it to the User-Agent" do
     assert_equal("Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", Sunstone.user_agent)
-    
+
     Sunstone.user_agent = "MyGem/3.14"
     assert_equal("MyGem/3.14 Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", Sunstone.user_agent)
     Sunstone.user_agent = nil
   end
-  
+
   # Sunstone.with_cookie_store ================================================
-  
+
   test '#with_cookie_store(store, &block) sets the cookie-store' do
     assert_nil Thread.current[:sunstone_cookie_store]
     Sunstone.with_cookie_store('my_store') do
@@ -56,20 +56,30 @@ class SunstoneTest < Minitest::Test
     assert_nil Thread.current[:sunstone_cookie_store]
   end
 
+  # Sunstone.with_api_key ================================================
+
+  test '#with_api_key(key, &block) sets the Api-Key' do
+    assert_nil Thread.current[:sunstone_api_key]
+    Sunstone.with_api_key('my_api_key') do
+      assert_equal 'my_api_key', Thread.current[:sunstone_api_key]
+    end
+    assert_nil Thread.current[:sunstone_api_key]
+  end
+
   # Sunstone.send_request =====================================================
-  
+
   test '#send_request(#<Net::HTTPRequest>)' do
     stub_request(:get, "http://testhost.com/test").to_return(:body => "get")
-    
+
     assert_equal('get', Sunstone.send_request(Net::HTTP::Get.new('/test')).body)
   end
-  
+
   test '#send_request(#<Net::HTTPRequest>, body) with string body' do
     stub_request(:post, "http://testhost.com/test").with(:body => '{"key":"value"}').to_return(:body => "post")
-    
+
     assert_equal('post', Sunstone.send_request(Net::HTTP::Post.new('/test'), '{"key":"value"}').body)
   end
-  
+
   test '#send_request(#<Net::HTTPRequest>, body) with IO body' do
     stub_request(:post, "http://testhost.com/test").with { |request|
       request.headers['Transfer-Encoding'] == "chunked" && request.body == '{"key":"value"}'
@@ -81,14 +91,14 @@ class SunstoneTest < Minitest::Test
 
     assert_equal('post', Sunstone.send_request(Net::HTTP::Post.new('/test'), rd).body)
   end
-  
+
   test '#send_request(#<Net::HTTPRequest>, body) with Ruby Object body' do
     stub_request(:post, "http://testhost.com/test").with(:body => '{"key":"value"}').to_return(:body => "post")
-    
+
     assert_equal('post', Sunstone.send_request(Net::HTTP::Post.new('/test'), {:key => 'value'}).body)
   end
 
-  test '#send_request(#<Net::HTTPRequest>) raises Sunstone::Exceptions on non-200 responses' do  
+  test '#send_request(#<Net::HTTPRequest>) raises Sunstone::Exceptions on non-200 responses' do
     stub_request(:get, "http://testhost.com/400").to_return(:status => 400)
     stub_request(:get, "http://testhost.com/401").to_return(:status => 401)
     stub_request(:get, "http://testhost.com/404").to_return(:status => 404)
@@ -97,7 +107,7 @@ class SunstoneTest < Minitest::Test
     stub_request(:get, "http://testhost.com/450").to_return(:status => 450)
     stub_request(:get, "http://testhost.com/503").to_return(:status => 503)
     stub_request(:get, "http://testhost.com/550").to_return(:status => 550)
-    
+
     assert_raises(Sunstone::Exception::BadRequest)   { Sunstone.send_request(Net::HTTP::Get.new('/400')) }
     assert_raises(Sunstone::Exception::Unauthorized) { Sunstone.send_request(Net::HTTP::Get.new('/401')) }
     assert_raises(Sunstone::Exception::NotFound)     { Sunstone.send_request(Net::HTTP::Get.new('/404')) }
@@ -107,27 +117,27 @@ class SunstoneTest < Minitest::Test
     assert_raises(Sunstone::Exception::ServiceUnavailable)    { Sunstone.send_request(Net::HTTP::Get.new('/503')) }
     assert_raises(Sunstone::Exception)               { Sunstone.send_request(Net::HTTP::Get.new('/550')) }
   end
-  
+
   test '#send_request(#<Net::HTTPRequest>, &block) returns value returned from &block' do
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
-    
+
     value = Sunstone.send_request(Net::HTTP::Get.new('/test')) do |response|
       3215
     end
-    
+
     assert_equal 3215, value
   end
-  
+
   test '#send_request(#<Net::HTTPRequest>, &block)' do
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
-    
+
     Sunstone.send_request(Net::HTTP::Get.new('/test')) do |response|
       assert_equal 'get', response.body
     end
 
     # make sure block is not called when not in valid_response_codes
     stub_request(:get, "http://testhost.com/test").to_return(:status => 401, :body => 'get')
-    
+
     assert_raises(Sunstone::Exception::Unauthorized) {
       Sunstone.send_request(Net::HTTP::Get.new('/test')) do |response|
         raise Sunstone::Exception, 'Should not get here'
@@ -141,7 +151,7 @@ class SunstoneTest < Minitest::Test
     wr.write(<<-DATA.gsub(/^ +/, '').gsub(/\n/, "\r\n"))
       HTTP/1.1 200 OK
       Content-Length: 5
-      
+
       hello
     DATA
 
@@ -149,7 +159,7 @@ class SunstoneTest < Minitest::Test
     connection = mock('connection')
     connection.stubs(:request).yields(res)
     Sunstone.stubs(:with_connection).yields(connection)
-    
+
     res.reading_body(rd, true) do
       Sunstone.send_request(Net::HTTP::Get.new('/test')) do |response|
         response.read_body do |chunk|
@@ -158,21 +168,21 @@ class SunstoneTest < Minitest::Test
       end
     end
   end
-  
+
   test '#send_request(#<Net::HTTPRequest) adds cookies to the cookie store if present' do
     store = CookieStore::HashStore.new
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get', :headers => {'Set-Cookie' => 'foo=bar; Max-Age=3600'})
-    
+
     Sunstone.with_cookie_store(store) do
       Sunstone.send_request(Net::HTTP::Get.new('/test'))
     end
-    
+
     assert_equal 1, store.instance_variable_get(:@domains).size
     assert_equal 1, store.instance_variable_get(:@domains)['testhost.com'].size
     assert_equal 1, store.instance_variable_get(:@domains)['testhost.com']['/test'].size
     assert_equal 'bar', store.instance_variable_get(:@domains)['testhost.com']['/test']['foo'].value
   end
-  
+
   test '#send_request(#<Net::HTTPRequest>) includes the headers' do
     stub_request(:get, "http://testhost.com/test").with(:headers => {
       'Api-Key'      => 'test_api_key',
@@ -181,7 +191,7 @@ class SunstoneTest < Minitest::Test
     }).to_return(:body => "get")
 
     assert_equal('get', Sunstone.send_request(Net::HTTP::Get.new('/test')).body)
-    
+
     # Test without api key
     Sunstone.site = "http://testhost.com"
     stub_request(:get, "http://testhost.com/test").with(:headers => {
@@ -191,12 +201,12 @@ class SunstoneTest < Minitest::Test
 
     assert_equal('get', Sunstone.send_request(Net::HTTP::Get.new('/test')).body)
   end
-  
+
   # Sunstone.get ==============================================================
-  
+
   test '#get(path)' do
     stub_request(:get, "http://testhost.com/test").to_return(:body => "get")
-    
+
     assert_equal('get', Sunstone.get('/test').body)
   end
 
@@ -205,16 +215,16 @@ class SunstoneTest < Minitest::Test
 
     assert_equal 'get', Sunstone.get('/test', 'key=value').body
   end
-  
+
   test '#get(path, params) with params as hash' do
     stub_request(:get, "http://testhost.com/test").with(:query => {'key' => 'value'}).to_return(:body => "get")
 
     assert_equal 'get', Sunstone.get('/test', {:key => 'value'}).body
   end
-  
+
   test '#get(path, &block)' do
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
-    
+
     Sunstone.get('/test') do |response|
       assert_equal 'get', response.body
     end
@@ -224,41 +234,41 @@ class SunstoneTest < Minitest::Test
 
   test '#post(path)' do
     stub_request(:post, "http://testhost.com/test").to_return(:body => "post")
-    
+
     assert_equal('post', Sunstone.post('/test').body)
   end
-  
+
   test '#post(path, body)' do
     stub_request(:post, "http://testhost.com/test").with(:body => 'body').to_return(:body => "post")
-    
+
     assert_equal('post', Sunstone.post('/test', 'body').body)
   end
-  
+
   test '#post(path, &block)' do
     stub_request(:post, "http://testhost.com/test").to_return(:body => 'post')
-    
+
     Sunstone.post('/test') do |response|
       assert_equal 'post', response.body
     end
   end
-  
+
   # Sunstone.put ==============================================================
 
   test '#put(path)' do
     stub_request(:put, "http://testhost.com/test").to_return(:body => "put")
-    
+
     assert_equal('put', Sunstone.put('/test').body)
   end
-  
+
   test '#put(path, body)' do
     stub_request(:put, "http://testhost.com/test").with(:body => 'body').to_return(:body => "put")
-    
+
     assert_equal('put', Sunstone.put('/test', 'body').body)
   end
-  
+
   test '#put(path, &block)' do
     stub_request(:put, "http://testhost.com/test").to_return(:body => 'put')
-    
+
     Sunstone.put('/test') do |response|
       assert_equal 'put', response.body
     end
@@ -268,35 +278,35 @@ class SunstoneTest < Minitest::Test
 
   test '#delete' do
     stub_request(:delete, "http://testhost.com/test").to_return(:body => "delete")
-    
+
     assert_equal('delete', Sunstone.delete('/test').body)
   end
-  
+
   test '#delete(path, &block)' do
     stub_request(:delete, "http://testhost.com/test").to_return(:body => 'delete')
-    
+
     Sunstone.delete('/test') do |response|
       assert_equal 'delete', response.body
     end
   end
-  
+
   # Sunstone.ping =============================================================
-  
+
   test '#ping' do
     stub_request(:get, "http://testhost.com/ping").to_return(:body => 'pong')
-    
+
     assert_equal( 'pong', Sunstone.ping )
   end
-  
+
   # Sunstone.config ===========================================================
-  
+
   test '#config' do
     stub_request(:get, "http://testhost.com/config").to_return(:body => '{"server": "configs"}')
-    
+
     assert_equal( {:server => "configs"}, Sunstone.config )
   end
 
 
 
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake