acts_as_assets 0.0.1 → 0.0.2

data/app/controllers/acts_as_assets/assets_controller.rb

@@ -1,23 +1,28 @@
 class ActsAsAssets::AssetsController < ApplicationController
+  include ActsAsAssets::AssetsHelper
+  helper_method :destroy_path
   before_filter "assign_root_model"
   before_filter "assign_target", :only => [:index,:destroy]
 
   def index
     load_assets
-    render 'acts_as_assets/assets/index', :layout => false
+    respond_to do |format|
+      format.html{render :layout => false}
+      format.json{render :json => @assets}
+    end
   end
 
   def create
     name = root_model_name
-    klazz = ([name.pluralize.camelize] << params[:type]).join('::')
+    klazz = ([name.pluralize.camelize] << camelize_type.flatten).join('::')
     @asset = klazz.constantize.create!(:asset => params[:file],
                               "#{name}".to_sym => instance_variable_get("@#{name}".to_sym))
 
     respond_to do |format|
       if @asset.valid?
-        format.js { render :json => {:success => true} }
+        format.js
       else
-        format.js { render :json =>{:success => false, :errors => @asset.errors} }
+        format.js { render :json =>{:errors => @asset.errors}, :status => 406 }
       end
     end
   end
@@ -25,7 +30,7 @@ class ActsAsAssets::AssetsController < ApplicationController
   def destroy
 
     begin
-      @asset = instance_variable_get("@#{root_model_name}").send(:assets).find_by_id(params[:id])
+      @asset = instance_variable_get("@#{root_model_name}").send(:assets).find_by_id(params[:asset_id])
       @asset.destroy
     rescue Exception => e
       error = e.message
@@ -33,9 +38,9 @@ class ActsAsAssets::AssetsController < ApplicationController
 
     respond_to do |format|
       if error.nil?
-        format.js { render 'acts_as_assets/assets/destroy'}
+        format.js
       else
-        format.js { render :json => {:success => false, :errors => error} }
+        format.js { render :json => {:errors => error}, :status => 406 }
       end
     end
 
@@ -46,7 +51,7 @@ class ActsAsAssets::AssetsController < ApplicationController
 
   def load_assets
     name = root_model_name
-    klazz = ([name.pluralize.camelize] << params[:type]).join('::')
+    klazz = ([name.pluralize.camelize] << camelize_type.flatten).join('::')
     @assets = klazz.constantize.send(:where,"#{name}_id".to_sym => params["#{name}_id".to_sym])
   end
 
@@ -63,12 +68,9 @@ class ActsAsAssets::AssetsController < ApplicationController
     @target = params[:target]
   end
 
-  def destroy_path doc
-    name = root_model_name
-    method = "#{name.pluralize}_assets_destroy_path"
-    send(method.to_sym, instance_variable_get("@#{name}"), :asset_id => doc.id, :target => @target)
+  # takes a type params string like "my/asset/type_of_documento" and convert into [My,Asset,TypeOfDocument]
+  def camelize_type
+    params[:type].split('/').collect{|i|i.camelize}
   end
-  helper_method :destroy_path
-
 
 end

data/app/helpers/acts_as_assets/assets_helper.rb

@@ -0,0 +1,9 @@
+module ActsAsAssets::AssetsHelper
+
+  def destroy_path doc, target
+    name = ActiveSupport::Inflector.underscore(self.class.to_s.split('::').first.singularize)
+    method = "#{name.pluralize}_assets_destroy_path"
+    send(method.to_sym, instance_variable_get("@#{name}"), :asset_id => doc.id, :target => target)
+  end
+
+end

data/app/views/acts_as_assets/assets/create.js.erb

@@ -0,0 +1 @@
+{"success":"true"}

data/app/views/acts_as_assets/assets/destroy.js.erb

@@ -1 +1 @@
-K.ajax.loadDiv("<%= @target %>", true);
+{"success":"true"}

data/app/views/acts_as_assets/assets/index.html.erb

@@ -3,7 +3,7 @@
 
     <div class="grid_6 document_link">
             <%= link_to doc.asset.to_file.original_filename, doc.asset.url %>
-            <%= link_to t('destroy'), destroy_path(doc),
+            <%= link_to t('destroy'), destroy_path(doc,@target),
                        :method => :delete, :confirm => 'Sei Sicuro?', :remote => true %>
     </div>
 

data/config/locales/it.yml

@@ -0,0 +1,2 @@
+acts_as_assets:
+    unique_asset_error: 'Un solo documento di questo tipo può essere caricato. Eliminare il file attuale per sostituirlo.'

