rails-uploader 0.2.0 → 0.2.1

data/README.md

@@ -63,12 +63,13 @@ class Picture < Asset
   validates_filesize_of :data, :maximum => 2.megabytes.to_i
 
   # structure of returned json array of files. (used in Hash.to_json operation)
-  def serializable_hash options=nil
+  def serializable_hash(options=nil)
     {
-        'id'  => id.to_s,
+        "id" => id.to_s,
         "filename" => File.basename(data.path),
         "url" => data.url,
-        'thumb_url' => data.url(:thumb)
+        "thumb_url" => data.url(:thumb),
+        "public_token" => public_token
     }
   end
 end
@@ -129,43 +130,44 @@ class User
 
   fileuploads :picture, :avatar
 end
+```
 
 
 ### Include assets
 
 Javascripts:
 
-``` ruby
+```
 //= require uploader/application
 ```
 
 Stylesheets:
 
-``` ruby
+```
 *= require uploader/application
 ```
 
 ### Views
 
-``` ruby
+```erb
 <%= uploader_field_tag :article, :photo %>
 ```
 
 or FormBuilder:
 
-``` ruby
+```erb
 <%= form.uploader_field :photo, :sortable => true %>
 ```
 
 ### Formtastic
 
-``` ruby
+```erb
 <%= f.input :pictures, :as => :uploader %>
 ```
 
 ### SimpleForm
 
-``` ruby
+```erb
 <%= f.input :pictures, :as => :uploader, :input_html => {:sortable => true} %>
 ```
 
@@ -173,7 +175,7 @@ or FormBuilder:
 
 This is only working in Formtastic and FormBuilder:
 
-``` ruby
+``` erb
 # formtastic
 <%= f.input :picture, :as => :uploader, :confirm_delete => true %>
 # the i18n lookup key would be en.formtastic.delete_confirmations.picture

data/lib/uploader/asset.rb

@@ -3,10 +3,6 @@ module Uploader
     def self.included(base)
       base.send(:extend, Uploader::Asset::ClassMethods)
       base.send(:include, Uploader::Asset::AssetProcessor)
-
-      base.instance_eval do
-        before_create :generate_public_token
-      end
     end
 
     module Mongoid
@@ -17,8 +13,6 @@ module Uploader
         base.instance_eval do
           field :guid, type: String
           field :public_token, type: String
-
-          before_create :generate_public_token
         end
       end
 

data/lib/uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

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

@@ -24,4 +24,6 @@ class Asset < ActiveRecord::Base
   include Uploader::Asset
   
   belongs_to :assetable, :polymorphic => true
+
+  before_create :generate_public_token
 end

data/spec/dummy/log/test.log

@@ -2246,3 +2246,84 @@ Started POST "/uploader/attachments" for 127.0.0.1 at 2013-09-05 18:45:19 +0300
    (0.1ms)  begin transaction
    (0.1ms)  rollback transaction
   MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=system.namespaces selector={:name=>{"$not"=>/system|\$/}} flags=[:slave_ok] limit=0 skip=0 fields=nil (0.4129ms)
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateAssets (20120508093416)
+Migrating to CreateArticles (20120508093830)
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (4.3ms)  INSERT INTO "articles" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "MyText"], ["created_at", Sat, 07 Sep 2013 06:36:54 UTC +00:00], ["title", "MyString"], ["updated_at", Sat, 07 Sep 2013 06:36:54 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Picture Exists (0.1ms)  SELECT 1 AS one FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = 'AWt2HVkcENAITwiipl91' LIMIT 1
+  SQL (0.7ms)  INSERT INTO "assets" ("assetable_id", "assetable_type", "created_at", "data_content_type", "data_file_name", "data_file_size", "guid", "public_token", "type", "updated_at", "user_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["assetable_id", 1], ["assetable_type", "Article"], ["created_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["data_content_type", "image/png"], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", nil], ["public_token", "AWt2HVkcENAITwiipl91"], ["type", "Picture"], ["updated_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["user_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Picture Load (0.3ms)  SELECT "assets".* FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."guid" IS NULL AND "assets"."assetable_type" = 'Article' LIMIT 1
+  SQL (0.2ms)  UPDATE "assets" SET "assetable_id" = 1000, "guid" = NULL WHERE "assets"."type" IN ('Picture') AND "assets"."guid" IS NULL AND "assets"."assetable_type" = 'Article'
+  Picture Load (0.1ms)  SELECT "assets".* FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."id" = ? LIMIT 1  [["id", 1]]
+  Picture Load (0.2ms)  SELECT "assets".* FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."guid" = 'tERRDemHo1OMihKx3oBP' AND "assets"."assetable_type" = 'Article' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (2.4ms)  rollback transaction
+  MOPED: 127.0.0.1:27017 COMMAND      database=admin command={:ismaster=>1} (21.0221ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=system.namespaces selector={:name=>{"$not"=>/system|\$/}} flags=[:slave_ok] limit=0 skip=0 fields=nil (7.5850ms)
+   (0.1ms)  begin transaction
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={"public_token"=>"gRMFvS8x2Rr0ec3iEXP8"} flags=[:slave_ok] limit=1 skip=0 fields={:_id=>1} (10.9842ms)
+  MOPED: 127.0.0.1:27017 INSERT       database=rails_uploader_test collection=mongoid_pictures documents=[{"_id"=>"522ac987dc26e7e3c4000001", "guid"=>"guid", "assetable_type"=>"MongoidArticle", "public_token"=>"gRMFvS8x2Rr0ec3iEXP8"}] flags=[] (0.1829ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={"$query"=>{"guid"=>"guid", "assetable_type"=>"MongoidArticle"}, "$orderby"=>{:_id=>1}} flags=[:slave_ok] limit=-1 skip=0 fields=nil (28.3999ms)
+  MOPED: 127.0.0.1:27017 COMMAND      database=rails_uploader_test command={:count=>"mongoid_pictures", :query=>{}} (1.3881ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={} flags=[:slave_ok] limit=0 skip=0 fields=nil (0.3190ms)
+  MOPED: 127.0.0.1:27017 DELETE       database=rails_uploader_test collection=mongoid_pictures selector={"_id"=>"522ac987dc26e7e3c4000001"} flags=[:remove_first] (0.1488ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={"public_token"=>"ORqLAVteAhpTVGWHXOjC"} flags=[:slave_ok] limit=1 skip=0 fields={:_id=>1} (0.7150ms)
+  MOPED: 127.0.0.1:27017 INSERT       database=rails_uploader_test collection=mongoid_pictures documents=[{"_id"=>"522ac987dc26e7e3c4000002", "guid"=>"guid", "assetable_type"=>"MongoidArticle", "public_token"=>"ORqLAVteAhpTVGWHXOjC"}] flags=[] (0.1011ms)
+  MOPED: 127.0.0.1:27017 UPDATE       database=rails_uploader_test collection=mongoid_pictures selector={"guid"=>"guid", "assetable_type"=>"MongoidArticle"} update={"$set"=>{:assetable_id=>1000, :guid=>nil}} flags=[:multi] (0.1230ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={:_id=>"522ac987dc26e7e3c4000002"} flags=[:slave_ok] limit=-1 skip=0 fields=nil (3.6292ms)
+  MOPED: 127.0.0.1:27017 COMMAND      database=rails_uploader_test command={:count=>"mongoid_pictures", :query=>{}} (0.4101ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={} flags=[:slave_ok] limit=0 skip=0 fields=nil (0.2871ms)
+  MOPED: 127.0.0.1:27017 DELETE       database=rails_uploader_test collection=mongoid_pictures selector={"_id"=>"522ac987dc26e7e3c4000002"} flags=[:remove_first] (0.0710ms)
+   (0.1ms)  rollback transaction
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=system.namespaces selector={:name=>{"$not"=>/system|\$/}} flags=[:slave_ok] limit=0 skip=0 fields=nil (0.4151ms)
+  MOPED: 127.0.0.1:27017 COMMAND      database=rails_uploader_test command={:drop=>"mongoid_pictures"} (9.9230ms)
+   (0.1ms)  begin transaction
+
+
+Started POST "/uploader/attachments" for 127.0.0.1 at 2013-09-07 09:36:55 +0300
+   (0.1ms)  SAVEPOINT active_record_1
+  Picture Exists (0.2ms)  SELECT 1 AS one FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = '7PSgybt0d7BfJOUHdpve' LIMIT 1
+  SQL (0.6ms)  INSERT INTO "assets" ("assetable_id", "assetable_type", "created_at", "data_content_type", "data_file_name", "data_file_size", "guid", "public_token", "type", "updated_at", "user_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["assetable_id", 1], ["assetable_type", "Article"], ["created_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["data_content_type", nil], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", "SOMESTRING"], ["public_token", "7PSgybt0d7BfJOUHdpve"], ["type", "Picture"], ["updated_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["user_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "articles" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "MyText"], ["created_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["title", "MyString"], ["updated_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Picture Exists (0.1ms)  SELECT 1 AS one FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = 'dqTLYqXzmZOVibKNUmBn' LIMIT 1
+  SQL (0.3ms)  INSERT INTO "assets" ("assetable_id", "assetable_type", "created_at", "data_content_type", "data_file_name", "data_file_size", "guid", "public_token", "type", "updated_at", "user_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["assetable_id", 1], ["assetable_type", "Article"], ["created_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["data_content_type", "image/png"], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", nil], ["public_token", "dqTLYqXzmZOVibKNUmBn"], ["type", "Picture"], ["updated_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["user_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  SELECT COUNT(*) FROM "assets" WHERE "assets"."type" IN ('Picture')
+
+
+Started DELETE "/uploader/attachments/dqTLYqXzmZOVibKNUmBn" for 127.0.0.1 at 2013-09-07 09:36:55 +0300
+  Picture Load (0.2ms)  SELECT "assets".* FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = 'dqTLYqXzmZOVibKNUmBn' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  DELETE FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."id" = ?  [["id", 2]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SELECT COUNT(*) FROM "assets" WHERE "assets"."type" IN ('Picture')
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "articles" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "MyText"], ["created_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["title", "MyString"], ["updated_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Picture Exists (0.1ms)  SELECT 1 AS one FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = 'KHcKVIB0QJ0xDGYrOONx' LIMIT 1
+  SQL (0.2ms)  INSERT INTO "assets" ("assetable_id", "assetable_type", "created_at", "data_content_type", "data_file_name", "data_file_size", "guid", "public_token", "type", "updated_at", "user_id") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["assetable_id", 2], ["assetable_type", "Article"], ["created_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["data_content_type", "image/png"], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", nil], ["public_token", "KHcKVIB0QJ0xDGYrOONx"], ["type", "Picture"], ["updated_at", Sat, 07 Sep 2013 06:36:55 UTC +00:00], ["user_id", nil]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+
+Started DELETE "/uploader/attachments/wrong" for 127.0.0.1 at 2013-09-07 09:36:55 +0300
+  Picture Load (0.1ms)  SELECT "assets".* FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = 'wrong' LIMIT 1
+
+
+Started POST "/uploader/attachments" for 127.0.0.1 at 2013-09-07 09:36:55 +0300
+   (1.8ms)  rollback transaction
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=system.namespaces selector={:name=>{"$not"=>/system|\$/}} flags=[:slave_ok] limit=0 skip=0 fields=nil (0.5319ms)
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=system.namespaces selector={:name=>{"$not"=>/system|\$/}} flags=[:slave_ok] limit=0 skip=0 fields=nil (0.4559ms)

data/spec/mongoid_spec.rb

@@ -13,6 +13,8 @@ class MongoidPicture
   include Mongoid::Document
   include Uploader::Asset::Mongoid
 
+  before_create :generate_public_token
+
   belongs_to :assetable, polymorphic: true
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails