alchemy-richmedia-essences 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d868ba94d2c79f37ccd320126840d8bd7c803195
-  data.tar.gz: a433b359ff064e065c6081f01f0dc1bc08d697b9
+  metadata.gz: 299155d3d95957fa0d389c9088e72168fa6b6513
+  data.tar.gz: 4fe0286cee0b99569227213ca50a980c3020dd65
 SHA512:
-  metadata.gz: ebd2df4a4fd9dfa932ade846c72d4f20aabbb4ef1271dbc3ed3eb53cd47d3923341f6612efc4810d91d5301d7b05c9326014244047e5a2160edd75e88fda1849
-  data.tar.gz: adbf22abb6a089dfdb57d3c89703625398d579e3c4813c4df2d6ae0d18357734746012ac56c20501fef820fa0a4dd1decba0b80ce00e0e3493420786f4adfe4a
+  metadata.gz: 3d37398490272910fa3f85f2287febc46aa2bb327157e657aedcfa3fa4637de60d7c52eb9b5453812b5c3efe656eca9b81b746d41f3663f7a39b031e377f06a2
+  data.tar.gz: 20d1490901ceb769505279788cea0fe8c57ebe865944360b46932f4e373fd9a995b53288d846ba989601d6eb9365755b764f75a0813b17e779c4ecf75246a49c

data/README.md

@@ -1,19 +1,20 @@
-# Alchemy CMS HTML5 Richmedia Essences
+# AlchemyCMS HTML5 Richmedia Essences
 
-Adds HTML5 `EssenceAudio` and `EssenceVideo` essences to your Alchemy CMS powered site.
+Adds HTML5 `EssenceAudio` and `EssenceVideo` essences to your AlchemyCMS powered website.
 
 ## Alchemy version
 
-This version is compatible with Alchemy version 3.0 and above only.
-
-Also this plugin does not contain a `EssenceFlash` any more. If you need `EssenceFlash`, you need to use version 0.3-stable.
+This version is compatible with Alchemy v4.0 and above only.
 
+- For Alchemy v3.x please use version 1.0.0.
 - For Alchemy v2.7.0 please use version 0.2.0.
 - For Alchemy v2.6.0 and below please use version 0.1.0.
 
+Also this plugin does not contain a `EssenceFlash` any more. If you need `EssenceFlash`, you need to use version 0.3-stable.
+
 ## Installation
 
-**Make sure you have Alchemy CMS installed.**
+**Make sure you have AlchemyCMS installed.**
 
 Add this line to your application's Gemfile:
 

data/alchemy-richmedia-essences.gemspec

@@ -7,14 +7,14 @@ Gem::Specification.new do |gem|
   gem.name          = "alchemy-richmedia-essences"
   gem.version       = Alchemy::Richmedia::Essences::VERSION
   gem.authors       = ["Thomas von Deyen"]
-  gem.email         = ["tvd@magiclabs.de"]
-  gem.description   = %q{EssenceAudio and EssenceVideo for Alchemy CMS 3.0}
-  gem.summary       = %q{Adds EssenceAudio and EssenceVideo essences to your Alchemy CMS powered site.}
+  gem.email         = ["thomas@vondeyen.com"]
+  gem.description   = %q{EssenceAudio and EssenceVideo for AlchemyCMS 4.0}
+  gem.summary       = %q{Adds EssenceAudio and EssenceVideo essences to your AlchemyCMS powered website.}
   gem.homepage      = "http://alchemy-cms.com"
   gem.license       = 'BSD New'
 
   gem.files         = `git ls-files`.split($/)
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'alchemy_cms', ['>= 3.0.0']
+  gem.add_runtime_dependency 'alchemy_cms', ['>= 4.0.0.rc1']
 end

data/app/controllers/alchemy/admin/essence_audios_controller.rb

@@ -1,7 +1,7 @@
 module Alchemy
   class Admin::EssenceAudiosController < Alchemy::Admin::BaseController
     authorize_resource class: Alchemy::EssenceAudio
-    before_filter :load_essence
+    before_action :load_essence
 
     def update
       @essence_audio.update(essence_audio_params)

data/app/controllers/alchemy/admin/essence_videos_controller.rb

