acts_as_assets 0.1.1 → 0.2.0

data/spec/routing/assets_routing_spec.rb

@@ -20,4 +20,10 @@ describe Books::AssetsController do
   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")}
 
+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)}
+
 end

data/spec/spec_helper.rb

@@ -12,7 +12,8 @@ require 'paperclip/matchers'
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
-Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+
+Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/*.rb")].each {|f| require f }
 
 require 'rspec/rails'
 
@@ -23,14 +24,35 @@ RSpec.configure do |config|
   config.mock_with :rspec
 
   config.before :suite do
-    ActiveRecord::Base.connection.create_table(:books,:force => true) do |t|
+    ActiveRecord::Base.connection.create_table(:books, :force => true) do |t|
       t.string :title
     end
-    ActiveRecord::Base.connection.create_table(:books_assets,:force => true) do |t|
+    ActiveRecord::Base.connection.create_table(:books_assets, :force => true) do |t|
       t.has_attached_file :asset
       t.string :type
       t.integer :counter, :default => 0, :null => false
       t.integer :book_id
+      t.boolean :displayable, :default => false, :null => false
+    end
+    ActiveRecord::Base.connection.create_table(:chapters, {:id => false, :force => true}) do |t|
+      t.string :name, :null => false
+    end
+    ActiveRecord::Base.connection.create_table(:chapters_assets, :force => true) do |t|
+      t.has_attached_file :asset
+      t.string :type
+      t.integer :counter, :default => 0, :null => false
+      t.string :chapter_name
+      t.boolean :displayable, :default => false, :null => false
+    end
+    ActiveRecord::Base.connection.create_table(:rt_tipi_pannello, {:id => false, :force => true}) do |t|
+      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.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
@@ -39,20 +61,26 @@ RSpec.configure do |config|
         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
+        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
+        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'
+        delete ':asset_id' => 'tipi_pannello/assets#destroy', :as => 'tipo_pannello_destroy_asset'
+      end
     end
-
   end
 
-  #destroy created assets
-  config.before :all do
-    @dtbd = []
-  end
-  config.after :all do
+  config.after :suite do
     require 'fileutils'
-    @dtbd.each {|d| d.destroy unless d.nil? }
-    Dir[File.expand_path("spec/temp/*")].each do |file|
-      FileUtils.rm file
-    end
+    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
@@ -61,11 +89,9 @@ RSpec.configure do |config|
     Book.delete_all
   end
 
-  config.after(:suite) do
-  end
-
-  def jpg_test
+  def uploaded_test_asset
     Rack::Test::UploadedFile.new(File.expand_path('../resources/jpg_test.jpg',__FILE__), "image/jpeg")
   end
 
+  #def uploader_field_tag(name, *args); end
 end

data/spec/support/book.rb

@@ -36,5 +36,4 @@ module Books
     class TestImage < Books::Image
     end
   end
-end
-
+end

data/spec/support/chapter.rb

@@ -0,0 +1,17 @@
+class Chapter < ActiveRecord::Base
+  self.primary_key = :name
+  attr_accessible :id, :name
+  has_one :assets, :class_name => "Chapters::Asset", :foreign_key => "chapter_name"
+end
+module Chapters
+  class Asset < ActiveRecord::Base
+    self.table_name = "chapters_assets"
+    acts_as_assets :foreign_key => "chapter_name"
+  end
+end
+module Chapters
+  module Assets
+    class Paragraph < Chapters::Asset
+    end
+  end
+end

data/spec/support/chapters_assets_controller.rb

@@ -0,0 +1,2 @@
+class Chapters::AssetsController < ActsAsAssets::AssetsController
+end

data/spec/support/tipi_pannello_assets_controller.rb

@@ -0,0 +1,4 @@
+module TipiPannello
+  class AssetsController < ActsAsAssets::AssetsController
+  end
+end

data/spec/support/tipo_pannello.rb

@@ -0,0 +1,22 @@
+class TipoPannello < ActiveRecord::Base
+  self.primary_key = :name
+  self.table_name = :rt_tipi_pannello
+  has_one :asset_scheda_tecnica, :class_name => "TipiPannello::Documenti"
+  has_one :scheda_tecnica, :class_name => "TipiPannello::Documenti::SchedaTecnica", :through => :asset_scheda_tecnica
+  attr_accessible :id, :name
+end
+
+module TipiPannello
+  class Asset < ActiveRecord::Base
+    self.table_name_prefix = :rt_tipi_pannello_
+    acts_as_assets :foreign_key => :tipo_pannello_name
+  end
+end
+
+module TipiPannello
+  module Documenti
+    class SchedaTecnica < TipiPannello::Asset
+      include ActsAsAssets::UniqueAsset
+    end
+  end
+end

data/spec/unique_asset_spec.rb

@@ -4,17 +4,11 @@ describe ActsAsAssets::UniqueAsset do
   let(:book) { Book.create!(:title => "my new book") }
 
   context "creating 2 assets of the same type related to the same resource" do
-    before do
-      @book = book
-    end
-
     context "and asset include the model UniqAsset" do
 
       it "should fail on the creation of the second asset" do
-        asset1 = Books::Assets::UniqueTestDoc.create! :book => @book
-        @dtbd << asset1
-        asset2 = Books::Assets::UniqueTestDoc.new :book => @book
-        @dtbd << asset2
+        Books::Assets::UniqueTestDoc.create! :book => book
+        asset2 = Books::Assets::UniqueTestDoc.new :book => book
         asset2.save
 
         asset2.should_not be_valid
@@ -26,10 +20,8 @@ describe ActsAsAssets::UniqueAsset do
     context "and asset does not include the model UniqAsset" do
 
       it "should fail on the creation of the second asset" do
-        asset1 = Books::Assets::TestDoc.create! :book => @book
-        @dtbd << asset1
-        asset2 = Books::Assets::TestDoc.new :book => @book
-        @dtbd << asset2
+        asset1 = Books::Assets::TestDoc.create! :book => book
+        asset2 = Books::Assets::TestDoc.new :book => book
         asset2.save
 
         asset2.should be_valid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70331742182940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,31 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70331742182940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70331742182280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: h5_uploader
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70331742182280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &70331742181480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331742181480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70331742180800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331742180800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70331742180160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331742180160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70331742178240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331742178240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &70331742176820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331742176820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage multiple assets related to a specific model
 email:
 - acampolonghi@gmail.com
@@ -97,13 +148,20 @@ extra_rdoc_files: []
 files:
 - app/controllers/acts_as_assets/assets_controller.rb
 - app/helpers/acts_as_assets/assets_helper.rb
+- app/views/acts_as_assets/assets/_asset.html.erb
+- app/views/acts_as_assets/assets/_asset_multiple_upload.html.erb
+- app/views/acts_as_assets/assets/_asset_upload.html.erb
+- app/views/acts_as_assets/assets/_assets.html.erb
+- app/views/acts_as_assets/assets/_upload_link.html.erb
 - app/views/acts_as_assets/assets/create.js.erb
 - app/views/acts_as_assets/assets/destroy.js.erb
 - app/views/acts_as_assets/assets/index.html.erb
+- config/initializers/inflections.rb
 - config/locales/it.yml
 - config/routes.rb
 - lib/acts_as_assets/base.rb
 - lib/acts_as_assets/engine.rb
+- lib/acts_as_assets/form_helper.rb
 - lib/acts_as_assets/matchers/rspec.rb
 - lib/acts_as_assets/paperclip/interpolations.rb
 - lib/acts_as_assets/unique_asset.rb
@@ -151,6 +209,10 @@ files:
 - spec/spec_helper.rb
 - spec/support/book.rb
 - spec/support/books_assets_controller.rb
+- spec/support/chapter.rb
+- spec/support/chapters_assets_controller.rb
+- spec/support/tipi_pannello_assets_controller.rb
+- spec/support/tipo_pannello.rb
 - spec/unique_asset_spec.rb
 homepage: ''
 licenses: []
@@ -166,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 723916665890432220
+      hash: 835702223512288152
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,10 +237,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 723916665890432220
+      hash: 835702223512288152
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Assets management
@@ -222,4 +284,8 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/book.rb
 - spec/support/books_assets_controller.rb
+- spec/support/chapter.rb
+- spec/support/chapters_assets_controller.rb
+- spec/support/tipi_pannello_assets_controller.rb
+- spec/support/tipo_pannello.rb
 - spec/unique_asset_spec.rb