refinerycms-images 2.0.10 → 2.1.0

data/lib/refinery/images/dragonfly.rb

@@ -7,7 +7,6 @@ module Refinery
       class << self
         def setup!
           app_images = ::Dragonfly[:refinery_images]
-          app_images.configure_with(:imagemagick)
 
           app_images.define_macro(::Refinery::Image, :image_accessor)
 
@@ -17,9 +16,11 @@ module Refinery
 
         def configure!
           app_images = ::Dragonfly[:refinery_images]
+          app_images.configure_with(:imagemagick)
           app_images.configure_with(:rails) do |c|
             c.datastore.root_path = Refinery::Images.datastore_root_path
             c.url_format = Refinery::Images.dragonfly_url_format
+            c.url_host = Refinery::Images.dragonfly_url_host
             c.secret = Refinery::Images.dragonfly_secret
             c.trust_file_extensions = Refinery::Images.trust_file_extensions
           end
@@ -34,18 +35,20 @@ module Refinery
               s3.region = Refinery::Images.s3_region if Refinery::Images.s3_region
             end
           end
+
+          if Images.custom_backend?
+            app_images.datastore = Images.custom_backend_class.new(Images.custom_backend_opts)
+          end
         end
 
+        ##
+        # Injects Dragonfly::Middleware for Refinery::Images into the stack
         def attach!(app)
-          ### Extend active record ###
-          app.config.middleware.insert_before Refinery::Images.dragonfly_insert_before,
-                                              'Dragonfly::Middleware', :refinery_images
-
-          app.config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
-            :verbose     => Rails.env.development?,
-            :metastore   => "file:#{Rails.root.join('tmp', 'dragonfly', 'cache', 'meta')}",
-            :entitystore => "file:#{Rails.root.join('tmp', 'dragonfly', 'cache', 'body')}"
-          }
+          if ::Rails.application.config.action_controller.perform_caching
+            app.config.middleware.insert_after 'Rack::Cache', 'Dragonfly::Middleware', :refinery_images
+          else
+            app.config.middleware.use 'Dragonfly::Middleware', :refinery_images
+          end
         end
       end
 

data/lib/refinery/images/engine.rb

@@ -1,7 +1,7 @@
 module Refinery
   module Images
     class Engine < ::Rails::Engine
-      include Refinery::Engine
+      extend Refinery::Engine
 
       isolate_namespace Refinery
       engine_name :refinery_images
@@ -17,7 +17,6 @@ module Refinery
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = 'refinery_images'
-          plugin.version = %q{2.0.0}
           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 }

data/lib/refinery/images/validators.rb

@@ -2,6 +2,7 @@ module Refinery
   module Images
     module Validators
       autoload :ImageSizeValidator, 'refinery/images/validators/image_size_validator'
+      autoload :ImageUpdateValidator, 'refinery/images/validators/image_update_validator'
     end
   end
 end

data/lib/refinery/images/validators/image_update_validator.rb

@@ -0,0 +1,17 @@
+module Refinery
+  module Images
+    module Validators
+      class ImageUpdateValidator < ActiveModel::Validator
+
+        def validate(record)
+          if record.image_name_changed?
+            record.errors.add :image_name,
+              ::I18n.t("different_file_name",
+                       :scope => "activerecord.errors.models.refinery/image")
+          end
+        end
+
+      end
+    end
+  end
+end

data/refinerycms-images.gemspec

@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -20,7 +19,6 @@ 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.8'
-  s.add_dependency 'rack-cache',       '>= 0.5.3'
+  s.add_dependency 'dragonfly',        '~> 0.9.14'
   s.add_dependency 'refinerycms-core', version
 end

data/spec/factories/image.rb

@@ -2,4 +2,8 @@ FactoryGirl.define do
   factory :image, :class => ::Refinery::Image do
     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")
+  end
 end

data/spec/{requests → features}/refinery/admin/images_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Refinery
   describe "AdminImages" do
-    login_refinery_user
+    refinery_login_with :refinery_user
 
     context "when no images" do
       it "invites to add one" do
@@ -35,11 +35,59 @@ module Refinery
         Refinery::Image.count.should == 1
       end
 
-      it 'is accessible via url' do
-        image = Refinery::Image.create(:image => Refinery.roots(:'refinery/images').join("spec/fixtures/image-with-dashes.jpg"))
-        get image.url
+      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
 
-        response.should be_success
+        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
+    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')
+
+        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
     end
 
@@ -56,14 +104,24 @@ module Refinery
           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/fathead.png")
+          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 => "'Fathead'"))
+          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)
+
+          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
 
       context "destroy" do

data/spec/models/refinery/image_spec.rb

@@ -6,9 +6,59 @@ module Refinery
     let(:image) { FactoryGirl.build(:image) }
     let(:created_image) { FactoryGirl.create(:image) }
 
-    context "with valid attributes" do
-      it "should report being valid" do
-        image.valid?.should be_true
+    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)
+        end
+
+        it "should be valid when size does not exceed .max_image_size" do
+          Image.new(:image => @file).should 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)
+          @image = Image.new(:image => @file)
+        end
+
+        it "should not be valid when size exceeds .max_image_size" do
+          @image.should_not 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"]
+        end
+      end
+
+      describe "invalid argument for #image" do
+        before do
+          @image = Image.new
+        end
+
+        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"]
+        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)
+        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
+        end
       end
     end
 
@@ -22,16 +72,16 @@ module Refinery
       end
 
       it "becomes different when supplying geometry" do
-        created_image.url.should_not == created_image.thumbnail('200x200').url
+        created_image.url.should_not == created_image.thumbnail(:geometry => '200x200').url
       end
 
       it "has different urls for each geometry string" do
-        created_image.thumbnail('200x200').url.should_not == created_image.thumbnail('200x201').url
+        created_image.thumbnail(:geometry => '200x200').url.should_not == created_image.thumbnail(:geometry => '200x201').url
       end
 
       it "uses right geometry when given a thumbnail name" do
         name, geometry = Refinery::Images.user_image_sizes.first
-        created_image.thumbnail(name).url.should == created_image.thumbnail(geometry).url
+        created_image.thumbnail(:geometry => name).url.should == created_image.thumbnail(:geometry => geometry).url
       end
     end
 
@@ -112,47 +162,27 @@ module Refinery
       end
     end
 
-    describe "validations" do
-      describe "valid #image" do
-        before do
-          @file = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
-          Images.max_image_size = (File.read(@file).size + 10.megabytes)
-        end
+    describe '#thumbnail_dimensions returns correctly with' do
+      let(:created_alternate_image) { FactoryGirl.create(:alternate_image) }
 
-        it "should be valid when size does not exceed .max_image_size" do
-          Image.new(:image => @file).should be_valid
-        end
+      it 'nil' do
+        created_alternate_image.thumbnail_dimensions(nil).should == { :width => 376, :height => 184 }
       end
 
-      describe "too large #image" do
-        before do
-          @file = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
-          Images.max_image_size = 0
-          @image = Image.new(:image => @file)
-        end
-
-        it "should not be valid when size exceeds .max_image_size" do
-          @image.should_not 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"]
-        end
+      it '225x255>' do
+        created_alternate_image.thumbnail_dimensions('225x255>').should == { :width => 225, :height => 110 }
       end
+    end
 
-      describe "invalid argument for #image" do
-        before do
-          @image = Image.new
-        end
+    describe '#thumbnail_dimensions returns correctly with user-defined geometries' do
+      it ':medium' do
+        created_image.thumbnail_dimensions(:medium).should == { :width => 225, :height => 169 }
+      end
 
-        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"]
-        end
+      it ':large' do
+        created_image.thumbnail_dimensions(:large).should == { :width => 450, :height => 338 }
       end
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-images
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -18,42 +18,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.9.14
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 description: Handles all image upload and processing functionality in Refinery CMS.
 email: info@refinerycms.com
 executables: []
@@ -84,6 +70,7 @@ files:
 - config/locales/es.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/hu.yml
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ko.yml
@@ -93,16 +80,20 @@ files:
 - config/locales/nl.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
+- config/locales/pt.yml
 - config/locales/rs.yml
 - config/locales/ru.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/sv.yml
+- config/locales/tr.yml
+- config/locales/uk.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20100913234707_create_refinerycms_images_schema.rb
+- db/migrate/20120625093918_remove_image_ext_from_refinery_images.rb
 - lib/generators/refinery/images/images_generator.rb
 - lib/generators/refinery/images/templates/config/initializers/refinery/images.rb.erb
 - lib/refinery/images.rb
@@ -111,16 +102,19 @@ files:
 - lib/refinery/images/engine.rb
 - lib/refinery/images/validators.rb
 - lib/refinery/images/validators/image_size_validator.rb
+- lib/refinery/images/validators/image_update_validator.rb
 - lib/refinerycms-images.rb
 - license.md
 - refinerycms-images.gemspec
 - spec/factories/image.rb
+- spec/features/refinery/admin/images_spec.rb
+- spec/fixtures/beach-alternate.jpeg
 - spec/fixtures/beach.jpeg
+- spec/fixtures/cape-town-tide-table.pdf
 - spec/fixtures/fathead.png
 - spec/fixtures/image-with-dashes.jpg
 - spec/lib/generators/refinery/images/images_generator_spec.rb
 - spec/models/refinery/image_spec.rb
-- spec/requests/refinery/admin/images_spec.rb
 homepage: http://refinerycms.com
 licenses:
 - MIT
@@ -147,9 +141,11 @@ specification_version: 4
 summary: Images extension for Refinery CMS
 test_files:
 - spec/factories/image.rb
+- spec/features/refinery/admin/images_spec.rb
+- spec/fixtures/beach-alternate.jpeg
 - spec/fixtures/beach.jpeg
+- spec/fixtures/cape-town-tide-table.pdf
 - spec/fixtures/fathead.png
 - spec/fixtures/image-with-dashes.jpg
 - spec/lib/generators/refinery/images/images_generator_spec.rb
 - spec/models/refinery/image_spec.rb
-- spec/requests/refinery/admin/images_spec.rb