ecm_links2 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 853ed52b3c5d318e2707c636377398637aa1af0e
-  data.tar.gz: b4d3ac14136f351b63407bcffc5572085c63ae5b
+  metadata.gz: 7252b1793098998c2a8c750335d2b46c62dac1d1
+  data.tar.gz: bfa1d8303f5162224500587ac642c356a26778ee
 SHA512:
-  metadata.gz: 32981ecb377401a189f713321cc0b368365a3b4661502e7d29f3daa34ed1bf319392f1103a94d855637f8dbccc4df322d37cec3852bd6b4a810e7ae8f3aaeda9
-  data.tar.gz: 2b0dcdb90e68156051fef0b4d976ceec2badfb01189fa33ddaf7f754d108ec5df3c29b597d3210811e00e9ea7c5200023c4d2446e92f8a2c5b1c1d9994371fac
+  metadata.gz: 3b3c4013f3715abe1880db4cbb8d64d6e0fbfdf482474d058c638559265a88b474f027ae512b3f2508a4f55039ac83751bf84a2f0d6e1417ceac40d6d2429ff3
+  data.tar.gz: 9de509dbada3da70e06ea2184b82a7a677aba97431755d730ce7794e1f28495897ef85339354c1f44fdf0a71908362350100a32888cc2bf7252557e7226f4eb2

data/app/controllers/ecm/links/categories_controller.rb

@@ -1,11 +1,11 @@
 module Ecm::Links
   class CategoriesController < ApplicationController
     def index
-      @categories = Category.includes(:ecm_links_links).all.decorate
+      @categories = Category.includes(:links).all.decorate
     end
 
     def show
-      @category = Category.includes(:ecm_links_links).find(params[:id]).decorate
+      @category = Category.includes(:links).find(params[:id]).decorate
     end
   end
 end

data/app/decorators/ecm/links/category_decorator.rb

@@ -2,7 +2,7 @@ module Ecm::Links
   class CategoryDecorator < Draper::Decorator
     delegate_all
 
-    def ecm_links_links_count_label
+    def links_count_label
       h.content_tag(:span, ecm_links_links_count, class: 'badge')
     end
 

data/app/models/ecm/links/category.rb

@@ -3,25 +3,10 @@ require_dependency 'redcloth'
 module Ecm::Links
   class Category < ActiveRecord::Base
     # associations
-    has_many :ecm_links_links, -> { order(:position) },
-             class_name: Ecm::Links::Link,
-             dependent: :destroy,
-             foreign_key: :ecm_links_category_id
-
-    # attributes
-    attr_accessible :depth,
-                    :ecm_links_links_attributes,
-                    :lft,
-                    :link_footer_column,
-                    :locale,
-                    :long_description,
-                    :markup_language,
-                    :name,
-                    :parent_id,
-                    :rgt,
-                    :short_description,
-                    :slug if respond_to? :attr_accessible
-    accepts_nested_attributes_for :ecm_links_links, allow_destroy: true
+    has_many :links, -> { order(:position) },
+             dependent: :destroy
+
+    accepts_nested_attributes_for :links, allow_destroy: true
 
     # awesome nested set
     acts_as_nested_set
@@ -78,6 +63,10 @@ module Ecm::Links
       end
     end
 
+    def links_count
+      links.count
+    end
+
     private
 
     def markup(text)

data/app/models/ecm/links/link.rb

@@ -2,20 +2,12 @@ require_dependency 'redcloth'
 
 class Ecm::Links::Link < ActiveRecord::Base
   # acts as list
-  acts_as_list scope: :ecm_links_category
+  acts_as_list scope: :category
 
   # associations
-  belongs_to :ecm_links_category,
-             class_name: Ecm::Links::Category,
-             counter_cache: :ecm_links_links_count
-
-  # attributes
-  attr_accessible :description,
-                  :ecm_links_category_id,
-                  :markup_language,
-                  :name,
-                  :position,
-                  :url if respond_to? :attr_accessible
+  belongs_to :category,
+             optional: true
+
 
   # callbacks
   after_initialize :set_defaults
