intesys_asset_manager 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06714d71553ceb082aa1c8ec949ad75bbd743c1f
-  data.tar.gz: ed8b29a0a8673c91e31d4d8ab7fb98f277a8266b
+  metadata.gz: 71646169a95914b4ca547945943d63e5fd078574
+  data.tar.gz: 7cb420debca52eaa80954233ec2c6bf3b4a7c83b
 SHA512:
-  metadata.gz: 6dd505e9478c53b54959abf96673731cb24d9596bfe342f76c5921d754d1d09351e56b582c4985be098dbdac5d14db39194f5e286db0c4d6264c4c07ea37ee77
-  data.tar.gz: eb5d69fa3f3ec239e63886b835a18aa1bc263a4f35fc9d835a31e7d9c3281cf18df085303a37121a7a37bd77cc763463c8f95e92258bfe17066a30d0f408175e
+  metadata.gz: 329871fe066385bb3e0ba15b1bb0ea067609177cae3930b4245e6a21556bfea8d0551f48f6e86c83c5f0a530837daae4d35f41ad334f366b11f2d1be24bfce96
+  data.tar.gz: 84f999c9a92da482480712cb560dacb5594b6961de406ca17c06fd6ac40693882d23ae10dd0210352379f8a87b1660bd0cf4d8c8d66795c4a051c226213961f7

data/README.rdoc

@@ -112,6 +112,10 @@ Asset Manager relies on ImageMagick to process images (for thumbnails etc.). To
 There is also a rake task to re-process already existing images when you add a new format:
   rake asset_manager:recreate_versions
 
+=== Default Image Formats
+A list of file formats that will be accepted for has_image and has_images.
+  config.default_image_formats = %w(jpg jpeg gif png)
+
 == Project Roadmap
 
 - FCKEditor (Rich) integration

data/lib/asset_manager.rb

@@ -3,6 +3,7 @@ require 'asset_manager/engine'
 require 'acts-as-taggable-on'
 require 'bootstrap_kaminari'
 require 'carrierwave'
+require 'cocoon'
 require 'fancybox2-rails'
 require 'formtastic-bootstrap'
 require 'globalize'
@@ -13,41 +14,58 @@ require 'kaminari'
 require 'meta_search'
 require 'mini_magick'
 require 'sass-rails'
-require 'cocoon'
 
 module AssetManager
   include ActiveSupport::Configurable
 
+  ##
+  # Asset types
+  # Defines the visibility of your assets. You can specify:
+  # [:public] or [:private] or [:private, :public]
+  config.asset_types = :public
+  config_accessor :asset_types, instance_reader: false
+
+  ##
+  # Default image formats
+  # A list of file formats that will be accepted for has_image and has_images.
+  config.default_image_formats = %w(jpg jpeg gif png)
+  config_accessor :default_image_formats
+
+  ##
   # With Categories
+  # Decides whether or not your assets are organized by categories.
   config.with_categories = true
   config_accessor :with_categories
 
-  # With Tags
-  config.with_tags = true
-  config_accessor :with_tags
-
+  ##
   # With Clippy
+  # Permits you to copy an asset's URL to the clip board directly from the
+  # assets list.
   config.with_clippy = false
   config_accessor :with_clippy
 
-  # Asset types
-  config.asset_types = :public
-  config_accessor :asset_types, instance_reader: false
+  ##
+  # With Tags
+  # Decides whether or not your assets are organized by tags.
+  config.with_tags = true
+  config_accessor :with_tags
 
-  def self.asset_types
-    Array(config.asset_types)
-  end
+  class << self
+    def asset_types
+      Array(config.asset_types)
+    end
 
-  def self.public_asset_type?
-    asset_types.include?(:public)
-  end
+    def public_asset_type?
+      asset_types.include?(:public)
+    end
 
-  def self.private_asset_type?
-    asset_types.include?(:private)
-  end
+    def private_asset_type?
+      asset_types.include?(:private)
+    end
 
-  def self.unique_asset_type?
-    asset_types.length == 1
+    def unique_asset_type?
+      asset_types.length == 1
+    end
   end
 end
 

data/lib/asset_manager/active_record.rb

