refinerycms-images 2.0.2 → 2.0.3

data/app/controllers/refinery/admin/images_controller.rb

@@ -1,4 +1,4 @@
-module ::Refinery
+module Refinery
   module Admin
     class ImagesController < ::Refinery::AdminController
 

data/app/models/refinery/image.rb

@@ -1,12 +1,16 @@
+require 'dragonfly'
+
 module Refinery
   class Image < Refinery::Core::BaseModel
+    ::Refinery::Images::Dragonfly.setup!
+
     include Images::Validators
 
     image_accessor :image
 
     validates :image, :presence  => true
     validates_with ImageSizeValidator
-    validates_property :mime_type, :of => :image, :in => %w(image/jpeg image/png image/gif image/tiff),
+    validates_property :mime_type, :of => :image, :in => ::Refinery::Images.whitelisted_mime_types,
                        :message => :incorrect_format
 
     # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed

data/lib/generators/refinery/images/templates/config/initializers/refinery/images.rb.erb

@@ -15,6 +15,9 @@ Refinery::Images.configure do |config|
   # Configure image sizes
   # config.user_image_sizes = <%= Refinery::Images.user_image_sizes.inspect %>
 
+  # Configure white-listed mime types for validation
+  # config.whitelisted_mime_types = <%= Refinery::Images.whitelisted_mime_types.inspect %>
+
   # Configure image view options
   # config.image_views = <%= Refinery::Images.image_views.inspect %>
 

data/lib/refinery/images/configuration.rb

@@ -7,7 +7,8 @@ module Refinery
                     :pages_per_dialog_that_have_size_options, :user_image_sizes,
                     :image_views, :preferred_image_view, :datastore_root_path,
                     :s3_backend, :s3_bucket_name, :s3_region,
-                    :s3_access_key_id, :s3_secret_access_key, :trust_file_extensions
+                    :s3_access_key_id, :s3_secret_access_key, :trust_file_extensions,
+                    :whitelisted_mime_types
 
     self.dragonfly_insert_before = 'ActionDispatch::Callbacks'
     self.dragonfly_secret = Refinery::Core.dragonfly_secret
@@ -24,6 +25,9 @@ module Refinery
       :medium => '225x255>',
       :large => '450x450>'
     }
+
+    self.whitelisted_mime_types = %w[image/jpeg image/png image/gif image/tiff]
+
     self.image_views = [:grid, :list]
     self.preferred_image_view = :grid
 

data/lib/refinery/images/dragonfly.rb

@@ -9,7 +9,7 @@ module Refinery
           app_images = ::Dragonfly[:refinery_images]
           app_images.configure_with(:imagemagick)
 
-          app_images.define_macro(::Refinery::Core::BaseModel, :image_accessor)
+          app_images.define_macro(::Refinery::Image, :image_accessor)
 
           app_images.analyser.register(::Dragonfly::ImageMagick::Analyser)
           app_images.analyser.register(::Dragonfly::Analysis::FileCommandAnalyser)

data/lib/refinery/images/engine.rb

@@ -8,10 +8,6 @@ module Refinery
 
       config.autoload_paths += %W( #{config.root}/lib )
 
-      initializer 'setup-refinery-images-with-dragonfly', :before => :load_config_initializers do
-        ::Refinery::Images::Dragonfly.setup!
-      end
-
       initializer 'attach-refinery-images-with-dragonfly', :after => :load_config_initializers do |app|
         ::Refinery::Images::Dragonfly.configure!
         ::Refinery::Images::Dragonfly.attach!(app)

metadata

@@ -1,82 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: refinerycms-images
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.0.3
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 2
-  version: 2.0.2
 platform: ruby
-authors: 
+authors:
 - Philip Arndt
-- "U\xC4\xA3is Ozols"
+- Uģis Ozols
 - David Jones
 - Steven Heidel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dragonfly
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.9.8
-  version_requirements: *id001
-  name: dragonfly
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
-        version: 0.5.3
-  version_requirements: *id002
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+- !ruby/object:Gem::Dependency
   name: rack-cache
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
-        version: 2.0.2
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
   name: refinerycms-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 description: Handles all image upload and processing functionality in Refinery CMS.
 email: info@refinerycms.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/refinery/admin/images_controller.rb
 - app/helpers/refinery/admin/images_helper.rb
 - app/models/refinery/image.rb
@@ -139,39 +130,37 @@ files:
 - 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2455254302820496676
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2455254302820496676
 requirements: []
-
 rubyforge_project: refinerycms
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Images extension for Refinery CMS
-test_files: 
+test_files:
 - spec/factories/image.rb
 - spec/fixtures/beach.jpeg
 - spec/fixtures/fathead.png