@@ -24,8 +16,8 @@ class Ecm::Links::Link < ActiveRecord::Base
   MARKUP_LANGUAGES = %w(markdown textile rdoc)
 
   # validations
-  validates :name, presence: true # , :uniqueness => { :scope => [ :ecm_links_category_id ] }
-  validates :url,  presence: true # , :uniqueness => { :scope => [ :ecm_links_category_id ] }
+  validates :name, presence: true
+  validates :url,  presence: true
   validates :markup_language, presence: true,
                               inclusion: MARKUP_LANGUAGES
 

data/app/views/ecm/links/_link_footer.html.erb

@@ -4,7 +4,7 @@
       <% categories[column + 1].each do |c| %>
         <h4><%= c.name %></h4>
 
-        <% c.ecm_links_links.each do |l| %>
+        <% c.links.each do |l| %>
           <p><%= render partial: 'ecm/links/links/link', locals: { link: l } %></p>
         <% end %>
 

data/app/views/ecm/links/categories/_category.html.erb

@@ -13,10 +13,10 @@
 
   <div class="download_category-downloads item_list">
     <h2><%= Ecm::Links::Category.human_attribute_name(:ecm_links_links) %></h2>
-    <% if category.ecm_links_links.count == 0 %>
+    <% if category.links.count == 0 %>
       <p><%= t('ecm.links.category.messages.no_links_available') %></p>
     <% else %>
-      <%= render partial: 'ecm/links/links/table', locals: { links: category.ecm_links_links } %>
+      <%= render partial: 'ecm/links/links/table', locals: { links: category.links } %>
     <% end %>
   </div>
 </div>

data/app/views/ecm/links/categories/_category_in_index.html.erb

@@ -1,5 +1,5 @@
-<%= link_to(category, class: "list-group-item left-padding-#{category.depth * 3}", title: category.short_description) do %>
+<%= link_to([ecm_links, category], class: "list-group-item left-padding-#{category.depth * 3}", title: category.short_description) do %>
   <%= category.tree_name %>
   <%= category.locale_label %>
-  <%= category.ecm_links_links_count_label %>
+  <%= category.links_count_label %>
 <% end %>

data/app/views/ecm/links/categories/show.html.erb

@@ -2,7 +2,7 @@
 
 <div class="well">
 <% if @category.root? %>
-  <%= link_to(t('ecm.links.category.actions.back_to_index'), ecm_links_categories_path, class: 'btn btn-default') if respond_to?(:ecm_links_categories_path) %>
+  <%= link_to(t('ecm.links.category.actions.back_to_index'), ecm_links.categories_path, class: 'btn btn-default') if respond_to?(:ecm_links_categories_path) %>
 <% else %>
   <%= link_to(Ecm::Links::Category.human_attribute_name(:parent), @category.parent, class: 'btn btn-default') %>
 <% end %>

data/app/views/ecm/links/links/_link_in_table.html.erb

@@ -1,5 +1,5 @@
 <tr class="<%= link.class.name.underscore.gsub('/', ' ') %>" id="<%= "#{link.class.name.underscore.gsub('/', '-')}-#{link.to_param}" %>">
   <td><%= link_to link.name, link.url %></td>
-  <td><%= link_to link.ecm_links_category.human, link.ecm_links_category %></td>
+  <td><%= link_to link.category.human, link.category %></td>
   <td><%= link.description(as: :html).html_safe %></td>
 </tr>

data/config/locales/ecm.links.category.de.yml

@@ -8,8 +8,8 @@ de:
     attributes:
       ecm/links/category:
         name: Name
-        ecm_links_links: Links
-        ecm_links_links_count: Links
+        links: Links
+        links_count: Links
         slug: Freundliche ID
         created_at: Erstellt am
         short_description: Kurzbeschreibung

data/config/locales/ecm.links.category.en.yml

@@ -8,8 +8,8 @@ en:
     attributes:
       ecm/links/category:
         name: name
-        ecm_links_links: links
-        ecm_links_links_count: links
+        links: links
+        links_count: links
         slug: friendly id
         created_at: created at
         short_description: short description

data/config/locales/ecm.links.de.yml

@@ -1,9 +1,6 @@
 de:
-  ecm:
-    links:
-      active_admin:
-        menu: Links
   routes:
-    ecm_links_categories: link-kategorien
-    ecm_links_links: links
+    ecm_links_engine: links
+    categories: kategorien
+    links: links
 

data/config/locales/ecm.links.en.yml

@@ -1,9 +1,6 @@
 en:
-  ecm:
-    links:
-      active_admin:
-        menu: links
   routes:
-    ecm_links_categories: link-categories
-    ecm_links_links: links
+    ecm_links_engine: links
+    categories: categories
+    links: links
 

data/config/locales/ecm.links.link.de.yml

@@ -12,7 +12,7 @@ de:
         created_at: Erstellt am
         updated_at: Aktualisiert am
         url: URL
-        ecm_links_category: Link Kategorie
-        ecm_links_category_id: Link Kategorie
+        category: Link Kategorie
+        category_id: Link Kategorie
         markup_language: Markup Sprache
         description: Beschreibung

data/config/locales/ecm.links.link.en.yml

@@ -12,7 +12,7 @@ en:
         created_at: created at
         updated_at: updated at
         url: url
-        ecm_links_category: link category
-        ecm_links_category_id: link category
+        category: link category
+        category_id: link category
         markup_language: markup language
         description: description

data/config/routes.rb

@@ -0,0 +1,7 @@
+Ecm::Links::Engine.routes.draw do
+  localized do
+    scope :ecm_links_engine do
+      resources :categories, only: [:index, :show]
+    end
+  end
+end

data/db/migrate/001_create_ecm_links_categories.rb

@@ -1,4 +1,4 @@
-class CreateEcmLinksCategories < ActiveRecord::Migration
+class CreateEcmLinksCategories < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_links_categories do |t|
       t.string :locale

data/db/migrate/002_create_ecm_links_links.rb

@@ -1,4 +1,4 @@
-class CreateEcmLinksLinks < ActiveRecord::Migration
+class CreateEcmLinksLinks < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_links_links do |t|
       t.string :name

data/db/migrate/20170605034337_remove_counter_caches_from_ecm_links_categories.rb

@@ -0,0 +1,5 @@
+class RemoveCounterCachesFromEcmLinksCategories < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :ecm_links_categories, :ecm_links_links_count
+  end
+end

data/db/migrate/20170605034440_rename_ecm_links_category_id_on_ecm_links_links.rb

@@ -0,0 +1,5 @@
+class RenameEcmLinksCategoryIdOnEcmLinksLinks < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :ecm_links_links, :ecm_links_category_id, :category_id
+  end
+end

data/lib/ecm/links/engine.rb

@@ -1,11 +1,7 @@
 module Ecm
   module Links
     class Engine < ::Rails::Engine
-      initializer :ecm_links_engine do
-        ActiveAdmin.setup do |config|
-          config.load_paths += Dir[root.join('app', 'admin')]
-        end
-      end if Gem::Specification.find_all_by_name('activeadmin').any?
+      isolate_namespace Ecm::Links
     end
   end
 end

data/lib/ecm/links/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Links
-    VERSION = '2.0.1'
+    VERSION = '3.0.0'
   end
 end

data/lib/ecm/links.rb

@@ -0,0 +1,11 @@
+require 'ecm/links/configuration'
+
+module Ecm
+  module Links
+    extend Configuration
+
+    def self.table_name_prefix
+      'ecm_links_'
+    end
+  end
+end

data/lib/ecm_links2.rb

@@ -1,21 +1,9 @@
-require 'active_admin-acts_as_list' if Gem::Specification.find_all_by_name('activeadmin').any?
-require 'active_admin-awesome_nested_set' if Gem::Specification.find_all_by_name('activeadmin').any?
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'awesome_nested_set-tools'
 require 'friendly_id'
 require 'draper'
 
