ecm_downloads2 3.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a011ee69e20f13fe57f0e51ca4cd34822c40c3b1
-  data.tar.gz: a87b07226aec17fa1c0df0a85fcf34ef8e33c499
+  metadata.gz: 9984cf40411bae23b117593ec5d99859ef46e3e6
+  data.tar.gz: 190578856491b42f2f2fc064974ddda9ef6f13ec
 SHA512:
-  metadata.gz: 3057fd1be45b82fefda43033c065f90a8526476cf6f0adff4469fea959e699e1d1c8589804f602c1d7f00e2d0e48e61de04b330b7319c94335fc21f93fae55b6
-  data.tar.gz: 945db5099965448191c55258794af336a41883fe23b0b0004b4cec761ecd0bd5561bc79120254b4006a476d33f623c55eee45fc32e0ac59bd4f509358422efae
+  metadata.gz: ead4af186ef32494d85a6a2ec2c826148755be6a9e8d9b0398240e6492aa3ff03e22256080c0eb01105a3c0babad1eb959f5833581243e6b56a91713e027500a
+  data.tar.gz: 58333058281ee9c9fd269e6e6b298f38b671c4f5e4242107aaea61704fb7524d954e0372114eca5ca617181a7ee9de95d329edb4f51a847bfe3311565ee97e02

data/app/models/ecm/downloads/download.rb

@@ -1,53 +1,53 @@
-class Ecm::Downloads::Download < ActiveRecord::Base
-  # db settings
-  self.table_name = 'ecm_downloads_downloads'
-
-  # acts as list
-  acts_as_list scope: :ecm_downloads_download_category
-
-  # acts as published
-  include ActsAsPublished::ActiveRecord
-  acts_as_published
-
-  # associations
-  belongs_to :ecm_downloads_download_category,
-             class_name: Ecm::Downloads::DownloadCategory,
-             inverse_of: :ecm_downloads_downloads
-
-  # attibutes
-  attr_accessible :asset,
-                  :description,
-                  :ecm_downloads_download_category_id,
-                  :name if respond_to? :attr_accessible
-
-  # callbacks
-  before_update :fix_updated_position, if: proc { |d| !position.blank? && d.ecm_downloads_download_category_id_changed? }
-
-  # friendly id
-  extend FriendlyId
-  friendly_id :name, use: [:slugged]
-
-  # paperclip
-  has_attached_file :asset, Ecm::Downloads::Configuration.paperclip_options
-
-  # validations
-  validates :ecm_downloads_download_category, presence: true
-  validates :name, presence: true
-  validates_attachment :asset, presence => true
-  do_not_validate_attachment_file_type :asset
-
-  def human
-    name
-  end
-
-  def to_s
-    human
-  end
-
-  private
-
-  def fix_updated_position
-    Rails.logger.debug "Fixing positions for #{self} (Moving to last)"
-    add_to_list_bottom
+module Ecm
+  module Downloads
+    class Download < ActiveRecord::Base
+      # acts as list
+      acts_as_list scope: :download_category
+
+      # acts as published
+      include ActsAsPublished::ActiveRecord
+      acts_as_published
+
+      # associations
+      belongs_to :download_category,
+               inverse_of: :downloads
+
+      # attibutes
+      attr_accessible :asset,
+                    :description,
+                    :download_category_id,
+                    :name if respond_to? :attr_accessible
+
+      # callbacks
+      before_update :fix_updated_position, if: proc { |d| !position.blank? && d.category_id_changed? }
+
+      # friendly id
+      extend FriendlyId
+      friendly_id :name, use: [:slugged]
+
+      # paperclip
+      has_attached_file :asset, Ecm::Downloads::Configuration.paperclip_options
+
+      # validations
+      validates :download_category, presence: true
+      validates :name, presence: true
+      validates_attachment :asset, presence: true
+      do_not_validate_attachment_file_type :asset
+
+      def human
+      name
+      end
+
+      def to_s
+      human
+      end
+
+      private
+
+      def fix_updated_position
+        Rails.logger.debug "Fixing positions for #{self} (Moving to last)"
+        add_to_list_bottom
+      end
+    end
   end
 end

data/app/models/ecm/downloads/download_category.rb

