glebtv-rails-uploader 0.4.1 → 0.5.0

data/lib/uploader/helpers/field_tag.rb

@@ -3,90 +3,79 @@ module Uploader
     class FieldTag
       attr_reader :template, :object, :theme
 
-      delegate :uploader, :to => :template
-
+      delegate :uploader, :to => :template      
+      
       # Wrapper for render uploader field
       # Usage:
       #
       #   uploader = FieldTag.new(object_name, method_name, template, options)
-      #   uploader.to_s
+      #   uploader.render
       #
       def initialize(object_name, method_name, template, options = {}) #:nodoc:
         options = { :object_name => object_name, :method_name => method_name }.merge(options)
-        @template, @options = template, options.dup
 
+        @template, @options = template, options.dup
+        
         @theme = (@options.delete(:theme) || "default")
         @value = @options.delete(:value) if @options.key?(:value)
-
+        
         @object = @options.delete(:object) if @options.key?(:object)
         @object ||= @template.instance_variable_get("@#{object_name}")
       end
 
-      def to_s(locals = {}) #:nodoc:
+      def render(locals = {}) #:nodoc:
         locals = { :field => self }.merge(locals)
         @template.render :partial => "uploader/#{@theme}/container", :locals => locals
       end
-
+      
       def id
-        @id ||= @template.dom_id(@object, [method_name, 'uploader', @object.fileupload_guid].join('_'))
+        @id ||= @template.dom_id(@object, [method_name, 'uploader'].join('_'))
       end
-
+      
       def method_name
         @options[:method_name]
       end
-
+      
       def object_name
         @options[:object_name]
       end
-
+      
       def multiple?
         @object.fileupload_multiple?(method_name)
       end
-
+      
       def value
         @value ||= @object.fileupload_asset(method_name)
       end
-
+      
       def values
-        if !value.nil? && value.respond_to?(:first) && value.first.respond_to?(:sort)
-          Array.wrap(value).sort_by(&:sort)
-        else
-          Array.wrap(value)
-        end
+        Array.wrap(value)
       end
-
+      
       def exists?
         values.map(&:persisted?).any?
       end
 
+      def sortable?
+        @options[:sortable] == true
+      end
+      
       def klass
         @klass ||= @object.class.fileupload_klass(method_name)
       end
-
+      
       def attachments_path(options = {})
         options = {
           :guid => @object.fileupload_guid, 
           :assetable_type => @object.class.base_class.name.to_s,
           :klass => klass.to_s
         }.merge(options)
-
+        
         options[:assetable_id] = @object.id if @object.persisted?
-
+        
         uploader.attachments_path(options)
       end
