refinerycms-resources 1.0.11 → 2.0.0

data/config/locales/vi.yml

@@ -1,35 +1,36 @@
 vi:
-  plugins:
-    refinery_files:
-      title: Các tập tin
-      description: Tải lên và liên kết đến tập tin
-  admin:
-    resources:
-      delete: Hủy bỏ tập tin này mãi mãi
-      edit: Sửa tập tin này
-      form:
-        download_current: Tải tập tin hiện tại
-        or: hoặc
-        replace: " thay thế nó bằng này..."
-        maximum_file_size: Kích thước file tối đa là %{megabytes} megabytes.
-      resource:
-        download: Tải về file này (%{size})
-      actions:
-        upload_new: Tải lên tập tin mới
-      records:
-        no_files_yet: Chưa có tập tin nào. Nhấp vào "Tải lên tập tin mới" để thêm tập tin đầu tiên của bạn.
-      insert:
-        existing: Tập tin đang tồn tại
-        new: Tập tin mới
-        no_files: Không có tập tin nào.
-      existing_resource:
-        link_to_file: Liên kết đến tập tin này.
-        button_text: Chèn
+  refinery:
+    plugins:
+      refinery_files:
+        title: Các tập tin
+        description: Tải lên và liên kết đến tập tin
+    admin:
+      resources:
+        delete: Hủy bỏ tập tin này mãi mãi
+        edit: Sửa tập tin này
+        form:
+          download_current: Tải tập tin hiện tại
+          or: hoặc
+          replace: " thay thế nó bằng này..."
+          maximum_file_size: Kích thước file tối đa là %{bytes}.
+        resource:
+          download: Tải về file này (%{size})
+        actions:
+          upload_new: Tải lên tập tin mới
+        records:
+          no_files_yet: Chưa có tập tin nào. Nhấp vào "Tải lên tập tin mới" để thêm tập tin đầu tiên của bạn.
+        insert:
+          existing: Tập tin đang tồn tại
+          new: Tập tin mới
+          no_files: Không có tập tin nào.
+        existing_resource:
+          link_to_file: Liên kết đến tập tin này.
+          button_text: Chèn
   activerecord:
     models:
-      resource: tập tin
+      refinery/resource: tập tin
     errors:
       models:
-        resource:
+        refinery/resource:
           blank: Bạn phải xác định tập tin để tải lên
-          too_long: Tập tin phải nhỏ hơn %{count} về kích thước
+          too_big: Tập tin phải nhỏ hơn %{size} bytes về kích thước

data/config/locales/zh-CN.yml

@@ -1,35 +1,36 @@
 zh-CN:
-  plugins:
-    refinery_files:
-      title: 文件
-      description: 上传与连接文件
-  admin:
-    resources:
-      delete: 永久删除此文件
-      edit: 编辑此文件
-      form:
-        download_current: 下载当前文件
-        or: 或
-        replace: " 用这个来替换..."
-        maximum_file_size: 最大的文件大小是 %{megabytes} MB.
-      resource:
-        download: 下载此文件 (%{size})
-      actions:
-        upload_new: 上传新文件
-      records:
-        no_files_yet: 这里还没有文件. 点击 "上传新文件" 去添加您第一个文件.
-      insert:
-        existing: 已存在的文件
-        new: 新文件
-        no_files: 没有文件.
-      existing_resource:
-        link_to_file: 连接到此文件
-        button_text: 插入
+  refinery:
+    plugins:
+      refinery_files:
+        title: 文件
+        description: 上传与连接文件
+    admin:
+      resources:
+        delete: 永久删除此文件
+        edit: 编辑此文件
+        form:
+          download_current: 下载当前文件
+          or: 或
+          replace: " 用这个来替换..."
+          maximum_file_size: 最大的文件大小是 %{bytes}.
+        resource:
+          download: 下载此文件 (%{size})
+        actions:
+          upload_new: 上传新文件
+        records:
+          no_files_yet: 这里还没有文件. 点击 "上传新文件" 去添加您第一个文件.
+        insert:
+          existing: 已存在的文件
+          new: 新文件
+          no_files: 没有文件.
+        existing_resource:
+          link_to_file: 连接到此文件
+          button_text: 插入
   activerecord:
     models:
-      resource: 文件
+      refinery/resource: 文件
     errors:
       models:
-        resource:
+        refinery/resource:
           blank: 您必须选择一个文件来上传
-          too_long: 文件应该小于 %{count} 大小
+          too_big: 文件应该小于 %{size} MB 大小

data/config/locales/zh-TW.yml

@@ -1,35 +1,36 @@
 zh-TW:
