refinerycms-images 1.0.11 → 2.0.0

data/config/locales/zh-TW.yml

@@ -1,43 +1,44 @@
 zh-TW:
-  plugins:
-    refinery_images:
-      title: 圖片
-      description: 管理圖片
-  admin:
-    images:
-      delete: 永遠地移除這張圖片
-      edit: 編輯圖片
-      form:
-        image: 圖片
-        use_current_image: 使用目前圖片
-        or: 或
-        replace_image: " 用這個來取代..."
-        current_image: 目前圖片
-        maximum_image_size: 圖片大小限制為 %{megabytes} MB.
-      actions:
-        create_new_image: 新增圖片
-      records:
-        no_images_yet: 目前沒有任何圖片. 點選 "新增圖片" 來加入您的第一張圖片.
-      index:
-        view:
-          switch_to: 切換到%{view_name}模式
-          list: 列表
-          grid: 格狀
-      grid_view:
-        view_live_html: 瀏覽圖片 <br/><em>在新視窗中開啟</em>
-      existing_image:
-        button_text: 插入
-        resize_image: 調整圖片大小?
-        size: 大小
-      insert:
-        existing_image: 圖片庫
-        new_image: 上傳
+  refinery:
+    plugins:
+      refinery_images:
+        title: 圖片
+        description: 管理圖片
+    admin:
+      images:
+        delete: 永遠地移除這張圖片
+        edit: 編輯圖片
+        form:
+          image: 圖片
+          use_current_image: 使用目前圖片
+          or: 或
+          replace_image: " 用這個來取代..."
+          current_image: 目前圖片
+          maximum_image_size: 圖片大小限制為 %{bytes}.
+        actions:
+          create_new_image: 新增圖片
+        records:
+          no_images_yet: 目前沒有任何圖片. 點選 "新增圖片" 來加入您的第一張圖片.
+        index:
+          view:
+            switch_to: 切換到%{view_name}模式
+            list: 列表
+            grid: 格狀
+        grid_view:
+          view_live_html: 瀏覽圖片 <br/><em>在新視窗中開啟</em>
+        existing_image:
+          button_text: 插入
+          resize_image: 調整圖片大小?
+          size: 大小
+        insert:
+          existing_image: 圖片庫
+          new_image: 上傳
   activerecord:
     models:
-      image: 圖片
+      refinery/image: 圖片
     errors:
       models:
-        image:
+        refinery/image:
           blank: 您必須指定一張圖片來上傳
-          too_long: 圖片必須小於 %{count} 這個大小
+          too_big: 圖片必須小於 %{size} MB 這個大小
           incorrect_format: '您的圖片必須是 JPG, PNG 或是 GIF'

data/config/routes.rb

@@ -1,12 +1,9 @@
-::Refinery::Application.routes.draw do
+Refinery::Core::Engine.routes.draw do
+  match '/system/images/*dragonfly', :to => Dragonfly[:refinery_images]
 
-  match '/system/images/*dragonfly', :to => Dragonfly[:images]
-
-  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
+  namespace :admin, :path => 'refinery' do
     resources :images, :except => :show do
-      collection do
-        get :insert
-      end
+      get :insert, :on => :collection
     end
   end
 end

data/db/migrate/20100913234707_create_refinerycms_images_schema.rb

@@ -1,23 +1,15 @@
 class CreateRefinerycmsImagesSchema < ActiveRecord::Migration
-  def self.up
-    create_table ::Image.table_name, :force => true do |t|
-      t.string   "image_mime_type"
-      t.string   "image_name"
-      t.integer  "image_size"
-      t.integer  "image_width"
-      t.integer  "image_height"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.string   "image_uid"
-      t.string   "image_ext"
-    end
-  end
+  def change
+    create_table :refinery_images do |t|
+      t.string   :image_mime_type
+      t.string   :image_name
+      t.integer  :image_size
+      t.integer  :image_width
+      t.integer  :image_height
+      t.string   :image_uid
+      t.string   :image_ext
 
-  def self.down
-    [::Image].reject{|m|
-      !(defined?(m) and m.respond_to?(:table_name))
-    }.each do |model|
-      drop_table model.table_name
+      t.timestamps
     end
   end
 end

data/lib/generators/refinery/images/images_generator.rb

@@ -0,0 +1,10 @@
+module Refinery
+  class ImagesGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def generate_images_initializer
+      template "config/initializers/refinery/images.rb.erb", File.join(destination_root, "config", "initializers", "refinery", "images.rb")
+    end
+
+  end
+end

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

@@ -0,0 +1,41 @@
+Refinery::Images.configure do |config|
+  # Configures the maximum allowed upload size (in bytes) for an image
+  # config.max_image_size = <%= Refinery::Images.max_image_size.inspect %>
+
+  # Configure how many images per page should be displayed when a dialog is presented that contains images
+  # config.pages_per_dialog = <%= Refinery::Images.pages_per_dialog.inspect %>
+
+  # Configure how many images per page should be displayed when a dialog is presented that
+  # contains images and image resize options
+  # config.pages_per_dialog_that_have_size_options = <%= Refinery::Images.pages_per_dialog_that_have_size_options.inspect %>
+
+  # Configure how many images per page should be displayed in the list of images in the admin area
+  # config.pages_per_admin_index = <%= Refinery::Images.pages_per_admin_index.inspect %>
+
+  # Configure image sizes
+  # config.user_image_sizes = <%= Refinery::Images.user_image_sizes.inspect %>
+
+  # Configure image view options
+  # config.image_views = <%= Refinery::Images.image_views.inspect %>
+
+  # Configure default image view
+  # config.preferred_image_view = <%= Refinery::Images.preferred_image_view.inspect %>
+
+  # Configure S3 (you can also use ENV for this)
+  # The s3_backend setting by default defers to the core setting for this but can be set just for images.
+  # config.s3_backend = Refinery::Core.s3_backend
+  # config.s3_bucket_name = ENV['S3_BUCKET']
+  # config.s3_access_key_id = ENV['S3_KEY']
+  # config.s3_secret_access_key = ENV['S3_SECRET']
+  # config.s3_region = ENV['S3_REGION]
+
+  # Configure Dragonfly
+  # This is where in the middleware stack to insert the Dragonfly middleware
+  # config.dragonfly_insert_before = <%= Refinery::Images.dragonfly_insert_before.inspect %>
+  # config.dragonfly_secret = <%= Refinery::Images.dragonfly_secret.inspect %>
+  # If you decide to trust file extensions replace :ext below with :format
+  # config.dragonfly_url_format = <%= Refinery::Images.dragonfly_url_format.inspect %>
+  # config.datastore_root_path = <%= Refinery::Images.datastore_root_path.inspect %>
+  # config.trust_file_extensions = <%= Refinery::Images.trust_file_extensions.inspect %>
+
+end

data/lib/refinery/images.rb

@@ -0,0 +1,25 @@
+require 'refinerycms-core'
+require 'dragonfly'
+require 'rack/cache'
+
+module Refinery
+  autoload :ImagesGenerator, 'generators/refinery/images/images_generator'
+
+  module Images
+    require 'refinery/images/engine'
+    require 'refinery/images/configuration'
+
+    autoload :Dragonfly, 'refinery/images/dragonfly'
+    autoload :Validators, 'refinery/images/validators'
+
+    class << self
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+
+      def factory_paths
+        @factory_paths ||= [ root.join("spec/factories").to_s ]
+      end
+    end
+  end
+end

data/lib/refinery/images/configuration.rb

@@ -0,0 +1,54 @@
+module Refinery
+  module Images
+    include ActiveSupport::Configurable
+
+    config_accessor :dragonfly_insert_before, :dragonfly_secret, :dragonfly_url_format,
+                    :max_image_size, :pages_per_dialog, :pages_per_admin_index,
+                    :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
+
+    self.dragonfly_insert_before = 'ActionDispatch::Callbacks'
+    self.dragonfly_secret = Refinery::Core.dragonfly_secret
+    # If you decide to trust file extensions replace :ext below with :format
+    self.dragonfly_url_format = '/system/images/:job/:basename.:ext'
+    self.trust_file_extensions = false
+
+    self.max_image_size = 5242880
+    self.pages_per_dialog = 18
+    self.pages_per_dialog_that_have_size_options = 12
+    self.pages_per_admin_index = 20
+    self.user_image_sizes = {
+      :small => '110x110>',
+      :medium => '225x255>',
+      :large => '450x450>'
+    }
+    self.image_views = [:grid, :list]
+    self.preferred_image_view = :grid
+
+    # We have to configure these settings after Rails is available.
+    # But a non-nil custom option can still be provided
+    class << self
+      def datastore_root_path
+        config.datastore_root_path || (Rails.root.join('public', 'system', 'refinery', 'images').to_s if Rails.root)
+      end
+
+      def s3_backend
+        config.s3_backend.nil? ? Refinery::Core.s3_backend : config.s3_backend
+      end
+
+      def s3_bucket_name
+        config.s3_bucket_name.nil? ? Refinery::Core.s3_bucket_name : config.s3_bucket_name
+      end
+
+      def s3_access_key_id
+        config.s3_access_key_id.nil? ? Refinery::Core.s3_access_key_id : config.s3_access_key_id
+      end
+
+      def s3_secret_access_key
+        config.s3_secret_access_key.nil? ? Refinery::Core.s3_secret_access_key : config.s3_secret_access_key
+      end
+    end
+  end
+end

data/lib/refinery/images/dragonfly.rb

