resizor 0.0.2 → 0.0.3

data/lib/resizor/asset.rb

@@ -8,7 +8,7 @@ module Resizor
     
     def url(options={})
       options = {:size => '200', :format => 'jpg'}.merge(options)
-      "#{Resizor.api_url}/assets/#{id}.#{options[:format]}?size=#{options[:size]}&token=#{resize_token_for(options)}"
+      "#{Resizor.api_url(true)}/assets/#{id}.#{options[:format]}?size=#{options[:size]}&token=#{resize_token_for(options)}"
     end
     
     def resize_token_for(options={})

data/lib/resizor/connection.rb

@@ -1,12 +1,13 @@
 require 'cgi'
 module Resizor
   class Connection
-    attr_accessor :api_host, :api_port, :api_key
+    attr_accessor :api_host, :api_port, :api_key, :use_ssl
 
     def initialize(options={})
       @api_host = options[:api_host] || options['api_host'] || 'resizor.com'
       @api_port = options[:api_port] || options['api_port'] || 80
       @api_key  = options[:api_key]  || options['api_key']
+      @use_ssl  = options[:use_ssl]  || options['use_ssl'] || true
     end
     
     def get(request_uri, params={}, append_api_key=true)
@@ -32,8 +33,8 @@ module Resizor
       end
     end
     
-    def api_url
-      @api_url ||= "http://#{@api_host}:#{@api_port}"
+    def api_url(force_http = false)
+      @api_url ||= "#{(@use_ssl == true && force_http == false) ? 'https' : 'http'}://#{@api_host}:#{@api_port}"
     end
     
   protected

data/lib/resizor/resizor.rb

@@ -6,7 +6,7 @@ module Resizor
   extend self
   extend Forwardable
   attr_reader :connection
-  def_delegators :connection, :get, :post, :delete, :api_url, :api_key
+  def_delegators :connection, :get, :post, :delete, :api_url, :api_key, :use_ssl
   
   def configure
     yield @connection = Connection.new

data/lib/resizor/version.rb

@@ -1,3 +1,3 @@
 module Resizor
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/asset_test.rb

@@ -41,7 +41,7 @@ class AssetTest < Test::Unit::TestCase
       
       context 'on success' do
         setup do 
-          stub_http_request(:post, "resizor.test/assets.json").
+          stub_http_request(:post, "https://resizor.test:80/assets.json").
             with { |request|
               request.body.include?("Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg") 
             }.
@@ -51,7 +51,7 @@ class AssetTest < Test::Unit::TestCase
         end
         
         should 'make create call to Resizor on save with file' do
