refinerycms-images 1.0.11 → 2.0.0

data/refinerycms-images.gemspec

@@ -1,104 +1,27 @@
 # Encoding: UTF-8
-# DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
+$:.push File.expand_path('../../core/lib', __FILE__)
+require 'refinery/version'
+
+version = Refinery::Version.to_s
 
 Gem::Specification.new do |s|
+  s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-images}
-  s.version           = %q{1.0.11}
-  s.summary           = %q{Images engine for Refinery CMS}
+  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.date              = %q{2012-05-18}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel', 'Uģis Ozols']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
-  s.executables       = %w()
-
-  s.files             = [
-    'app',
-    'app/controllers',
-    'app/controllers/admin',
-    'app/controllers/admin/images_controller.rb',
-    'app/helpers',
-    'app/helpers/admin',
-    'app/helpers/admin/images_helper.rb',
-    'app/models',
-    'app/models/image.rb',
-    'app/views',
-    'app/views/admin',
-    'app/views/admin/images',
-    'app/views/admin/images/_actions.html.erb',
-    'app/views/admin/images/_existing_image.html.erb',
-    'app/views/admin/images/_form.html.erb',
-    'app/views/admin/images/_grid_view.html.erb',
-    'app/views/admin/images/_images.html.erb',
-    'app/views/admin/images/_list_view.html.erb',
-    'app/views/admin/images/_list_view_image.html.erb',
-    'app/views/admin/images/_records.html.erb',
-    'app/views/admin/images/edit.html.erb',
-    'app/views/admin/images/index.html.erb',
-    'app/views/admin/images/insert.html.erb',
-    'app/views/admin/images/new.html.erb',
-    'config',
-    'config/locales',
-    'config/locales/bg.yml',
-    'config/locales/cs.yml',
-    'config/locales/da.yml',
-    'config/locales/de.yml',
-    'config/locales/el.yml',
-    'config/locales/en.yml',
-    'config/locales/es.yml',
-    'config/locales/fi.yml',
-    'config/locales/fr.yml',
-    'config/locales/it.yml',
-    'config/locales/jp.yml',
-    'config/locales/lolcat.yml',
-    'config/locales/lt.yml',
-    'config/locales/lv.yml',
-    'config/locales/nb.yml',
-    'config/locales/nl.yml',
-    'config/locales/pl.yml',
-    'config/locales/pt-BR.yml',
-    'config/locales/rs.yml',
-    'config/locales/ru.yml',
-    'config/locales/sk.yml',
-    'config/locales/sl.yml',
-    'config/locales/sv.yml',
-    'config/locales/vi.yml',
-    'config/locales/zh-CN.yml',
-    'config/locales/zh-TW.yml',
-    'config/routes.rb',
-    'db',
-    'db/migrate',
-    'db/migrate/20100913234707_create_refinerycms_images_schema.rb',
-    'features',
-    'features/manage_images.feature',
-    'features/step_definitions',
-    'features/step_definitions/image_steps.rb',
-    'features/support',
-    'features/support/factories.rb',
-    'features/support/paths.rb',
-    'features/uploads',
-    'features/uploads/beach.jpeg',
-    'features/uploads/id-rather-be-here.jpg',
-    'features/uploads/refinery_is_awesome.txt',
-    'lib',
-    'lib/gemspec.rb',
-    'lib/generators',
-    'lib/generators/refinerycms_images_generator.rb',
-    'lib/refinerycms-images.rb',
-    'license.md',
-    'refinerycms-images.gemspec',
-    'spec',
-    'spec/models',
-    'spec/models/image_spec.rb',
-    'spec/uploads',
-    'spec/uploads/beach.jpeg'
-  ]
+  
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- spec/*`.split("\n")
+  s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
-  s.add_dependency 'refinerycms-core', '= 1.0.11'
-  s.add_dependency 'activerecord',     '~> 3.0.10'
-  s.add_dependency 'dragonfly',        '~> 0.9.0'
+  s.add_dependency 'dragonfly',        '~> 0.9.8'
   s.add_dependency 'rack-cache',       '>= 0.5.3'
+  s.add_dependency 'refinerycms-core', version
 end

data/spec/factories/image.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :image, :class => ::Refinery::Image do
+    image Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'generator_spec/test_case'
+require 'generators/refinery/images/images_generator'
+
+module Refinery
+  describe ImagesGenerator do
+    include GeneratorSpec::TestCase
+    destination File.expand_path("../../../../tmp", __FILE__)
+
+    before(:each) do
+      prepare_destination
+      run_generator
+    end
+
+    specify do
+      destination_root.should have_structure {
+        directory "config" do
+          directory "initializers" do
+            directory "refinery" do
+              file "images.rb" do
+                contains "Refinery::Images.configure"
+              end
+            end
+          end
+        end
+      }
+    end
+  end
+end

data/spec/models/refinery/image_spec.rb

@@ -0,0 +1,158 @@
+require 'spec_helper'
+
+module Refinery
+  describe Image do
+
+    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
+      end
+    end
+
+    context "image url" do
+      it "responds to .thumbnail" do
+        image.should respond_to(:thumbnail)
+      end
+
+      it "contains its filename at the end" do
+        created_image.url.split('/').last.should == created_image.image_name
+      end
+
+      it "becomes different when supplying geometry" do
+        created_image.url.should_not == created_image.thumbnail('200x200').url
+      end
+
+      it "has different urls for each geometry string" do
+        created_image.thumbnail('200x200').url.should_not == created_image.thumbnail('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
+      end
+    end
+
+    describe "#title" do
+      it "returns a titleized version of the filename" do
+        image.title.should == "Beach"
+      end
+    end
+
+    describe ".per_page" do
+      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
+          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
+          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
+        end
+      end
+    end
+
+    describe ".user_image_sizes" do
+      it "returns a hash" do
+        Refinery::Images.user_image_sizes.should 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 }
+      end
+
+      it '200x200#ne' do
+        created_image.thumbnail_dimensions('200x200#ne').should == { :width => 200, :height => 200 }
+      end
+
+      it '100x150#c' do
+        created_image.thumbnail_dimensions('100x150#c').should == { :width => 100, :height => 150 }
+      end
+
+      it '250x250>' do
+        created_image.thumbnail_dimensions('250x250>').should == { :width => 250, :height => 188 }
+      end
+
+      it '600x375>' do
+        created_image.thumbnail_dimensions('600x375>').should == { :width => 500, :height => 375 }
+      end
+
+      it '100x475>' do
+        created_image.thumbnail_dimensions('100x475>').should == { :width => 100, :height => 75 }
+      end
+
+      it '100x150' do
+        created_image.thumbnail_dimensions('100x150').should == { :width => 100, :height => 75 }
+      end
+
+      it '200x150' do
+        created_image.thumbnail_dimensions('200x150').should == { :width => 200, :height => 150 }
+      end
+
+      it '300x150' do
+        created_image.thumbnail_dimensions('300x150').should == { :width => 200, :height => 150 }
+      end
+
+      it '5x5' do
+        created_image.thumbnail_dimensions('5x5').should == { :width => 5, :height => 4 }
+      end
+    end
+
+    describe "validations" do
+      describe "valid #image" do
+        before(:each) do
+          @file = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
+          Images.max_image_size = (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(:each) 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
+      end
+
+      describe "invalid argument for #image" do
+        before(:each) 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
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+require "spec_helper"
+
+module Refinery
+  describe "AdminImages" do
+    login_refinery_user
+
+    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
+
+    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
+        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
+      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
+
+        response.should be_success
+      end
+    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/fathead.png")
+          click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
+
+          page.should have_content(::I18n.t('updated', :scope => 'refinery.crudify', :what => "'Fathead'"))
+          Refinery::Image.count.should == 1
+
+          lambda { click_link "View this image" }.should_not raise_error
+        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)}']")
+
+          click_link ::I18n.t('delete', :scope => 'refinery.admin.images')
+
+          page.should have_content(::I18n.t('destroyed', :scope => 'refinery.crudify', :what => "'Beach'"))
+          Refinery::Image.count.should == 0
+        end
+      end
+
+      context "download" do
+        it "succeeds" do
+          visit refinery.admin_images_path
+
+          lambda { click_link "View this image" }.should_not raise_error
+        end
+      end
+
+      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')}']")
+
+          click_link "Switch to list view"
+
+          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
+    end
+  end
+end

metadata

@@ -1,105 +1,97 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: refinerycms-images
-version: !ruby/object:Gem::Version
-  version: 1.0.11
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
-authors:
-- Resolve Digital
+authors: 
 - Philip Arndt
+- "U\xC4\xA3is Ozols"
 - David Jones
 - Steven Heidel
-- Uģis Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: refinerycms-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.11
-  type: :runtime
+
+date: 2012-03-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.11
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  version_requirements: *id001
   name: dragonfly
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
+  version_requirements: *id002
+  name: rack-cache
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  version_requirements: *id003
+  name: refinerycms-core
+  type: :runtime
 description: Handles all image upload and processing functionality in Refinery CMS.
 email: info@refinerycms.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- app/controllers/admin/images_controller.rb
-- app/helpers/admin/images_helper.rb
-- app/models/image.rb
-- app/views/admin/images/_actions.html.erb
-- app/views/admin/images/_existing_image.html.erb
-- app/views/admin/images/_form.html.erb
-- app/views/admin/images/_grid_view.html.erb
-- app/views/admin/images/_images.html.erb
-- app/views/admin/images/_list_view.html.erb
-- app/views/admin/images/_list_view_image.html.erb
-- app/views/admin/images/_records.html.erb
-- app/views/admin/images/edit.html.erb
-- app/views/admin/images/index.html.erb
-- app/views/admin/images/insert.html.erb
-- app/views/admin/images/new.html.erb
+
+files: 
+- app/controllers/refinery/admin/images_controller.rb
+- app/helpers/refinery/admin/images_helper.rb
+- app/models/refinery/image.rb
+- app/views/refinery/admin/images/_actions.html.erb
+- app/views/refinery/admin/images/_existing_image.html.erb
+- app/views/refinery/admin/images/_form.html.erb
+- app/views/refinery/admin/images/_grid_view.html.erb
+- app/views/refinery/admin/images/_images.html.erb
+- app/views/refinery/admin/images/_list_view.html.erb
+- app/views/refinery/admin/images/_list_view_image.html.erb
+- app/views/refinery/admin/images/_records.html.erb
+- app/views/refinery/admin/images/edit.html.erb
+- app/views/refinery/admin/images/index.html.erb
+- app/views/refinery/admin/images/insert.html.erb
+- app/views/refinery/admin/images/new.html.erb
 - config/locales/bg.yml
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -110,8 +102,8 @@ files:
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/it.yml
-- config/locales/jp.yml
-- config/locales/lolcat.yml
+- config/locales/ja.yml
+- config/locales/ko.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
 - config/locales/nb.yml
@@ -128,44 +120,62 @@ files:
 - config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20100913234707_create_refinerycms_images_schema.rb
-- features/manage_images.feature
-- features/step_definitions/image_steps.rb
-- features/support/factories.rb
-- features/support/paths.rb
-- features/uploads/beach.jpeg
-- features/uploads/id-rather-be-here.jpg
-- features/uploads/refinery_is_awesome.txt
-- lib/gemspec.rb
-- lib/generators/refinerycms_images_generator.rb
+- lib/generators/refinery/images/images_generator.rb
+- lib/generators/refinery/images/templates/config/initializers/refinery/images.rb.erb
+- lib/refinery/images.rb
+- lib/refinery/images/configuration.rb
+- lib/refinery/images/dragonfly.rb
+- lib/refinery/images/engine.rb
+- lib/refinery/images/validators.rb
+- lib/refinery/images/validators/image_size_validator.rb
 - lib/refinerycms-images.rb
 - license.md
 - refinerycms-images.gemspec
-- spec/models/image_spec.rb
-- spec/uploads/beach.jpeg
+- spec/factories/image.rb
+- spec/fixtures/beach.jpeg
+- 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:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: refinerycms
-rubygems_version: 1.8.22
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Images engine for Refinery CMS
-test_files: []
-has_rdoc: 
+summary: Images extension for Refinery CMS
+test_files: 
+- spec/factories/image.rb
+- spec/fixtures/beach.jpeg
+- 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