-  plugins:
-    refinery_files:
-      title: 檔案
-      description: 上傳與連結檔案
-  admin:
-    resources:
-      delete: 永遠地移除這個檔案
-      edit: 編輯檔案
-      form:
-        download_current: 下載目前檔案
-        or: 或
-        replace: " 用這個來取代..."
-        maximum_file_size: 檔案大小限制為 %{megabytes} MB.
-      resource:
-        download: 下載這個檔案 (%{size})
-      actions:
-        upload_new: 上傳新檔案
-      records:
-        no_files_yet: 目前沒有任何的檔案. 點選 "上傳新檔案" 來加入您的第一個檔案.
-      insert:
-        existing: 已存在的檔案
-        new: 新檔案
-        no_files: 目前沒有檔案.
-      existing_resource:
-        link_to_file: 此檔案連結
-        button_text: 插入
+  refinery:
+    plugins:
+      refinery_files:
+        title: 檔案
+        description: 上傳與連結檔案
+    admin:
+      resources:
+        delete: 永遠地移除這個檔案
+        edit: 編輯檔案
+        form:
+          download_current: 下載目前檔案
+          or: 或
+          replace: " 用這個來取代..."
+          maximum_file_size: 檔案大小限制為 %{bytes} 
+        resource:
+          download: 下載這個檔案 (%{size})
+        actions:
+          upload_new: 上傳新檔案
+        records:
+          no_files_yet: 目前沒有任何的檔案. 點選 "上傳新檔案" 來加入您的第一個檔案.
+        insert:
+          existing: 已存在的檔案
+          new: 新檔案
+          no_files: 目前沒有檔案.
+        existing_resource:
+          link_to_file: 此檔案連結
+          button_text: 插入
   activerecord:
     models:
-      resource: 檔案
+      refinery/resource: 檔案
     errors:
       models:
-        resource:
+        refinery/resource:
           blank: 您必須選取檔案來上傳
-          too_long: 檔案必須要小於 %{count} 這個大小
+          too_big: 檔案必須要小於 %{size} MB 這個大小

data/config/routes.rb

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

data/db/migrate/20100913234709_create_refinerycms_resources_schema.rb

@@ -1,21 +1,13 @@
 class CreateRefinerycmsResourcesSchema < ActiveRecord::Migration
-  def self.up
-    create_table ::Resource.table_name, :force => true do |t|
-      t.string   "file_mime_type"
-      t.string   "file_name"
-      t.integer  "file_size"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.string   "file_uid"
-      t.string   "file_ext"
-    end
-  end
+  def change
+    create_table :refinery_resources do |t|
+      t.string   :file_mime_type
+      t.string   :file_name
+      t.integer  :file_size
+      t.string   :file_uid
+      t.string   :file_ext
 
-  def self.down
-    [::Resource].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/resources/resources_generator.rb

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

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

@@ -0,0 +1,26 @@
+Refinery::Resources.configure do |config|
+  # Configures the maximum allowed upload size (in bytes) for a file upload
+  # config.max_file_size = <%= Refinery::Resources.max_file_size.inspect %>
+
+  # Configure how many resources per page should be displayed when a dialog is presented that contains resources
+  # config.pages_per_dialog = <%= Refinery::Resources.pages_per_dialog.inspect %>
+
+  # Configure how many resources per page should be displayed in the list of resources in the admin area
+  # config.pages_per_admin_index = <%= Refinery::Resources.pages_per_admin_index.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 resources.
+  # 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::Resources.dragonfly_insert_before.inspect %>
+  # config.dragonfly_secret = <%= Refinery::Resources.dragonfly_secret.inspect %>
+  # config.dragonfly_url_format = <%= Refinery::Resources.dragonfly_url_format.inspect %>
+  # config.datastore_root_path = <%= Refinery::Resources.datastore_root_path.inspect %>
+
+end

data/lib/refinery/resources/configuration.rb

@@ -0,0 +1,43 @@
+module Refinery
+  module Resources
+    include ActiveSupport::Configurable
+
+    config_accessor :dragonfly_insert_before, :dragonfly_secret, :dragonfly_url_format,
+                    :max_file_size, :pages_per_dialog, :pages_per_admin_index,
+                    :s3_backend, :s3_bucket_name, :s3_region,
+                    :s3_access_key_id, :s3_secret_access_key,
+                    :datastore_root_path
+
+    self.dragonfly_insert_before = 'ActionDispatch::Callbacks'
+    self.dragonfly_secret = Refinery::Core.dragonfly_secret
+    self.dragonfly_url_format = '/system/resources/:job/:basename.:format'
+
+    self.max_file_size = 52428800
+    self.pages_per_dialog = 12
+    self.pages_per_admin_index = 20
+
+    # 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', 'resources').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/resources/dragonfly.rb

