assetable 0.2.4 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjdkNGY5ZTA4YjM5ZTYzN2M0MWJmYWIzOWYyNjk0OWU1NDczNWRlZg==
+    Mjg5N2ViZDI4NDNjYjA1YWIxYWI0MTczN2IyMGU5OTdiNmI5MmNjMw==
   data.tar.gz: !binary |-
-    NDMxMWI4MDQwMDE1MDcxNDM1NGM5ZDk5YjFlYjlmMTJkNmFhYWNiZA==
+    ZDZjYmQzY2RhNjgyNDVhY2Y2OGEyNTU3MmIyOTFjMjRlMzQwN2Y0YQ==
 SHA512:
   metadata.gz: !binary |-
-    MjY2NzE3ZjhiYTE5OGZlODMyNDA1YTZkYjBjZTNhN2U4ZmNjOThjODRkNzVi
-    MTViZTU5YTJhMTc5YWJjZmNmM2E0YjA1OWVlNjM0ZmNhMWU4MTcxODBlNmY1
-    MjZjYWI4MjU1NzJjM2IyOTJlYWZmOTkzYTk5YjkyMDFmNjc1ZTA=
+    ODIxZTgwNWZiYjQzZTQzY2Q4MjFlMGQzNjQ1M2Y5MTBkYmMyYjA2ZjM4ODJj
+    MGFiMTlhOTk4ODU2MmVlMzVmNWZiOGVkOWQ2ZDg1MmYyNjM3NWI1NGQwOWY0
+    YzRmZjdmZTEzZjhiZjZlOTRiNTAwMzdiOTQzMzQyNjFjZjQ1MTk=
   data.tar.gz: !binary |-
-    Njg5NWI1NzBmNzJiYWI4YTYwYTBjMDBlMmY5ZTNjY2E4YzIwZDlhNGYzOWQ0
-    M2MyNGEyZDk2Mzg1Njk1ZGE2MDRlODBlZGVhNjE3NjZkODI3MDAwZjYyMTYw
-    OWU5MzZhYmNhMzU3NWIyZWY4NDhiMDRjZGI2MjdlZDFkY2ZhMDI=
+    YzVjYTBkNzVlYmNkNWRjZDNlYzE5YjVkYjNkNzYwZTgyY2EyODg1MTkyNDA3
+    MTVkZjZkNTZhNDE0NTA3ZDBkNTcyM2I2OGE1OWFlNGEwNTQ5ZjU1MWQ2MmVl
+    NDI4ZDJiMTFkYjc3NmM0ZjdlYjBkNzFjOGU3YTMwMGJlNzNlMGI=

data/app/controllers/assetable/assets_controller.rb

@@ -3,7 +3,7 @@ class Assetable::AssetsController < ActionController::Base
   respond_to :html, :js
 
   def index
-    @assets = Asset.page(params[:page]).per(20)
+    @assets = Assetabler::Asset.page(params[:page]).per(20)
     @fieldname = params[:fieldname]
     @uploader_id = params[:uploader_id]
   end
@@ -12,7 +12,7 @@ class Assetable::AssetsController < ActionController::Base
   def insert
     @fieldname = params[:fieldname]
     @uploader_id = params[:uploader_id]
-    @assets = Asset.find(params[:asset_ids])
+    @assets = Assetabler::Asset.find(params[:asset_ids])
   end
 
   # Create a new asset
@@ -23,11 +23,11 @@ class Assetable::AssetsController < ActionController::Base
 
     # Create the appropriate model
     if content_type.split("/").first == "image"
-      @asset = Image.new(asset_params)
+      @asset = Assetabler::Image.new(asset_params)
     elsif content_type.split("/").first == "video"
-      @asset = Video.new(asset_params)
+      @asset = Assetabler::Video.new(asset_params)
     elsif content_type.split("/").first == "application"
-      @asset = Document.new(asset_params)
+      @asset = Assetabler::Document.new(asset_params)
     end
 
     # Return