@@ -0,0 +1,155 @@
+class ActiveRecord::Base
+
+  class << self
+    attr_reader :am_file, :am_file_options, :am_files, :am_files_options
+
+    def has_file(field, options = {})
+      options.assert_valid_keys(:accepted, :type, :mode)
+      options.reverse_merge!(type: :public, max: 1, mode: :file)
+
+      @am_file = [] if @am_file.nil?
+      @am_file.push(field) unless @am_file.include?(field)
+      @am_file_options = {} if @am_file_options.nil?
+      @am_file_options[field] = options
+
+      attr_accessible am_field_name(field, false)
+      attr_accessor am_field_name(field, false)
+
+      has_one "asset_association_#{field}".to_sym, as: :owner, class_name: 'AssetManager::AssetAssociation', conditions: { context: "#{field}" }
+      has_one "#{field}".to_sym, through: "asset_association_#{field}".to_sym, source: :asset, class_name: 'AssetManager::Asset'
+
+      after_save :save_file_associations
+      after_destroy :destroy_file_and_files_associations
+    end
+
+    def has_private_file(field, options = {})
+      has_file(field, options.merge(type: :private))
+    end
+
+    def has_image(field, options = {})
+      has_file(field, options.merge(accepted: AssetManager.default_image_formats, mode: :image))
+    end
+
+    def has_files(field, options = {})
+      options.assert_valid_keys(:accepted, :type, :mode, :max)
+      options.reverse_merge!(type: :public, mode: :files, max: 999)
+
+      @am_files = [] if @am_files.nil?
+      @am_files.push(field) unless @am_files.include?(field)
+      @am_files_options = {} if @am_files_options.nil?
+      @am_files_options[field] = options
+
+      attr_accessible am_field_name(field, true)
+
+      has_many "asset_association_#{field}".to_sym, as: :owner, class_name: 'AssetManager::AssetAssociation', conditions: { context: "#{field}" }
+      has_many "#{field}".to_sym, through: "asset_association_#{field}".to_sym, source: :asset, class_name: 'AssetManager::Asset'
+
+      after_save :save_files_associations
+      after_destroy :destroy_file_and_files_associations
+    end
+
+    def has_private_files(field, options = {})
+      has_files(field, options.merge(type: :private))
+    end
+
+    def has_images(field, options = {})
+      has_files(field, options.merge(accepted: AssetManager.default_image_formats, mode: :images))
+    end
+
+    def am_file_fields
+      @am_file.nil? ? [] : @am_file
+    end
+
+    def am_files_fields
+      @am_files.nil? ? [] : @am_files
+    end
+
+    def am_file_options
+      @am_file_options.nil? ? {} : @am_file_options
+    end
+
+    def am_files_options
+      @am_files_options.nil? ? {} : @am_files_options
+    end
+
+    def am_has_field?(field)
+      am_file_fields.include?(field.to_sym) || am_files_fields.include?(field.to_sym)
+    end
+
+    def am_field_option(field, key)
+      options = field_options(field)
+      options[field.to_sym][key] rescue nil
+    end
+
+    def am_field_name(field, multiple)
+      (multiple ? "#{field.to_s.singularize}_ids" : "#{field.to_s}_id").to_sym
+    end
+
+    private
+
+    def field_options(field)
+      am_file_fields.include?(field.to_sym) ? am_file_options : am_files_options
+    end
+
+  end
+
+
+  private
+
+  def save_file_associations
+    self.class.am_file_fields.each do |field|
+      value = send(self.class.am_field_name(field, false))
+      unless value.nil?
+        ::AssetManager::AssetAssociation.destroy_all(
+            owner_type: self.class.name,
+            owner_id: id,
+            context: field
+        )
+        unless value.blank?
+          ::AssetManager::AssetAssociation.create(
+              owner_type: self.class.name,
+              owner_id: id,
+              context: field,
+              asset_id: value.to_i,
+              position: 1
+          )
+        end
+      end
+    end
+  end
+
+  def save_files_associations
+    self.class.am_files_fields.each do |field|
+      values = send(self.class.am_field_name(field, true))
+      unless values.nil?
+        ::AssetManager::AssetAssociation.destroy_all(
+            owner_type: self.class.name,
+            owner_id: id,
+            context: field
+        )
+        values.reject! { |a| a.to_s.strip.length == 0 }
+        unless values.empty?
+          values.each_with_index do |value, index|
+            ::AssetManager::AssetAssociation.create(
+                owner_type: self.class.name,
+                owner_id: id,
+                context: field,
+                asset_id: value.to_i,
+                position: (index + 1)
+            )
+          end
+        end
+      end
+    end
+  end
+
+  def destroy_file_and_files_associations
+    (self.class.am_file_fields + self.class.am_files_fields).each do |field|
+      ::AssetManager::AssetAssociation.destroy_all(
+          owner_type: self.class.name,
+          owner_id: id,
+          context: field
+      )
+    end
+  end
+end

data/lib/asset_manager/all.rb

