acts_as_assets 0.2.6 → 0.3.0

data/spec/routing/assets_routing_spec.rb

@@ -3,27 +3,27 @@ require "spec_helper"
 describe Books::AssetsController do
 
   it {should route(:get,'books/1/assets/TestDoc').to(
-                 :controller => "books/assets", :action => :index, :book_id => 1, :type => "TestDoc")}
+                 :controller => "books/assets", :action => :index, :fk_name => 1, :type => "TestDoc")}
 
   it {should route(:get,'books/1/assets/my/asset/type').to(
-                 :controller => "books/assets", :action => :index, :book_id => 1, :type => "my/asset/type")}
+                 :controller => "books/assets", :action => :index, :fk_name => 1, :type => "my/asset/type")}
 
   it {should route(:post,'books/1/assets/TestDoc.js').to(
-                 :controller => "books/assets", :action => :create, :book_id => 1, :type => "TestDoc", :format => 'js')}
+                 :controller => "books/assets", :action => :create, :fk_name => 1, :type => "TestDoc", :format => 'js')}
 
   it {should route(:delete,'books/1/assets/20.js').to(
-                 :controller => "books/assets", :action => :destroy, :book_id => 1, :format => 'js', :asset_id => 20)}
+                 :controller => "books/assets", :action => :destroy, :fk_name => 1, :format => 'js', :asset_id => 20)}
 
   it {should route(:get,'books/1/assets/get/20/thumb/filename.gif').to(
-                 :controller => "books/assets", :action => :get, :book_id => 1, :style => "thumb", :asset_id => 20, :filename => "filename", :extension => "gif" )}
+                 :controller => "books/assets", :action => :get, :fk_name => 1, :style => "thumb", :asset_id => 20, :filename => "filename", :extension => "gif" )}
 
   it {should route(:get,'books/1/assets/get/20/filename.gif').to(
-                 :controller => "books/assets", :action => :get, :book_id => 1, :asset_id => 20, :filename => "filename", :extension => "gif")}
+                 :controller => "books/assets", :action => :get, :fk_name => 1, :asset_id => 20, :filename => "filename", :extension => "gif")}
 
 end
 
 describe TipiPannello::AssetsController do
   it {should route(:delete,'tipi_pannello/il_mio_tipo/assets/20.js').to(
-                 :controller => "tipi_pannello/assets", :action => :destroy, :tipo_pannello_name=> 'il_mio_tipo', :format => 'js', :asset_id => 20)}
+                 :controller => "tipi_pannello/assets", :action => :destroy, :fk_name=> 'il_mio_tipo', :format => 'js', :asset_id => 20)}
 
 end

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ RSpec.configure do |config|
       t.string :title
     end
     ActiveRecord::Base.connection.create_table(:books_assets, :force => true) do |t|
-      t.has_attached_file :asset
+      t.attachment :asset
       t.string :type
       t.integer :counter, :default => 0, :null => false
       t.integer :book_id
@@ -38,7 +38,7 @@ RSpec.configure do |config|
       t.string :name, :null => false
     end
     ActiveRecord::Base.connection.create_table(:chapters_assets, :force => true) do |t|
-      t.has_attached_file :asset
+      t.attachment :asset
       t.string :type
       t.integer :counter, :default => 0, :null => false
       t.string :chapter_name
@@ -48,26 +48,26 @@ RSpec.configure do |config|
       t.string :name, :null => false
     end
     ActiveRecord::Base.connection.create_table(:rt_tipi_pannello_assets, :force => true) do |t|
-      t.has_attached_file :asset
+      t.attachment :asset
       t.string :type
       t.integer :counter, :default => 0, :null => false
       t.boolean :displayable, :default => false, :null => false
       t.string :tipo_pannello_name
     end
     Rails.application.routes.draw do
-      scope "books/:book_id/assets/" do
+      scope "books/:fk_name/assets/" do
         get 'get/:asset_id/(:style)/:filename.:extension' => 'books/assets#get', :as => 'book_get_asset'
         get '*type' => 'books/assets#index', :as => 'book_assets'
         post '*type' => 'books/assets#create', :as => 'book_create_asset'
         delete ':asset_id' => 'books/assets#destroy', :as => 'book_destroy_asset'
       end
-      scope "chapters/:chapter_name/assets/", :chapter_name => /.*/ do
+      scope "chapters/:fk_name/assets/", :chapter_name => /.*/ do
         get 'get/:asset_id/(:style)/:filename.:extension' => 'chapters/assets#get', :as => 'chapter_get_asset'
         get '*type' => 'chapters/assets#index', :as => 'chapter_assets'
         post '*type' => 'chapters/assets#create', :as => 'chapter_create_asset'
         delete ':asset_id' => 'chapters/assets#destroy', :as => 'chapter_destroy_asset'
       end
-      scope "tipi_pannello/:tipo_pannello_name/assets/" do
+      scope "tipi_pannello/:fk_name/assets/" do
         get 'get/:asset_id/(:style)/:filename.:extension' => 'tipi_pannello/assets#get', :as => 'tipo_pannello_get_asset'
         get '*type' => 'tipi_pannello/assets#index', :as => 'tipo_pannello_assets'
         post '*type' => 'tipi_pannello/assets#create', :as => 'tipo_pannello_create_asset'
@@ -80,7 +80,6 @@ RSpec.configure do |config|
     require 'fileutils'
     Dir[File.expand_path("../public/*", __FILE__)].each {|file| FileUtils.rm_rf file }
     Dir[File.expand_path("../temp/*", __FILE__)].each {|file| FileUtils.rm_rf file }
-    puts "Cleaned up files"
   end
 
   config.before(:each) do

data/spec/support/book.rb

@@ -5,7 +5,7 @@ end
 module Books
   class Asset < ActiveRecord::Base
     self.table_name = "books_assets"
-    acts_as_assets
+    acts_as_assets base_model: :book
   end
 end
 
@@ -27,7 +27,7 @@ end
 module Books
   class Image < ActiveRecord::Base
     self.table_name = "books_assets"
-    acts_as_assets :styles => {:thumb => "64x64", :medium => "128x128", :original => "800x600<"}
+    acts_as_assets base_model: :book,:styles => {:thumb => "64x64", :medium => "128x128", :original => "800x600<"}
   end
 end
 

data/spec/support/chapter.rb

@@ -6,7 +6,7 @@ end
 module Chapters
   class Asset < ActiveRecord::Base
     self.table_name = "chapters_assets"
-    acts_as_assets :foreign_key => "chapter_name"
+    acts_as_assets base_model: :chapter, :foreign_key => :chapter_name
   end
 end
 module Chapters

data/spec/support/tipo_pannello.rb

@@ -9,7 +9,7 @@ end
 module TipiPannello
   class Asset < ActiveRecord::Base
     self.table_name_prefix = :rt_tipi_pannello_
-    acts_as_assets :foreign_key => :tipo_pannello_name
+    acts_as_assets base_model: :tipo_pannello, foreign_key: :tipo_pannello_name
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -194,8 +194,10 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -229,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2243115149545460157
+      hash: 4562825233494503054
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -238,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2243115149545460157
+      hash: 4562825233494503054
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21
@@ -269,8 +271,10 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html