RubyGems - uploadcare-rails - Versions diffs - 1.0.6 → 1.1.0 - Mend

uploadcare-rails 1.0.6 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

checksums.yaml +4 -4
data/config/initializers/uploadcare.rb +22 -23
data/lib/uploadcare-rails.rb +6 -5
data/lib/uploadcare/rails/action_view/include_tags.rb +35 -26
data/lib/uploadcare/rails/action_view/uploader_tags.rb +31 -29
data/lib/uploadcare/rails/active_record/has_file.rb +14 -26
data/lib/uploadcare/rails/active_record/has_group.rb +23 -22
data/lib/uploadcare/rails/active_record/has_object.rb +3 -4
data/lib/uploadcare/rails/engine.rb +3 -3
data/lib/uploadcare/rails/formtastic/formtastic.rb +19 -15
data/lib/uploadcare/rails/objects/file.rb +13 -25
data/lib/uploadcare/rails/objects/group.rb +45 -22
data/lib/uploadcare/rails/operations.rb +57 -0
data/lib/uploadcare/rails/settings.rb +26 -30
data/lib/uploadcare/rails/simple_form/simple_form.rb +22 -20
data/lib/uploadcare/rails/version.rb +1 -1
data/spec/caching/file_caching_spec.rb +16 -24
data/spec/caching/group_caching_spec.rb +23 -26
data/{app → spec/dummy/app}/assets/javascripts/uploadcare-1.5.5.min.js +0 -0
data/spec/dummy/app/views/layouts/application.html.erb +2 -2
data/spec/dummy/config/routes.rb +2 -2
data/spec/helpers/include_tags_spec.rb +41 -29
data/spec/models/has_both_file_and_group_spec.rb +19 -17
data/spec/models/has_file_spec.rb +46 -47
data/spec/models/has_group_spec.rb +46 -32
data/spec/objects/file_spec.rb +9 -11
data/spec/objects/group_spec.rb +40 -29
data/spec/operations_spec.rb +28 -0
data/spec/spec_helper.rb +17 -5
metadata +235 -199
data/MIT-LICENSE +0 -20
data/app/assets/javascripts/uploadcare-0.17.0.js +0 -8248
data/app/assets/javascripts/uploadcare-0.17.0.min.js +0 -17
data/app/assets/javascripts/uploadcare-0.18.3.js +0 -8484
data/app/assets/javascripts/uploadcare-0.18.3.min.js +0 -17
data/app/assets/javascripts/uploadcare-1.0.1.js +0 -8430
data/app/assets/javascripts/uploadcare-1.0.1.min.js +0 -17
data/app/assets/javascripts/uploadcare-1.3.1.js +0 -8563
data/app/assets/javascripts/uploadcare-1.3.1.min.js +0 -17
data/app/assets/javascripts/uploadcare-1.5.5.js +0 -9278
data/app/assets/javascripts/uploadcare.js +0 -1
data/spec/dummy/db/test.sqlite3 +0 -0
data/spec/dummy/log/development.log +0 -0
data/spec/dummy/log/test.log +0 -2166

data/lib/uploadcare/rails/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Uploadcare
   module Rails
-    VERSION = "1.0.6"
+    VERSION = '1.1.0'
   end
 end

data/spec/caching/file_caching_spec.rb CHANGED

@@ -1,34 +1,26 @@
-require "spec_helper"
+require 'spec_helper'
-describe Uploadcare::Rails::File do
+describe Uploadcare::Rails::File, :vcr do
+  let(:post) { Post.new(title: 'Post title', file: FILE_CDN_URL) }
-  before :each do
-    @post = Post.new title: "Post title", file: FILE_CDN_URL
+  context 'when object is not persisted' do
+    it 'its file is not loaded' do
+      expect(post.file).not_to be_loaded
+    end
   end
-  after :each do
-    Rails.cache.delete FILE_CDN_URL
-  end
-  it "should be not loaded by default" do
-    @post.file.loaded?.should == false
-  end
-  it "rails cache for unloaded file should be nil" do
-    cached = Rails.cache.read @post.file.cdn_url
-    cached.should == nil
-  end
+  skip { expect(Rails.cache.read(post.file.cdn_url)).to be_nil }
-  it "rails cache should updates after load call" do
-    @post.file.load!
+  skip 'rails cache should updates after load call' do
+    post.file.load!
     cached = Rails.cache.read FILE_CDN_URL
     cached.should be_kind_of(Hash)
-    cached["datetime_uploaded"].should be_kind_of(String)
+    cached['datetime_uploaded'].should be_kind_of(String)
   end
-  it "file should stay loaded" do
-    @post.file.loaded?.should == false
-    @post.file.load!
-    @post.file.loaded?.should == true
+  skip 'file should stay loaded' do
+    post.file.loaded?.should == false
+    post.file.load!
+    post.file.loaded?.should == true
   end
-end
+end

data/spec/caching/group_caching_spec.rb CHANGED

@@ -1,43 +1,40 @@
-require "spec_helper"
+require 'spec_helper'
-describe Uploadcare::Rails::Group do
-  before :each do
-    @post = PostWithCollection.new title: "Post title", file: GROUP_CDN_URL
-  end
+describe Uploadcare::Rails::Group, :vcr do
+  let(:post)  { PostWithCollection.new(title: 'Title', file: GROUP_CDN_URL) }
   after :each do
-    Rails.cache.delete GROUP_CDN_URL
+    Rails.cache.delete(GROUP_CDN_URL)
   end
-  it "should be not loaded by default" do
-    @post.file.loaded?.should == false
+  it 'should be not loaded by default' do
+    expect(post.file).not_to be_loaded
   end
-  it "rails cache should be nil" do
-    cached = Rails.cache.read @post.file.cdn_url
-    cached.should == nil
+  it 'rails cache should be nil' do
+    expect(Rails.cache.read(post.file.cdn_url)).to be_nil
   end
-  it "rails cache should updates after load call" do
-    @post.file.load!
+  it 'rails cache should updates after load call' do
+    post.file.load!
     cached = Rails.cache.read GROUP_CDN_URL
-    cached.should be_kind_of(Hash)
-    cached["datetime_created"].should be_kind_of(String)
+    expect(cached).to be_a(Hash)
+    expect(cached['datetime_created']).to be_a(String)
   end
-  it "group should stay loaded" do
-    @post.file.loaded?.should == false
-    @post.file.load!
-    @post.file.loaded?.should == true
+  it 'group should stay loaded' do
+    expect(post.file).not_to be_loaded
+    post.file.load!
+    expect(post.file).to be_loaded
   end
-  it 'cached group should contained json representation of files' do
-    @post.file.load!
+  it 'cached group should contained json representation of files',
+    vcr: { cassette_name: 'group_cahsing_file_load'} do
+    post.file.load!
     cached = Rails.cache.read GROUP_CDN_URL
-    cached.should be_kind_of(Hash)
-    cached["files"].sample.should be_kind_of(Hash)
-  end
-  it 'group restored from cache should contain Uploadcare::Rails::Files' do
+    expect(cached).to be_a(Hash)
+    expect(cached['files'].sample).to be_a(Hash)
   end
-end
+end

data/{app → spec/dummy/app}/assets/javascripts/uploadcare-1.5.5.min.js RENAMED

File without changes

data/spec/dummy/app/views/layouts/application.html.erb CHANGED

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= stylesheet_link_tag :application, media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag :application, 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
   <%= include_uploadcare_widget_from_cdn %>
   <%= uploadcare_settings %>

data/spec/dummy/config/routes.rb CHANGED

@@ -1,10 +1,10 @@
 Dummy::Application.routes.draw do
   resources :posts_with_collection_and_files
-  root to: "posts#index"
+  root to: "posts#new"
   resources :posts
   resources :post_with_collections
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

data/spec/helpers/include_tags_spec.rb CHANGED

@@ -1,42 +1,54 @@
 require 'spec_helper'
 describe Uploadcare::Rails do
-  it "should include widget from cdn" do
+  it 'includes widget from cdn' do
     tag = helper.include_uploadcare_widget_from_cdn
-    tag.should be_kind_of(String)
-    tag.should == ("<script src=\"https://ucarecdn.com/widget/#{UPLOADCARE_SETTINGS.widget_version}/uploadcare/uploadcare-#{UPLOADCARE_SETTINGS.widget_version}.min.js\"></script>")
+    expect(tag).to eq(
+      [
+        "<script src=\"https://ucarecdn.com/widget/",
+        UPLOADCARE_SETTINGS.widget_version,
+        '/uploadcare/uploadcare.min.js"></script>'
+      ].join
+    )
   end
-  it "should specify widget version" do
-    version = "0.13.3"
+  describe 'for specifyed version' do
+    let(:version) { '0.13.3' }
-    tag = helper.include_uploadcare_widget_from_cdn({version: version})
-    tag.should == ("<script src=\"https://ucarecdn.com/widget/#{version}/uploadcare/uploadcare-#{version}.min.js\"></script>")
-  end
+    it 'uses widget version' do
+      tag = helper.include_uploadcare_widget_from_cdn(version: version)
-  it "should load not minified version" do
-    version = "0.13.3"
-    min = false
+      expect(tag).to eq(
+        "<script src=\"https://ucarecdn.com/widget/#{ version }/"\
+        'uploadcare/uploadcare.min.js"></script>'
+      )
+    end
-    tag = helper.include_uploadcare_widget_from_cdn({version: version, min: min})
-    tag.should == ("<script src=\"https://ucarecdn.com/widget/#{version}/uploadcare/uploadcare-#{version}.js\"></script>")
-  end
+    it 'loads not minified version' do
+      tag =
+        helper.include_uploadcare_widget_from_cdn(version: version, min: false)
-  it "should return js settings" do
-    settings = helper.uploadcare_settings
-    settings.should be_kind_of(String)
-    settings.should_not be_empty
+      expect(tag).to eq(
+        "<script src=\"https://ucarecdn.com/widget/#{ version }/"\
+        'uploadcare/uploadcare.js"></script>'
+      )
+    end
   end
-  it "should include all uplaodcare settings" do
-    settings = helper.uploadcare_settings
-    settings.should have_selector("script", :content => "UPLOADCARE_PUBLIC_KEY")
-    settings.should have_selector("script", :content => "UPLOADCARE_LOCALE")
-    settings.should have_selector("script", :content => "UPLOADCARE_PREVIEW_STEP")
-    settings.should have_selector("script", :content => "UPLOADCARE_CLEARABLE")
-    settings.should have_selector("script", :content => "UPLOADCARE_TABS")
-    settings.should have_selector("script", :content => "UPLOADCARE_AUTOSTORE")
-    settings.should have_selector("script", :content => "UPLOADCARE_MANUAL_START")
-    settings.should have_selector("script", :content => "UPLOADCARE_PATH_VALUE")
+  describe 'uploadcare settings' do
+    let(:subject) { helper.uploadcare_settings }
+    it { is_expected.to be_a(String) }
+    it { is_expected.not_to be_empty }
+    %w(
+      UPLOADCARE_LOCALE UPLOADCARE_PREVIEW_STEP
+      UPLOADCARE_PUBLIC_KEY UPLOADCARE_CLEARABLE
+      UPLOADCARE_TABS UPLOADCARE_AUTOSTORE
+      UPLOADCARE_MANUAL_START UPLOADCARE_PATH_VALUE).each do |content|
+      it 'contains expected selector' do
+        is_expected.to have_selector('script', content: content)
+      end
+    end
   end
-end
+end

data/spec/models/has_both_file_and_group_spec.rb CHANGED

@@ -1,12 +1,12 @@
 require "spec_helper"
 describe :has_both_file_and_group_spec do
-  before :each do
-    @post = PostsWithCollectionAndFile.new title: "Post title",
-      group: GROUP_CDN_URL,
-      file: FILE_CDN_URL
-    @file_method = "file"
-    @group_method = "group"
+  let(:subject) do
+    PostsWithCollectionAndFile.new(
+      title: "Post title",
+      group: GROUP_CDN_URL,
+      file: FILE_CDN_URL
+    )
   end
   after :each do
@@ -14,28 +14,30 @@ describe :has_both_file_and_group_spec do
     Rails.cache.delete GROUP_CDN_URL
   end
+  it 'creates empty post' do
+    expect(PostsWithCollectionAndFile.create).to be_persisted
+  end
   it "should respond to has_uploadcare_file? method" do
-    @post.should respond_to("has_#{@file_method}_as_uploadcare_file?".to_sym)
-    @post.should respond_to("has_#{@file_method}_as_uploadcare_file?".to_sym)
+    is_expected.to respond_to("has_file_as_uploadcare_file?".to_sym)
   end
   it "should respond to has_uploadcare_group? method" do
-    @post.should respond_to("has_#{@group_method}_as_uploadcare_group?".to_sym)
-    @post.should respond_to("has_#{@group_method}_as_uploadcare_group?".to_sym)
+    is_expected.to respond_to("has_group_as_uploadcare_group?".to_sym)
   end
   it ":has_uploadcare_file? should return true" do
-    @post.has_file_as_uploadcare_file?.should   == true
-    @post.has_group_as_uploadcare_group?.should == true
+    is_expected.to be_has_file_as_uploadcare_file
+    is_expected.to be_has_group_as_uploadcare_group
   end
   it ":has_uploadcare_group? should return false" do
-    @post.has_group_as_uploadcare_file?.should == false
-    @post.has_file_as_uploadcare_group?.should == false
+    is_expected.not_to be_has_group_as_uploadcare_file
+    is_expected.not_to be_has_file_as_uploadcare_group
   end
   it "should have uploadcare file" do
-    @post.group.should be_kind_of(Uploadcare::Rails::Group)
-    @post.file.should be_kind_of(Uploadcare::Rails::File)
+    expect(subject.group).to be_an(Uploadcare::Rails::Group)
+    expect(subject.file).to be_an(Uploadcare::Rails::File)
   end
-end
+end

data/spec/models/has_file_spec.rb CHANGED

@@ -1,47 +1,46 @@
-require "spec_helper"
-describe :has_uploadcare_file do
-  before :each do
-    @post = Post.new title: "Post title", file: FILE_CDN_URL
-    @method = "file"
-  end
-  after :each do
-    Rails.cache.delete FILE_CDN_URL
-  end
-  it "should respond to has_uploadcare_file? method" do
-    @post.should respond_to("has_#{@method}_as_uploadcare_file?".to_sym)
-  end
-  it "should respond to has_uploadcare_group? method" do
-    @post.should respond_to("has_#{@method}_as_uploadcare_group?".to_sym)
-  end
-  it ":has_uploadcare_file? should return true" do
-    @post.has_file_as_uploadcare_file?.should == true
-  end
-  it ":has_uploadcare_group? should return false" do
-    @post.has_file_as_uploadcare_group?.should == false
-  end
-  it "should have uploadcare file" do
-    @post.file.should be_kind_of(Uploadcare::Rails::File)
-  end
-  it "file should not be loaded by default" do
-    @post.file.loaded?.should == false
-  end
-  it 'file should be stored after save' do
-    @post.save
-    @post.file.stored?.should == true
-  end
-  it 'file should be deleted after destroy' do
-    @post.save if @post.new_record?
-    @post.destroy
-    @post.file.deleted?.should == true
-  end
-end
+require 'spec_helper'
+describe :has_uploadcare_file, :vcr do
+  let(:post) { Post.new(title: 'Post title', file: FILE_CDN_URL) }
+  let(:subject) { post }
+  let(:method) { 'file' }
+  describe 'object with uploadcare_file' do
+    it 'creates blank post' do
+      Post.create!
+    end
+    it 'responds to has_uploadcare_file? method' do
+      is_expected.to respond_to(:has_file_as_uploadcare_file?)
+    end
+    it 'responds to has_uploadcare_group? method' do
+      is_expected.to respond_to(:has_file_as_uploadcare_group?)
+    end
+    it 'has Uploadcare::Rails::File' do
+      expect(post.file).to be_an(Uploadcare::Rails::File)
+    end
+    it 'stores file after save' do
+      post.save
+      expect(post.file).to be_stored
+    end
+    it 'deletes file after destroy',
+      vcr: 'has_upload_care_file_destroy_file' do
+      post.save
+      post.destroy
+      expect(post.file).to be_deleted
+    end
+  end
+  context 'instanse methods' do
+    it '#has_uploadcare_file? returns true' do
+      expect(post.has_file_as_uploadcare_file?).to be_truthy
+    end
+    it '#has_uploadcare_group? returns false' do
+      expect(post.has_file_as_uploadcare_group?).to be_falsey
+    end
+  end
+end