-          assert_requested(:post, "resizor.test/assets.json",
+          assert_requested(:post, "https://resizor.test:80/assets.json",
                            :times => 1) { |request| 
                               request.body.include?("Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg")
                             }
@@ -69,7 +69,7 @@ class AssetTest < Test::Unit::TestCase
       
       context 'on failure' do
         should 'return false' do
-          stub_http_request(:post, "resizor.test/assets.json").to_return(:status => 422)
+          stub_http_request(:post, "https://resizor.test:80/assets.json").to_return(:status => 422)
           assert !@asset.save_to_resizor
         end
       end
@@ -77,18 +77,18 @@ class AssetTest < Test::Unit::TestCase
 
     context 'when destroying an asset' do
       should 'make delete call to Resizor on destroy' do
-        stub_http_request(:delete, "resizor.test/assets/10.json?api_key=test-api-key").to_return(:status => 200)
+        stub_http_request(:delete, "https://resizor.test:80/assets/10.json?api_key=test-api-key").to_return(:status => 200)
         @asset.destroy
-        assert_requested :delete, "resizor.test/assets/10.json?api_key=test-api-key", :times => 1
+        assert_requested :delete, "https://resizor.test:80/assets/10.json?api_key=test-api-key", :times => 1
       end
 
       should 'return true on success' do
-        stub_http_request(:delete, "resizor.test/assets/10.json?api_key=test-api-key").to_return(:status => 200)
+        stub_http_request(:delete, "https://resizor.test:80/assets/10.json?api_key=test-api-key").to_return(:status => 200)
         assert @asset.destroy
       end
 
       should 'return false on failure' do
-        stub_http_request(:delete, "resizor.test/assets/10.json?api_key=test-api-key").to_return(:status => 404) 
+        stub_http_request(:delete, "https://resizor.test:80/assets/10.json?api_key=test-api-key").to_return(:status => 404) 
         assert !@asset.destroy
       end
     end

data/test/integration_test.rb

@@ -24,17 +24,17 @@ class IntegrationTest < Test::Unit::TestCase
         File.open(@image_fixture_path, 'w') {|f| f.write('JPEG data') }
         @file = File.new(@image_fixture_path, 'rb')
         @item.image = @file
-        stub_http_request(:post, "resizor.test/assets.json").
+        stub_http_request(:post, "https://resizor.test:80/assets.json").
                           with { |request| request.body.include?("Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg") }.
                           to_return(:status => 201, :body => '{"asset": { "id":1, "name":"i", "extension":"jpg", "mime_type":"image/jpeg", "height":7, "width":8, "file_size":9, "created_at":"2010-10-23T13:07:25Z"}}')
-        stub_http_request(:delete, "resizor.test/assets/1.json?api_key=test-api-key").to_return(:status => 200)
+        stub_http_request(:delete, "https://resizor.test:80/assets/1.json?api_key=test-api-key").to_return(:status => 200)
       end
       
       teardown { File.unlink(@image_fixture_path) }
 
       should 'save attached asset to Resizor on save' do
         assert @item.save
-        assert_requested(:post, "resizor.test/assets.json", :times => 1) do |request|
+        assert_requested(:post, "https://resizor.test:80/assets.json", :times => 1) do |request|
           request.body.include?("Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg") 
         end
       end
@@ -75,14 +75,14 @@ class IntegrationTest < Test::Unit::TestCase
         [:image_resizor_id, :image_name, :image_mime_type, :image_size, :image_width, :image_height].each do |_attr|
           assert_nil @item.send(_attr)
         end
-        assert_requested :delete, "resizor.test/assets/1.json?api_key=test-api-key", :times => 1
+        assert_requested :delete, "https://resizor.test:80/assets/1.json?api_key=test-api-key", :times => 1
       end
       
       should 'delete resizor asset when model instance is deleted' do
         @item.save
         @item.reload
         assert @item.destroy
-        assert_requested :delete, "resizor.test/assets/1.json?api_key=test-api-key", :times => 1
+        assert_requested :delete, "https://resizor.test:80/assets/1.json?api_key=test-api-key", :times => 1
       end
 
     end

data/test/resizor_test.rb

@@ -16,12 +16,20 @@ class ResizorTest < Test::Unit::TestCase
 
   context 'When Resizor gem has been setup it' do
     setup { setup_resizor }
-    should 'return a API url' do
+    should 'default to use ssl' do
+      assert Resizor.use_ssl
+    end
+    should 'return a API https url when use_ssl is set to true' do
+      assert_equal 'https://resizor.test:80', Resizor.api_url
+    end
+
+    should 'return a API http url when use_ssl is set to false' do
+      Resizor.connection.use_ssl = false
       assert_equal 'http://resizor.test:80', Resizor.api_url
     end
     
     should 'make a GET request to Resizor server with API key' do
-      stub_http_request(:get, "resizor.test:80/assets.json?api_key=test-api-key").to_return(:body => '{"a": "123"}')
+      stub_http_request(:get, "https://resizor.test:80/assets.json?api_key=test-api-key").to_return(:body => '{"a": "123"}')
       Resizor.get('/assets.json').tap do |r|
         assert_equal 200, r.code
         assert_equal Hash['a', '123'], r.body
@@ -29,7 +37,7 @@ class ResizorTest < Test::Unit::TestCase
     end
 
     should 'make a POST request to Resizor server with API key' do 
-      stub_http_request(:post, "resizor.test:80/assets.json").with(:body => 'api_key=test-api-key').to_return(:body => '{"a": "123"}', :status => 201)
+      stub_http_request(:post, "https://resizor.test:80/assets.json").with(:body => 'api_key=test-api-key').to_return(:body => '{"a": "123"}', :status => 201)
       Resizor.post('/assets.json').tap do |r|
         assert_equal 201, r.code
         assert_equal Hash['a', '123'], r.body
@@ -37,7 +45,7 @@ class ResizorTest < Test::Unit::TestCase
     end
 
     should 'make a DELETE request to Resizor server with API key' do 
-      stub_http_request(:delete, "resizor.test:80/assets/1.json?api_key=test-api-key")
+      stub_http_request(:delete, "https://resizor.test:80/assets/1.json?api_key=test-api-key")
       Resizor.delete('/assets/1.json').tap do |r|
         assert_equal 200, r.code
         assert_equal nil, r.body
@@ -45,21 +53,21 @@ class ResizorTest < Test::Unit::TestCase
     end
     
     should 'add params along with API key when generating GET URL' do
-      stub_http_request(:get, "resizor.test:80/assets.json?api_key=test-api-key&id=1")
+      stub_http_request(:get, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1")
       Resizor.get('/assets.json', :id => 1)
-      assert_requested :get, "resizor.test:80/assets.json?api_key=test-api-key&id=1"
+      assert_requested :get, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1"
     end
    
     should 'add params along with API key when generating POST URL' do 
-      stub_http_request(:post, "resizor.test:80/assets.json").with(:body => 'api_key=test-api-key&id=1')
+      stub_http_request(:post, "https://resizor.test:80/assets.json").with(:body => 'api_key=test-api-key&id=1')
       Resizor.post('/assets.json', :id => 1)
-      assert_requested :post, "resizor.test:80/assets.json"
+      assert_requested :post, "https://resizor.test:80/assets.json"
     end
  
     should 'add params along with API key when generating DELETE URL' do
-      stub_http_request(:delete, "resizor.test:80/assets.json?api_key=test-api-key&id=1")
+      stub_http_request(:delete, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1")
       Resizor.delete('/assets.json', :id => 1)
-      assert_requested :delete, "resizor.test:80/assets.json?api_key=test-api-key&id=1"
+      assert_requested :delete, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1"
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resizor
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Winston Design
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +01:00
+date: 2010-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency