refinerycms-resources 2.1.5 → 3.0.0

data/spec/models/refinery/resource_spec.rb

@@ -1,80 +1,109 @@
 require 'spec_helper'
 
 module Refinery
-  describe Resource do
+  describe Resource, :type => :model do
     let(:resource) { FactoryGirl.create(:resource) }
+    let(:titled_resource) { FactoryGirl.create(:resource, resource_title: 'Resource Title')}
 
     context "with valid attributes" do
       it "should create successfully" do
-        resource.errors.should be_empty
+        expect(resource.errors).to be_empty
       end
     end
 
     context "resource url" do
       it "should respond to .url" do
-        resource.should respond_to(:url)
+        expect(resource).to respond_to(:url)
       end
 
       it "should not support thumbnailing like images do" do
-        resource.should_not respond_to(:thumbnail)
+        expect(resource).not_to respond_to(:thumbnail)
       end
 
       it "should contain its filename at the end" do
-        resource.url.split('/').last.should == resource.file_name
+        expect(resource.url.split('/').last).to match(/\A#{resource.file_name}/)
+      end
+
+      context "when Dragonfly.verify_urls is true" do
+        before do
+          allow(Refinery::Resources).to receive(:dragonfly_verify_urls).and_return(true)
+          ::Refinery::Resources::Dragonfly.configure!
+        end
+
+        it "returns a url with an SHA parameter" do
+          expect(resource.url).to match(/\?sha=[\da-fA-F]{16}\z/)
+        end
+      end
+
+      context "when Dragonfly.verify_urls is false" do
+        before do
+          allow(Refinery::Resources).to receive(:dragonfly_verify_urls).and_return(false)
+          ::Refinery::Resources::Dragonfly.configure!
+        end
+        it "returns a url without an SHA parameter" do
+          expect(resource.url).not_to match(/\?sha=[\da-fA-F]{16}\z/)
+        end
       end
     end
 
     describe "#type_of_content" do
       it "returns formated mime type" do
-        resource.type_of_content.should == "text plain"
+        expect(resource.type_of_content).to eq("text plain")
       end
     end
 
     describe "#title" do
-      it "returns a titleized version of the filename" do
-        resource.title.should == "Refinery Is Awesome"
+      context 'when a specific title has not been given' do
+        it "returns a titleized version of the filename" do
+          expect(resource.title).to eq("Refinery Is Awesome")
+        end
+      end
+      context 'when a specific title has been given' do
+        it 'returns that title' do
+          expect(titled_resource.title).to eq('Resource Title')
+        end
       end
     end
 
     describe ".per_page" do
       context "dialog is true" do
         it "returns resource count specified by Resources.pages_per_dialog option" do
-          Resource.per_page(true).should == Resources.pages_per_dialog
+          expect(Resource.per_page(true)).to eq(Resources.pages_per_dialog)
         end
       end
 
       context "dialog is false" do
         it "returns resource count specified by Resources.pages_per_admin_index constant" do
-          Resource.per_page.should == Resources.pages_per_admin_index
+          expect(Resource.per_page).to eq(Resources.pages_per_admin_index)
         end
       end
     end
 
     describe ".create_resources" do
-      let(:file) { Refinery.roots(:'refinery/resources').join("spec/fixtures/refinery_is_awesome.txt") }
+      let(:file) { Refinery.roots('refinery/resources').join("spec/fixtures/refinery_is_awesome.txt") }
 
       context "only one resource uploaded" do
         it "returns an array containing one resource" do
-          Resource.create_resources(:file => file).should have(1).item
+          expect(Resource.create_resources(:file => file).size).to eq(1)
         end
       end
 
       context "many resources uploaded at once" do
         it "returns an array containing all those resources" do
-          Resource.create_resources(:file => [file, file, file]).should have(3).items
+          expect(Resource.create_resources(:file => [file, file, file]).size).to eq(3)
         end
       end
 
       specify "each returned array item should be an instance of resource" do
         Resource.create_resources(:file => [file, file, file]).each do |r|
-          r.should be_an_instance_of(Resource)
+          expect(r).to be_an_instance_of(Resource)
         end
       end
 
       specify "each returned array item should be passed form parameters" do
         params = {:file => [file, file, file], :fake_param => 'blah'}
 
-        Resource.should_receive(:create).exactly(3).times.with({:file => file, :fake_param => 'blah'})
+        expect(Resource).to receive(:create).exactly(3).times.with({:file => file, :fake_param => 'blah'})
         Resource.create_resources(params)
       end
     end
@@ -82,33 +111,33 @@ module Refinery
     describe "validations" do
       describe "valid #file" do
         before do
-          @file = Refinery.roots(:'refinery/resources').join("spec/fixtures/refinery_is_awesome.txt")
+          @file = Refinery.roots('refinery/resources').join("spec/fixtures/refinery_is_awesome.txt")
           Resources.max_file_size = (File.read(@file).size + 10)
         end
 
         it "should be valid when size does not exceed .max_file_size" do
-          Resource.new(:file => @file).should be_valid
+          expect(Resource.new(:file => @file)).to be_valid
         end
       end
 
       describe "too large #file" do
         before do
-          @file = Refinery.roots(:'refinery/resources').join("spec/fixtures/refinery_is_awesome.txt")
+          @file = Refinery.roots('refinery/resources').join("spec/fixtures/refinery_is_awesome.txt")
           Resources.max_file_size = (File.read(@file).size - 10)
           @resource = Resource.new(:file => @file)
         end
 
         it "should not be valid when size exceeds .max_file_size" do
-          @resource.should_not be_valid
+          expect(@resource).not_to be_valid
         end
 
         it "should contain an error message" do
           @resource.valid?
-          @resource.errors.should_not be_empty
-          @resource.errors[:file].should == Array(::I18n.t(
+          expect(@resource.errors).not_to be_empty
+          expect(@resource.errors[:file]).to eq(Array(::I18n.t(
             'too_big', :scope => 'activerecord.errors.models.refinery/resource',
                        :size => Resources.max_file_size
-          ))
+          )))
         end
       end
 
@@ -119,10 +148,10 @@ module Refinery
 
         it "has an error message" do
           @resource.valid?
-          @resource.errors.should_not be_empty
-          @resource.errors[:file].should == Array(::I18n.t(
+          expect(@resource.errors).not_to be_empty
+          expect(@resource.errors[:file]).to eq(Array(::I18n.t(
             'blank', :scope => 'activerecord.errors.models.refinery/resource'
-          ))
+          )))
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-resources
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,58 +10,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dragonfly
+  name: acts_as_indexed
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: acts_as_indexed
+  name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: globalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 3.0.0
 description: Handles all file upload and processing functionality in Refinery CMS.
-email: info@refinerycms.com
+email: refinerycms@p.arndt.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/refinery/admin/resources_controller.rb
-- app/helpers/refinery/admin/resources_helper.rb
 - app/models/refinery/resource.rb
 - app/views/refinery/admin/resources/_actions.html.erb
 - app/views/refinery/admin/resources/_existing_resource.html.erb
@@ -74,6 +93,7 @@ files:
 - app/views/refinery/admin/resources/insert.html.erb
 - app/views/refinery/admin/resources/new.html.erb
 - config/locales/bg.yml
+- config/locales/ca.yml
 - config/locales/cs.yml
 - config/locales/da.yml
 - config/locales/de.yml
@@ -83,6 +103,7 @@ files:
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/hu.yml
+- config/locales/id.yml
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ko.yml
@@ -105,6 +126,7 @@ files:
 - config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20100913234709_create_refinerycms_resources_schema.rb
+- db/migrate/20150430180959_add_translated_title_to_refinery_resources.rb
 - lib/generators/refinery/resources/resources_generator.rb
 - lib/generators/refinery/resources/templates/config/initializers/refinery/resources.rb.erb
 - lib/refinery/resources.rb
@@ -135,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -143,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Resources extension for Refinery CMS

data/app/helpers/refinery/admin/resources_helper.rb

@@ -1,6 +0,0 @@
-module Refinery
-  module Admin
-    module ResourcesHelper
-    end
-  end
-end