@@ -1,5 +1,5 @@
-require 'asset_manager/extensions/all'
-require 'custom_versions.rb'
-require 'touch_translation.rb'
-require 'translations.rb'
-require 'deprecated.rb'
+require 'asset_manager/active_record'
+require 'asset_manager/deprecated.rb'
+require 'asset_manager/custom_versions.rb'
+require 'asset_manager/touch_translation.rb'
+require 'asset_manager/translations.rb'

data/lib/asset_manager/deprecated.rb

@@ -0,0 +1,69 @@
+module AssetManager
+  module Deprecated
+
+    module AssetsHelper
+      def asset_manager_select_link(resource, field, save = false)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_select instead.")
+        am_select_link(resource, field, save)
+      end
+
+      def am_icon_url(type, size = 16, frontend = true)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_ico_path instead.")
+        am_ico_path(type, size: size)
+      end
+
+      def render_attachments(assets, title = t('.downloads', default: 'Downloads'), size = nil, categorized = true)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_render instead.")
+        nil
+      end
+
+      def categorized_asset_group(assets, size = nil)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_render instead.")
+        nil
+      end
+
+      def asset_group(assets, size = nil)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_render instead.")
+        nil
+      end
+
+      def assets(collection, version = nil, options = {}, container_class = '', linked = false)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_render instead.")
+        nil
+      end
+
+      def asset(resource, version = nil, options = {}, container_asset_class = '', linked = false)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_render instead.")
+        nil
+      end
+
+      def clippy(text, bgcolor = '#FFFFFF')
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_clippy instead.")
+        am_clippy(text, bg_color: bgcolor)
+      end
+
+      def asset_url(resource, version = nil)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_asset_url instead.")
+        am_asset_url(resource, version: version)
+      end
+    end
+
+    module AssetInstancesHelper
+      def asset_instance(resource, version = nil, options = {}, linked = false)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated.")
+        nil
+      end
+
+      def asset_instance_url(resource, options = {})
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_asset_instance_url instead.")
+        am_asset_instance_url(resource, options)
+      end
+
+      def display_instance_context(resource)
+        Rails.logger.warn ActiveSupport::Deprecation.warn("#{__callee__} is deprecated - use am_display_instance_context instead.")
+        am_display_instance_context(resource)
+      end
+    end
+
+  end
+end

data/lib/asset_manager/engine.rb

@@ -9,25 +9,21 @@ module AssetManager
     config.generators.stylesheets true
     config.generators.form_builder :formtastic
 
-    # We include the engine's helpers
-    initializer 'asset_manager.action_controller' do |app|
+    initializer 'asset_manager' do |app|
+      app.config.assets.precompile += ['asset_manager.css', 'asset_manager.js']
+
+      # We include the engine's helpers
       ActiveSupport.on_load :action_view do
         include AssetManager::AssetsHelper
         include AssetManager::AssetInstancesHelper
       end
-      ActiveSupport.on_load :active_record do
-        Formtastic::Inputs.autoload(:AssetManagerInput, 'formtastic/inputs/asset_manager_input') if defined?(Formtastic)
-        SimpleForm::Inputs.autoload(:AssetManagerInput, 'simple_form/inputs/asset_manager_input') if defined?(SimpleForm)
-      end
-    end
 
-    if Rails.version > '3.1'
-      initializer 'Asset Manager precompile hook' do |app|
-        app.config.assets.precompile += [
-          'asset_manager.css',
-          'asset_manager.js',
-        ]
-      end
+      # Formtastic input type
+      Formtastic::Inputs.autoload(:AssetManagerInput, 'formtastic/inputs/asset_manager_input') if defined?(Formtastic)
+
+      # SimpleForm input type
+      SimpleForm::Inputs.autoload(:AssetManagerInput, 'simple_form/inputs/asset_manager_input') if defined?(SimpleForm)
     end
+
   end
 end

data/lib/formtastic/inputs/asset_manager_input.rb

@@ -1,5 +1,6 @@
 module Formtastic
   module Inputs
+
     class AssetManagerInput
       include Formtastic::Inputs::Base
 
@@ -26,5 +27,6 @@ module Formtastic
         end
       end
     end
+
   end
 end

data/lib/intesys_asset_manager/version.rb

@@ -1,3 +1,3 @@
 module AssetManager
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

data/lib/simple_form/inputs/asset_manager_input.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Inputs
-    class AssetManagerInput < SimpleForm::Inputs::Base
 
+    class AssetManagerInput < SimpleForm::Inputs::Base
       def input
         template.content_tag(:div, class: 'asset_manager_container') do
           template.concat select_link
@@ -28,7 +28,7 @@ module SimpleForm
           end
         end
       end
