effective_assets 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 683799595ae295b197a44f02b02a769932610fcc
-  data.tar.gz: 28505119bba096a4952d6ddff8331dde8420bc6a
+  metadata.gz: c67c92237f6b56315688a9a7e3d99fda5003ae1a
+  data.tar.gz: 4342c97db0a74f2e3154feeb24d7f5ed3024aed0
 SHA512:
-  metadata.gz: b8d0188295ccac3909e171064047f844ec53f841f9139a8739adcd2288482a01b595c34b355418b567771a45354d46ce68a4b3311452f2bb282901a44b34ce24
-  data.tar.gz: a0902359371838357880728816d299a6fb23225cff4ef62ad456582e437ed20bf6dabf6c585374628c63e972666940e4d5ebde7c253c265cefe87517217a1482
+  metadata.gz: 72ad719b4aca16a29444fb9fabed8c9fa32ae455aaee367678f0083b16f049c20b5c5ca7dd5349019ebd7d9fe7e287e03b7b40367af588f27c0ba5040a7b43d7
+  data.tar.gz: 06128f78aa8bc3d1ba9201c8ddca3ae68bc034e3db7c6c8580ed9137a6a7a33104c6658e6ebca4f3d2f018752f25eecb0bc55d64dc736b587443082796e37661

data/README.md

@@ -89,7 +89,7 @@ You will need an AWS IAM user with sufficient priviledges and a properly configu
 
 - Click Services -> S3 from the top-left menu
 - Click Create Bucket
-  - Give the Bucket a name, and select the US Standard region
+- Give the Bucket a name, and select the US Standard region
 
 ### Configure CORS Permissions
 
@@ -125,15 +125,22 @@ The Bucket is now set up and ready to accept uploads, but we still need a user t
 
 - Select Users from the left-side menu
 - Click Create New Users
+
 - Create just one user with any name
 
 - Expand the Show User Security Credentials
 - This displays the AWS Access Key and Secret Access Key.
 - (important) These are the two values you should copy into the effective_assets.rb initializer file
+- Click Close.  It's okay that you didn't download the credentials.
+
+- Return to the Services -> IAM -> Users page
+- Click on the name of the user you just created (not the checkbox, but the username text)
+
+- Click Permissions tab
+- Click Attach Policy
 
-- Once the user is created, Click on the User Properties area
-- Click Attach User Policy
-- Scroll down and Select 'Amazon S3 Full Access'
+- Scroll down and Select 'AmazonS3FullAccess'
+- Click Attach Policy
 
 This user is now set up and ready to access the S3 Bucket previously created
 

data/active_admin/effective_assets.rb