data/lib/acts_as_assets/base.rb

@@ -1,3 +1,6 @@
+require "acts_as_assets/paperclip/interpolations"
+require "acts_as_assets/unique_asset"
+
 module ActsAsAssets
 
   module Base
@@ -31,6 +34,10 @@ module ActsAsAssets
 
   module InstanceMethods
 
+    def acting_as_assets?
+      true
+    end
+
     private
 
     def touch_counter

data/lib/acts_as_assets/matchers/rspec.rb

@@ -0,0 +1,13 @@
+RSpec::Matchers.define :act_as_assets do
+  match do |model|
+    model.new if model.respond_to?(:new)
+    model.respond_to?(:acting_as_assets?) && model.acting_as_assets?
+  end
+end
+
+RSpec::Matchers.define :act_as_unique_asset do
+  match do |model|
+    model.new if model.respond_to?(:new)
+    model.respond_to?(:acts_as_assets_check_uniqness)
+  end
+end

data/lib/acts_as_assets/unique_asset.rb

@@ -0,0 +1,19 @@
+module ActsAsAssets::UniqueAsset
+
+    def self.included(klass)
+      klass.send(:include, InstanceMethods)
+      klass.send(:validate,:acts_as_assets_check_uniqness, :on => :create)
+    end
+
+    module InstanceMethods
+
+      def acts_as_assets_check_uniqness
+        key = "#{self.class.root_model}_id"
+        obj = self.class.send("find_by_#{key}".to_sym,self.send(key.to_sym))
+        if obj
+          errors.add(self.type, I18n.translate('acts_as_assets.unique_asset_error'))
+        end
+      end
+
+    end
+end

data/lib/acts_as_assets/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAssets
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/acts_as_assets.rb

@@ -1,3 +1,3 @@
 require "acts_as_assets/engine"
-require "acts_as_assets/interpolations"
 require "acts_as_assets/base"
+require "acts_as_assets/matchers/rspec" if defined?(RSpec)

data/spec/acts_as_assets_spec.rb

@@ -4,14 +4,6 @@ describe "ActsAsAssets" do
 
   let(:book) { Book.create!(:title => "my new book") }
 
-  before :all do
-    @docs = []
-  end
-
-  after :all do
-    @docs.each { |d| d.destroy }
-  end
-
   describe "model that acts as assets" do
     subject { Books::Asset.new }
     it { should belong_to(:book) }
@@ -88,9 +80,9 @@ describe "ActsAsAssets" do
 
         it "should increase counter by one if a document of the same type are created" do
           dc = Books::Assets::TestDoc.create!
-          @docs << dc
+          @dtbd << dc
           dc2 = Books::Assets::TestDoc.create!
-          @docs << dc2
+          @dtbd << dc2
           Books::Asset.find(dc.id).counter.should eq 1
           Books::Asset.find(dc2.id).counter.should eq 2
         end
@@ -106,14 +98,14 @@ describe "ActsAsAssets" do
         it "should interpolate the correct path for a subclass instance" do
           b = book
           doc = Books::Assets::TestDoc.create! :asset => jpg_test, :book => b
-          @docs << doc
+          @dtbd << doc
           doc.asset.path.should eq "public/system/books/#{b.id}/assets/test_doc.jpg"
         end
 
         it "should interpolate the correct url for a subclass instance" do
           b = book
           doc = Books::Assets::TestDoc.create! :asset => jpg_test, :book => b
-          @docs << doc
+          @dtbd << doc
           doc.asset.url.should  match /\/books\/#{b.id}\/assets\/#{doc.id}/
         end
 

data/spec/controllers/assets_controller_spec.rb

@@ -5,15 +5,6 @@ describe Books::AssetsController do
   let(:book) { Book.create!(:title => "my new book") }
   let(:target){'target_div'}
 
-  before :all do
-    @docs = []
-  end
-
-  after :all do
-    @docs.each { |d| d.destroy }
-  end
-
-
   context "given a Books::AssetsController controller " do
 
     describe "root_model_name" do
@@ -26,11 +17,11 @@ describe Books::AssetsController do
       before do
         @book = book
         @asset = Books::Assets::TestDoc.create!(:book => @book, :asset => jpg_test)
-        @docs << @asset
-        get :index, :book_id => @book.id, :type => ["Assets","TestDoc"]
+        @dtbd << @asset
+        get :index, :book_id => @book.id, :type => "Assets/TestDoc"
       end
       it "should return /books/id/assets/asset_id" do