-
-      def sort_path(options = {})
-        options = {
-            :guid => @object.fileupload_guid,
-            :assetable_type => @object.class.base_class.name.to_s,
-            :klass => klass.to_s
-        }.merge(options)
-
-        options[:assetable_id] = @object.id if @object.persisted?
-
-        uploader.sort_attachments_path(options)
-      end
-
+      
       def input_html
         @input_html ||= {
           :"data-url" => attachments_path, 

data/lib/uploader/helpers/form_builder.rb

@@ -3,7 +3,7 @@ module Uploader
     module FormBuilder
       # Render uploader field
       # Usage:
-      #
+      #   
       #   <%= form_for @article do |f| %>
       #     <%= f.uploader_field :picture %>
       #   <%= end %>

data/lib/uploader/helpers/form_tag_helper.rb

@@ -2,14 +2,13 @@ module Uploader
   module Helpers
     module FormTagHelper
       include ActionView::Helpers::JavaScriptHelper
-
+      
       # A helper that renders file upload container
       #
       #   <%= uploader_field_tag :article, :photo %>
       #
       def uploader_field_tag(object_name, method_name, options = {})
-        uploader = FieldTag.new(object_name, method_name, self, options)
-        uploader.to_s
+        FieldTag.new(object_name, method_name, self, options).render
       end
     end
   end

data/lib/uploader/hooks/formtastic.rb

@@ -1,13 +1,19 @@
-# encoding: utf-8
-
 require 'formtastic'
 
 class UploaderInput
   include ::Formtastic::Inputs::Base
-
+  
   def to_html
     input_wrapping do
-      label_html << builder.uploader_field(method, input_html_options)
+      label_html <<
+      builder.uploader_field(method, input_html_options)
     end
   end
+
+  def input_html_options
+    data = super
+    data[:confirm_delete] = options[:confirm_delete]
+    data[:confirm_message] = localized_string(method, method, :delete_confirmation) || I18n.t('uploader.confirm_delete')
+    data
+  end
 end

data/lib/uploader/hooks/simple_form.rb

@@ -1,9 +1,7 @@
 require "simple_form"
 
-class SimpleFormUploaderInput < SimpleForm::Inputs::Base
+class UploaderInput < ::SimpleForm::Inputs::Base
   def input
     @builder.uploader_field(attribute_name, input_html_options)
   end
 end
-
-::SimpleForm::FormBuilder.map_type :uploader, :to => SimpleFormUploaderInput

data/lib/uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.0".freeze
 end

data/spec/dummy/app/models/article.rb

@@ -1,11 +1,7 @@
-class Article
-  include Mongoid::Document
-  include Uploader::Fileuploads
-
-  field :content
-  field :title
+class Article < ActiveRecord::Base
+  attr_accessible :content, :title
   
-  has_one :picture, as: :assetable, dependent: :destroy
+  has_one :picture, :as => :assetable, :dependent => :destroy
 
   fileuploads :picture
 end

data/spec/dummy/app/models/asset.rb

@@ -1,20 +1,27 @@
-# encoding: utf-8
-
-class Asset 
-  include Mongoid::Document
+# == Schema Information
+#
+# Table name: assets
+#
+#  id                :integer(4)      not null, primary key
+#  data_file_name    :string(255)     not null
+#  data_content_type :string(255)
+#  data_file_size    :integer(4)
+#  assetable_id      :integer(4)      not null
+#  assetable_type    :string(25)      not null
+#  type              :string(25)
+#  guid              :string(10)
+#  user_id           :integer(4)
+#  sort_order        :integer(4)      default(0)
+#  created_at        :datetime
+#  updated_at        :datetime
+#
+# Indexes
+#
+#  index_assets_on_assetable_type_and_assetable_id           (assetable_type,assetable_id)
+#  index_assets_on_user_id                                   (user_id)
+#
+class Asset < ActiveRecord::Base
   include Uploader::Asset
-
-  belongs_to :assetable, polymorphic: true
-
-  field :guid
-
-  before_save do
-    return true if self.assetable_id.nil? || !self.assetable_id.is_a?(String)
-    if defined?(Moped::BSON)
-      self.assetable_id = Moped::BSON::ObjectId.from_string(self.assetable_id) if Moped::BSON::ObjectId.legal?(self.assetable_id)
-    else
-      self.assetable_id = BSON::ObjectId.from_string(self.assetable_id) if BSON::ObjectId.legal?(self.assetable_id)
-    end
-    true
-  end
-end
+  
+  belongs_to :assetable, :polymorphic => true
+end

data/spec/dummy/app/models/picture.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
-
 class Picture < Asset
-  mount_uploader :data, PictureUploader, mount_on: :data_file_name
-end
+  mount_uploader :data, PictureUploader, :mount_on => :data_file_name
+  
+  attr_accessible :data
+end

data/spec/dummy/config/application.rb

@@ -1,13 +1,11 @@
 require File.expand_path('../boot', __FILE__)
 
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie" 
+require 'rails/all'
 
 Bundler.require
-
-require 'glebtv-rails-uploader'
-require 'carrierwave/mongoid'
+require "rails-uploader"
+require 'carrierwave'
+require 'carrierwave/orm/activerecord'
 
 module Dummy
   class Application < Rails::Application
@@ -48,7 +46,7 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
+    config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/spec/dummy/config/environments/development.rb

@@ -7,7 +7,7 @@ Dummy::Application.configure do
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
-  # config.whiny_nils = true
+  config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -34,8 +34,4 @@ Dummy::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
-
-  config.eager_load = false
-
-  config.secret_key_base = 'XXX'
 end

data/spec/dummy/config/environments/production.rb

@@ -64,8 +64,4 @@ Dummy::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
-
-  config.eager_load = true
-
-  config.secret_key_base = 'XXX'
 end

data/spec/dummy/config/environments/test.rb

@@ -12,7 +12,7 @@ Dummy::Application.configure do
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
-  # config.whiny_nils = true
+  config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -30,12 +30,8 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  # config.active_record.mass_assignment_sanitizer = :strict
+  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  config.eager_load = false
-
-  config.secret_key_base = 'XXX'
 end

data/spec/dummy/db/migrate/20120508093416_create_assets.rb

@@ -7,7 +7,8 @@ class CreateAssets < ActiveRecord::Migration
       t.integer  "assetable_id",                                   :null => false
       t.string   "assetable_type",    :limit => 25,                :null => false
       t.string   "type",              :limit => 25
-      t.string   "guid",              :limit => 10
+      t.string   "guid",              :limit => 20
+      t.string   "public_token",      :limit => 20
       t.integer  "user_id"
     
       t.timestamps
@@ -15,5 +16,6 @@ class CreateAssets < ActiveRecord::Migration
     
     add_index "assets", ["assetable_type", "assetable_id"]
     add_index "assets", ["user_id"]
+    add_index "assets", ["public_token"]
   end
 end

data/spec/factories/articles.rb

@@ -6,3 +6,4 @@ FactoryGirl.define do
     content "MyText"
   end
 end
+

data/spec/factories/assets.rb

@@ -3,6 +3,7 @@
 FactoryGirl.define do  
   factory :picture, :class => Picture do
     data File.open('spec/factories/files/rails.png')
+    data_content_type "image/png"
     data_file_name "rails.png"
     
     association :assetable, :factory => :article

data/spec/fileuploads_spec.rb

@@ -19,9 +19,9 @@ describe Uploader::Fileuploads do
   end
 
   it "should update asset target_id by guid" do
-    Article.fileupload_update('507f1f77bcf86cd799439011', @picture.guid, :picture)
+    Article.fileupload_update(1000, @picture.guid, :picture)
     @picture.reload
-    @picture.assetable_id.to_s.should == '507f1f77bcf86cd799439011'
+    @picture.assetable_id.should == 1000
     @picture.guid.should be_nil
   end
 

data/spec/mongoid_spec.rb

@@ -11,14 +11,12 @@ end
 
 class MongoidPicture
   include Mongoid::Document
-  include Uploader::Asset
-
-  field :guid
+  include Uploader::Asset::Mongoid
 
   belongs_to :assetable, polymorphic: true
 end
 
-describe Uploader::Asset do
+describe Uploader::Asset::Mongoid do
   before do
     @guid = 'guid'
     @picture = MongoidPicture.create!(:guid => @guid, :assetable_type => 'MongoidArticle')
@@ -30,9 +28,9 @@ describe Uploader::Asset do
   end
 
   it "should update asset target_id by guid" do
-    MongoidArticle.fileupload_update('507f1f77bcf86cd799439011', @picture.guid, :mongoid_picture)
+    MongoidArticle.fileupload_update(1000, @picture.guid, :mongoid_picture)
     @picture.reload
-    @picture.assetable_id.to_s.should == '507f1f77bcf86cd799439011'
+    @picture.assetable_id.should == 1000
     @picture.guid.should be_nil
   end
 

data/spec/requests/attachments_controller_spec.rb

@@ -11,7 +11,7 @@ describe Uploader::AttachmentsController do
     file = Rack::Test::UploadedFile.new('spec/factories/files/rails.png', "image/png")
     post "/uploader/attachments", {
       :klass => "Picture", 
-      :assetable_id => "507f1f77bcf86cd799439011",
+      :assetable_id => "1",
       :assetable_type => "Article",
       :guid => "SOMESTRING",
       :asset => {:data => file}
@@ -26,9 +26,17 @@ describe Uploader::AttachmentsController do
     @asset = FactoryGirl.create(:picture)
     
     lambda {
-      delete "/uploader/attachments/#{@asset.id}", {:klass => "Picture"}
+      delete "/uploader/attachments/#{@asset.public_token}", {:klass => "Picture"}
     }.should change { Picture.count }.by(-1)
   end
+
+  it "should not destroy asset with not exists guid" do
+    @asset = FactoryGirl.create(:picture)
+    
+    lambda {
+      delete "/uploader/attachments/wrong", {:klass => "Picture"}
+    }.should raise_error(ActionController::RoutingError)
+  end
   
   it "should raise 404 error with wrong class" do
     lambda {

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ ActionMailer::Base.default_url_options[:host] = "test.com"
 Rails.backtrace_cleaner.remove_silencers!
 
 # Run any available migration
+ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
 require 'carrierwave'
 CarrierWave.configure do |config|
@@ -42,14 +43,17 @@ RSpec.configure do |config|
   config.mock_with :rspec
   
   config.before(:suite) do
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner[:active_record].strategy = :truncation
+    DatabaseCleaner[:mongoid].strategy = :truncation
   end
 
   config.before(:all) do
-    DatabaseCleaner.start
+    DatabaseCleaner[:active_record].start
+    DatabaseCleaner[:mongoid].start
   end
 
   config.after(:all) do
-    DatabaseCleaner.clean
+    DatabaseCleaner[:active_record].clean
+    DatabaseCleaner[:mongoid].clean
   end
 end