@@ -1,57 +1,57 @@
-class Ecm::Downloads::DownloadCategory < ActiveRecord::Base
-  # db settings
-  self.table_name = 'ecm_downloads_download_categories'
-
-  # associations
-  has_many :ecm_downloads_downloads, -> { order(:position) },
-           class_name: Ecm::Downloads::Download,
-           dependent: :destroy,
-           foreign_key: :ecm_downloads_download_category_id,
-           inverse_of: :ecm_downloads_download_category
-
-  accepts_nested_attributes_for :ecm_downloads_downloads,
-                                allow_destroy: true
-
-  # attributes
-  attr_accessible :description,
-                  :ecm_downloads_downloads_attributes,
-                  :ecm_downloads_downloads_count,
-                  :locale,
-                  :name,
-                  :parent_id,
-                  :position,
-                  :slug if respond_to? :attr_accessible
-
-  # awesome nested set
-  acts_as_nested_set
-  default_scope { order('lft ASC') }
-
-  # friendly id
-  extend FriendlyId
-  friendly_id :name, use: [:slugged]
-
-  # validations
-  validates :name, presence: true,
-                   uniqueness: { scope: [:parent_id] }
-
-  validates :locale, presence: true,
-                     if: :root?
-
-  validates :locale, inclusion: I18n.available_locales.map(&:to_s),
-                     if: proc { |cc| cc.locale.present? }
-
-  validates :locale, absence: true,
-                     unless: :root?
-
-  def ecm_downloads_downloads_count
-    ecm_downloads_downloads.count
-  end
-
-  def human
-    name
-  end
-
-  def to_s
-    name
+module Ecm
+  module Downloads
+    class DownloadCategory < ActiveRecord::Base
+      # associations
+      has_many :downloads, -> { order(:position) },
+               dependent: :destroy,
+               foreign_key: :download_category_id,
+               inverse_of: :download_category
+
+      accepts_nested_attributes_for :downloads,
+                                    allow_destroy: true
+
+      # attributes
+      attr_accessible :description,
+                      :downloads_attributes,
+                      :downloads_count,
+                      :locale,
+                      :name,
+                      :parent_id,
+                      :position,
+                      :slug if respond_to? :attr_accessible
+
+      # awesome nested set
+      acts_as_nested_set
+      default_scope { order('lft ASC') }
+
+      # friendly id
+      extend FriendlyId
+      friendly_id :name, use: [:slugged]
+
+      # validations
+      validates :name, presence: true,
+                       uniqueness: { scope: [:parent_id] }
+
+      validates :locale, presence: true,
+                         if: :root?
+
+      validates :locale, inclusion: I18n.available_locales.map(&:to_s),
+                         if: proc { |cc| cc.locale.present? }
+
+      validates :locale, absence: true,
+                         unless: :root?
+
+      def downloads_count
+        downloads.count
+      end
+
+      def human
+        name
+      end
+
+      def to_s
+        name
+      end
+    end
   end
 end

data/app/views/ecm/downloads/download_categories/_download_category.haml

@@ -2,4 +2,4 @@
 
 %p= download_category.description
 
-= render download_category.ecm_downloads_downloads.decorate
+= render download_category.downloads.decorate

data/app/views/ecm/downloads/download_categories/index.haml

@@ -5,5 +5,5 @@
 
 = render @collection
 
-= bootstrap_button(to: root_path, context: :default) do
+= bootstrap_button(to: main_app.root_path, context: :default) do
   = t('.back')

data/app/views/ecm/downloads/download_categories/show.haml

@@ -5,7 +5,7 @@
 
 %p= @resource.description
 
-= render @resource.ecm_downloads_downloads.decorate
+= render @resource.downloads.decorate
 
 = bootstrap_button(to: :back, context: :default) do
   = t('.back')

data/app/views/ecm/downloads/downloads/index.haml

@@ -3,7 +3,7 @@
 
 %h1= Ecm::Downloads::Download.model_name.human(count: :other)
 
-- @collection.group_by{|d| d.ecm_downloads_download_category}.each do |category, collection|
+- @collection.group_by{|d| d.download_category}.each do |category, collection|
   %h2= category.name
   = render collection
 

data/config/locales/ecm.downloads.download.de.yml

@@ -11,8 +11,8 @@ de:
         asset_updated_at: Datei aktualisiert am
         created_at: Erstellt am
         description: Beschreibung
-        ecm_downloads_download_category: Download Kategorie
-        ecm_downloads_download_category_id: Download Kategorie
+        download_category: Download Kategorie
+        download_category_id: Download Kategorie
         filesize: Dateigröße
         link: Link
         locale: Sprache
@@ -26,5 +26,5 @@ de:
         one: Download
         other: Downloads
   routes:
-    ecm_downloads_downloads: downloads
+    downloads: downloads
 

data/config/locales/ecm.downloads.download.en.yml

@@ -11,8 +11,8 @@ en:
         asset_updated_at: file updated at
         created_at: created at
         description: description
-        ecm_downloads_download_category: download category
-        ecm_downloads_download_category_id: download category
+        download_category: download category
+        download_category_id: download category
         filesize: filesize
         link: link
         locale: locale
@@ -26,5 +26,5 @@ en:
         one: download
         other: downloads
   routes:
-    ecm_downloads_downloads: downloads
+    downloads: downloads
 

data/config/locales/ecm.downloads.download_category.de.yml

@@ -7,8 +7,8 @@ de:
         created_at: Erstellt am
         depth: Baumtiefe
         description: Beschreibung
-        ecm_downloads_downloads: Downloads
-        ecm_downloads_downloads_count: Downloads
+        downloads: Downloads
+        downloads_count: Downloads
         lft: Links
         link: Link
         locale: Sprache
