resizor 0.0.6 → 0.0.7

data/lib/resizor/asset.rb

@@ -1,5 +1,5 @@
 module Resizor
-  class Asset
+  class ResizorAsset
     attr_accessor :id, :name, :mime_type, :size, :width, :height, :path
 
     def initialize(options={})
@@ -41,7 +41,7 @@ module Resizor
     end
   end
 
-  class AttachedAsset < Resizor::Asset
+  class AttachedResizorAsset < Resizor::ResizorAsset
 
     attr_accessor :attachment_name, :instance, :file
 
@@ -58,7 +58,7 @@ module Resizor
     end
 
     def assign in_file
-      if in_file.is_a?(Resizor::Asset)
+      if in_file.is_a?(Resizor::ResizorAsset)
         @id = in_file.id
         @name = in_file.name
         @mime_type = in_file.mime_type

data/lib/resizor/connection.rb

@@ -1,6 +1,6 @@
 require 'cgi'
 module Resizor
-  class Connection
+  class ResizorConnection
     attr_accessor :api_host, :api_port, :api_key, :use_ssl
 
     def initialize(options={})
@@ -34,7 +34,7 @@ module Resizor
     end
 
     def api_url(force_http = false)
-      @api_url ||= "#{(@use_ssl == true && force_http == false) ? 'https' : 'http'}://#{@api_host}:#{(@use_ssl == true && force_http == false) ? '443' : @api_port}"
+      "#{(@use_ssl == true && force_http == false) ? 'https' : 'http'}://#{@api_host}:#{(@use_ssl == true && force_http == false) ? '443' : @api_port}"
     end
 
   protected

data/lib/resizor/railtie.rb

@@ -13,26 +13,26 @@ module Resizor
 
   class Railtie
     def self.insert
-      ActiveRecord::Base.send(:include, Resizor)
+      ActiveRecord::Base.send(:include, Resizor::Glue)
     end
   end
 
-  class << self
-    def included base
+  module Glue
+    def self.included base
       base.extend ClassMethods
     end
   end
-  
+
   module ClassMethods
     def has_resizor_asset name, options = {}
       include InstanceMethods
-      
+
       write_inheritable_attribute(:resizor_assets, {}) if resizor_assets.nil?
       resizor_assets[name] = options
-      
+
       before_save :save_attached_files_for_resizor
       before_destroy :delete_attached_files_on_resizor
-      
+
       define_method name do |*args|
         asset_for(name)
       end
@@ -51,19 +51,19 @@ module Resizor
       read_inheritable_attribute(:resizor_assets)
     end
   end
-  
-  module InstanceMethods 
+
+  module InstanceMethods
     def asset_for name
       @resizor_assets ||= {}
-      @resizor_assets[name] ||= Resizor::AttachedAsset.new(name, self, self.class.resizor_assets[name])
+      @resizor_assets[name] ||= Resizor::AttachedResizorAsset.new(name, self, self.class.resizor_assets[name])
     end
-    
+
     def save_attached_files_for_resizor
       self.class.resizor_assets.each do |name, options|
         asset_for(name).send(:save)
       end
     end
-    
+
     def delete_attached_files_on_resizor
       self.class.resizor_assets.each do |name, options|
         asset_for(name).send(:destroy)

data/lib/resizor/resizor.rb

@@ -7,11 +7,11 @@ module Resizor
   extend Forwardable
   attr_reader :connection
   def_delegators :connection, :get, :post, :delete, :api_url, :api_key, :use_ssl
-  
+
   def configure
-    yield @connection = Connection.new
+    yield @connection = ResizorConnection.new
   end
-  
+
   def connection
     raise "Not connected. Please setup Resizor configuration first." unless @connection
     @connection

data/lib/resizor/version.rb

@@ -1,3 +1,3 @@
 module Resizor
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/asset_test.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
-class AssetTest < Test::Unit::TestCase
-  context "A Asset" do
+class ResizorAssetTest < Test::Unit::TestCase
+  context "A ResizorAsset" do
     setup do
       setup_resizor
-      @asset = Resizor::Asset.new(:id => 10,
+      @asset = Resizor::ResizorAsset.new(:id => 10,
                                   :name => 'my_file.jpg',
                                   :mime_type => 'image/jpeg',
                                   :width => 200,