@@ -42,12 +42,12 @@ class Assetable::AssetsController < ActionController::Base
 
   # Edit an asset will return the edit form
   def edit
-    @asset = Asset.find(params[:id])
+    @asset = Assetabler::Asset.find(params[:id])
   end
 
   # Update an asset
   def update
-    @asset = Asset.find(params[:id])
+    @asset = Assetabler::Asset.find(params[:id])
     @asset.update_attributes(permitted_params)
   end
 

data/app/controllers/assetable/external_services_controller.rb

@@ -9,14 +9,14 @@ class Assetable::ExternalServicesController < ActionController::Base
 
   # New template
   def new
-    @external_service = ExternalService.new
+    @external_service = Assetabler::ExternalService.new
     @fieldname = params[:fieldname]
     @uploader_id = params[:uploader_id]
   end
 
   # Create a new external service asset
   def create
-    @external_service = ExternalService.new(permitted_params)
+    @external_service = Assetabler::ExternalService.new(permitted_params)
 
     if @external_service.errors.empty? and @external_service.save
       @fieldname = params[:fieldname]

data/app/helpers/assetable/asset_helper.rb

@@ -1,7 +1,7 @@
 module Assetable::AssetHelper
 
   def asset_preview asset
-    render partial: "assetable/shared/asset_preview", locals: { asset: asset }
+    render_to_string partial: "assetable/shared/asset_preview", locals: { asset: asset }
   end
 
 end

data/app/inputs/gallery_input.rb

@@ -21,7 +21,8 @@ class GalleryInput < SimpleForm::Inputs::FileInput
     uploader_html = template.content_tag(:div, (gallery_hidden_input + preview), class: "uploader-assets-wrapper")
 
     # Create and return the uploader html
-    uploader_wrapper = template.content_tag :div, (uploader_html + hidden_input + directions_html.html_safe), class: "gallery-uploader"
+    directions = options[:directions]
+    uploader_wrapper = template.content_tag :div, (uploader_html + hidden_input + directions_html(directions, attribute_name).html_safe), class: "gallery-uploader"
     return uploader_wrapper
   end
 

data/app/inputs/uploader_input.rb

@@ -3,6 +3,7 @@ class UploaderInput < SimpleForm::Inputs::FileInput
   include Assetable::Uploaders
 
   def input
+
     # Create the hidden input as fields_for
     fieldname = "#{object_name}[#{attribute_name}_association_attributes][asset_id]"
 
@@ -18,7 +19,7 @@ class UploaderInput < SimpleForm::Inputs::FileInput
 
     # Create and return the uploader html
     directions = options[:directions]
-    uploader_wrapper = template.content_tag :div, (uploader_html + directions_html(directions).html_safe), class: "assetable-uploader"
+    uploader_wrapper = template.content_tag :div, (uploader_html + directions_html(directions, attribute_name).html_safe), class: "assetable-uploader"
     return uploader_wrapper
   end
 

data/app/models/assetabler.rb

@@ -0,0 +1,5 @@
+module Assetabler
+  def self.table_name_prefix
+    'assetable_'
+  end
+end

data/app/models/assetabler/asset.rb

@@ -0,0 +1,55 @@
+module Assetabler
+  class Asset < ActiveRecord::Base
+
+    has_many :asset_attachments, :as => :assetable, :dependent => :destroy
+    has_many :assetable, :through => :asset_attachments
+    
+    before_save :update_asset_attributes
+
+
+
+    # File Type Helpers
+    # ---------------------------------------------------------------------
+
+    # Is the asset a image?
+    def image?
+      self.type == "Assetabler::Image"
+    end
+
+    # Is the asset a document?
+    def document?
+      self.type == "Assetabler::Document"
+    end
+
+    # Is the asset a video?
+    def video?
+      self.type == "Assetabler::Video"
+    end
+
+    def external_service?
+      self.type == "Assetabler::ExternalService"
+    end
+
+
+    # File meta and helpers
+    # ---------------------------------------------------------------------
+
+    # Get the file type extension from the filename
+    def extension
+      filename = File.extname(self.filename.to_s)
+      filename[0] = '' # remove the dot, i.e. (.docx or .pptx)
+      filename
+    end
+
+    # Add some custom attributes to the asset
+    def update_asset_attributes
+      if !self.external_service? and self.present? and self.changed?
+        self.content_type = self.filename.file.content_type
+        self.file_size = self.filename.file.size
+        self.width, self.height = `identify -format "%wx%h" #{self.filename.file.path}`.split(/x/) unless self.document? or self.width? or self.height?
+        self.ratio = self.width.to_f / self.height.to_f if self.width.present? and self.height.present?
+      end
+    end
+
+  end
+end

data/app/models/assetabler/asset_attachment.rb

@@ -0,0 +1,33 @@
+module Assetabler
+  class AssetAttachment < ActiveRecord::Base
+
+    belongs_to :asset
+    belongs_to :assetable, polymorphic: true
+
+    before_validation :ensure_name_is_not_blank
+    before_save :set_sort_order
+
+    # Is the asset_attachment attached to a gallery?
+    def gallery?
+      assetable_type.downcase == "gallery"
+    end
+
+    def gallery
+      assetable
+    end
+
+
+    private
+
+      # Ensure the name is not blank to avoid unique indexes on the name
+      # If it's blank, let's set it to nil
+      def ensure_name_is_not_blank
+        name = nil if name.blank?
+      end
+
+      def set_sort_order
+        sort_order = assetable.asset_attachments.size if gallery? and sort_order.blank?
+      end
+
+  end
+end

data/app/models/assetabler/document.rb

@@ -0,0 +1,7 @@
+module Assetabler
+  class Document < Asset
+
+    mount_uploader :filename, DocumentUploader
+
+  end
+end

data/app/models/assetabler/external_service.rb

@@ -0,0 +1,24 @@
+module Assetabler
+  class ExternalService < Asset
+
+    validates_presence_of :name, :body
+
+    def self.possible_content_types
+      if user_defined_document_types = Assetable.external_document_types
+        return user_defined_document_types
+      else
+        return ["iFrame", "Third Party API"]
+      end
+    end
+
+    def has_icon?
+      available_icons = Assetable.external_document_icons.collect{|k, v| k}
+      available_icons.include? self.content_type.to_sym if self.content_type.present?
+    end
+
+    def icon
+      Assetable.external_document_icons[self.content_type.to_sym].to_s if self.has_icon?
+    end
+
+  end
+end

data/app/models/assetabler/gallery.rb

@@ -0,0 +1,13 @@
+module Assetabler
+  class Gallery < ActiveRecord::Base
+
+    belongs_to :galleryable, polymorphic: true
+    has_many :asset_attachments, -> { order('sort_order asc') }, as: :assetable, dependent: :destroy
+    has_many :assets, through: :asset_attachments
+
+    accepts_nested_attributes_for :asset_attachments, allow_destroy: true
+
+
+
+  end
+end

data/app/models/assetabler/image.rb

@@ -0,0 +1,7 @@
+module Assetabler
+  class Image < Asset
+
+    mount_uploader :filename, ImageUploader
+
+  end
+end

data/app/models/assetabler/video.rb

@@ -0,0 +1,7 @@
+module Assetabler
+  class Video < Asset
+
+    mount_uploader :filename, VideoUploader
+
+  end
+end

data/db/migrate/20131122232735_create_assets.rb

@@ -1,6 +1,6 @@
 class CreateAssets < ActiveRecord::Migration
   def change
-    create_table :assets do |t|
+    create_table :assetable_assets do |t|
       t.string :type
       t.string :name
       t.text :body

data/db/migrate/20131123172825_create_asset_attachments.rb

@@ -1,15 +1,15 @@
 class CreateAssetAttachments < ActiveRecord::Migration
   def change
-    create_table :asset_attachments do |t|
+    create_table :assetable_asset_attachments do |t|
       t.references :asset
       t.references :assetable, :polymorphic => true
       t.string :name
       t.timestamps
     end
 
-    add_index :asset_attachments, :asset_id
-    add_index :asset_attachments, [:assetable_type, :assetable_id]
-    add_index :asset_attachments, [:assetable_type, :assetable_id, :name], unique: true, name: "named_asset"
-    add_index :asset_attachments, :assetable_id
+    add_index :assetable_asset_attachments, :asset_id
+    add_index :assetable_asset_attachments, [:assetable_type, :assetable_id], name: "poly_asset"
+    add_index :assetable_asset_attachments, [:assetable_type, :assetable_id, :name], unique: true, name: "named_asset"
+    add_index :assetable_asset_attachments, :assetable_id
   end
 end

data/db/migrate/20131125200943_create_galleries.rb

@@ -1,14 +1,14 @@
 class CreateGalleries < ActiveRecord::Migration
   def change
-    create_table :galleries do |t|
+    create_table :assetable_galleries do |t|
       t.references :galleryable, :polymorphic => true
       t.string :name
       t.timestamps
     end
 
-    add_index :galleries, [:galleryable_type, :galleryable_id]
-    add_index :galleries, [:galleryable_type, :galleryable_id, :name], unique: true, name: "named_gallery"
+    add_index :assetable_galleries, [:galleryable_type, :galleryable_id], name: "poly_asset"
+    add_index :assetable_galleries, [:galleryable_type, :galleryable_id, :name], unique: true, name: "named_gallery"
 
-    add_index :galleries, :galleryable_id
+    add_index :assetable_galleries, :galleryable_id
   end
 end

data/db/migrate/20140121173312_add_ratio_to_assets.rb

@@ -1,5 +1,5 @@
 class AddRatioToAssets < ActiveRecord::Migration
   def change
-    add_column :assets, :ratio, :float, precision: 5, scale: 4
+    add_column :assetable_assets, :ratio, :float, precision: 5, scale: 4
   end
 end

data/db/migrate/20140220053656_add_sort_order_to_asset_attachments.rb

@@ -1,10 +1,11 @@
 class AddSortOrderToAssetAttachments < ActiveRecord::Migration
   def change
-    add_column :asset_attachments, :sort_order, :integer, default: 0
+    add_column :assetable_asset_attachments, :sort_order, :integer, default: 0
 
-    AssetAttachment.reset_column_information
+    Assetabler::AssetAttachment.reset_column_information
+    Assetabler::Gallery.reset_column_information
 
-    Gallery.all.each do |gallery|
+    Assetabler::Gallery.all.each do |gallery|
       if gallery.asset_attachments.present?
         gallery.asset_attachments.each_with_index do |attachment, index|
           attachment.update_attribute(:sort_order, index)

data/lib/assetable/active_record/base.rb

@@ -9,24 +9,32 @@ module Assetable
       def assetable *args
         if args.present?
           args.each do |arg|
-            has_one :"#{arg}_association", -> { where(name: arg) }, class_name: "AssetAttachment", as: :assetable
-            has_one arg, through: :"#{arg}_association", source: :asset
+            has_one :"#{arg}_association", -> { where(name: arg) }, class_name: "Assetabler::AssetAttachment", as: :assetable
+            has_one arg, through: :"#{arg}_association", :source => :asset
             accepts_nested_attributes_for :"#{arg}_association", allow_destroy: true
+            # Hack to fix the has_one accessor from not correctly guessing namespace of source association
+            class_eval %Q"
+              def #{arg}
+                #{arg}_association.try(:asset) || super
+              end
+            "
+
           end
         end
+
       end
 
       # Galleries
       def galleryable *args
         # By default, let's include a gallery. 
         unless args.include? :gallery
-          has_one :gallery, as: :galleryable, dependent: :destroy
+          has_one :gallery, class_name: "Assetabler::Gallery", as: :galleryable, dependent: :destroy
           accepts_nested_attributes_for :gallery
         end
         
         if args.present?
           args.each do |arg|