@@ -24,5 +24,5 @@ de:
         one: Download Kategorie
         other: Download Kategorien
   routes:
-    ecm_downloads_download_categories: download-kategorien
+    download_categories: download-kategorien
 

data/config/locales/ecm.downloads.download_category.en.yml

@@ -7,8 +7,8 @@ en:
         created_at: created at
         depth: depth
         description: description
-        ecm_downloads_downloads: downloads
-        ecm_downloads_downloads_count: downloads
+        downloads: downloads
+        downloads_count: downloads
         lft: left
         link: link
         locale: locale
@@ -24,5 +24,5 @@ en:
         one: download category
         other: download categories
   routes:
-    ecm_downloads_download_categories: download-categories
+    download_categories: download-categories
 

data/config/routes.rb

@@ -0,0 +1,8 @@
+Ecm::Downloads::Engine.routes.draw do
+  localized do
+    resources :download_categories, only: [:index, :show]
+    resources :downloads,  only: [:index, :show] do
+      get :download, on: :member
+    end
+  end
+end

data/db/migrate/20170505182738_rename_ecm_downloads_download_category_id_to_download_category_id.rb

@@ -0,0 +1,5 @@
+class RenameEcmDownloadsDownloadCategoryIdToDownloadCategoryId < ActiveRecord::Migration[4.2]
+  def change
+    rename_column :ecm_downloads_downloads, :ecm_downloads_download_category_id, :download_category_id
+  end
+end

data/db/migrate/20170505183226_remove_ecm_downloads_downloads_count.rb

@@ -0,0 +1,5 @@
+class RemoveEcmDownloadsDownloadsCount < ActiveRecord::Migration[4.2]
+  def change
+    remove_column :ecm_downloads_download_categories, :ecm_downloads_downloads_count
+  end
+end

data/lib/ecm/downloads/engine.rb

@@ -1,13 +1,7 @@
 module Ecm
   module Downloads
     class Engine < Rails::Engine
-      initializer :ecm_downloads_engine do
-        ::ActiveAdmin.setup do |config|
-          config.load_paths += Dir[root.join(*%(app admin))]
-          config.register_stylesheet 'ecm_downloads.css'
-          # config.register_javascript 'ecm_downloads.js'
-        end
-      end if Gem::Specification.find_all_by_name('activeadmin').any?
+      isolate_namespace Ecm::Downloads
     end
   end
 end

data/lib/ecm/downloads/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Downloads
-    VERSION = '3.0.0'
+    VERSION = '4.0.1'
   end
 end

data/lib/ecm_downloads2.rb

@@ -8,7 +8,6 @@ require 'draper'
 
 require 'ecm/downloads/engine'
 require 'ecm/downloads/configuration'
-require 'ecm/downloads/routing'
 
 module Ecm
   module Downloads

data/lib/generators/ecm/downloads/install/templates/routes.source

@@ -1,5 +1,3 @@
   
   # ECM Downloads Frontend Routing
-  localized do
-    Ecm::Downloads::Routing.routes(self)
-  end
+  mount Ecm::Downloads::Engine, at: '/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_downloads2
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -493,11 +493,13 @@ files:
 - config/locales/ecm.downloads.download_category.de.yml
 - config/locales/ecm.downloads.download_category.en.yml
 - config/locales/ecm.downloads.en.yml
+- config/routes.rb
 - db/migrate/001_create_ecm_downloads_download_categories.rb
 - db/migrate/002_create_ecm_downloads_downloads.rb
+- db/migrate/20170505182738_rename_ecm_downloads_download_category_id_to_download_category_id.rb
+- db/migrate/20170505183226_remove_ecm_downloads_downloads_count.rb
 - lib/ecm/downloads/configuration.rb
 - lib/ecm/downloads/engine.rb
-- lib/ecm/downloads/routing.rb
 - lib/ecm/downloads/version.rb
 - lib/ecm_downloads2.rb
 - lib/generators/ecm/downloads/install/install_generator.rb

data/lib/ecm/downloads/routing.rb

@@ -1,24 +0,0 @@
-module Ecm
-  module Downloads
-    class Routing
-      # Creates the routes for downloads and categories. You can pass options to
-      # specify the actions for both downloads and/or categories.
-      #
-      #   Ecm::Downloads::Routing.routes(self, { :download_category_actions => [ :show ]})
-      #
-      # This will only create the show action for download categories, but omit the index action.
-      def self.routes(router, options = {})
-        options.reverse_merge!(
-          download_category_actions: [:index, :show],
-          download_actions: [:index, :show],
-          add_download_member_action: false
-        )
-
-        router.resources :ecm_downloads_download_categories, only: options[:download_category_actions], controller: 'ecm/downloads/download_categories'
-        router.resources :ecm_downloads_downloads, only: options[:download_actions], controller: 'ecm/downloads/downloads' do
-          router.get :download, on: :member, if: options[:add_download_member_action]
-        end
-      end
-    end
-  end
-end