@@ -1,7 +1,7 @@
 module Alchemy
   class Admin::EssenceVideosController < Alchemy::Admin::BaseController
     authorize_resource class: Alchemy::EssenceVideo
-    before_filter :load_essence
+    before_action :load_essence
 
     def update
       @essence_video.update(essence_video_params)
@@ -21,6 +21,7 @@ module Alchemy
         :controls,
         :loop,
         :muted,
+        :preload,
         :attachment_id
       )
     end

data/app/models/alchemy/essence_audio.rb

@@ -3,6 +3,6 @@ module Alchemy
     acts_as_essence ingredient_column: 'attachment',
       preview_text_method: 'name'
 
-    belongs_to :attachment
+    belongs_to :attachment, optional: true
   end
 end

data/app/models/alchemy/essence_video.rb

@@ -3,6 +3,6 @@ module Alchemy
     acts_as_essence ingredient_column: 'attachment',
       preview_text_method: 'name'
 
-    belongs_to :attachment
+    belongs_to :attachment, optional: true
   end
 end

data/app/views/alchemy/admin/essence_audios/edit.html.erb

@@ -3,5 +3,5 @@
   <%= f.input :controls %>
   <%= f.input :loop %>
   <%= f.input :muted %>
-  <%= f.submit _t(:save) %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/essence_videos/edit.html.erb

@@ -5,5 +5,7 @@
   <%= f.input :controls %>
   <%= f.input :loop %>
   <%= f.input :muted %>
-  <%= f.submit _t(:save) %>
+  <%= f.input :preload, collection: %w(auto none metadata),
+    include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
+  <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/essences/_essence_video_view.html.erb

@@ -4,6 +4,7 @@
     autoplay: content.essence.autoplay,
     loop: content.essence.loop,
     muted: content.essence.muted,
+    preload: content.essence.preload.presence || nil,
     width: content.essence.width,
     height: content.essence.height do %>
     <%= content_tag :source, nil,

data/app/views/alchemy/essences/_richmedia_essence_editor.html.erb

@@ -1,67 +1,52 @@
-<div class="content_editor essence_file" id="<%= content.dom_id %>">
-  <% if respond_to?(:content_label) %>
-    <%= content_label(content) %>
-  <% else %>
-    <%= label_and_remove_link(content) %>
-  <% end %>
+<% dialog_link = link_to_dialog('',
+  alchemy.admin_attachments_path(
+    content_id: content.id,
+    only: content.settings_value(:only, local_assigns.fetch(:options, {})),
+    except: content.settings_value(:except, local_assigns.fetch(:options, {})),
+    options: local_assigns.fetch(:options, {})
+  ),
+  {
+    title: Alchemy.t(:assign_file),
+    size: '780x585',
+    padding: false
+  },
+  {
+    class: 'icon assign_file',
+    title: Alchemy.t(:assign_file)
+  }
+) %>
+
+<div class="content_editor essence_file" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+  <%= content_label(content) %>
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
-    <% if content.ingredient.nil? %>
-      <%= link_to_dialog '',
-        alchemy.admin_attachments_path(
-          content_id: content.id,
-          only: options[:file_assign_show_only],
-          except: options[:file_assign_do_not_show],
-          options: options.to_json
-        ),
-        {
-          title: _t(:assign_file),
-          size: '780x585',
-          padding: false
-        },
-        class: 'assign_file',
-        title: _t(:assign_file)
-      %>
-    <% else %>
+    <% if content.ingredient %>
       <%= render_icon(content.ingredient.icon_css_class) %>
+    <% else %>
+      <%= dialog_link %>
     <% end %>
     </div>
     <div class="file_name">
-      <%= content.ingredient.name rescue ("&#x2190;" + _t(:assign_file_from_archive)).html_safe %>
+      <%= content.ingredient.try(:name) ||
+        ("&#x2190;" + Alchemy.t(:assign_file_from_archive)).html_safe %>
     </div>
-    <% unless content.ingredient.nil? %>
-    <%= hidden_field_tag content.form_field_name(:attachment_id), content.ingredient.id %>
     <div class="essence_file_tools">
