alchemy-richmedia-essences 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c368e688fbed9b1e75d5390132a2e96c8aab3a3a
-  data.tar.gz: 1466c1312100108384f41c867705792d2f2a558d
+  metadata.gz: d868ba94d2c79f37ccd320126840d8bd7c803195
+  data.tar.gz: a433b359ff064e065c6081f01f0dc1bc08d697b9
 SHA512:
-  metadata.gz: 3b4f8af2708993d78972231d631a4c3007474848c2b2cabb1dd972a0b2ffc3e598972294420e7fd9016b6ded9e40b4ce6917fd3c6f60c05a688aa55793ddf162
-  data.tar.gz: 0e0ca4a660ad8e1f337beab1fddc44008312170ec41426afd80d78b0374836abb56cbc6b83967ac3c140b3bbc5c320e461fa4eb3ed7ffa5fa843c86549d44747
+  metadata.gz: ebd2df4a4fd9dfa932ade846c72d4f20aabbb4ef1271dbc3ed3eb53cd47d3923341f6612efc4810d91d5301d7b05c9326014244047e5a2160edd75e88fda1849
+  data.tar.gz: adbf22abb6a089dfdb57d3c89703625398d579e3c4813c4df2d6ae0d18357734746012ac56c20501fef820fa0a4dd1decba0b80ce00e0e3493420786f4adfe4a

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014, magic labs GmbH, Hamburg Germany
+Copyright (c) 2010-2015, magic labs GmbH, Hamburg Germany
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -1,12 +1,15 @@
-# Alchemy CMS Richmedia Essences
+# Alchemy CMS HTML5 Richmedia Essences
 
-Adds EssenceAudio, EssenceFlash and EssenceVideo essences to your Alchemy CMS powered site.
+Adds HTML5 `EssenceAudio` and `EssenceVideo` essences to your Alchemy CMS powered site.
+
+## Alchemy version
 
 This version is compatible with Alchemy version 3.0 and above only.
 
-For Alchemy v2.7.0 please use version 0.2.0.
+Also this plugin does not contain a `EssenceFlash` any more. If you need `EssenceFlash`, you need to use version 0.3-stable.
 
-For Alchemy v2.6.0 and below please use version 0.1.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.
 
 ## Installation
 
@@ -14,31 +17,46 @@ For Alchemy v2.6.0 and below please use version 0.1.0.
 
 Add this line to your application's Gemfile:
 
-    gem 'alchemy-richmedia-essences'
+~~~ruby
+gem 'alchemy-richmedia-essences', github: 'AlchemyCMS/alchemy-richmedia-essences'
+~~~
 
 And then execute:
 
-    $ bundle
+~~~shell
+$ bundle install
+~~~
 
-Or install it yourself as:
+## Usage
 
-    $ gem install alchemy-richmedia-essences
+1) After installing or updating, prepare your database with:
 
-## Usage
+~~~shell
+$ rake alchemy_richmedia_essences:install:migrations db:migrate
+~~~
+
+2) In your `elements.yml` add one of these essences to your element of choice.
+
+~~~yaml
+# elements.yml
+- name: video
+  contents:
+  - name: video
+    type: EssenceVideo
 
-1. After installing, prepare your database with:
+- name: audio
+  contents:
+  - name: audio
+    type: EssenceAudio
+~~~
 
-        $ rake alchemy_richmedia_essences:install:migrations db:migrate
+## Player customization
 
-2. In your `elements.yml` add one of the shiny new essences to your element of choice.
+This plugin just provides HTML5 `<video>` and `<audio>` tags and no styling at all. The players will appear as the browser vendors provide.
 
-        # elements.yml
-        - name: video
-          contents:
-          - name: file
-            type: EssenceVideo
+If you want a cross browser and customizable player with Flash® fallback, then we strongly recommend something like http://mediaelementjs.com/
 