-
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intesys_asset_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Intesys S.r.l.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -416,19 +416,18 @@ files:
 - db/migrate/20121005072255_acts_as_taggable_on_migration.rb
 - db/migrate/20140512090937_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - db/migrate/20130417082644_asset_manager_add_index_to_foreign_keys.rb
-- lib/custom_versions.rb
-- lib/deprecated.rb
-- lib/translations.rb
 - lib/formtastic/inputs/asset_manager_input.rb
 - lib/tasks/asset_manager_tasks.rake
 - lib/asset_manager.rb
 - lib/simple_form/inputs/asset_manager_input.rb
 - lib/intesys_asset_manager.rb
 - lib/asset_manager/engine.rb
+- lib/asset_manager/custom_versions.rb
+- lib/asset_manager/deprecated.rb
+- lib/asset_manager/translations.rb
 - lib/asset_manager/all.rb
-- lib/asset_manager/extensions/all.rb
-- lib/asset_manager/extensions/active_record.rb
-- lib/touch_translation.rb
+- lib/asset_manager/active_record.rb
+- lib/asset_manager/touch_translation.rb
 - lib/assets/javascripts/bootstrap2/bootstrap.js
 - lib/assets/stylesheets/bootstrap2/bootstrap.css.erb
 - lib/assets/stylesheets/bootstrap2/bootstrap-responsive.css

data/lib/asset_manager/extensions/active_record.rb

@@ -1,152 +0,0 @@
-class ActiveRecord::Base
-  class << self
-    attr_reader :am_file, :am_file_options, :am_files, :am_files_options
-  end
-
-  def self.has_file(field, options = {})
-    fail "has_file :#{field} for #{name} class is not a valid name. The name must be singular!" if field.to_s != field.to_s.singularize
-    options.assert_valid_keys(:accepted, :type, :mode)
-    options.reverse_merge!(type: :public, max: 1, mode: :file)
-
-    @am_file = [] if @am_file.nil?
-    @am_file.push(field) unless @am_file.include?(field)
-    @am_file_options = {} if @am_file_options.nil?
-    @am_file_options[field] = options
-
-    attr_accessible am_field_name(field, false)
-    attr_accessor am_field_name(field, false)
-
-    has_one "asset_association_#{field}".to_sym, as: :owner, class_name: 'AssetManager::AssetAssociation', conditions: { context: "#{field}" }
-    has_one "#{field}".to_sym, through: "asset_association_#{field}".to_sym, source: :asset, class_name: 'AssetManager::Asset'
-
-    after_save :save_file_associations
-    after_destroy :destroy_file_and_files_associations
-  end
-
-  def self.has_private_file(field, options = {})
-    has_file(field, options.merge(type: :private))
-  end
-
-  def self.has_image(field, options = {})
-    has_file(field, options.merge(accepted: %w(jpg gif png), mode: :image))
-  end
-
-  def self.has_files(field, options = {})
-    fail "has_files :#{field} for #{name} class is not a valid name. The name must be plural!" if field.to_s != field.to_s.pluralize
-    options.assert_valid_keys(:accepted, :type, :mode, :max)
-    options.reverse_merge!(type: :public, mode: :files, max: 999)
-
-    @am_files = [] if @am_files.nil?
-    @am_files.push(field) unless @am_files.include?(field)
-    @am_files_options = {} if @am_files_options.nil?
-    @am_files_options[field] = options
-
-    attr_accessible am_field_name(field, true)
-
-    has_many "asset_association_#{field}".to_sym, as: :owner, class_name: 'AssetManager::AssetAssociation', conditions: { context: "#{field}" }
-    has_many "#{field}".to_sym, through: "asset_association_#{field}".to_sym, source: :asset, class_name: 'AssetManager::Asset'
-
-    after_save :save_files_associations
-    after_destroy :destroy_file_and_files_associations
-  end
-
-  def self.has_private_files(field, options = {})
-    has_files(field, options.merge(type: :private))
-  end
-
-  def self.has_images(field, options = {})
-    has_files(field, options.merge(accepted: %w(jpg gif png), mode: :images))
-  end
-
-  def self.am_file_fields
-    @am_file.nil? ? [] : @am_file
-  end
-
-  def self.am_files_fields
-    @am_files.nil? ? [] : @am_files
-  end
-
-  def self.am_file_options
-    @am_file_options.nil? ? {} : @am_file_options
-  end
-
-  def self.am_files_options
-    @am_files_options.nil? ? {} : @am_files_options
-  end
-
-  def self.am_has_field?(field)
-    am_file_fields.include?(field.to_sym) || am_files_fields.include?(field.to_sym)
-  end
-
-  def self.am_field_option(field, key)
-    options = field_options(field)
-    options[field.to_sym][key] rescue nil
-  end
-
-  def self.am_field_name(field, multiple)
-    "#{field.to_s.singularize}_#{multiple ? 'ids' : 'id'}".to_sym
-  end
-
-  private
-
-  def self.field_options(field)
-    am_file_fields.include?(field.to_sym) ? am_file_options : am_files_options
-  end
-
-  def save_file_associations
-    self.class.am_file_fields.each do |field|
-      value = send(self.class.am_field_name(field, false))
-      unless value.nil?
-        ::AssetManager::AssetAssociation.destroy_all(
-            owner_type: self.class.name,
-            owner_id: id,
-            context: field
-        )
-        unless value.blank?
-          ::AssetManager::AssetAssociation.create(
-              owner_type: self.class.name,
-              owner_id: id,
-              context: field,
-              asset_id: value.to_i,
-              position: 1
-          )
-        end
-      end
-    end
-  end
-
-  def save_files_associations
-    self.class.am_files_fields.each do |field|
-      values = send(self.class.am_field_name(field, true))
-      unless values.nil?
-        ::AssetManager::AssetAssociation.destroy_all(
-            owner_type: self.class.name,
-            owner_id: id,
-            context: field
-        )
-        values.reject! { |a| a.to_s.strip.length == 0 }
-        unless values.empty?
-          values.each_with_index do |value, index|
-            ::AssetManager::AssetAssociation.create(
-                owner_type: self.class.name,
-                owner_id: id,
-                context: field,
-                asset_id: value.to_i,
-                position: (index + 1)
-            )
-          end
-        end
-      end
-    end
-  end
-
-  def destroy_file_and_files_associations
-    (self.class.am_file_fields + self.class.am_files_fields).each do |field|
-      ::AssetManager::AssetAssociation.destroy_all(
-          owner_type: self.class.name,
-          owner_id: id,
-          context: field
-      )
-    end
-  end
-end