-            has_one arg, -> { where(name: arg) }, class_name: "Gallery", as: :galleryable
+            has_one arg, -> { where(name: arg) }, class_name: "Assetabler::Gallery", as: :galleryable
             accepts_nested_attributes_for arg
           end
         end

data/lib/assetable/engine.rb

@@ -3,6 +3,11 @@ module Assetable
     config.generators.integration_tool :rspec
     config.generators.test_framework :rspec
 
+
+    initializer :assets do |config|
+      Rails.application.config.assets.precompile += %w( Moxie.swf Moxie.xap )
+    end
+
     # Run the engine migrations with the main app rake task
     initializer :append_migrations do |app|
       unless app.root.to_s.match root.to_s

data/lib/assetable/inputs/uploaders.rb

@@ -9,7 +9,7 @@ module Assetable::Uploaders
       # modal_gallery.assets.each do |asset|
       modal_gallery.asset_attachments.each_with_index do |asset_attachment, index|
         # gallery += asset_preview(asset, :gallery, fieldname) 
-        gallery += ActionController::Base.new.send(:render_to_string, partial: "assetable/shared/templates/gallery_item", locals: { asset: asset_attachment.asset, asset_attachment: asset_attachment, fieldname: fieldname, index: index })
+        gallery += ac.send(:render_to_string, partial: "assetable/shared/templates/gallery_item", locals: { asset: asset_attachment.asset, asset_attachment: asset_attachment, fieldname: fieldname, index: index })
       end
 
       gallery
@@ -17,11 +17,18 @@ module Assetable::Uploaders
   end
 
   def asset_preview asset, type=:asset, fieldname=nil
-    ActionController::Base.new.send(:render_to_string, partial: "assetable/shared/templates/#{type.downcase.to_s}_item", locals: { asset: asset, fieldname: fieldname })
+    ac.send(:render_to_string, partial: "assetable/shared/templates/#{type.downcase.to_s}_item", locals: { asset: asset, fieldname: fieldname })
   end
 
-  def directions_html directions=nil
-    ActionController::Base.new.send(:render_to_string, partial: 'assetable/assets/directions', locals: {directions: directions})
+  def directions_html(directions, fieldname=nil)
+    ac.send(:render_to_string, :partial => 'assetable/assets/directions', locals: {directions: directions, fieldname: fieldname})
+  end
+
+  def ac
+    return @c if @c.present?
+    @c = ActionController::Base.new
+    @c.request = OpenStruct.new()
+    @c
   end
 
 end

data/lib/assetable/version.rb

@@ -1,3 +1,3 @@
 module Assetable
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assetable
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - John Koht
@@ -14,14 +14,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -335,13 +335,14 @@ files:
 - app/helpers/assetable/asset_helper.rb
 - app/inputs/gallery_input.rb
 - app/inputs/uploader_input.rb
-- app/models/asset.rb
-- app/models/asset_attachment.rb
-- app/models/document.rb
-- app/models/external_service.rb
-- app/models/gallery.rb
-- app/models/image.rb
-- app/models/video.rb
+- app/models/assetabler.rb
+- app/models/assetabler/asset.rb
+- app/models/assetabler/asset_attachment.rb
+- app/models/assetabler/document.rb
+- app/models/assetabler/external_service.rb
+- app/models/assetabler/gallery.rb
+- app/models/assetabler/image.rb
+- app/models/assetabler/video.rb
 - app/uploaders/asset_uploader.rb
 - app/uploaders/document_uploader.rb
 - app/uploaders/image_uploader.rb

data/app/models/asset.rb