+require 'ecm/links'
 require 'ecm/links/engine'
-require 'ecm/links/configuration'
-require 'ecm/links/routing'
 
-module Ecm
-  module Links
-    extend Configuration
-
-    def self.table_name_prefix
-      'ecm_links_'
-    end
-  end
-end

data/lib/generators/ecm/links/install/install_generator.rb

@@ -2,7 +2,7 @@ module Ecm
   module Links
     module Generators
       class InstallGenerator < Rails::Generators::Base
-        desc 'Generates the intializer'
+        desc 'Generates the initializer'
 
         source_root File.expand_path('../templates', __FILE__)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_links2
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,104 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activeadmin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: less-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: active_admin-acts_as_list
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: active_admin-awesome_nested_set
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -412,8 +314,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/admin/ecm_links_categories.rb
-- app/admin/ecm_links_links.rb
 - app/controllers/ecm/links/categories_controller.rb
 - app/decorators/ecm/links/category_decorator.rb
 - app/helpers/ecm/links/categories_helper.rb
@@ -435,11 +335,14 @@ files:
 - config/locales/ecm.links.en.yml
 - config/locales/ecm.links.link.de.yml
 - config/locales/ecm.links.link.en.yml
+- config/routes.rb
 - db/migrate/001_create_ecm_links_categories.rb
 - db/migrate/002_create_ecm_links_links.rb
+- db/migrate/20170605034337_remove_counter_caches_from_ecm_links_categories.rb
+- db/migrate/20170605034440_rename_ecm_links_category_id_on_ecm_links_links.rb
+- lib/ecm/links.rb
 - lib/ecm/links/configuration.rb
 - lib/ecm/links/engine.rb
-- lib/ecm/links/routing.rb
 - lib/ecm/links/version.rb
 - lib/ecm_links2.rb
 - lib/generators/ecm/links/install/install_generator.rb
@@ -468,9 +371,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Link management module for ruby on rails.
 test_files: []
-has_rdoc: 

data/app/admin/ecm_links_categories.rb

@@ -1,120 +0,0 @@
-include ActiveAdmin::ActsAsList::Helper if defined?(ActiveAdmin)
-include ActiveAdmin::AwesomeNestedSet::Helper if defined?(ActiveAdmin)
-
-ActiveAdmin.register Ecm::Links::Category do
-  # menu entry settings
-  menu parent: proc { I18n.t('ecm.links.active_admin.menu') }.call
-
-  # awesome nested set
-  sortable_tree_member_actions
-
-  permit_params :link_footer_column,
-                :locale,
-                :long_description,
-                :markup_language,
-                :name,
-                :parent_id,
-                :short_description,
-                ecm_links_links_attributes: [
-                  :description,
-                  :ecm_links_category_id,
-                  :markup_language,
-                  :name,
-                  :position,
-                  :url
-                ]
-
-  form do |f|
-    f.inputs do
-      f.input :parent, as: :select, collection: nested_set_options(Ecm::Links::Category, f.object) { |c| "#{'    ' * c.level} |-- #{c}".html_safe }
-      f.input :locale, as: :select, collection: I18n.available_locales.map(&:to_s)
-      f.input :name
-      f.input :short_description
-      f.input :long_description
-    end
-
-    f.inputs do
-      f.input :markup_language, as: :select, collection: Ecm::Links::Configuration.markup_languages.map(&:to_s)
-      f.input :link_footer_column, as: :select, collection: (1..Ecm::Links::Configuration.link_footer_columns).to_a
-    end
-
-    f.inputs do
-      f.has_many :ecm_links_links do |l|
-        if l.object.persisted?
-          l.input :_destroy, as: :boolean, label: I18n.t('active_admin.delete')
-        end
-        l.input :name
-        l.input :url
-        l.input :description
-      end
-    end
-
-    f.actions
-  end
-
-  index as: :nested_set do
-    selectable_column
-    sortable_tree_columns
-    column :locale
-    column :name do |c|
-      span(style: "margin-left: #{30 * c.level}px") { c.name }
-    end
-    column :short_description
-    column :ecm_links_links_count
-    column :link_footer_column
-    column :created_at
-    column :updated_at
-    actions
-  end
-
-  show do
-    attributes_table do
-      row :parent
-      row :locale
-      row :name
-      row :ecm_links_links_count
-      row :markup_language
-      row :link_footer_column
-      row :created_at
-      row :updated_at
-    end
-
-    panel Ecm::Links::Category.human_attribute_name(:short_description) do
-      div { ecm_links_category.short_description }
-    end
-
-    panel Ecm::Links::Category.human_attribute_name(:long_description) do
-      div { ecm_links_category.long_description }
-    end
-
-    panel Ecm::Links::Category.human_attribute_name(:children) do
-      table_for ecm_links_category.descendants, i18n: Ecm::Links::Category do
-        sortable_tree_columns
-        column(:name) { |child| link_to child, [:admin, child], style: "margin-left: #{30 * (child.level - ecm_links_category.level - 1)}px" }
-        column :short_description
-        column :ecm_links_links_count
-        column :link_footer_column
-        column :created_at
-        column :updated_at
-        column do |child|
-          link_to(I18n.t('active_admin.view'), [:admin, child], class: 'member_link view_link') +
-            link_to(I18n.t('active_admin.edit'), [:edit, :admin, child], class: 'member_link edit_link')
-        end
-      end
-    end
-
-    panel Ecm::Links::Category.human_attribute_name(:ecm_links_links) do
-      table_for ecm_links_category.ecm_links_links, i18n: Ecm::Links::Link do
-        sortable_columns
-        column(:name) { |link| link_to link.name, [:admin, link] }
-        column(:url) { |link| link_to link.url, link.url }
-        column :created_at
-        column :updated_at
-        column do |link|
-          link_to(I18n.t('active_admin.view'), [:admin, link], class: 'member_link view_link') +
-            link_to(I18n.t('active_admin.edit'), [:edit, :admin, link], class: 'member_link edit_link')
-        end
-      end
-    end
-  end
-end if defined?(ActiveAdmin)

data/app/admin/ecm_links_links.rb

@@ -1,56 +0,0 @@
-include ActiveAdmin::ActsAsList::Helper if defined?(ActiveAdmin)
-
-ActiveAdmin.register Ecm::Links::Link do
-  # menu entry settings
-  menu parent: proc { I18n.t('ecm.links.active_admin.menu') }.call
-
-  permit_params :description,
-                :ecm_links_category_id,
-                :markup_language,
-                :name,
-                :position,
-                :url
-
-  # acts as list
-  sortable_member_actions
-
-  form do |f|
-    f.inputs do
-      f.input :ecm_links_category, as: :select, collection: nested_set_options(Ecm::Links::Category) { |c| "#{'    ' * c.level} |-- #{c}".html_safe }
-      f.input :name
-      f.input :url
-      f.input :description
-    end
-
-    f.inputs do
-      f.input :markup_language, as: :select, collection: Ecm::Links::Link::MARKUP_LANGUAGES
-    end
-
-    f.actions
-  end
-
-  index do
-    selectable_column
-    column :ecm_links_category
-    column :name
-    column :url
-    column :created_at
-    column :updated_at
-    actions
-  end
-
-  show do
-    attributes_table do
-      row :ecm_links_category
-      row :name
-      row :url
-      row :markup_language
-      row :created_at
-      row :updated_at
-    end
-
-    panel Ecm::Links::Link.human_attribute_name(:description) do
-      div { ecm_links_link.description }
-    end
-  end
-end if defined?(ActiveAdmin)

data/lib/ecm/links/routing.rb

@@ -1,11 +0,0 @@
-module Ecm
-  module Links
-    class Routing
-      def self.routes(router, options = {})
-        options.reverse_merge!(links_category_actions: [:index, :show])
-
-        router.resources :ecm_links_categories, only: options[:links_category_actions], controller: 'ecm/links/categories'
-      end
-    end
-  end
-end