-        subject.send(:destroy_path,@asset).should eq "/books/#{@book.id}/assets/#{@asset.id}"
+        subject.send(:destroy_path,@asset, target).should eq "/books/#{@book.id}/assets/#{@asset.id}?target=#{target}"
       end
     end
 
@@ -42,7 +33,7 @@ describe Books::AssetsController do
 
       before do
         @book = book
-        get :index, :book_id => @book.id, :type => ["Assets","TestDoc"]
+        get :index, :book_id => @book.id, :type => "Assets/TestDoc"
       end
 
       it "should assign @book" do
@@ -55,25 +46,46 @@ describe Books::AssetsController do
 
   describe "index" do
 
-    before :each do
-      @book = book
-      @asset = Books::Assets::TestDoc.create!(:book => @book, :asset => jpg_test)
-      @docs << @asset
-      get :index, :book_id => book.id, :type => ["Assets","TestDoc"], :target => target, :format => :js
-    end
+    context "format html" do
+
+      before :each do
+        @book = book
+        @asset = Books::Assets::TestDoc.create!(:book => @book, :asset => jpg_test)
+        @dtbd << @asset
+        get :index, :book_id => book.id, :type => "Assets/TestDoc", :target => target, :format => :html
+      end
+
+      it "should assign variables" do
+        should assign_to(:assets)
+        should assign_to(:target)
+        should assign_to(:book)
+      end
+
+      it{should respond_with(:success)}
+
+      it{should render_template('acts_as_assets/assets/index')}
+
+      it "should return the correct formatted view" do
+        response.body.should match(/#{@asset.asset.to_file.original_filename}/)
+      end
 
-    it "should assign variables" do
-      should assign_to(:assets)
-      should assign_to(:target)
-      should assign_to(:book)
     end
 
-    it{should respond_with(:success)}
+    context "format json" do
 
-    it{should render_template('acts_as_assets/assets/index')}
+      before :each do
+        @book = book
+        @asset = Books::Assets::TestDoc.create!(:book => @book, :asset => jpg_test)
+        @dtbd << @asset
+        get :index, :book_id => book.id, :type => "Assets/TestDoc", :target => target, :format => :json
+      end
+
+      it{should_not render_template('acts_as_assets/assets/index')}
+
+      it "should return assets in json format" do
+        ActiveSupport::JSON.decode(response.body).first["asset_file_name"].should eq @asset.asset_file_name
+      end
 
-    it "should return the correct formatted view" do
-      response.body.should match(/#{@asset.asset.to_file.original_filename}/)
     end
 
   end
@@ -82,8 +94,8 @@ describe Books::AssetsController do
 
     before do
       @book = book
-      post :create, :book_id => @book.id, :type => ["Assets","TestDoc"], :file => jpg_test, :format => "js"
-      @docs << assigns(:asset)
+      post :create, :book_id => @book.id, :type => "Assets/TestDoc", :file => jpg_test, :format => "js"
+      @dtbd << assigns(:asset)
     end
 
     it "should assign variables" do
@@ -91,7 +103,8 @@ describe Books::AssetsController do
       should assign_to(:book)
     end
 
-    it "should be success returning the correct content type" do
+    it "should be success returning the correct json formatted text and the correct content type" do
+      ActiveSupport::JSON.decode(response.body)["success"].should be_true
       should respond_with_content_type(:js)
       should respond_with(:success)
     end
@@ -107,7 +120,8 @@ describe Books::AssetsController do
     before :each do
       @book = book
       @asset = Books::Assets::TestDoc.create!(:book => @book, :asset => jpg_test)
-      delete :destroy, :book_id => @book.id, :id => @asset.id, :format => "js", :target => target
+      @dtbd << @asset
+      delete :destroy, :book_id => @book.id, :asset_id => @asset.id, :format => "js", :target => target
     end
 
     it "should assign variables" do
@@ -116,17 +130,14 @@ describe Books::AssetsController do
       should assign_to(:book)
     end
 
-    it "should be success returning the correct content type" do
+    it "should be success returning the correct content type and a json string reporting succes == true" do
+      ActiveSupport::JSON.decode(response.body)["success"].should be_true
       should respond_with_content_type(:js)
       should respond_with(:success)
     end
 
     it{should render_template('acts_as_assets/assets/destroy')}
 
-    it "should return the correct js to execute" do
-      response.body.should match(/#{target}/)
-    end
-
     it "should correctly delete the file" do
       File.exist?(File.expand_path(@asset.asset.path)).should be_false
     end