-That's it!
+There is even a gem https://github.com/tobsch/mediaelement_rails that provides everthing for the Rails' asset pipeline.
 
 ## Contributing
 

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         = ["tvdeyen@gmail.com"]
-  gem.description   = %q{EssenceAudio, EssenceFlash and EssenceVideo for Alchemy CMS 3.0}
-  gem.summary       = %q{Adds EssenceAudio, EssenceFlash and EssenceVideo essences to your Alchemy CMS powered site.}
+  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.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.rc4']
+  gem.add_runtime_dependency 'alchemy_cms', ['>= 3.0.0']
 end

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

@@ -15,10 +15,10 @@ module Alchemy
 
     def essence_audio_params
       params.require(:essence_audio).permit(
-        :width,
-        :height,
-        :show_eq,
-        :show_navigation,
+        :autoplay,
+        :controls,
+        :loop,
+        :muted,
         :attachment_id
       )
     end

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

@@ -17,9 +17,10 @@ module Alchemy
       params.require(:essence_video).permit(
         :width,
         :height,
-        :allow_fullscreen,
-        :auto_play,
-        :show_navigation,
+        :autoplay,
+        :controls,
+        :loop,
+        :muted,
         :attachment_id
       )
     end

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

@@ -1,7 +1,7 @@
 <%= alchemy_form_for [:admin, @essence_audio] do |f| %>
-  <%= f.input :width %>
-  <%= f.input :height %>
-  <%= f.input :show_eq %>
-  <%= f.input :show_navigation %>
+  <%= f.input :autoplay %>
+  <%= f.input :controls %>
+  <%= f.input :loop %>
+  <%= f.input :muted %>
   <%= f.submit _t(:save) %>
 <% end %>

data/app/views/alchemy/admin/essence_files/assign.js.erb

@@ -0,0 +1,9 @@
+$('#<%= @content.dom_id %>').replaceWith('<%= j(
+  render "alchemy/essences/#{@content.essence_partial_name}_editor",
+    formats: [:html],
+    content: @content,
+    options: @options
+) %>');
+Alchemy.closeCurrentDialog();
+Alchemy.setElementDirty($('#element_<%= @content.element.id %>'));
+Alchemy.watchForDialogs($('#<%= @content.dom_id %>'));

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

@@ -1,8 +1,9 @@
 <%= alchemy_form_for [:admin, @essence_video] do |f| %>
   <%= f.input :width %>
   <%= f.input :height %>
-  <%= f.input :allow_fullscreen %>
-  <%= f.input :auto_play %>
-  <%= f.input :show_navigation %>
+  <%= f.input :autoplay %>
+  <%= f.input :controls %>
+  <%= f.input :loop %>
+  <%= f.input :muted %>
   <%= f.submit _t(:save) %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <%= render(
-  "alchemy/essences/richmedia_essence_editor",
-  :options => options,
-  :content => content,
-  :controller => 'essence_audios'
+  'alchemy/essences/richmedia_essence_editor',
+  options: options,
+  content: content,
+  controller: 'essence_audios'
 ) %>

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

@@ -1,33 +1,14 @@
-<%- unless content.essence.attachment.nil? -%>
-<%- unless options[:player_cover_image].blank? -%>
-  <%- i_height = options[:player_cover_image].image_height.to_f -%>
-  <%- i_width = options[:player_cover_image].image_width.to_f -%>
-  <%- ratio =  i_height / i_width -%>
-  <%- width = (options[:player_cover_image_width] rescue 320) -%>
-  <%- height = width * ratio -%>
-<%- else -%>
-  <%- width = content.essence.width.blank? ? (options[:player_size].split('x')[0] rescue 320) : content.essence.width -%>
-  <%- height = content.essence.height.blank? ? (options[:player_size].split('x')[1] rescue 20) : content.essence.height -%>
-<%- end -%>
-<div id="alchemy_audio_player_<%= content.id %>">
-  To watch this video, you need the latest <a href="http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash" target="_blank">Flash-Player</a> and active javascript in your browser.
-</div>
-<script type="text/javascript" charset="utf-8">
-//<!--[CDATA[
-  var alchemy_audio_player_<%= content.id %> = new SWFObject("/mediaplayer.swf", "mediaplayer", <%= width %>, <%= height %>, "8");
-  alchemy_audio_player_<%= content.id %>.addVariable("width", <%= width %>);
-  alchemy_audio_player_<%= content.id %>.addVariable("height", <%= height %>);
-  alchemy_audio_player_<%= content.id %>.addVariable("backcolor", '<%= options[:player_backcolor] || "0xFFFFFF" %>');
-  alchemy_audio_player_<%= content.id %>.addVariable("frontcolor", '<%= options[:player_frontcolor] || "0x000000" %>');
-  alchemy_audio_player_<%= content.id %>.addVariable("lightcolor", '<%= options[:player_lightcolor] || "0xEDEDED" %>');
-  alchemy_audio_player_<%= content.id %>.addVariable("screencolor", '<%= options[:player_screencolor] || "0x000000" %>');
-  alchemy_audio_player_<%= content.id %>.addVariable("showeq", '<%= content.essence.show_eq ? "true" : "false" %>');
-  alchemy_audio_player_<%= content.id %>.addVariable("shownavigation", '<%= content.essence.show_navigation ? "true" : "false" %>');
-  alchemy_audio_player_<%= content.id %>.addVariable("file", '<%= content.essence.attachment.public_filename %>');
-  <%- unless options[:player_cover_image].blank? -%>
-  alchemy_audio_player_<%= content.id %>.addVariable("image", '<%= "/" + options[:player_cover_image].file_name %>');
-  <%- end -%>
-  alchemy_audio_player_<%= content.id %>.write("alchemy_audio_player_<%= content.id %>");
-//]]-->
-</script>
+<%- if content.ingredient -%>
+  <%= content_tag :audio,
+      controls: content.essence.controls,
+      autoplay: content.essence.autoplay,
+      loop: content.essence.loop,
+      muted: content.essence.muted do %>
+    <%= content_tag :source, nil,
+      src: alchemy.show_attachment_path(
+        content.ingredient,
+        format: content.ingredient.suffix
+      ),
+      type: content.ingredient.file_mime_type %>
+  <% end %>
 <%- end -%>

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

@@ -1,6 +1,6 @@
 <%= render(
-  "alchemy/essences/richmedia_essence_editor",
-  :options => options,
-  :content => content,
-  :controller => 'essence_videos'
+  'alchemy/essences/richmedia_essence_editor',
+  options: options,
+  content: content,
+  controller: 'essence_videos'
 ) %>

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

@@ -1,35 +1,16 @@
-<%- unless content.essence.attachment.nil? -%>
-
-<%- width = content.essence.width.blank? ? (options[:player_size].split('x')[0] rescue 480) : content.essence.width -%>
-<%- height = content.essence.height.blank? ? (options[:player_size].split('x')[1] rescue 320) : content.essence.height -%>
-
-<a  href="<%= alchemy.show_attachment_path(content.essence.attachment) %>" 
-    id="player_<%= content.id %>" 
-    style="width: <%= width %>px; height: <%= height %>px; display: block">
-</a>
-<script type="text/javascript" charset="utf-8">
-    flowplayer("player_<%= content.id %>",
-        {
-            src: "/flowplayer-3.2.5.swf",
-            allowfullscreen: <%= content.essence.allow_fullscreen %>
-        },
-        {
-            clip: {
-                autoBuffering: true,
-                autoPlay: false,
-                scaling: 'fit'
-            },
-            plugins: {
-                controls:
-                <%- if content.essence.show_navigation -%>
-                {
-                        fullscreen: <%= content.essence.allow_fullscreen %>
-                }
-                <%- else -%>
-                null
-                <%- end -%>
-            }
-        }
-    );
-</script>
+<%- if content.ingredient -%>
+  <%= content_tag :video,
+    controls: content.essence.controls,
+    autoplay: content.essence.autoplay,
+    loop: content.essence.loop,
+    muted: content.essence.muted,
+    width: content.essence.width,
+    height: content.essence.height do %>
+    <%= content_tag :source, nil,
+      src: alchemy.show_attachment_path(
+        content.ingredient,
+        format: content.ingredient.suffix
+      ),
+      type: content.ingredient.file_mime_type %>
+  <% end %>
 <%- end -%>

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