@@ -0,0 +1,104 @@
+if defined?(ActiveAdmin)
+  ActiveAdmin.register Effective::Asset do
+    menu :label => "Assets", :if => proc { EffectiveAssets.authorized?(controller, :manage, Effective::Asset.new()) rescue false }
+
+    filter :title
+    filter :content_type
+    filter :created_at
+
+    scope :all, :default => true
+    scope :images
+    scope :videos
+    scope :files
+
+    index do
+      selectable_column
+
+      column 'Thumbnail' do |asset|
+        effective_asset_image_tag(asset, nil, {:height => 100, :width => 100})
+      end
+
+      column 'Title' do |asset|
+        strong asset.title
+      end
+
+      column 'Insert' do |asset|
+        ul :class => 'insert_links' do
+          if asset.image?
+            if asset.height.present? and asset.width.present?
+              li link_to "Insert as Original (#{asset.width}x#{asset.height}px)", '#', :class => 'asset-insertable', :data => { 'asset-id' => asset.id, 'asset' => effective_asset_image_tag(asset) }
+            else
+              li link_to 'Insert as Original', '#', :class => 'asset-insertable', :data => { 'asset-id' => asset.id, 'asset' => effective_asset_image_tag(asset) }
+            end
+
+            unless asset.processed?
+              li image_tag('/assets/effective_assets/spinner.gif', :alt => 'Generating additional image sizes...')
+              li 'Generating additional sizes...'
+              li "Please #{link_to 'Refresh', '#', :title => 'Refresh this page', :onclick => 'window.location.reload();'} in a moment.".html_safe
+            else
+              asset.versions_info.each do |title, dimensions|
+                li link_to "Insert as #{title.to_s.gsub('_',' ').titleize} (#{dimensions[:width]}x#{dimensions[:height]}px)", '#', :class => 'asset-insertable', :data => { 'asset-id' => asset.id, 'asset' => effective_asset_image_tag(asset) }
+              end
+            end
+
+            li link_to 'Reprocess all Versions', reprocess_admin_effective_asset_path(asset)
+
+          elsif asset.icon?
+            li link_to 'Insert icon', '#', :class => 'asset-insertable', :data => { 'asset-id' => asset.id, 'asset' => effective_asset_image_tag(asset) }
+
+          elsif asset.video?
+            li link_to 'Insert video', '#', :class => 'asset-insertable', :data => { 'asset-id' => asset.id, 'asset' => effective_asset_video_tag(asset) }
+
+          else
+            li link_to 'Insert link to file', '#', :class => 'asset-insertable', :data => { 'asset-id' => asset.id, 'asset' => effective_asset_link_to(asset) }
+          end
+        end
+      end
+
+      ActiveAdmin::VERSION.to_i >= 1 ? actions : default_actions
+    end
+
+    form :partial => "active_admin/effective_assets/form"
+
+    show :title => :title do
+      attributes_table do
+        row :title
+        row :content_type
+        row :created_at
+        row :thumb do
+          effective_asset_image_tag(effective_asset, nil, {:height => 100, :width => 100})
+        end
+        row :files do
+          ul do
+            if effective_asset.image?
+              li do
+                a :href => effective_asset.url, :target => "blank" do
+                  "Original"
+                end
+                span "#{effective_asset.width || '?'}x#{effective_asset.height || '?'}px #{number_to_human_size(effective_asset.data_size, :precision => 3)}"
+              end
+
+              effective_asset.versions_info.each do |version, attributes|
+                li do
+                  a :href => effective_asset.url(version), :target => 'blank' do
+                    "#{version.to_s.gsub('_',' ').titleize}"
+                  end
+                  span "#{attributes[:width]}x#{attributes[:height]}px #{number_to_human_size(attributes[:data_size], :precision => 3)}"
+                end
+              end
+            else  # Asset is not an image
+              li do
+                a :href => effective_asset.url do "#{effective_asset.file_name}" end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    member_action :reprocess, :method => :get do
+      asset = Effective::Asset.find(params[:id]).reprocess!
+      redirect_to admin_effective_assets_path
+    end
+  end
+end

data/app/assets/javascripts/effective/snippets/effective_asset.js.coffee.erb

@@ -20,8 +20,20 @@ CKEDITOR.dialog.add 'effective_asset', (editor) ->
 
               $(this).contents().on 'click', 'a.attachment-insert', (event) ->
                 event.preventDefault()
-                dialog.setValueOf('asset', 'asset_id', $(event.currentTarget).data('asset-id'))
-                dialog.setValueOf('asset', 'link_title', $($(event.currentTarget).data('asset')).text())
+                linkTitle = $($(event.currentTarget).data('asset')).text()
+
+                currentAssetId = dialog.getValueOf('asset', 'asset_id')
+                newAssetId = $(event.currentTarget).data('asset-id')
+                # if changing or initializing the attachment
+                if currentAssetId != newAssetId
+                  dialog.setValueOf('asset', 'asset_id', newAssetId)
+                  # if initializing the attachment
+                  if currentAssetId == ''
+                    # try to set the link title based on a given link title
+                    givenLinkTitle = dialog.getContentElement('asset', 'link_title').getValue()
+                    linkTitle = givenLinkTitle if givenLinkTitle.length > 0
+
+                dialog.setValueOf('asset', 'link_title', linkTitle)
                 dialog.commitContent()
                 dialog.click('ok')
         }

data/app/views/effective/snippets/_effective_asset.html.haml

@@ -6,4 +6,5 @@
 - elsif asset.image?
   = effective_asset_image_tag(asset, nil, :class => effective_asset.html_class)
 - else
-  = effective_asset_link_to(asset, nil, :class => effective_asset.html_class, :title => effective_asset.link_title.presence)
+  %span.effective-assets-asset-link{data: {'content-type' => asset.content_type}}
+    = effective_asset_link_to(asset, nil, :class => effective_asset.html_class, :title => effective_asset.link_title.presence)

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: unf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +161,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- active_admin/effective_assets.rb
 - app/assets/images/effective_assets/icon_close.png
 - app/assets/images/effective_assets/spinner.gif
 - app/assets/images/mime-types/excel.jpg