refinerycms-images 2.1.5 → 3.0.0

data/lib/refinery/images/engine.rb

@@ -8,17 +8,16 @@ module Refinery
 
       config.autoload_paths += %W( #{config.root}/lib )
 
-      initializer 'attach-refinery-images-with-dragonfly', :before => :build_middleware_stack do |app|
+      initializer 'attach-refinery-images-with-dragonfly', :before => :finisher_hook do |app|
         ::Refinery::Images::Dragonfly.configure!
         ::Refinery::Images::Dragonfly.attach!(app)
       end
 
-      initializer "register refinery_images plugin" do
+      before_inclusion do
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = 'refinery_images'
           plugin.menu_match = %r{refinery/image(_dialog)?s$}
-          plugin.activity = { :class_name => :'refinery/image' }
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_images_path }
         end
       end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005-2013 [Resolve Digital](http://www.resolvedigital.com)
+Copyright (c) 2005-2015 [Resolve Digital](http://resolve.digital)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/refinerycms-images.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Images extension for Refinery CMS}
   s.description       = %q{Handles all image upload and processing functionality in Refinery CMS.}
-  s.email             = %q{info@refinerycms.com}
+  s.email             = %q{refinerycms@p.arndt.io}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'dragonfly',        '~> 0.9.14'
-  s.add_dependency 'refinerycms-core', version
+  s.add_dependency 'dragonfly',               '~> 1.0.0'
+  s.add_dependency 'globalize',               ['>= 4.0.0', '< 5.2']
+  s.add_dependency 'refinerycms-core',        version
+
+  s.required_ruby_version = Refinery::Version.required_ruby_version
 end

data/spec/factories/image.rb

@@ -1,9 +1,13 @@
 FactoryGirl.define do
   factory :image, :class => ::Refinery::Image do
-    image Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
+    image Refinery.roots('refinery/images').join("spec/fixtures/beach.jpeg")
   end
 
   factory :alternate_image, :class => ::Refinery::Image do
-    image Refinery.roots(:'refinery/images').join("spec/fixtures/beach-alternate.jpeg")
+    image Refinery.roots('refinery/images').join("spec/fixtures/beach-alternate.jpeg")
+  end
+
+  factory :another_image, :class => ::Refinery::Image do
+    image Refinery.roots('refinery/images').join("spec/fixtures/fathead.png")
   end
 end

data/spec/features/refinery/admin/images_spec.rb

@@ -1,161 +1,74 @@
 require "spec_helper"
 
 module Refinery
-  describe "AdminImages" do
-    refinery_login_with :refinery_user
+  describe "the Admin Images Tab", type: :feature do
+    refinery_login
+    include_context 'admin images tab'
 
-    context "when no images" do
-      it "invites to add one" do
-        visit refinery.admin_images_path
-        page.should have_content(::I18n.t('no_images_yet', :scope => 'refinery.admin.images.records'))
-      end
-    end
+    context 'When there are no images' do
+      include_context 'no existing images'
 
-    it "shows add new image link" do
-      visit refinery.admin_images_path
-      page.should have_content(::I18n.t('create_new_image', :scope => 'refinery.admin.images.actions'))
-      page.should have_selector("a[href*='#{refinery.new_admin_image_path}']")
-    end
-
-    context "new/create" do
-      it "uploads image", :js => true do
+      it 'says there are no images' do
         visit refinery.admin_images_path
-
-        click_link ::I18n.t('create_new_image', :scope => 'refinery.admin.images.actions')
-
-        page.should have_selector 'iframe#dialog_iframe'
-
-        page.within_frame('dialog_iframe') do
-          attach_file "image_image", Refinery.roots(:'refinery/images').
-                                              join("spec/fixtures/image-with-dashes.jpg")
-          click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
-        end
-
-        page.should have_content(::I18n.t('created', :scope => 'refinery.crudify', :what => "'Image With Dashes'"))
-        Refinery::Image.count.should == 1
+        expect(page).to have_content(::I18n.t('no_images_yet', scope: 'refinery.admin.images.records'))
       end
 
-      it "cannot upload a pdf", :js => true do
-        visit refinery.admin_images_path
-
-        click_link ::I18n.t('create_new_image', :scope => 'refinery.admin.images.actions')
-
-        page.should have_selector 'iframe#dialog_iframe'
-
-        page.within_frame('dialog_iframe') do
-          attach_file "image_image", Refinery.roots(:'refinery/images').
-                                              join("spec/fixtures/cape-town-tide-table.pdf")
-          click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
-        end
-
-        page.within_frame('dialog_iframe') do
-          page.should have_content(::I18n.t('incorrect_format', :scope => 'activerecord.errors.models.refinery/image'))
-        end
-        Refinery::Image.count.should == 0
-      end
+      it_has_behaviour 'uploads images'
     end
 
-    context "new/create - insert mode" do
-      it "uploads image", :js => true do
-        visit refinery.insert_admin_images_path(:modal => true, :wymedtior => true)
-
-        attach_file "image_image", Refinery.roots(:'refinery/images').join("spec/fixtures/image-with-dashes.jpg")
-        click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
-
-        page.should have_selector('#existing_image_area', :visible => true)
-        Refinery::Image.count.should == 1
-      end
-
-      it "gets error message when uploading non-image", :js => true do
-        visit refinery.insert_admin_images_path(:modal => true, :wymedtior => true)
-
-        attach_file "image_image", Refinery.roots(:'refinery/images').join("spec/fixtures/cape-town-tide-table.pdf")
-        click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
-
-        page.should have_selector('#upload_image_area', :visible => true)
-        page.should have_content(::I18n.t('incorrect_format', :scope => 'activerecord.errors.models.refinery/image'))
-        Refinery::Image.count.should == 0
-      end
-
-      it "gets error message when uploading non-image (when an image already exists)", :js => true do
-        FactoryGirl.create(:image)
-        visit refinery.insert_admin_images_path(:modal => true, :wymedtior => true)
-
-        choose 'Upload'
-        attach_file "image_image", Refinery.roots(:'refinery/images').join("spec/fixtures/cape-town-tide-table.pdf")
-        click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
+    context 'When there is one image' do
+      include_context 'one image'
 
-        page.should have_selector('#upload_image_area', :visible => true)
-        page.should have_content(::I18n.t('incorrect_format', :scope => 'activerecord.errors.models.refinery/image'))
-        Refinery::Image.count.should == 1
-      end
+      it_has_behaviour 'indexes images'
+      it_has_behaviour 'shows list and grid views'
+      it_has_behaviour 'shows an image preview'
+      it_has_behaviour 'deletes an image'
+      it_has_behaviour 'edits an image'
+      it_has_behaviour 'uploads images'
+      it_has_behaviour 'translates an image'
     end
 
-    context "when an image exists" do
-      let!(:image) { FactoryGirl.create(:image) }
-
-      context "edit/update" do
-        it "updates image" do
-          visit refinery.admin_images_path
-          page.should have_selector("a[href='#{refinery.edit_admin_image_path(image)}']")
-
-          click_link ::I18n.t('edit', :scope => 'refinery.admin.images')
-
-          page.should have_content("Use current image or replace it with this one...")
-          page.should have_selector("a[href*='#{refinery.admin_images_path}']")
-
-          attach_file "image_image", Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
-          click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
-
-          page.should have_content(::I18n.t('updated', :scope => 'refinery.crudify', :what => "'Beach'"))
-          Refinery::Image.count.should == 1
-
-          lambda { click_link "View this image" }.should_not raise_error
-        end
-
-        it "doesn't allow updating if image has different file name" do
-          visit refinery.edit_admin_image_path(image)
+    context 'When there are many images' do
+      include_context 'many images'
 
-          attach_file "image_image", Refinery.roots(:'refinery/images').join("spec/fixtures/fathead.png")
-          click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
-
-          page.should have_content(::I18n.t("different_file_name",
-                                            :scope => "activerecord.errors.models.refinery/image"))
-        end
-      end
+      it_has_behaviour 'indexes images'
+      it_has_behaviour 'shows list and grid views'
+      it_has_behaviour 'paginates the list of images'
+      it_has_behaviour 'shows an image preview'
+      it_has_behaviour 'deletes an image'
+      it_has_behaviour 'uploads images'
+      it_has_behaviour 'edits an image'
+    end
+  end
 
-      context "destroy" do
-        it "removes image" do
-          visit refinery.admin_images_path
-          page.should have_selector("a[href='#{refinery.admin_image_path(image)}']")
+  describe 'Page Visual Editor - Add Image' do
 
-          click_link ::I18n.t('delete', :scope => 'refinery.admin.images')
+    refinery_login
 
-          page.should have_content(::I18n.t('destroyed', :scope => 'refinery.crudify', :what => "'Beach'"))
-          Refinery::Image.count.should == 0
-        end
-      end
+    include_context 'Visual Editor - add image'
 
-      context "download" do
-        it "succeeds" do
-          visit refinery.admin_images_path
+    context 'When there are no images' do
+      include_context 'no existing images'
+      it_has_behaviour 'uploads images'
+    end
 
-          lambda { click_link "View this image" }.should_not raise_error
-        end
-      end
+    context 'When there is one image' do
+      include_context 'one image'
 
-      describe "switch view" do
-        it "shows images in grid" do
-          visit refinery.admin_images_path
-          page.should have_content(::I18n.t('switch_to', :view_name => 'list', :scope => 'refinery.admin.images.index.view'))
-          page.should have_selector("a[href='#{refinery.admin_images_path(:view => 'list')}']")
+      it_has_behaviour 'indexes images'
+      it_has_behaviour 'paginates the list of images'
+      it_has_behaviour 'uploads images'
+      it_has_behaviour 'inserts images'
+    end
 
-          click_link "Switch to list view"
+    context 'When there are many images' do
+      include_context 'many images'
 
-          page.should have_content(::I18n.t('switch_to', :view_name => 'grid', :scope => 'refinery.admin.images.index.view'))
-          page.should have_selector("a[href='#{refinery.admin_images_path(:view => 'grid')}']")
-        end
-      end
+      it_has_behaviour 'indexes images'
+      it_has_behaviour 'paginates the list of images'
+      it_has_behaviour 'uploads images'
+      it_has_behaviour 'inserts images'
     end
+
   end
 end

data/spec/lib/generators/refinery/images/images_generator_spec.rb

@@ -13,7 +13,7 @@ module Refinery
     end
 
     specify do
-      destination_root.should have_structure {
+      expect(destination_root).to have_structure {
         directory "config" do
           directory "initializers" do
             directory "refinery" do

data/spec/lib/refinery/images/dragonfly_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Refinery
+
+  describe Dragonfly do
+    def configure_dragonfly(name, verify)
+      app = ::Dragonfly.app(name)
+
+      app.configure do
+        verify_urls verify
+      end
+    end
+
+    context 'when verify_urls is true' do
+      before do
+        configure_dragonfly(:app1, true)
+      end
+      it 'it is reflected in the dragonfly configuration' do
+        expect(Dragonfly.app(:app1).server.verify_urls).to be(true)
+      end
+    end
+
+    context 'when verify_urls is false' do
+      before do
+        configure_dragonfly(:app2, false)
+      end
+      it 'it is reflected in the dragonfly configuration' do
+        expect(Dragonfly.app(:app2).server.verify_urls).to be(false)
+      end
+    end
+
+  end
+end
+

data/spec/models/refinery/image_spec.rb

@@ -1,38 +1,42 @@
 require 'spec_helper'
 
 module Refinery
-  describe Image do
+  describe Image, :type => :model do
 
-    let(:image) { FactoryGirl.build(:image) }
+    let(:image)         { FactoryGirl.build(:image) }
     let(:created_image) { FactoryGirl.create(:image) }
+    let(:titled_image)  { FactoryGirl.create(:image, image_title: 'Image Title')}
+    let(:image_with_alt_text) { FactoryGirl.create(:image, image_alt: 'Alt Text')}
+    let(:image_with_sha) {FactoryGirl.create(:image)}
+    let(:image_without_sha) {FactoryGirl.create(:image)}
 
     describe "validations" do
       describe "valid #image" do
         before do
-          @file = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
-          Images.stub(:max_image_size).and_return(File.read(@file).size + 10.megabytes)
+          @file = Refinery.roots('refinery/images').join("spec/fixtures/beach.jpeg")
+          allow(Images).to receive(:max_image_size).and_return(File.read(@file).size + 10.megabytes)
         end
 
         it "should be valid when size does not exceed .max_image_size" do
-          Image.new(:image => @file).should be_valid
+          expect(Image.new(:image => @file)).to be_valid
         end
       end
 
       describe "too large #image" do
         before do
-          @file = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
-          Images.stub(:max_image_size).and_return(0)
+          @file = Refinery.roots('refinery/images').join("spec/fixtures/beach.jpeg")
+          allow(Images).to receive(:max_image_size).and_return(0)
           @image = Image.new(:image => @file)
         end
 
         it "should not be valid when size exceeds .max_image_size" do
-          @image.should_not be_valid
+          expect(@image).not_to be_valid
         end
 
         it "should contain an error message" do
           @image.valid?
-          @image.errors.should_not be_empty
-          @image.errors[:image].should == ["Image should be smaller than #{Images.max_image_size} bytes in size"]
+          expect(@image.errors).not_to be_empty
+          expect(@image.errors[:image]).to eq(["Image should be smaller than #{Images.max_image_size} bytes in size"])
         end
       end
 
@@ -43,51 +47,85 @@ module Refinery
 
         it "has an error message" do
           @image.valid?
-          @image.errors.should_not be_empty
-          @image.errors[:image].should == ["You must specify an image for upload"]
+          expect(@image.errors).not_to be_empty
+          expect(@image.errors[:image]).to eq(["You must specify an image for upload"])
         end
       end
 
       context "when image exists" do
         it "doesn't allow to replace it with image which has different file name" do
-          created_image.image = Refinery.roots(:'refinery/images').join("spec/fixtures/beach-alternate.jpeg")
-          created_image.should_not be_valid
-          created_image.should have_at_least(1).error_on(:image_name)
+          created_image.image = Refinery.roots('refinery/images').join("spec/fixtures/beach-alternate.jpeg")
+          expect(created_image).not_to be_valid
+          expect(created_image.errors.messages[:image_name].size).to be >= 1
         end
 
         it "allows to replace it with image which has the same file name" do
-          created_image.image = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
-          created_image.should be_valid
+          created_image.image = Refinery.roots('refinery/images').join("spec/fixtures/beach.jpeg")
+          expect(created_image).to be_valid
         end
       end
     end
 
-    context "image url" do
+    describe "image url" do
       it "responds to .thumbnail" do
-        image.should respond_to(:thumbnail)
+        expect(image).to respond_to(:thumbnail)
       end
 
       it "contains its filename at the end" do
-        created_image.url.split('/').last.should == created_image.image_name
+        expect(created_image.url.split('/').last).to match(/\A#{created_image.image_name}/)
       end
 
       it "becomes different when supplying geometry" do
-        created_image.url.should_not == created_image.thumbnail(:geometry => '200x200').url
+        expect(created_image.url).not_to eq(created_image.thumbnail(:geometry => '200x200').url)
       end
 
       it "has different urls for each geometry string" do
-        created_image.thumbnail(:geometry => '200x200').url.should_not == created_image.thumbnail(:geometry => '200x201').url
+        expect(created_image.thumbnail(:geometry => '200x200').url).not_to eq(created_image.thumbnail(:geometry => '200x201').url)
+      end
+
+      it "doesn't call thumb when geometry is nil" do
+        expect(created_image.image).not_to receive(:thumb)
+        created_image.thumbnail(geometry: nil)
       end
 
       it "uses right geometry when given a thumbnail name" do
         name, geometry = Refinery::Images.user_image_sizes.first
-        created_image.thumbnail(:geometry => name).url.should == created_image.thumbnail(:geometry => geometry).url
+        expect(created_image.thumbnail(:geometry => name).url).to eq(created_image.thumbnail(:geometry => geometry).url)
+      end
+
+      it "can strip a thumbnail" do
+        expect(created_image.thumbnail(:strip => true).url.blank?).to eq(false)
       end
+
+      it "can resize and strip a thumbnail" do
+        expect(created_image.thumbnail(:geometry => '200x200', :strip => true).url.blank?).to eq(false)
+      end
+
     end
 
     describe "#title" do
-      it "returns a titleized version of the filename" do
-        image.title.should == "Beach"
+      context 'when a specific title has not been given' do
+        it "returns a titleized version of the filename" do
+          expect(image.title).to eq("Beach")
+        end
+      end
+      context 'when a specific title has been given' do
+        it 'returns that title' do
+          expect(titled_image.title).to eq('Image Title')
+        end
+      end
+    end
+
+    describe "#alt" do
+      context 'when no alt attribute is given' do
+        it "returns the title" do
+          expect(image.alt).to eq(image.title)
+        end
+      end
+      context 'when an alt attribute is given' do
+        it 'returns that alt attribute' do
+          expect(image_with_alt_text.alt).to  eq('Alt Text')
+        end
       end
     end
 
@@ -95,70 +133,70 @@ module Refinery
       context "dialog is true" do
         context "has_size_options is true" do
           it "returns image count specified by Images.pages_per_dialog_that_have_size_options option" do
-            ::Refinery::Image.per_page(true, true).should == Images.pages_per_dialog_that_have_size_options
+            expect(::Refinery::Image.per_page(true, true)).to eq(Images.pages_per_dialog_that_have_size_options)
           end
         end
 
         context "has_size_options is false" do
           it "returns image count specified by Images.pages_per_dialog option" do
-            ::Refinery::Image.per_page(true).should == Images.pages_per_dialog
+            expect(::Refinery::Image.per_page(true)).to eq(Images.pages_per_dialog)
           end
         end
       end
 
       context "dialog is false" do
         it "returns image count specified by Images.pages_per_admin_index option" do
-          ::Refinery::Image.per_page.should == Images.pages_per_admin_index
+          expect(::Refinery::Image.per_page).to eq(Images.pages_per_admin_index)
         end
       end
     end
 
     describe ".user_image_sizes" do
       it "returns a hash" do
-        Refinery::Images.user_image_sizes.should be_a_kind_of(Hash)
+        expect(Refinery::Images.user_image_sizes).to be_a_kind_of(Hash)
       end
     end
 
     # The sample image has dimensions 500x375
     describe '#thumbnail_dimensions returns correctly with' do
       it 'nil' do
-        created_image.thumbnail_dimensions(nil).should == { :width => 500, :height => 375 }
+        expect(created_image.thumbnail_dimensions(nil)).to eq({ :width => 500, :height => 375 })
       end
 
       it '200x200#ne' do
-        created_image.thumbnail_dimensions('200x200#ne').should == { :width => 200, :height => 200 }
+        expect(created_image.thumbnail_dimensions('200x200#ne')).to eq({ :width => 200, :height => 200 })
       end
 
       it '100x150#c' do
-        created_image.thumbnail_dimensions('100x150#c').should == { :width => 100, :height => 150 }
+        expect(created_image.thumbnail_dimensions('100x150#c')).to eq({ :width => 100, :height => 150 })
       end
 
       it '250x250>' do
-        created_image.thumbnail_dimensions('250x250>').should == { :width => 250, :height => 188 }
+        expect(created_image.thumbnail_dimensions('250x250>')).to eq({ :width => 250, :height => 188 })
       end
 
       it '600x375>' do
-        created_image.thumbnail_dimensions('600x375>').should == { :width => 500, :height => 375 }
+        expect(created_image.thumbnail_dimensions('600x375>')).to eq({ :width => 500, :height => 375 })
       end
 
       it '100x475>' do
-        created_image.thumbnail_dimensions('100x475>').should == { :width => 100, :height => 75 }
+        expect(created_image.thumbnail_dimensions('100x475>')).to eq({ :width => 100, :height => 75 })
       end
 
       it '100x150' do
-        created_image.thumbnail_dimensions('100x150').should == { :width => 100, :height => 75 }
+        expect(created_image.thumbnail_dimensions('100x150')).to eq({ :width => 100, :height => 75 })
       end
 
       it '200x150' do
-        created_image.thumbnail_dimensions('200x150').should == { :width => 200, :height => 150 }
+        expect(created_image.thumbnail_dimensions('200x150')).to eq({ :width => 200, :height => 150 })
       end
 
       it '300x150' do
-        created_image.thumbnail_dimensions('300x150').should == { :width => 200, :height => 150 }
+        expect(created_image.thumbnail_dimensions('300x150')).to eq({ :width => 200, :height => 150 })
       end
 
       it '5x5' do
-        created_image.thumbnail_dimensions('5x5').should == { :width => 5, :height => 4 }
+        expect(created_image.thumbnail_dimensions('5x5')).to eq({ :width => 5, :height => 4 })
       end
     end
 
@@ -166,21 +204,21 @@ module Refinery
       let(:created_alternate_image) { FactoryGirl.create(:alternate_image) }
 
       it 'nil' do
-        created_alternate_image.thumbnail_dimensions(nil).should == { :width => 376, :height => 184 }
+        expect(created_alternate_image.thumbnail_dimensions(nil)).to eq({ :width => 376, :height => 184 })
       end
 
       it '225x255>' do
-        created_alternate_image.thumbnail_dimensions('225x255>').should == { :width => 225, :height => 110 }
+        expect(created_alternate_image.thumbnail_dimensions('225x255>')).to eq({ :width => 225, :height => 110 })
       end
     end
 
     describe '#thumbnail_dimensions returns correctly with user-defined geometries' do
       it ':medium' do
-        created_image.thumbnail_dimensions(:medium).should == { :width => 225, :height => 169 }
+        expect(created_image.thumbnail_dimensions(:medium)).to eq({ :width => 225, :height => 169 })
       end
 
       it ':large' do
-        created_image.thumbnail_dimensions(:large).should == { :width => 450, :height => 338 }
+        expect(created_image.thumbnail_dimensions(:large)).to eq({ :width => 450, :height => 338 })
       end
     end