resizor 0.0.3 → 0.0.4

data/lib/resizor/asset.rb

@@ -1,21 +1,21 @@
 module Resizor
   class Asset
     attr_accessor :id, :name, :mime_type, :size, :width, :height, :path
-    
+
     def initialize(options={})
-      options.each { |k,v| send "#{k}=".to_sym, v } 
+      options.each { |k,v| send "#{k}=".to_sym, v }
     end
-    
+
     def url(options={})
       options = {:size => '200', :format => 'jpg'}.merge(options)
       "#{Resizor.api_url(true)}/assets/#{id}.#{options[:format]}?size=#{options[:size]}&token=#{resize_token_for(options)}"
     end
-    
+
     def resize_token_for(options={})
       options = {:size => '200', :format => 'jpg'}.merge(options)
       Digest::SHA1.hexdigest("#{Resizor.api_key}-#{id}-#{options[:size]}-#{options[:format]}")
     end
-    
+
     def save_to_resizor
       if path && File.exists?(path)
         ret = Resizor.post('/assets.json', :file => File.open(path))
@@ -32,19 +32,19 @@ module Resizor
       end
       return true
     end
-    
+
     def destroy
       ret = Resizor.delete("/assets/#{id}.json")
       if ret.code == 200
        return true
-      end  
+      end
     end
   end
-  
+
   class AttachedAsset < Resizor::Asset
-    
+
     attr_accessor :attachment_name, :instance, :file
-    
+
     def initialize(attachment_name, instance, options = {})
       @attachment_name = attachment_name
       @instance = instance
@@ -56,7 +56,7 @@ module Resizor
       @width = instance_read("width")
       @height = instance_read("height")
     end
-    
+
     def assign in_file
       if in_file.is_a?(Resizor::Asset)
         @id = in_file.id
@@ -69,12 +69,12 @@ module Resizor
         @file = in_file
       end
     end
-  
+
     def save
       if file
         @path = File.join(Dir.tmpdir, file.original_filename)
-        if file.is_a?(Tempfile)
-          FileUtils.move(file.local_path, @path)
+        if file.is_a?(Tempfile) || file.respond_to?(:path)
+          FileUtils.move(file.path, @path)
         else
           File.open(@path, 'wb') { |f| f.write(file.read) }
         end
@@ -93,7 +93,7 @@ module Resizor
       instance_write(:height, @height)
       return true
     end
-    
+
     def delete
       destroy
     end
@@ -109,14 +109,14 @@ module Resizor
       end
       ret
     end
-  
-  protected  
+
+  protected
     def instance_write(_attr, value)
       setter = :"#{attachment_name}_#{_attr}="
       self.instance_variable_set("@#{_attr.to_s.chop}", value)
       instance.send(setter, value) if instance.respond_to?(setter)
     end
-    
+
     def instance_read(_attr)
       getter = :"#{attachment_name}_#{_attr}"
       instance.send(getter) if instance.respond_to?(getter)

data/lib/resizor/connection.rb

@@ -9,40 +9,40 @@ module Resizor
       @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)
       params[:api_key] = @api_key if append_api_key
       query = make_query(params)
       do_request do
         make_response_for resource[request_uri + '?' + query].get
       end
-    end 
-    
+    end
+
     def post(request_uri, params={}, append_api_key=true)
       params[:api_key] = @api_key if append_api_key
-      do_request do 
+      do_request do
         make_response_for resource[request_uri].post params
       end
-    end 
-    
+    end
+
     def delete(request_uri, params={}, append_api_key=true)
       params[:api_key] = @api_key if append_api_key
       query = make_query(params)
-      do_request do 
+      do_request do
         make_response_for resource[request_uri + '?' + query].delete
       end
     end
-    
+
     def api_url(force_http = false)
-      @api_url ||= "#{(@use_ssl == true && force_http == false) ? 'https' : 'http'}://#{@api_host}:#{@api_port}"
+      @api_url ||= "#{(@use_ssl == true && force_http == false) ? 'https' : 'http'}://#{@api_host}:#{(@use_ssl == true && force_http == false) ? '443' : @api_port}"
     end
-    
+
   protected
-    
+
     def resource
       @resource ||= RestClient::Resource.new(api_url)
     end
-    
+
     def make_query(params)
       params.collect {|key, value| [CGI.escape(key.to_s), CGI.escape(value.to_s)].join("=") }.join("&")
     end
@@ -50,7 +50,7 @@ module Resizor
     def make_response_for(http_response)
       Resizor::Response.new(http_response.code, http_response.body)
     end
-    
+
     def do_request(&block)
       begin
         yield
@@ -59,7 +59,7 @@ module Resizor
       end
     end
   end
-  
+
   class Response
     attr_accessor :code, :body, :format
     def initialize(_code, _body, _format = 'json')
@@ -71,7 +71,7 @@ module Resizor
         else
           JSON.parse(_body)
         end
