rails-uploader 0.3.4 → 0.4.0

data/spec/factories/assets.rb

@@ -1,11 +1,11 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do  
-  factory :picture, :class => Picture do
+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_content_type 'image/png'
+    data_file_name 'rails.png'
+
+    association :assetable, factory: :article
   end
 end

data/spec/fileuploads_spec.rb

@@ -2,34 +2,29 @@ require 'spec_helper'
 
 describe Uploader::Fileuploads do
   before(:all) do
-    @picture = FactoryGirl.create(:picture)
+    @picture = FactoryGirl.create(:picture, assetable_type: 'Article')
   end
 
   it "should be a Module" do
     Uploader::Fileuploads.should be_a(Module)
   end
 
-  it "should return asset class" do
-    Article.fileupload_klass("picture").should == Picture
-  end
-
-  it "should find asset by guid" do
-    asset = Article.fileupload_find("picture", @picture.guid)
-    asset.should == @picture
-  end
-
-  it "should update asset target_id by guid" do
-    Article.fileupload_update(1000, @picture.guid, :picture)
-    @picture.reload
-    @picture.assetable_id.should == 1000
-    @picture.guid.should be_nil
-  end
-
   context "instance methods" do
     before(:each) do
       @article = FactoryGirl.build(:article)
     end
 
+    it "should return asset class" do
+      @article.fileupload_klass("picture").should == Picture
+    end
+
+    it "should find asset by guid" do
+      @picture.update_column(:guid, @article.fileupload_guid)
+
+      asset = @article.fileupload_asset('picture')
+      asset.should == @picture
+    end
+
     it "should generate guid" do
       @article.fileupload_guid.should_not be_blank
     end
@@ -50,8 +45,8 @@ describe Uploader::Fileuploads do
       picture.should be_new_record
     end
 
-    it "should return fileuploads columns" do
-      @article.fileupload_associations.should include(:picture)
+    it 'must get fileupload params' do
+      @article.fileupload_params(:picture).should_not be nil
     end
   end
 end

data/spec/mongoid_spec.rb

@@ -7,33 +7,37 @@ class MongoidArticle
   include Mongoid::Document
   include Uploader::Fileuploads
 
-  has_one :mongoid_picture, :as => :assetable
+  has_one :mongoid_picture, as: :assetable
 
   fileuploads :mongoid_picture
 end
 
 class MongoidPicture
   include Mongoid::Document
-  include Uploader::Asset::Mongoid
+  include Uploader::Asset
+
+  field :guid, type: String
 
   belongs_to :assetable, polymorphic: true
 end
 
-describe Uploader::Asset::Mongoid do
+describe Uploader::Asset do
   before do
     @guid = 'guid'
-    @picture = MongoidPicture.create!(:guid => @guid, :assetable_type => 'MongoidArticle')
+    @article = MongoidArticle.new(fileupload_guid: @guid)
+    @picture = MongoidPicture.create!(guid: @guid, assetable_type: 'MongoidArticle')
   end
 
   it 'should find asset by guid' do
-    asset = MongoidArticle.fileupload_find("mongoid_picture", @picture.guid)
+    asset = @article.fileupload_asset(:mongoid_picture)
     asset.should == @picture
   end
 
   it "should update asset target_id by guid" do
-    MongoidArticle.fileupload_update(1000, @picture.guid, :mongoid_picture)
+    @article.save
+
     @picture.reload
-    @picture.assetable_id.should == 1000
+    @picture.assetable_id.should == @article.id
     @picture.guid.should be_nil
   end
 

data/spec/uploader_spec.rb

@@ -4,13 +4,13 @@ describe Uploader do
   it "should be a Module" do
     Uploader.should be_a(Module)
   end
-  
+
   it "should generate random string" do
     value = Uploader.guid
     value.should_not be_blank
-    value.size.should == 20
+    value.size.should == 22
   end
-  
+
   it "should find all precompile assets" do
     Uploader.assets.should_not be_nil
     Uploader.assets.should include('uploader/jquery.fileupload.js')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
@@ -97,6 +97,7 @@ files:
 - lib/uploader/chunked_uploads.rb
 - lib/uploader/engine.rb
 - lib/uploader/file_part.rb
+- lib/uploader/fileupload_glue.rb
 - lib/uploader/fileuploads.rb
 - lib/uploader/helpers/field_tag.rb
 - lib/uploader/helpers/form_builder.rb
@@ -277,4 +278,3 @@ test_files:
 - spec/requests/attachments_controller_spec.rb
 - spec/spec_helper.rb
 - spec/uploader_spec.rb
-has_rdoc: