uploadcare-rails 1.1.0 → 1.1.1

data/spec/generators/uploadcare_config_generator_spec.rb

@@ -0,0 +1,39 @@
+require 'yaml'
+require_relative '../support/generators'
+require 'generators/uploadcare_config_generator'
+
+RSpec.describe UploadcareConfigGenerator, :type => :generator do
+  destination File.expand_path('../tmp', __dir__)
+  let(:config_file_path) { 'spec/tmp/config/uploadcare.yml' }
+  let(:defaults) do
+    {
+      "public_key"=>"demopublickey",
+      "private_key"=>"demoprivatekey",
+      "live"=>true, "cache_files"=>true,
+      "cache_groups"=>true,
+      "store_after_save"=>true,
+      "delete_after_destroy"=>true,
+    }
+  end
+
+  before do
+    prepare_destination
+    expect(File.exists?(config_file_path)).to be(false)
+    run_generator
+  end
+
+  it "generates config/uploadcare.yml" do
+    expect(File.exists?(config_file_path)).to be(true)
+  end
+
+  it "config/uploadcare.yml contains default config" do
+    expect(YAML.load_file(config_file_path)).to eq(
+      "defaults" => defaults,
+      "development" => defaults,
+      "production" => defaults,
+      "test" => defaults,
+    )
+  end
+end
+
+

data/spec/helpers/form_helpers_has_file_spec.rb

@@ -10,21 +10,21 @@ describe Uploadcare::Rails::ActionView::FormBuilder, type: :helper do
     # not that post has uc file
     tag = @form.uploadcare_field :file
     tag.should be_kind_of(String)
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "false")
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="false"]', visible: :all)
   end
 
   it "should override uploadcare- attribute" do
     tag = @form.uploadcare_field :file, :uploadcare => {:multiple => true}
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "false")
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="false"]', visible: :all)
   end
 
   it "should override data- attribute" do
     tag = @form.uploadcare_field :file, :data => {:multiple => true}
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "false")
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="false"]', visible: :all)
   end
 
   it "should override data- and uploadcare- attributes" do
     tag = @form.uploadcare_field :file, :data => {:multiple => true}, :uploadcare => {:multiple => true}
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "false")
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="false"]', visible: :all)
   end
-end
+end

data/spec/helpers/form_helpers_has_group_spec.rb

@@ -9,22 +9,22 @@ describe Uploadcare::Rails::ActionView::FormBuilder, type: :helper do
   it "should include uploader tag for name" do
     # not that post has uc file
     tag = @form.uploadcare_field :file
-    tag.should be_kind_of(String)
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "true")
+    expect(tag).to be_kind_of(String)
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="true"]', visible: :all)
   end
 
   it "should override uploadcare- attribute" do
     tag = @form.uploadcare_field :file, :uploadcare => {:multiple => false}
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "true")
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="true"]', visible: :all)
   end
 
   it "should override data- attribute" do
     tag = @form.uploadcare_field :file, :data => {:multiple => false}
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "true")
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="true"]', visible: :all)
   end
 
   it "should override data- and uploadcare- attributes" do
     tag = @form.uploadcare_field :file, :data => {:multiple => false}, :uploadcare => {:multiple => false}
-    tag.should have_selector("input", :type => "hidden", "data-multiple" => "true")
+    expect(tag).to have_selector('input[type="hidden"][data-multiple="true"]', visible: :all)
   end
-end
+end

data/spec/helpers/form_helpers_spec.rb

@@ -13,21 +13,21 @@ describe Uploadcare::Rails::ActionView::FormBuilder, type: :helper do
 
   it "should have role attr" do
     tag = @form.uploadcare_field :file, :uploadcare => {:multiple => true}
-    tag.should have_selector("input", :role => "uploadcare-uploader")
+    expect(tag).to have_selector('input[role="uploadcare-uploader"]', visible: :all)
   end
 
   it "should have custom data-attributes" do
     tag = @form.uploadcare_field :file, :data => {:custom => true}
-    tag.should have_selector("input", "data-custom" => "true")
+    expect(tag).to have_selector('input[data-custom="true"]', visible: :all)
   end
 
   it "should have uploadcare namespace translated into data- attributes" do
     tag = @form.uploadcare_field :file, :uploadcare => {:custom => true}
-    tag.should have_selector("input", "data-custom" => "true")
+    expect(tag).to have_selector('input[data-custom="true"]', visible: :all)
   end
 
   it "should override data namespace with uploadcare namespace" do
     tag = @form.uploadcare_field :file, :uploadcare => {:custom => true}, :data => {:custom => false}
-    tag.should have_selector(:input, "data-custom" => "true")
+    expect(tag).to have_selector('input[data-custom="true"]', visible: :all)
   end
-end
+end

data/spec/helpers/formtastic_spec.rb

@@ -1,32 +1,25 @@
 require "spec_helper"
 
-begin
-  req = require 'formtastic' 
-rescue Exception => e
-  req = nil
-end
-
-if req
-  require 'uploadcare/rails/formtastic/formtastic'
-  describe "Uploadcare::Rails::Formtastic", type: :helper  do
-    before :each  do
-      @post = Post.new
-      @form = Formtastic::FormBuilder.new(:post, @post, helper, {})
-    end
+describe "Uploadcare::Rails::Formtastic", type: :helper  do
+  before :each  do
+    @post = Post.new
+    @form = Formtastic::FormBuilder.new(:post, @post, helper, {})
+  end
 
-    it 'should create smart uploader field' do
-      tag = @form.input :file, as: :uploadcare_uploader
-      tag.should have_selector("input", :role => "uploadcare-uploader")
-    end
+  it 'should create smart uploader field' do
+    tag = @form.input :file, as: :uploadcare_uploader
+    expect(tag).to have_selector('input[role="uploadcare-uploader"]', visible: :all)
+  end
 
-    it 'should create single uploader field' do
-      tag = @form.input :file, as: :uploadcare_single_uploader
-      tag.should have_selector("input", :role => "uploadcare-uploader", "data-multiple" => "false")
-    end
+  it 'should create single uploader field' do
+    tag = @form.input :file, as: :uploadcare_single_uploader
+    expect(tag)
+      .to have_selector('input[role="uploadcare-uploader"][data-multiple="false"]', visible: :all)
+  end
 
-    it 'should create multiple uploader field' do
-      tag = @form.input :file, as: :uploadcare_multiple_uploader
-      tag.should have_selector("input", :role => "uploadcare-uploader", "data-multiple" => "true")
-    end
+  it 'should create multiple uploader field' do
+    tag = @form.input :file, as: :uploadcare_multiple_uploader
+    expect(tag)
+      .to have_selector('input[role="uploadcare-uploader"][data-multiple="true"]', visible: :all)
   end
-end
+end

data/spec/helpers/include_tags_spec.rb

@@ -6,9 +6,9 @@ describe Uploadcare::Rails do
 
     expect(tag).to eq(
       [
-        "<script src=\"https://ucarecdn.com/widget/",
+        "<script src=\"https://ucarecdn.com/libs/widget/",
         UPLOADCARE_SETTINGS.widget_version,
-        '/uploadcare/uploadcare.min.js"></script>'
+        '/uploadcare.min.js"></script>'
       ].join
     )
   end
@@ -20,8 +20,8 @@ describe Uploadcare::Rails do
       tag = helper.include_uploadcare_widget_from_cdn(version: version)
 
       expect(tag).to eq(
-        "<script src=\"https://ucarecdn.com/widget/#{ version }/"\
-        'uploadcare/uploadcare.min.js"></script>'
+        "<script src=\"https://ucarecdn.com/libs/widget/#{ version }/"\
+        'uploadcare.min.js"></script>'
       )
     end
 
@@ -30,8 +30,8 @@ describe Uploadcare::Rails do
         helper.include_uploadcare_widget_from_cdn(version: version, min: false)
 
       expect(tag).to eq(
-        "<script src=\"https://ucarecdn.com/widget/#{ version }/"\
-        'uploadcare/uploadcare.js"></script>'
+        "<script src=\"https://ucarecdn.com/libs/widget/#{ version }/"\
+        'uploadcare.js"></script>'
       )
     end
   end
@@ -47,7 +47,7 @@ describe Uploadcare::Rails do
       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)
+        is_expected.to have_xpath("//script[text()[contains(.,'UPLOADCARE')]]", visible: :all)
       end
     end
   end

data/spec/helpers/simple_form_spec.rb

@@ -1,33 +1,25 @@
 require "spec_helper"
 
-begin
-  req = require 'simple_form' 
-rescue Exception => e
-  req = nil
-end
-
-if req
-  require 'uploadcare/rails/simple_form/simple_form'
-  
-  describe "Uploadcare::Rails::SimpleForm", type: :helper  do
-    before :each  do
-      @post = Post.new
-      @form = SimpleForm::FormBuilder.new(:post, @post, helper, {})
-    end
+describe "Uploadcare::Rails::SimpleForm", type: :helper  do
+  before :each  do
+    @post = Post.new
+    @form = SimpleForm::FormBuilder.new(:post, @post, helper, {})
+  end
 
-    it 'should create smart uploader field' do
-      tag = @form.input :file, as: :uploadcare_uploader
-      tag.should have_selector("input", :role => "uploadcare-uploader")
-    end
+  it 'should create smart uploader field' do
+    tag = @form.input :file, as: :uploadcare_uploader
+    expect(tag).to have_selector('input[role="uploadcare-uploader"]', visible: :all)
+  end
 
-    it 'should create single uploader field' do
-      tag = @form.input :file, as: :uploadcare_single_uploader
-      tag.should have_selector("input", :role => "uploadcare-uploader", "data-multiple" => "false")
-    end
+  it 'should create single uploader field' do
+    tag = @form.input :file, as: :uploadcare_single_uploader
+    expect(tag)
+      .to have_selector('input[role="uploadcare-uploader"][data-multiple="false"]', visible: :all)
+  end
 
-    it 'should create multiple uploader field' do
-      tag = @form.input :file, as: :uploadcare_multiple_uploader
-      tag.should have_selector("input", :role => "uploadcare-uploader", "data-multiple" => "true")
-    end
+  it 'should create multiple uploader field' do
+    tag = @form.input :file, as: :uploadcare_multiple_uploader
+    expect(tag)
+      .to have_selector('input[role="uploadcare-uploader"][data-multiple="true"]', visible: :all)
   end
-end 
+end

data/spec/helpers/uploader_tags_spec.rb

@@ -1,15 +1,21 @@
 require "spec_helper"
 
 describe Uploadcare::Rails::ActionView::UploaderTags do
+  let(:expected_selector) do
+    'input[type="hidden"][role="uploadcare-uploader"][data-path-value="true"]'
+  end
+
   it "should include uploader tag for name" do
     tag = helper.uploadcare_uploader_tag :file
-    tag.should be_kind_of(String)
-    tag.should have_selector("input", :type =>"hidden", :role =>"uploadcare-uploader", "data-path-value" => "true")
+
+    expect(tag).to be_kind_of(String)
+    expect(tag).to have_selector(expected_selector, visible: :all)
   end
 
   it "should include uploader field for object" do
     tag = helper.uploadcare_uploader_field :post, :file
-    tag.should be_kind_of(String)
-    tag.should have_selector("input", :type =>"hidden", :role =>"uploadcare-uploader", "data-path-value" => "true")
+
+    expect(tag).to be_kind_of(String)
+    expect(tag).to have_selector(expected_selector, visible: :all)
   end
-end
+end

data/spec/objects/group_spec.rb

@@ -42,10 +42,10 @@ describe Uploadcare::Rails::Group, :vcr do
     end
 
     it 'builds images url' do
-      expect(subject.urls(size: '200x200').first).
-        to eq(
-          "http://www.ucarecdn.com/#{ subject.uuid }/nth/0/-/resize/200x200/"
-        )
+      allow_any_instance_of(Uploadcare::Api).to receive(:options) { {static_url_base: 'http://example.com'} }
+      expected = "http://example.com/#{ subject.uuid }/nth/0/-/resize/200x200/"
+
+      expect(subject.urls(size: '200x200').first).to eq(expected)
     end
   end
 end

data/spec/support/generators.rb

@@ -0,0 +1,38 @@
+require 'rails/generators/test_case'
+
+module Uploadcare
+  module Rails
+    module Generators
+      extend ActiveSupport::Concern
+
+      included do
+        cattr_accessor :test_case, :test_case_instance
+
+        self.test_case = Class.new(::Rails::Generators::TestCase) do
+          def fake_test_case; end
+          def add_assertion; end
+        end
+        self.test_case_instance = self.test_case.new(:fake_test_case)
+        self.test_case.generator_class = described_class
+      end
+
+      def prepare_destination
+        self.test_case_instance.send :prepare_destination
+      end
+
+      def run_generator
+        self.test_case_instance.run_generator
+      end
+
+      module ClassMethods
+        def destination(path)
+          self.test_case.destination_root = path
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.include Uploadcare::Rails::Generators, type: :generator
+end

data/spec/tmp/config/uploadcare.yml

@@ -0,0 +1,71 @@
+defaults: &defaults
+  public_key: "demopublickey" # replace it with your public key
+  private_key: "demoprivatekey" # replace it with your private key
+
+  # instances of widget initialized for you on page load
+  live: true
+  
+  # cache files json dumps to prevent calling to server if it posible
+  cache_files: true
+
+  # cache groups json dumps to prevent calling to server if it posible
+  cache_groups: true
+
+  # store file or group after model is created or updated
+  store_after_save: true
+
+  # deletes file or group after model object is deleted
+  delete_after_destroy: true
+
+  # Avaliable options are listed at https://uploadcare.com/documentation/widget/#advanced-configuration
+  # please note, that for options marker as Global: N/A - there is no practical meaning
+  # of putting this option here, as it will not have any effect. 
+  # But it also will not break anything.
+
+  # for preview step use:
+  # preview_step: false # true or false
+
+  # for clearable option (allows user to remove uploaded file from widget) use:
+  # clearable: false # true or false
+
+  # for setting tabs use tabs option:
+  # tabs: "url file facebook" # etc
+  # read more here: https://uploadcare.com/documentation/widget/#tabs
+  # 
+  #   Full list of tabs: 
+  # |----------------------------------------|
+  # | Code       | File Source     | Default |
+  # |------------|-----------------|---------|
+  # | url        | Any URL         | On      |
+  # | file       | Local disk      | On      |
+  # | facebook   | Facebook        | On      |
+  # | dropbox    | Dropbox         | Off     |
+  # | gdrive     | Google Drive    | On      |
+  # | box        | Box             | On      |
+  # | skydrive   | SkyDrive        | On      |
+  # | instagram  | Instagram       | On      |
+  # | evernote   | Evernote        | On      |
+  # | vk         | VK              | Off     |
+  # |________________________________________|
+
+  # for locale option use:
+  # locale: "en"
+
+  # for autostore option use:
+  # autostore: true #true or false
+
+  # for manual start (which means you will need to initialize uploaders yourself) use:
+  # manual_start: false # true or false
+
+  # for path value use:
+  # path_value: true # true or false
+  # (important for input values - see https://uploadcare.com/documentation/widget/#input-value)
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults