alchemy-richmedia-essences 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4aad3cb02328b0f4f7310591cbcfcc0cd4a6a88
-  data.tar.gz: 4859c2f54981879ddf22564073960d37f8c16c5f
+  metadata.gz: c368e688fbed9b1e75d5390132a2e96c8aab3a3a
+  data.tar.gz: 1466c1312100108384f41c867705792d2f2a558d
 SHA512:
-  metadata.gz: f47703c4adfffa3961b694d07b162195c3106caedcd8de65b97b97666c3122bf270676b6985f996ee3d07d58daa6973e6d7e96b475f8bee963ae626d1a84f7c7
-  data.tar.gz: a3299b85bbbb07d135c55574875fabfc1dbe12dc79366862f1442d163c600ec1cdce9ab226c60aab468f41431a1045ab0e7f0890204dc10f24db984b9f729ed6
+  metadata.gz: 3b4f8af2708993d78972231d631a4c3007474848c2b2cabb1dd972a0b2ffc3e598972294420e7fd9016b6ded9e40b4ce6917fd3c6f60c05a688aa55793ddf162
+  data.tar.gz: 0e0ca4a660ad8e1f337beab1fddc44008312170ec41426afd80d78b0374836abb56cbc6b83967ac3c140b3bbc5c320e461fa4eb3ed7ffa5fa843c86549d44747

data/LICENSE.txt

@@ -1,22 +1,27 @@
-Copyright (c) 2012 Thomas von Deyen
+Copyright (c) 2010-2014, magic labs GmbH, Hamburg Germany
+All rights reserved.
 
-MIT License
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  Neither the name of the magic labs GmbH nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -2,7 +2,9 @@
 
 Adds EssenceAudio, EssenceFlash and EssenceVideo essences to your Alchemy CMS powered site.
 
-This version is compatible with Alchemy version 2.7 and above.
+This version is compatible with Alchemy version 3.0 and above only.
+
+For Alchemy v2.7.0 please use version 0.2.0.
 
 For Alchemy v2.6.0 and below please use version 0.1.0.
 

data/alchemy-richmedia-essences.gemspec

@@ -8,12 +8,13 @@ Gem::Specification.new do |gem|
   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}
+  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.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', ['>= 2.7.0', '< 3.0.0']
+  gem.add_runtime_dependency 'alchemy_cms', ['>= 3.0.0.rc4']
 end

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

@@ -1,21 +1,26 @@
 module Alchemy
   class Admin::EssenceAudiosController < Alchemy::Admin::BaseController
-
+    authorize_resource class: Alchemy::EssenceAudio
     before_filter :load_essence
 
-    def edit
-      render :layout => false
-    end
-
     def update
-      @essence_audio.update_attributes(params[:essence_audio])
+      @essence_audio.update(essence_audio_params)
     end
 
-  private
+    private
 
     def load_essence
       @essence_audio = EssenceAudio.find(params[:id])
     end
 
+    def essence_audio_params
+      params.require(:essence_audio).permit(
+        :width,
+        :height,
+        :show_eq,
+        :show_navigation,
+        :attachment_id
+      )
+    end
   end
 end

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

@@ -1,21 +1,25 @@
 module Alchemy
   class Admin::EssenceFlashesController < Alchemy::Admin::BaseController
-
+    authorize_resource class: Alchemy::EssenceFlash
     before_filter :load_essence
 
-    def edit
-      render :layout => false
-    end
-
     def update
-      @essence_flash.update_attributes(params[:essence_flash])
+      @essence_flash.update(essence_flash_params)
     end
 
-  private
+    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/controllers/alchemy/admin/essence_videos_controller.rb

@@ -1,21 +1,27 @@
 module Alchemy
   class Admin::EssenceVideosController < Alchemy::Admin::BaseController
-
+    authorize_resource class: Alchemy::EssenceVideo
     before_filter :load_essence
 
-    def edit
-      render :layout => false
-    end
-
     def update
-      @essence_video.update_attributes(params[:essence_video])
+      @essence_video.update(essence_video_params)
     end
 
-  private
+    private
 
     def load_essence
       @essence_video = EssenceVideo.find(params[:id])
     end
 
+    def essence_video_params
+      params.require(:essence_video).permit(
+        :width,
+        :height,
+        :allow_fullscreen,
+        :auto_play,
+        :show_navigation,
+        :attachment_id
+      )
+    end
   end
 end

data/app/models/alchemy/essence_audio.rb

@@ -1,20 +1,8 @@
 module Alchemy
   class EssenceAudio < ActiveRecord::Base
-
-    attr_accessible(
-      :width,
-      :height,
-      :show_eq,
-      :show_navigation,
-      :attachment_id
-    )
-
-    acts_as_essence(
-      :ingredient_column => :attachment,
-      :preview_text_method => :name
-    )
+    acts_as_essence ingredient_column: 'attachment',
+      preview_text_method: 'name'
 
     belongs_to :attachment
-
   end
 end

data/app/models/alchemy/essence_flash.rb

@@ -1,19 +1,8 @@
 module Alchemy
   class EssenceFlash < ActiveRecord::Base
-
-    attr_accessible(
-      :width,
-      :height,
-      :player_version,
-      :attachment_id
-    )
-
-    acts_as_essence(
-      :ingredient_column => :attachment,
-      :preview_text_method => :name
-    )
+    acts_as_essence ingredient_column: 'attachment',
+      preview_text_method: 'name'
 
     belongs_to :attachment
-
   end
 end

data/app/models/alchemy/essence_video.rb

@@ -1,21 +1,8 @@
 module Alchemy
   class EssenceVideo < ActiveRecord::Base
-
-    attr_accessible(
-      :width,
-      :height,
-      :allow_fullscreen,
-      :auto_play,
-      :show_navigation,
-      :attachment_id
-    )
-
-    acts_as_essence(
-      :ingredient_column => :attachment,
-      :preview_text_method => :name
-    )
+    acts_as_essence ingredient_column: 'attachment',
+      preview_text_method: 'name'
 
     belongs_to :attachment
-
   end
 end

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

@@ -1,25 +1,7 @@
-<%= form_for([:admin, @essence_audio], :remote => true) do |f| %>
-  <table>
-    <tr>
-      <td class="label"><%= f.label "width" %></td>
-      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "height" %></td>
-      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "show_eq" %></td>
-      <td class="checkbox"><%= f.check_box "show_eq" %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "show_navigation" %></td>
-      <td class="checkbox"><%= f.check_box "show_navigation" %></td>
-    </tr>
-    <tr>
-      <td colspan="2" class="submit">
-        <%= f.button t("save"), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
+<%= alchemy_form_for [:admin, @essence_audio] do |f| %>
+  <%= f.input :width %>
+  <%= f.input :height %>
+  <%= f.input :show_eq %>
+  <%= f.input :show_navigation %>
+  <%= f.submit _t(:save) %>
 <% end %>

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

@@ -1,21 +1,6 @@
-<%= form_for([:admin, @essence_flash], :remote => true) do |f| %>
-  <table>
-    <tr>
-      <td class="label"><%= f.label "width" %></td>
-      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "height" %></td>
-      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "player_version" %></td>
-      <td class="input"><%= f.text_field "player_version", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td colspan="2" class="submit">
-        <%= f.button t("save"), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
+<%= 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/admin/essence_videos/edit.html.erb

@@ -1,29 +1,8 @@
-<%= form_for([:admin, @essence_video], :remote => true) do |f| %>
-  <table>
-    <tr>
-      <td class="label"><%= f.label "width" %></td>
-      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "height" %></td>
-      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "allow_fullscreen" %></td>
-      <td class="checkbox"><%= f.check_box "allow_fullscreen" %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "auto_play" %></td>
-      <td class="checkbox"><%= f.check_box "auto_play" %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "show_navigation" %></td>
-      <td class="checkbox"><%= f.check_box "show_navigation" %></td>
-    </tr>
-    <tr>
-      <td colspan="2" class="submit">
-        <%= f.button t("save"), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
+<%= 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.submit _t(:save) %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<div class="content_editor" id="<%= content_dom_id(content) %>">
+<div class="content_editor essence_file" id="<%= content.dom_id %>">
   <label style="display: inline">
     <%= render_content_name(content) %>
     <%= delete_content_link(content) %>
@@ -6,59 +6,60 @@
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
     <% if content.ingredient.nil? %>
-      <%= link_to_overlay_window("",
+      <%= 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
+          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 => '520x400',
-          :resizable => 'true'
+          title: _t(:assign_file),
+          size: '780x585',
+          padding: false
         },
-        :class => 'assign_file',
-        :title => t('assign_file')
-      ) %>
+        class: 'assign_file',
+        title: _t(:assign_file)
+      %>
     <% else %>
       <%= render_icon(content.ingredient.icon_css_class) %>
     <% end %>
     </div>
     <div class="file_name">
-      <%= content.ingredient.name rescue ("&#x2190;" + t('assign_file_from_archive')).html_safe %>
+      <%= content.ingredient.name rescue ("&#x2190;" + _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_overlay_window("",
+      <%= 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
+          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 => '520x400',
-          :resizable => 'true'
+          title: _t(:assign_file),
+          size: '780x585',
+          padding: false
         },
-        :class => 'assign_file',
-        :title => t('assign_file')
-      ) %>
-      <%= link_to_overlay_window("",
+        class: 'assign_file',
+        title: _t(:assign_file)
+      %>
+      <%= link_to_dialog '',
         url_for(
-          :controller => controller,
-          :action => 'edit',
-          :id => content.essence.id
+          controller: controller,
+          action: 'edit',
+          options: options.to_json,
+          id: content
         ),
         {
-          :title => t('edit_file_properties'),
-          :size => '400x150'
+          title: _t(:edit_file_properties),
+          size: '400x165'
         },
-        :class => 'edit_file',
-        :title => t('edit_file_properties')
-      ) %>
+        class: 'edit_file',
+        title: _t(:edit_file_properties)
+      %>
     </div>
     <% end %>
   </div>

data/lib/alchemy-richmedia-essences.rb

@@ -1 +1,9 @@
+require "alchemy_cms"
 require "alchemy-richmedia-essences/engine"
+
+module Alchemy
+  module Richmedia
+    module Essences
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Alchemy
+  module Richmedia
+    module Essences
+      class Ability
+        include CanCan::Ability
+
+        def initialize(user)
+          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
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require "alchemy-richmedia-essences/ability"
+
 module Alchemy
   module Richmedia
     module Essences
@@ -5,10 +7,9 @@ module Alchemy
         engine_name 'alchemy_richmedia_essences'
         config.mount_at = '/'
 
-        initializer "alchemy_richmedia_essences.add_authorization_rules" do
-          Alchemy::Auth::Engine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
+        initializer "alchemy_richmedia_essences.register_ability" do
+          Alchemy.register_ability Alchemy::Richmedia::Essences::Ability
         end
-
       end
     end
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-richmedia-essences
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,21 +16,15 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-description: EssenceAudio, EssenceFlash and EssenceVideo for Alchemy CMS
+        version: 3.0.0.rc4
+description: EssenceAudio, EssenceFlash and EssenceVideo for Alchemy CMS 3.0
 email:
 - tvdeyen@gmail.com
 executables: []
@@ -59,14 +53,15 @@ files:
 - 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/authorization_rules.rb
 - config/routes.rb
 - db/migrate/20121113171023_create_alchemy_richmedia_essences.rb
 - lib/alchemy-richmedia-essences.rb
+- lib/alchemy-richmedia-essences/ability.rb
 - lib/alchemy-richmedia-essences/engine.rb
 - lib/alchemy-richmedia-essences/version.rb
 homepage: http://alchemy-cms.com
-licenses: []
+licenses:
+- BSD New
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -84,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds EssenceAudio, EssenceFlash and EssenceVideo essences to your Alchemy

data/config/authorization_rules.rb

@@ -1,9 +0,0 @@
-authorization do
-
-  role :author do
-    has_permission_on :alchemy_admin_essence_audios, :to => [:edit, :update]
-    has_permission_on :alchemy_admin_essence_flashes, :to => [:edit, :update]
-    has_permission_on :alchemy_admin_essence_videos, :to => [:edit, :update]
-  end
-
-end