@@ -1,70 +0,0 @@
-# Base Asset Class
-# ---------------------------------------
-# Available Attributes:
-# :type
-# :name
-# :body
-# :filename
-# :checksum
-# :path
-# :content_type
-# :file_size
-# :width
-# :height
-# :duration
-# :bit_rate
-
-class Asset < ActiveRecord::Base
-
-  has_many :asset_attachments, :as => :assetable, :dependent => :destroy
-  has_many :assetable, :through => :asset_attachments
-  
-  before_validation :update_asset_attributes
-
-  validates_uniqueness_of :checksum, message: "File has already been uploaded." if Assetable.unique_assets
-
-
-  # File Type Helpers
-  # ---------------------------------------------------------------------
-
-  # Is the asset a image?
-  def image?
-    self.type == "Image"
-  end
-
-  # Is the asset a document?
-  def document?
-    self.type == "Document"
-  end
-
-  # Is the asset a video?
-  def video?
-    self.type == "Video"
-  end
-
-  def external_service?
-    self.type == "ExternalService"
-  end
-
-
-  # File meta and helpers
-  # ---------------------------------------------------------------------
-
-  # Get the file type extension from the filename
-  def extension
-    filename = File.extname(self.filename.to_s)
-    filename[0] = '' # remove the dot, i.e. (.docx or .pptx)
-    filename
-  end
-
-  # Add some custom attributes to the asset
-  def update_asset_attributes
-    if !self.external_service? and self.present? and self.changed?
-      self.content_type = self.filename.file.content_type
-      self.file_size = self.filename.file.size
-      self.width, self.height = `identify -format "%wx%h" #{self.filename.file.path}`.split(/x/) unless self.document? or self.width? or self.height?
-      self.ratio = self.width.to_f / self.height.to_f if self.width.present? and self.height.present?
-    end
-  end
-
-end

data/app/models/asset_attachment.rb

@@ -1,31 +0,0 @@
-class AssetAttachment < ActiveRecord::Base
-
-  belongs_to :asset
-  belongs_to :assetable, polymorphic: true
-
-  before_validation :ensure_name_is_not_blank
-  before_save :set_sort_order
-
-  # Is the asset_attachment attached to a gallery?
-  def gallery?
-    assetable_type.downcase == "gallery"
-  end
-
-  def gallery
-    assetable
-  end
-
-
-  private
-
-    # Ensure the name is not blank to avoid unique indexes on the name
-    # If it's blank, let's set it to nil
-    def ensure_name_is_not_blank
-      name = nil if name.blank?
-    end
-
-    def set_sort_order
-      sort_order = assetable.asset_attachments.size if gallery? and sort_order.blank?
-    end
-
-end

data/app/models/document.rb

@@ -1,5 +0,0 @@
-class Document < Asset
-
-  mount_uploader :filename, DocumentUploader
-
-end

data/app/models/external_service.rb

@@ -1,22 +0,0 @@
-class ExternalService < Asset
-
-  validates_presence_of :name, :body
-
-  def self.possible_content_types
-    if user_defined_document_types = Assetable.external_document_types
-      return user_defined_document_types
-    else
-      return ["iFrame", "Third Party API"]
-    end
-  end
-
-  def has_icon?
-    available_icons = Assetable.external_document_icons.collect{|k, v| k}
-    available_icons.include? self.content_type.to_sym if self.content_type.present?
-  end
-
-  def icon
-    Assetable.external_document_icons[self.content_type.to_sym].to_s if self.has_icon?
-  end
-
-end

data/app/models/gallery.rb

@@ -1,9 +0,0 @@
-class Gallery < ActiveRecord::Base
-
-  belongs_to :galleryable, polymorphic: true
-  has_many :asset_attachments, -> { order('sort_order asc') }, as: :assetable, dependent: :destroy
-  has_many :assets, through: :asset_attachments
-
-  accepts_nested_attributes_for :asset_attachments, allow_destroy: true
-
-end

data/app/models/image.rb

@@ -1,5 +0,0 @@
-class Image < Asset
-
-  mount_uploader :filename, ImageUploader
-
-end

data/app/models/video.rb

@@ -1,5 +0,0 @@
-class Video < Asset
-
-  mount_uploader :filename, VideoUploader
-
-end