-      else  
+      else
         _body
       end
     end

data/lib/resizor/version.rb

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

data/lib/resizor.rb

@@ -5,3 +5,15 @@ require 'resizor/connection'
 require 'resizor/asset'
 require 'resizor/version'
 require 'resizor/railtie'
+
+if defined? ActionDispatch::Http::UploadedFile
+  module ActionDispatch
+    module Http
+      class UploadedFile
+        def path
+          @tempfile.path
+        end
+      end
+    end
+  end
+end

data/resizor.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
-  
-  s.add_dependency(%q<rest-client>, [">= 1.4"])
+
+  s.add_dependency(%q<rest-client>, ["~> 1.4.2"])
   s.add_dependency(%q<json>, [">= 1.2"])
 
   s.files        = `git ls-files`.split("\n")

data/test/asset_test.rb

@@ -4,13 +4,13 @@ class AssetTest < Test::Unit::TestCase
   context "A Asset" do
     setup do
       setup_resizor
-      @asset = Resizor::Asset.new(:id => 10, 
-                                  :name => 'my_file.jpg', 
-                                  :mime_type => 'image/jpeg', 
-                                  :width => 200, 
-                                  :height => 300, 
+      @asset = Resizor::Asset.new(:id => 10,
+                                  :name => 'my_file.jpg',
+                                  :mime_type => 'image/jpeg',
+                                  :width => 200,
+                                  :height => 300,
                                   :size => 123456)
-    end 
+    end
     should "have assigned attributes" do
       assert_equal @asset.id, 10
       assert_equal @asset.name, 'my_file.jpg'
@@ -19,40 +19,40 @@ class AssetTest < Test::Unit::TestCase
       assert_equal @asset.height, 300
       assert_equal @asset.size, 123456
     end
-    
+
     should 'generate url for size c200x300' do
       assert_equal 'http://resizor.test:80/assets/10.jpg?size=c200x300&token=b8bb7c4c7c4fc1006c904f011f32f50f69730e5e', @asset.url(:size => 'c200x300')
     end
-    
+
     should 'generate url for size c200x300 format png' do
       assert_equal 'http://resizor.test:80/assets/10.png?size=c200x300&token=0cf27070e89c44a40aee85decca2cd2d98af1dc2', @asset.url(:size => 'c200x300', :format => 'png')
     end
-    
+
     should 'generate resize token for size c200x300 and format jpg' do
       assert_equal 'b8bb7c4c7c4fc1006c904f011f32f50f69730e5e', @asset.resize_token_for(:size => 'c200x300', :format => 'jpg')
     end
-    
+
     context 'when saving to resizor' do
       setup do
         @jpg_file = Tempfile.new('image.jpg')
         @asset.path = @jpg_file.path
       end
       teardown { @jpg_file.unlink }
-      
+
       context 'on success' do
-        setup do 
-          stub_http_request(:post, "https://resizor.test:80/assets.json").
+        setup do
+          stub_http_request(:post, "https://resizor.test:443/assets.json").
             with { |request|
-              request.body.include?("Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg") 
+              request.body.include?("Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg")
             }.
-            to_return(:status => 201, 
+            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"}}')
           @asset.save_to_resizor
         end
-        
+
         should 'make create call to Resizor on save with file' do
-          assert_requested(:post, "https://resizor.test:80/assets.json",
-                           :times => 1) { |request| 
+          assert_requested(:post, "https://resizor.test:443/assets.json",
+                           :times => 1) { |request|
                               request.body.include?("Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg")
                             }
         end
@@ -66,10 +66,10 @@ class AssetTest < Test::Unit::TestCase
           assert_equal 9, @asset.size
         end
       end
-      
+
       context 'on failure' do
         should 'return false' do
-          stub_http_request(:post, "https://resizor.test:80/assets.json").to_return(:status => 422)
+          stub_http_request(:post, "https://resizor.test:443/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, "https://resizor.test:80/assets/10.json?api_key=test-api-key").to_return(:status => 200)
+        stub_http_request(:delete, "https://resizor.test:443/assets/10.json?api_key=test-api-key").to_return(:status => 200)
         @asset.destroy
-        assert_requested :delete, "https://resizor.test:80/assets/10.json?api_key=test-api-key", :times => 1
+        assert_requested :delete, "https://resizor.test:443/assets/10.json?api_key=test-api-key", :times => 1
       end
 
       should 'return true on success' do
-        stub_http_request(:delete, "https://resizor.test:80/assets/10.json?api_key=test-api-key").to_return(:status => 200)
+        stub_http_request(:delete, "https://resizor.test:443/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, "https://resizor.test:80/assets/10.json?api_key=test-api-key").to_return(:status => 404) 
+        stub_http_request(:delete, "https://resizor.test:443/assets/10.json?api_key=test-api-key").to_return(:status => 404)
         assert !@asset.destroy
       end
     end

data/test/integration_test.rb

@@ -1,41 +1,41 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class IntegrationTest < Test::Unit::TestCase
-  
+
   context 'Including Resizor in a Rails project' do
     setup do
       setup_resizor
     end
-    
+
     should 'add has_resizor_asset to ActiveRecord::Base' do
       assert ActiveRecord::Base.methods.include?('has_resizor_asset')
     end
-  end  
-  
+  end
+
   context 'A ActiveRecord model that has_resizor_asset' do
-    setup do 
-      build_model 
+    setup do
+      build_model
       @item = Item.new(:name => 'my test item')
     end
-   
+
     context 'with a file attached' do
       setup do
         @image_fixture_path = File.join(File.dirname(__FILE__), 'fixtures', 'image.jpg')
         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, "https://resizor.test:80/assets.json").
+        stub_http_request(:post, "https://resizor.test:443/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, "https://resizor.test:80/assets/1.json?api_key=test-api-key").to_return(:status => 200)
+        stub_http_request(:delete, "https://resizor.test:443/assets/1.json?api_key=test-api-key").to_return(:status => 200)
       end
-      
-      teardown { File.unlink(@image_fixture_path) }
+
+      teardown { File.unlink(@image_fixture_path) if File.exists?(@image_fixture_path) }
 
       should 'save attached asset to Resizor on save' do
         assert @item.save
-        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") 
+        assert_requested(:post, "https://resizor.test:443/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, "https://resizor.test:80/assets/1.json?api_key=test-api-key", :times => 1
+        assert_requested :delete, "https://resizor.test:443/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, "https://resizor.test:80/assets/1.json?api_key=test-api-key", :times => 1
+        assert_requested :delete, "https://resizor.test:443/assets/1.json?api_key=test-api-key", :times => 1
       end
 
     end

data/test/resizor_test.rb

@@ -20,54 +20,54 @@ class ResizorTest < Test::Unit::TestCase
       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
+      assert_equal 'https://resizor.test:443', 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, "https://resizor.test:80/assets.json?api_key=test-api-key").to_return(:body => '{"a": "123"}')
+      stub_http_request(:get, "https://resizor.test:443/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
       end
     end
 
-    should 'make a POST request to Resizor server with API key' do 
-      stub_http_request(:post, "https://resizor.test:80/assets.json").with(:body => 'api_key=test-api-key').to_return(:body => '{"a": "123"}', :status => 201)
+    should 'make a POST request to Resizor server with API key' do
+      stub_http_request(:post, "https://resizor.test:443/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
       end
     end
 
-    should 'make a DELETE request to Resizor server with API key' do 
-      stub_http_request(:delete, "https://resizor.test:80/assets/1.json?api_key=test-api-key")
+    should 'make a DELETE request to Resizor server with API key' do
+      stub_http_request(:delete, "https://resizor.test:443/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
+        assert_nil r.body
       end
     end
-    
+
     should 'add params along with API key when generating GET URL' do
-      stub_http_request(:get, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1")
+      stub_http_request(:get, "https://resizor.test:443/assets.json?api_key=test-api-key&id=1")
       Resizor.get('/assets.json', :id => 1)
-      assert_requested :get, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1"
+      assert_requested :get, "https://resizor.test:443/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, "https://resizor.test:80/assets.json").with(:body => 'api_key=test-api-key&id=1')
+
+    should 'add params along with API key when generating POST URL' do
+      stub_http_request(:post, "https://resizor.test:443/assets.json").with(:body => 'api_key=test-api-key&id=1')
       Resizor.post('/assets.json', :id => 1)
-      assert_requested :post, "https://resizor.test:80/assets.json"
+      assert_requested :post, "https://resizor.test:443/assets.json"
     end
- 
+
     should 'add params along with API key when generating DELETE URL' do
-      stub_http_request(:delete, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1")
+      stub_http_request(:delete, "https://resizor.test:443/assets.json?api_key=test-api-key&id=1")
       Resizor.delete('/assets.json', :id => 1)
-      assert_requested :delete, "https://resizor.test:80/assets.json?api_key=test-api-key&id=1"
+      assert_requested :delete, "https://resizor.test:443/assets.json?api_key=test-api-key&id=1"
     end
 
   end

data/test/test_helper.rb

@@ -16,7 +16,21 @@ config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
 
-ActiveRecord::Base.send(:include, Resizor)
+if defined?(Rails::Railtie)
+  class Railtie < Rails::Railtie
+    initializer 'resizor.insert_into_active_record' do
+      ActiveSupport.on_load :active_record do
+        Resizor::Railtie.insert
+      end
+    end
+  end
+end
+
+class Railtie
+  def self.insert
+    ActiveRecord::Base.send(:include, Resizor)
+  end
+end
 
 def build_model
   ActiveRecord::Base.connection.create_table :items, :force => true do |t|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resizor
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Winston Design
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +01:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,13 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 1
         - 4
-        version: "1.4"
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency