rails-uploader 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e9f68c0b656b627bdacf2628989d73b63c31647a
+  data.tar.gz: 9c4d638cb6b89af40cf599e3c3f7aef950239d79
+SHA512:
+  metadata.gz: 924193e248df81257e025613fff57b74b4f8f76b09a8f59ec1cc2dc09a23a47050a20797f3b735b6e094b26d86a2d117f60d89527121a64e869b403c09331c32
+  data.tar.gz: 929c88e3d08db5fb926c6bf522667d1e8c5e9c36e59b1f63c783474a99cb423b08550c1ec8ff1fc8ac86113ac5bf7f5295da24371e93ea498bdeeeca48c17043

data/app/controllers/uploader/attachments_controller.rb

@@ -51,5 +51,6 @@ module Uploader
         self.content_type = Uploader.content_type(env["HTTP_USER_AGENT"])
         self.response_body = hash_or_object.to_json(:root => false)
       end
+      
   end
 end

data/lib/uploader.rb

@@ -4,6 +4,7 @@ require 'securerandom'
 module Uploader
   autoload :Fileuploads, 'uploader/fileuploads'
   autoload :Asset, 'uploader/asset'
+  autoload :AssetInstance, 'uploader/asset_instance'
   
   module Helpers
     autoload :FormTagHelper, 'uploader/helpers/form_tag_helper'

data/lib/uploader/asset.rb

@@ -69,9 +69,10 @@ module Uploader
       #   end
       #
       def uploader_create(params, request = nil)
+        
         self.guid = params[:guid]
         self.assetable_type = params[:assetable_type]
-        self.assetable_id = assetable_id_format(params[:assetable_id]) if params[:assetable_id]
+        self.assetable_id = assetable_id_format(params[:assetable_id])
         save
       end
       
@@ -101,7 +102,7 @@ module Uploader
     end
 
     def assetable_id_format(assetable_id)
-      assetable_id
+      assetable_id || 0
     end
   end
 end

data/lib/uploader/hooks/simple_form.rb

@@ -1,7 +1,8 @@
 require "simple_form"
 
 class UploaderInput < ::SimpleForm::Inputs::Base
-  def input
-    @builder.uploader_field(attribute_name, input_html_options)
+  def input(wrapper_options = nil)
+    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+    @builder.uploader_field(attribute_name, merged_input_options)
   end
 end

data/lib/uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.2.5".freeze
+  VERSION = "0.2.6".freeze
 end

data/spec/dummy/log/test.log

@@ -2651,3 +2651,84 @@ Started POST "/uploader/attachments" for 127.0.0.1 at 2013-11-21 18:13:19 +0200
    (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.4461ms)
+Connecting to database specified by database.yml
+   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateAssets (20120508093416)
+Migrating to CreateArticles (20120508093830)
+   (0.1ms)  begin transaction
+   (1.0ms)  SAVEPOINT active_record_1
+  SQL (2.8ms)  INSERT INTO "articles" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "MyText"], ["created_at", Mon, 15 Jun 2015 08:27:26 UTC +00:00], ["title", "MyString"], ["updated_at", Mon, 15 Jun 2015 08:27:26 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Picture Exists (0.6ms)  SELECT 1 AS one FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = 'M4yogSJZYTBRNMVyFvyY' LIMIT 1
+  SQL (2.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", 1], ["assetable_type", "Article"], ["created_at", Mon, 15 Jun 2015 08:27:26 UTC +00:00], ["data_content_type", "image/png"], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", nil], ["public_token", "M4yogSJZYTBRNMVyFvyY"], ["type", "Picture"], ["updated_at", Mon, 15 Jun 2015 08:27:26 UTC +00:00], ["user_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Picture Load (0.1ms)  SELECT "assets".* FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."guid" IS NULL AND "assets"."assetable_type" = 'Article' LIMIT 1
+  SQL (0.3ms)  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.2ms)  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" = 'OFd4CKWG8kWZadG83nyt' AND "assets"."assetable_type" = 'Article' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.9ms)  rollback transaction
+  MOPED: 127.0.0.1:27017 COMMAND      database=admin command={:ismaster=>1} (72.6321ms)
+  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 (10.3052ms)
+   (0.1ms)  begin transaction
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={"public_token"=>"WzQHW0b7MgwOFzA0w36v"} flags=[:slave_ok] limit=1 skip=0 fields={:_id=>1} (14.7321ms)
+  MOPED: 127.0.0.1:27017 INSERT       database=rails_uploader_test collection=mongoid_pictures documents=[{"_id"=>"557e8c6edc26e7c103000001", "guid"=>"guid", "assetable_type"=>"MongoidArticle", "public_token"=>"WzQHW0b7MgwOFzA0w36v"}] flags=[] (0.2539ms)
+  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 (42.6080ms)
+  MOPED: 127.0.0.1:27017 COMMAND      database=rails_uploader_test command={:count=>"mongoid_pictures", :query=>{}} (3.1428ms)
+  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.3161ms)
+  MOPED: 127.0.0.1:27017 DELETE       database=rails_uploader_test collection=mongoid_pictures selector={"_id"=>"557e8c6edc26e7c103000001"} flags=[:remove_first] (0.1340ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={"public_token"=>"ApIxKrqWMfKMfY41LAR9"} flags=[:slave_ok] limit=1 skip=0 fields={:_id=>1} (0.6771ms)
+  MOPED: 127.0.0.1:27017 INSERT       database=rails_uploader_test collection=mongoid_pictures documents=[{"_id"=>"557e8c6edc26e7c103000002", "guid"=>"guid", "assetable_type"=>"MongoidArticle", "public_token"=>"ApIxKrqWMfKMfY41LAR9"}] flags=[] (0.1130ms)
+  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.1309ms)
+  MOPED: 127.0.0.1:27017 QUERY        database=rails_uploader_test collection=mongoid_pictures selector={:_id=>"557e8c6edc26e7c103000002"} flags=[:slave_ok] limit=-1 skip=0 fields=nil (3.0262ms)
+  MOPED: 127.0.0.1:27017 COMMAND      database=rails_uploader_test command={:count=>"mongoid_pictures", :query=>{}} (0.2980ms)
+  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.2861ms)
+  MOPED: 127.0.0.1:27017 DELETE       database=rails_uploader_test collection=mongoid_pictures selector={"_id"=>"557e8c6edc26e7c103000002"} flags=[:remove_first] (0.1123ms)
+   (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.3400ms)
+  MOPED: 127.0.0.1:27017 COMMAND      database=rails_uploader_test command={:drop=>"mongoid_pictures"} (10.0429ms)
+   (0.1ms)  begin transaction
+
+
+Started POST "/uploader/attachments" for 127.0.0.1 at 2015-06-15 11:27:26 +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" = '2j8DKDapRBfA20oiHZvP' 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", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["data_content_type", nil], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", "SOMESTRING"], ["public_token", "2j8DKDapRBfA20oiHZvP"], ["type", "Picture"], ["updated_at", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["user_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.7ms)  INSERT INTO "articles" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "MyText"], ["created_at", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["title", "MyString"], ["updated_at", Mon, 15 Jun 2015 08:27:27 UTC +00:00]]
+   (0.1ms)  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" = 'rjSC2eQxiyqjmSqW9ATA' 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", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["data_content_type", "image/png"], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", nil], ["public_token", "rjSC2eQxiyqjmSqW9ATA"], ["type", "Picture"], ["updated_at", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["user_id", nil]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "assets" WHERE "assets"."type" IN ('Picture')
+
+
+Started DELETE "/uploader/attachments/rjSC2eQxiyqjmSqW9ATA" for 127.0.0.1 at 2015-06-15 11:27:27 +0300
+  Picture Load (0.2ms)  SELECT "assets".* FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."public_token" = 'rjSC2eQxiyqjmSqW9ATA' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  DELETE FROM "assets" WHERE "assets"."type" IN ('Picture') AND "assets"."id" = ?  [["id", 2]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "assets" WHERE "assets"."type" IN ('Picture')
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "articles" ("content", "created_at", "title", "updated_at") VALUES (?, ?, ?, ?)  [["content", "MyText"], ["created_at", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["title", "MyString"], ["updated_at", Mon, 15 Jun 2015 08:27:27 UTC +00:00]]
+   (0.1ms)  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" = '6eUhharayYOCdXJWsElD' 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", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["data_content_type", "image/png"], ["data_file_name", "rails.png"], ["data_file_size", nil], ["guid", nil], ["public_token", "6eUhharayYOCdXJWsElD"], ["type", "Picture"], ["updated_at", Mon, 15 Jun 2015 08:27:27 UTC +00:00], ["user_id", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+
+
+Started DELETE "/uploader/attachments/wrong" for 127.0.0.1 at 2015-06-15 11:27:27 +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 2015-06-15 11:27:27 +0300
+   (0.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.5350ms)
+   (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.4451ms)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Igor Galeta
@@ -10,70 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   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: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails HTML5 FileUpload helpers
@@ -192,27 +183,26 @@ files:
 - spec/uploader_spec.rb
 homepage: https://github.com/superp/rails-uploader
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rails-uploader
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails file upload implementation with jQuery-File-Upload
 test_files:
 - spec/dummy/app/assets/javascripts/application.js