@@ -0,0 +1,52 @@
+require 'dragonfly'
+
+module Refinery
+  module Resources
+    module Dragonfly
+
+      class << self
+        def setup!
+          app_resources = ::Dragonfly[:refinery_resources]
+
+          app_resources.define_macro(::Refinery::Core::BaseModel, :resource_accessor)
+
+          app_resources.analyser.register(::Dragonfly::Analysis::FileCommandAnalyser)
+          app_resources.content_disposition = :attachment
+        end
+
+        def configure!
+          app_resources = ::Dragonfly[:refinery_resources]
+          app_resources.configure_with(:rails) do |c|
+            c.datastore.root_path = Refinery::Resources.datastore_root_path
+            c.url_format = Refinery::Resources.dragonfly_url_format
+            c.secret = Refinery::Resources.dragonfly_secret
+          end
+
+          if ::Refinery::Resources.s3_backend
+            app_resources.datastore = ::Dragonfly::DataStorage::S3DataStore.new
+            app_resources.datastore.configure do |s3|
+              s3.bucket_name = Refinery::Resources.s3_bucket_name
+              s3.access_key_id = Refinery::Resources.s3_access_key_id
+              s3.secret_access_key = Refinery::Resources.s3_secret_access_key
+              # S3 Region otherwise defaults to 'us-east-1'
+              s3.region = Refinery::Resources.s3_region if Refinery::Resources.s3_region
+            end
+          end
+        end
+
+        def attach!(app)
+          ### Extend active record ###
+          app.config.middleware.insert_before Refinery::Resources.dragonfly_insert_before,
+                                              'Dragonfly::Middleware', :refinery_resources
+
+          app.config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
+            :verbose     => Rails.env.development?,
+            :metastore   => "file:#{URI.encode(Rails.root.join('tmp', 'dragonfly', 'cache', 'meta').to_s)}",
+            :entitystore => "file:#{URI.encode(Rails.root.join('tmp', 'dragonfly', 'cache', 'body').to_s)}"
+          }
+        end
+      end
+
+    end
+  end
+end

data/lib/refinery/resources/engine.rb

@@ -0,0 +1,38 @@
+module Refinery
+  module Resources
+    class Engine < ::Rails::Engine
+      include Refinery::Engine
+
+      isolate_namespace Refinery
+      engine_name :refinery_resources
+
+      config.autoload_paths += %W( #{config.root}/lib )
+
+      initializer 'setup-refinery-resources-with-dragonfly', :before => :load_config_initializers do |app|
+        ::Refinery::Resources::Dragonfly.setup!
+      end
+
+      initializer 'attach-refinery-resources-with-dragonfly', :after => :load_config_initializers do |app|
+        ::Refinery::Resources::Dragonfly.configure!
+        ::Refinery::Resources::Dragonfly.attach!(app)
+      end
+
+      initializer "register refinery_files plugin" do
+        Refinery::Plugin.register do |plugin|
+          plugin.pathname = root
+          plugin.name = 'refinery_files'
+          plugin.menu_match = /refinery\/(refinery_)?(files|resources)$/
+          plugin.version = %q{2.0.0}
+          plugin.activity = {
+            :class_name => :'refinery/resource'
+          }
+          plugin.url = { :controller => '/refinery/admin/resources' }
+        end
+      end
+
+      config.after_initialize do
+        Refinery.register_extension(Refinery::Resources)
+      end
+    end
+  end
+end

data/lib/refinery/resources/validators/file_size_validator.rb

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

data/lib/refinery/resources/validators.rb

@@ -0,0 +1,7 @@
+module Refinery
+  module Resources
+    module Validators
+      autoload :FileSizeValidator, 'refinery/resources/validators/file_size_validator'
+    end
+  end
+end

data/lib/refinery/resources.rb

@@ -0,0 +1,25 @@
+require 'refinerycms-core'
+require 'dragonfly'
+require 'rack/cache'
+
+module Refinery
+  autoload :ResourcesGenerator, 'generators/refinery/resources/resources_generator'
+
+  module Resources
+    require 'refinery/resources/engine'
+    require 'refinery/resources/configuration'
+
+    autoload :Dragonfly, 'refinery/resources/dragonfly'
+    autoload :Validators, 'refinery/resources/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/refinerycms-resources.rb

@@ -1,75 +1 @@
-require 'dragonfly'
-require 'rack/cache'
-require 'refinerycms-core'
-
-module Refinery
-  module Resources
-
-    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 'resources-with-dragonfly' do |app|
-        app_resources = Dragonfly[:resources]
-        app_resources.configure_with(:rails) do |c|
-          c.datastore.root_path = Rails.root.join('public', 'system', 'resources').to_s
-          # This url_format makes 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 file was 'refinery_is_awesome.pdf')
-          # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.pdf
-          c.url_format = '/system/resources/: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_resources.configure_with(:heroku, ENV['S3_BUCKET'])
-          # Dragonfly doesn't set the S3 region, so we have to do this manually
-          app_resources.datastore.configure do |d|
-            d.region = ENV['S3_REGION'] if ENV['S3_REGION'] # defaults to 'us-east-1'
-          end
-        end
-
-        app_resources.define_macro(ActiveRecord::Base, :resource_accessor)
-        app_resources.analyser.register(Dragonfly::Analysis::FileCommandAnalyser)
-        app_resources.content_disposition = :attachment
-
-        ### Extend active record ###
-
-        app.config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :resources
-
-        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_files'
-          plugin.url = {:controller => '/admin/resources', :action => 'index'}
-          plugin.menu_match = /(refinery|admin)\/(refinery_)?(files|resources)$/
-          plugin.version = %q{1.0.0}
-          plugin.activity = {
-            :class => Resource
-          }
-        end
-      end
-    end
-  end
-end
-
-::Refinery.engines << 'resources'
+require 'refinery/resources'