@@ -1,8 +1,9 @@
 <div class="content_editor essence_file" id="<%= content.dom_id %>">
-  <label style="display: inline">
-    <%= render_content_name(content) %>
-    <%= delete_content_link(content) %>
-  </label>
+  <% if respond_to?(:content_label) %>
+    <%= content_label(content) %>
+  <% else %>
+    <%= label_and_remove_link(content) %>
+  <% end %>
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
     <% if content.ingredient.nil? %>
@@ -51,7 +52,7 @@
           controller: controller,
           action: 'edit',
           options: options.to_json,
-          id: content
+          id: content.essence.id
         ),
         {
           title: _t(:edit_file_properties),

data/config/routes.rb

@@ -1,7 +1,6 @@
 Alchemy::Engine.routes.draw do
   namespace :admin do
     resources :essence_audios
-    resources :essence_flashes
     resources :essence_videos
   end
 end

data/db/migrate/20140814212620_alchemy_essence_video_html5_update.rb

@@ -0,0 +1,25 @@
+class AlchemyEssenceVideoHtml5Update < ActiveRecord::Migration
+  def up
+    change_table :alchemy_essence_videos do |t|
+      t.change :width, :string
+      t.change :height, :string
+      t.rename :auto_play, :autoplay
+      t.rename :show_navigation, :controls
+    end
+
+    add_column :alchemy_essence_videos, :loop, :boolean, default: false
+    add_column :alchemy_essence_videos, :muted, :boolean, default: false
+  end
+
+  def down
+    change_table :alchemy_essence_videos do |t|
+      t.change :width, :integer
+      t.change :height, :integer
+      t.rename :autoplay, :auto_play
+      t.rename :controls, :show_navigation
+    end
+
+    remove_column :alchemy_essence_videos, :loop, :boolean
+    remove_column :alchemy_essence_videos, :muted, :boolean
+  end
+end

data/db/migrate/20150728153847_remove_alchemy_essence_flashes.rb

@@ -0,0 +1,9 @@
+class RemoveAlchemyEssenceFlashes < ActiveRecord::Migration
+  def up
+    drop_table :alchemy_essence_flashes
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20150728172823_alchemy_essence_audio_html5_update.rb

@@ -0,0 +1,17 @@
+class AlchemyEssenceAudioHtml5Update < ActiveRecord::Migration
+  def up
+    change_table :alchemy_essence_audios do |t|
+      t.boolean :autoplay, default: false
+      t.boolean :loop,     default: false
+      t.boolean :muted,    default: false
+      t.rename :show_navigation, :controls
+      t.remove :width
+      t.remove :height
+      t.remove :show_eq
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

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

@@ -8,7 +8,6 @@ module Alchemy
           return if user.nil?
           if user.has_role?(:author) || user.has_role?(:editor) || user.has_role?(:admin)
             can :manage, Alchemy::EssenceAudio
-            can :manage, Alchemy::EssenceFlash
             can :manage, Alchemy::EssenceVideo
           end
         end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-richmedia-essences
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2015-07-28 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.rc4
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc4
-description: EssenceAudio, EssenceFlash and EssenceVideo for Alchemy CMS 3.0
+        version: 3.0.0
+description: EssenceAudio and EssenceVideo for Alchemy CMS 3.0
 email:
-- tvdeyen@gmail.com
+- tvd@magiclabs.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -38,23 +38,22 @@ files:
 - Rakefile
 - alchemy-richmedia-essences.gemspec
 - app/controllers/alchemy/admin/essence_audios_controller.rb
-- app/controllers/alchemy/admin/essence_flashes_controller.rb
 - app/controllers/alchemy/admin/essence_videos_controller.rb
 - app/models/alchemy/essence_audio.rb
-- app/models/alchemy/essence_flash.rb
 - app/models/alchemy/essence_video.rb
 - app/views/alchemy/admin/essence_audios/edit.html.erb
-- app/views/alchemy/admin/essence_flashes/edit.html.erb
+- app/views/alchemy/admin/essence_files/assign.js.erb
 - app/views/alchemy/admin/essence_videos/edit.html.erb
 - app/views/alchemy/essences/_essence_audio_editor.html.erb
 - app/views/alchemy/essences/_essence_audio_view.html.erb
-- app/views/alchemy/essences/_essence_flash_editor.html.erb
-- app/views/alchemy/essences/_essence_flash_view.html.erb
 - app/views/alchemy/essences/_essence_video_editor.html.erb
 - app/views/alchemy/essences/_essence_video_view.html.erb
 - app/views/alchemy/essences/_richmedia_essence_editor.html.erb
 - config/routes.rb
 - db/migrate/20121113171023_create_alchemy_richmedia_essences.rb
+- 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
 - lib/alchemy-richmedia-essences.rb
 - lib/alchemy-richmedia-essences/ability.rb
 - lib/alchemy-richmedia-essences/engine.rb
@@ -79,10 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Adds EssenceAudio, EssenceFlash and EssenceVideo essences to your Alchemy
-  CMS powered site.
+summary: Adds EssenceAudio and EssenceVideo essences to your Alchemy CMS powered site.
 test_files: []
-has_rdoc: 

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

@@ -1,25 +0,0 @@
-module Alchemy
-  class Admin::EssenceFlashesController < Alchemy::Admin::BaseController
-    authorize_resource class: Alchemy::EssenceFlash
-    before_filter :load_essence
-
-    def update
-      @essence_flash.update(essence_flash_params)
-    end
-
-    private
-
-    def load_essence
-      @essence_flash = EssenceFlash.find(params[:id])
-    end
-
-    def essence_flash_params
-      params.require(:essence_flash).permit(
-        :width,
-        :height,
-        :player_version,
-        :attachment_id
-      )
-    end
-  end
-end

data/app/models/alchemy/essence_flash.rb

@@ -1,8 +0,0 @@
-module Alchemy
-  class EssenceFlash < ActiveRecord::Base
-    acts_as_essence ingredient_column: 'attachment',
-      preview_text_method: 'name'
-
-    belongs_to :attachment
-  end
-end

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

@@ -1,6 +0,0 @@
-<%= alchemy_form_for [:admin, @essence_flash] do |f| %>
-  <%= f.input :width %>
-  <%= f.input :height %>
-  <%= f.input :player_version %>
-  <%= f.submit _t(:save) %>
-<% end %>

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

@@ -1,6 +0,0 @@
-<%= render(
-  "alchemy/essences/richmedia_essence_editor",
-  :options => options,
-  :content => content,
-  :controller => 'essence_flashes'
-) %>

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

@@ -1,26 +0,0 @@
-<%- unless content.essence.attachment.nil? -%>
-<%- width = content.essence.width.blank? ? (options[:flash_movie_size].split('x')[0] rescue 320) : content.essence.width -%>
-<%- height = content.essence.height.blank? ? (options[:flash_movie_size].split('x')[1] rescue 200) : content.essence.height -%>
-<%- player_version = content.essence.player_version.blank? ? "8" : content.essence.player_version -%>
-<div class="flash_film">
-  <div id="swf_container_<%= content.id %>">
-    Sie brauchen den neusten <a href="http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash" target="_blank">Flash-Player</a> und Sie müssen JavaScript aktivieren.
-  </div>
-  <script type="text/javascript" charset="utf-8">
-    var flashvars = {};
-    var params = {};
-    var attributes = {};
-    swfobject.embedSWF(
-      "<%= content.essence.attachment.public_filename %>",
-      "swf_container_<%= content.id %>",
-      '<%= width %>',
-      '<%= height %>',
-      '<%= player_version %>',
-      false,
-      flashvars,
-      params,
-      attributes
-    );
-  </script>
-</div>
-<%- end -%>