-      <%= link_to_dialog '',
-        alchemy.admin_attachments_path(
-          content_id: content.id,
-          only: options[:file_assign_show_only],
-          except: options[:file_assign_do_not_show],
-          options: options.to_json
-        ),
-        {
-          title: _t(:assign_file),
-          size: '780x585',
-          padding: false
-        },
-        class: 'assign_file',
-        title: _t(:assign_file)
-      %>
+      <%= dialog_link %>
       <%= link_to_dialog '',
         url_for(
           controller: controller,
           action: 'edit',
-          options: options.to_json,
+          options: local_assigns[:options],
           id: content.essence.id
         ),
         {
-          title: _t(:edit_file_properties),
-          size: '400x165'
+          title: Alchemy.t(:edit_file_properties),
+          size: '400x215'
         },
         class: 'edit_file',
-        title: _t(:edit_file_properties)
-      %>
+        title: Alchemy.t(:edit_file_properties) %>
     </div>
-    <% end %>
+    <%= hidden_field_tag content.form_field_name(:attachment_id),
+      content.ingredient && content.ingredient.id %>
   </div>
 </div>

data/db/migrate/20121113171023_create_alchemy_richmedia_essences.rb

@@ -1,4 +1,4 @@
-class CreateAlchemyRichmediaEssences < ActiveRecord::Migration
+class CreateAlchemyRichmediaEssences < ActiveRecord::Migration[4.2]
   def change
     return if table_exists?(:alchemy_essence_audios)
 

data/db/migrate/20140814212620_alchemy_essence_video_html5_update.rb

@@ -1,4 +1,4 @@
-class AlchemyEssenceVideoHtml5Update < ActiveRecord::Migration
+class AlchemyEssenceVideoHtml5Update < ActiveRecord::Migration[4.2]
   def up
     change_table :alchemy_essence_videos do |t|
       t.change :width, :string

data/db/migrate/20150728153847_remove_alchemy_essence_flashes.rb

@@ -1,4 +1,4 @@
-class RemoveAlchemyEssenceFlashes < ActiveRecord::Migration
+class RemoveAlchemyEssenceFlashes < ActiveRecord::Migration[4.2]
   def up
     drop_table :alchemy_essence_flashes
   end

data/db/migrate/20150728172823_alchemy_essence_audio_html5_update.rb

@@ -1,4 +1,4 @@
-class AlchemyEssenceAudioHtml5Update < ActiveRecord::Migration
+class AlchemyEssenceAudioHtml5Update < ActiveRecord::Migration[4.2]
   def up
     change_table :alchemy_essence_audios do |t|
       t.boolean :autoplay, default: false

data/db/migrate/20151005130801_add_preload_to_alchemy_essence_videos.rb

@@ -0,0 +1,5 @@
+class AddPreloadToAlchemyEssenceVideos < ActiveRecord::Migration[4.2]
+  def change
+    add_column :alchemy_essence_videos, :preload, :string
+  end
+end

data/lib/alchemy-richmedia-essences/version.rb

@@ -1,7 +1,7 @@
 module Alchemy
   module Richmedia
     module Essences
-      VERSION = "1.0.0"
+      VERSION = "2.0.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-richmedia-essences
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,17 +16,17 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-description: EssenceAudio and EssenceVideo for Alchemy CMS 3.0
+        version: 4.0.0.rc1
+description: EssenceAudio and EssenceVideo for AlchemyCMS 4.0
 email:
-- tvd@magiclabs.de
+- thomas@vondeyen.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -54,6 +54,7 @@ files:
 - db/migrate/20140814212620_alchemy_essence_video_html5_update.rb
 - db/migrate/20150728153847_remove_alchemy_essence_flashes.rb
 - db/migrate/20150728172823_alchemy_essence_audio_html5_update.rb
+- db/migrate/20151005130801_add_preload_to_alchemy_essence_videos.rb
 - lib/alchemy-richmedia-essences.rb
 - lib/alchemy-richmedia-essences/ability.rb
 - lib/alchemy-richmedia-essences/engine.rb
@@ -78,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Adds EssenceAudio and EssenceVideo essences to your Alchemy CMS powered site.
+summary: Adds EssenceAudio and EssenceVideo essences to your AlchemyCMS powered website.
 test_files: []