data/lib/asset_manager/extensions/all.rb

@@ -1 +0,0 @@
-require 'asset_manager/extensions/active_record'

data/lib/deprecated.rb

@@ -1,61 +0,0 @@
-module AssetManager
-  module Deprecated
-    module AssetsHelper
-      def asset_manager_select_link(resource, field, save = false)
-        ActiveSupport::Deprecation.warn('asset_manager_select_link will be deprecated; use am_select_link')
-        am_select_link(resource, field, save)
-      end
-
-      def am_icon_url(type, size = 16, frontend = true)
-        ActiveSupport::Deprecation.warn('am_icon_url will be deprecated; use am_ico_path')
-        am_ico_path(type, size: size)
-      end
-
-      def render_attachments(assets, title = t('.downloads', default: 'Downloads'), size = nil, categorized = true)
-        ActiveSupport::Deprecation.warn('render_attachments will be deprecated; use am_render')
-      end
-
-      def categorized_asset_group(assets, size = nil)
-        ActiveSupport::Deprecation.warn('categorized_asset_group will be deprecated; use am_render')
-      end
-
-      def asset_group(assets, size = nil)
-        ActiveSupport::Deprecation.warn('asset_group will be deprecated; use am_render')
-      end
-
-      def assets(collection, version = nil, options = {}, container_class = '', linked = false)
-        ActiveSupport::Deprecation.warn('assets will be deprecated; use am_render')
-      end
-
-      def asset(resource, version = nil, options = {}, container_asset_class = '', linked = false)
-        ActiveSupport::Deprecation.warn('asset will be deprecated; use am_render')
-      end
-
-      def clippy(text, bgcolor = '#FFFFFF')
-        ActiveSupport::Deprecation.warn('clippy will be deprecated; use am_clippy')
-        am_clippy(text, bg_color: bgcolor)
-      end
-
-      def asset_url(resource, version = nil)
-        ActiveSupport::Deprecation.warn('asset_url will be deprecated; use am_asset_url')
-        am_asset_url(resource, version: version)
-      end
-    end
-
-    module AssetInstancesHelper
-      def asset_instance(resource, version = nil, options = {}, linked = false)
-        ActiveSupport::Deprecation.warn('asset_instance will be deprecated')
-      end
-
-      def asset_instance_url(resource, options = {})
-        ActiveSupport::Deprecation.warn('asset_instance_url will be deprecated; use am_asset_instance_url')
-        am_asset_instance_url(resource, options)
-      end
-
-      def display_instance_context(resource)
-        ActiveSupport::Deprecation.warn('display_instance_context will be deprecated; use am_display_instance_context')
-        am_display_instance_context(resource)
-      end
-    end
-  end
-end