@@ -0,0 +1,54 @@
+require 'dragonfly'
+
+module Refinery
+  module Images
+    module Dragonfly
+
+      class << self
+        def setup!
+          app_images = ::Dragonfly[:refinery_images]
+          app_images.configure_with(:imagemagick)
+
+          app_images.define_macro(::Refinery::Core::BaseModel, :image_accessor)
+
+          app_images.analyser.register(::Dragonfly::ImageMagick::Analyser)
+          app_images.analyser.register(::Dragonfly::Analysis::FileCommandAnalyser)
+        end
+
+        def configure!
+          app_images = ::Dragonfly[:refinery_images]
+          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.secret = Refinery::Images.dragonfly_secret
+            c.trust_file_extensions = Refinery::Images.trust_file_extensions
+          end
+
+          if ::Refinery::Images.s3_backend
+            app_images.datastore = ::Dragonfly::DataStorage::S3DataStore.new
+            app_images.datastore.configure do |s3|
+              s3.bucket_name = Refinery::Images.s3_bucket_name
+              s3.access_key_id = Refinery::Images.s3_access_key_id
+              s3.secret_access_key = Refinery::Images.s3_secret_access_key
+              # S3 Region otherwise defaults to 'us-east-1'
+              s3.region = Refinery::Images.s3_region if Refinery::Images.s3_region
+            end
+          end
+        end
+
+        def attach!(app)
+          ### Extend active record ###
+          app.config.middleware.insert_before Refinery::Resources.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')}"
+          }
+        end
+      end
+
+    end
+  end
+end

data/lib/refinery/images/engine.rb

@@ -0,0 +1,38 @@
+module Refinery
+  module Images
+    class Engine < ::Rails::Engine
+      include Refinery::Engine
+
+      isolate_namespace Refinery
+      engine_name :refinery_images
+
+      config.autoload_paths += %W( #{config.root}/lib )
+
+      initializer 'setup-refinery-images-with-dragonfly', :before => :load_config_initializers do |app|
+        ::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)
+      end
+
+      initializer "register refinery_images plugin" do
+        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 = { :controller => '/refinery/admin/images' }
+        end
+      end
+
+      config.after_initialize do
+        Refinery.register_extension(Refinery::Images)
+      end
+    end
+  end
+end

data/lib/refinery/images/validators.rb

@@ -0,0 +1,7 @@
+module Refinery
+  module Images
+    module Validators
+      autoload :ImageSizeValidator, 'refinery/images/validators/image_size_validator'
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Refinery
+  module Images
+    module Validators
+      class ImageSizeValidator < ActiveModel::Validator
+
+        def validate(record)
+          image = record.image
+
+          if image.respond_to?(:length) && image.length > Images.max_image_size
+            record.errors[:image] << ::I18n.t('too_big',
+                                             :scope => 'activerecord.errors.models.refinery/image',
+                                             :size => Images.max_image_size)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/refinerycms-images.rb

@@ -1,76 +1 @@
-require 'dragonfly'
-require 'rack/cache'
-require 'refinerycms-core'
-
-module Refinery
-  module Images
-
-    class << self
-      attr_accessor :root
-      def root
-        @root ||= Pathname.new(File.expand_path('../../', __FILE__))
-      end
-    end
-
-    class Engine < ::Rails::Engine
-
-      initializer 'serve static assets' do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
-      end
-
-      initializer 'images-with-dragonfly' do |app|
-        app_images = Dragonfly[:images]
-        app_images.configure_with(:imagemagick)
-        app_images.configure_with(:rails) do |c|
-          c.datastore.root_path = Rails.root.join('public', 'system', 'images').to_s
-          # This url_format it so that dragonfly urls work in traditional
-          # situations where the filename and extension are required, e.g. lightbox.
-          # What this does is takes the url that is about to be produced e.g.
-          # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw
-          # and adds the filename onto the end (say the image was 'refinery_is_awesome.jpg')
-          # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.jpg
-          c.url_format = '/system/images/:job/:basename.:format'
-          c.secret = RefinerySetting.find_or_set(:dragonfly_secret,
-                                                Array.new(24) { rand(256) }.pack('C*').unpack('H*').first)
-        end
-
-        if Refinery.s3_backend
-          app_images.configure_with(:heroku, ENV['S3_BUCKET'])
-          # Dragonfly doesn't set the S3 region, so we have to do this manually
-          app_images.datastore.configure do |d|
-            d.region = ENV['S3_REGION'] if ENV['S3_REGION'] # otherwise defaults to 'us-east-1'
-          end
-        end
-
-        app_images.define_macro(ActiveRecord::Base, :image_accessor)
-        app_images.analyser.register(Dragonfly::ImageMagick::Analyser)
-        app_images.analyser.register(Dragonfly::Analysis::FileCommandAnalyser)
-
-        ### Extend active record ###
-
-        app.config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :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')}"
-        }
-      end
-
-      config.after_initialize do
-        ::Refinery::Plugin.register do |plugin|
-          plugin.pathname = root
-          plugin.name = 'refinery_images'
-          plugin.directory = 'images'
-          plugin.version = %q{1.0.0}
-          plugin.menu_match = /(refinery|admin)\/image(_dialog)?s$/
-          plugin.activity = {
-            :class => Image
-          }
-        end
-      end
-    end
-  end
-end
-
-::Refinery.engines << 'dashboard'
+require 'refinery/images'