data/spec/models/has_group_spec.rb CHANGED

@@ -1,43 +1,57 @@
-require "spec_helper"
+require 'spec_helper'
-describe :has_uploadcare_group do
-  before :each do
-    @post = PostWithCollection.new title: "Post title", file: GROUP_CDN_URL
-    @method = "file"
-  end
+describe :has_uploadcare_group, :vcr do
+  let(:post) { PostWithCollection.new(title: 'Title', file: GROUP_CDN_URL) }
+  let(:method) { 'file' }
-  it "should respond to has_uploadcare_file? method" do
-    @post.should respond_to("has_#{@method}_as_uploadcare_file?".to_sym)
+  after :each do
+    Rails.cache.delete(GROUP_CDN_URL)
   end
-  it "should respond to has_uploadcare_group? method" do
-    @post.should respond_to("has_#{@method}_as_uploadcare_group?".to_sym)
-  end
+  describe 'object with group' do
+    let(:subject) { post }
+    it 'should respond to has_uploadcare_file? method' do
+      is_expected.to respond_to('has_file_as_uploadcare_file?'.to_sym)
+    end
-  it ":has_uploadcare_file? should return true" do
-    @post.has_file_as_uploadcare_file?.should == false
-  end
+    it 'should respond to has_uploadcare_group? method' do
+      is_expected.to respond_to('has_file_as_uploadcare_group?'.to_sym)
+    end
-  it ":has_uploadcare_group? should return false" do
-    @post.has_file_as_uploadcare_group?.should == true
-  end
+    it ':has_uploadcare_file? should return true' do
+      is_expected.not_to be_has_file_as_uploadcare_file
+    end
-  it "should have uploadcare file" do
-    @post.file.should be_kind_of(Uploadcare::Rails::Group)
+    it ':has_uploadcare_group? should return false' do
+      is_expected.to be_has_file_as_uploadcare_group
+    end
   end
-  it "file should not be loaded by default" do
-    @post.file.loaded?.should == false
-  end
+  describe 'object attachment' do
+    let(:subject) { post.file }
-  it 'file should be stored after save' do
-    @post.save
-    @post.file.stored?.should == true
-  end
+    it 'should have uploadcare file' do
+      is_expected.to be_an(Uploadcare::Rails::Group)
+    end
+    it 'dont loads group by default' do
+      is_expected.not_to be_loaded
+    end
+    it 'contains files inside' do
+      expect(subject.load.files.last).to be_an(Uploadcare::Rails::File)
+    end
-  # it 'file should be deleted after destroy' do
-  #   @post.save if @post.new_record?
-  #   @post.destroy
-  #   @post.file.deleted?.should == true
-  # end
-end
+    it 'stores group after save', vcr: { cassette_name: 'has_uploadcare_group_save' } do
+      post.save
+      is_expected.to be_stored
+    end
+    skip 'deleteds group after destroy' do
+      post.save
+      post.file.load
+      post.destroy
+      expect(post.file).to be_deleted
+    end
+  end
+end