ecm_references2 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0eec12851cb4a8cc1568d3cd8b91b9cf9d47cd7
-  data.tar.gz: 5ef621a651dbbc89498d513e28279461fc0e8298
+  metadata.gz: c3673a28c5459957312089a130d5bb521034962a
+  data.tar.gz: ee6f2c9c5b7b47748d53a68bd9109fb5a68e3f66
 SHA512:
-  metadata.gz: 78478ab24ab14599ed662a892f5ebd2cee1d23e3595201a84a797c946372929b07c48c4610a0df1c1640d0cfbb23cb89c465c1efb96b4e1947d71e60b4574d41
-  data.tar.gz: e38a50bbc36a352de7faf6c3c25b97658f23f720ac0ef374af125f3d3a2f91934b69984c15549c15a582e45d2b16f652400874a9de536ea820b850927e0f2af3
+  metadata.gz: 72b14316756c4449d637c1cefc5f8beabebffda3adb5e21a44e81897c656fb4acfb5d0383c5dcb6252c28b6a4c5e342d5cb7369d6c4ea7fbcdebc45c582071de
+  data.tar.gz: 18a9d7ce7fa3ba6bf37384f84a9f4ec476f76b948a6323cdd9612d775e4de002b3db2537d581941b1634657739a8e5db6f8a2cc13d387ca6d49383c46ff309ae

data/README.rdoc

@@ -2,6 +2,21 @@
 
 This project rocks and uses MIT-LICENSE.
 
+= Migrating from 1.x.x to 2.0.0
+
+Add active_admin-awesome_nested_set to your gemfile, if you are using activeadmin:
+
+    # Gemfile
+    gem 'active_admin-acts_as_list'
+
+= Prerequisites when using active admin
+
+if you are using activeadmin as backend, ecm_cms2 comes with admin files to provide a backend. In that case, you'll need active_admin-acts_as_list. Add it to your gemfile:
+
+    # Gemfile
+    gem 'active_admin-acts_as_list'
+    gem 'active_admin-awesome_nested_set'
+
 = Installation
 
 Add it to your Gemfile:

data/app/admin/ecm_references_categories.rb

@@ -89,4 +89,4 @@ ActiveAdmin.register Ecm::References::Category do
       row :updated_at
     end
   end # sidebar
-end # ActiveAdmin.register Ecm::References::Category
+end if Gem::Specification.find_all_by_name('activeadmin').any?

data/app/admin/ecm_references_references.rb

@@ -3,7 +3,7 @@ ActiveAdmin.register Ecm::References::Reference do
 
   permit_params :attached_pictures_attributes,
                 :category,
-                :ecm_categories_category_id,
+                :ecm_references_category_id,
                 :description,
                 :markup_language,
                 :name,
@@ -75,4 +75,4 @@ ActiveAdmin.register Ecm::References::Reference do
       row :updated_at
     end
   end # sidebar
-end # ActiveAdmin.register Ecm::References::Reference
+end if Gem::Specification.find_all_by_name('activeadmin').any?

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

@@ -3,17 +3,9 @@ module Ecm::References
     self.table_name = 'ecm_references_categories'
 
     # associations
-    has_many :references, foreign_key: :ecm_categories_category_id,
+    has_many :references, foreign_key: :ecm_references_category_id,
                           dependent:   :destroy
 
-    # attributes
-    # attr_accessible :description,
-    #                 :locale,
-    #                 :markup_language,
-    #                 :name,
-    #                 :parent_id,
-    #                 :slug
-
     # callbacks
     after_initialize :set_defaults
     before_validation :set_locale_from_parent
@@ -64,8 +56,12 @@ module Ecm::References
       references.count
     end
 
-    def references_count_label(view)
-      view.content_tag(:span, references_count, class: 'badge')
+    def public_references_count
+      references.with_public_visibility.count
+    end
+
+    def public_references_count_label(view)
+      view.content_tag(:span, public_references_count, class: 'badge')
     end
 
     def to_s
@@ -80,23 +76,23 @@ module Ecm::References
 
     def equality_of_locale_and_parent_locale
       locale == parent.locale
-    end # def
+    end
 
     def set_defaults
       if self.new_record?
         self.markup_language ||= Ecm::References::Configuration.default_markup_language
       end
-    end # def
+    end
 
     def set_locale_from_parent
       self.locale = parent.locale if parent.respond_to?(:locale)
-    end # def
+    end
 
     def update_locale_on_children!
       children.each do |child|
         child.locale = locale
         child.save!
       end
-    end # def
-  end # class Category < ActiveRecord::Base
-end # module Ecm::References
+    end
+  end
+end

data/app/models/ecm/references/reference.rb

@@ -3,8 +3,8 @@ module Ecm::References
     self.table_name = 'ecm_references_references'
 
     # acts as list
-    acts_as_list scope: :ecm_categories_category
-    default_scope { order('ecm_categories_category_id ASC, position ASC') }
+    acts_as_list scope: :ecm_references_category
+    default_scope { order('ecm_references_category_id ASC, position ASC') }
 
     # acts as published
     include ActsAsPublished::ActiveRecord
@@ -12,7 +12,7 @@ module Ecm::References
 
     # associations
     belongs_to :category,
-               foreign_key: :ecm_categories_category_id
+               foreign_key: :ecm_references_category_id
     has_many :attached_pictures, as: :pictureable,
                                  class_name: Ecm::Pictures::AttachedPicture,
                                  inverse_of: :pictureable
@@ -22,20 +22,8 @@ module Ecm::References
     accepts_nested_attributes_for :attached_pictures, allow_destroy: true
     accepts_nested_attributes_for :pictures, allow_destroy: true
 
-    # attributes
-    # attr_accessible :attached_pictures_attributes,
-    #                 :category,
-    #                 :ecm_categories_category_id,
-    #                 :description,
-    #                 :markup_language,
-    #                 :name,
-    #                 :pictures_attributes
-
     # callbacks
     after_initialize :set_defaults
-    #    before_validation do
-    #      self.published = ["published"] # if @attributes.has_key?("published")
-    #    end
 
     # friendly id support
     extend FriendlyId
@@ -45,11 +33,11 @@ module Ecm::References
     acts_as_markup language: :variable, columns: [:description]
 
     # validations
-    validates :ecm_categories_category_id, presence: true
+    validates :ecm_references_category_id, presence: true
     validates :markup_language, presence: true,
                                 inclusion: Ecm::References::Configuration.markup_languages.map(&:to_s)
     validates :name, presence: true,
-                     uniqueness: { scope: [:ecm_categories_category_id] }
+                     uniqueness: { scope: [:ecm_references_category_id] }
 
     def self.localized
       joins(:category).where(ecm_references_categories: { locale: I18n.locale })
@@ -69,7 +57,7 @@ module Ecm::References
 
     def to_s
       name
-    end # def
+    end
 
     private
 
@@ -78,6 +66,6 @@ module Ecm::References
         self.markup_language ||= Ecm::References::Configuration.default_markup_language
         self.published = Ecm::References::Configuration.new_references_published_by_default if published_at.nil?
       end
-    end # def
-  end # class Reference < ActiveRecord::Base
-end # module Ecm::References
+    end
+  end
+end

data/app/views/ecm/references/categories/_category_in_table.html.haml

@@ -3,4 +3,4 @@
     = link_to(category.tree_name, category, class: "left-padding-#{category.depth * 3}", title: category.description)
     = category.locale_label(self)
   %td.text-right
-    = category.references_count_label(self)
+    = category.public_references_count_label(self)

data/config/locales/de.yml

@@ -11,7 +11,7 @@ de:
         markup_language: "Markup Sprache"
         name: Name
         parent: "Übergeordnete Kategorie"
-        reference_count: Referenzen
+        references_count: Referenzen
         references: Referenzen
         slug: "Freundliche ID"
         updated_at: "Aktualisiert am"
@@ -20,6 +20,7 @@ de:
         created_at: "Erstellt am"
         description: Beschreibung
         details: Details
+        ecm_references_category: Kategorie
         markup_language: "Markup Sprache"
         name: Name
         preview_picture: Vorschaubild

data/config/locales/en.yml

@@ -11,7 +11,7 @@ en:
         markup_language: "markup language"
         name: name
         parent: "parent category"
-        reference_count: references
+        references_count: references
         references: references
         slug: "friendly id"
         updated_at: "updated at"
@@ -20,6 +20,7 @@ en:
         created_at: "created at"
         description: description
         details: details
+        ecm_references_category: category
         markup_language: "markup language"
         name: name
         preview_picture: preview picture

data/db/migrate/002_create_ecm_references_references.rb

@@ -17,7 +17,7 @@ class CreateEcmReferencesReferences < ActiveRecord::Migration
       t.string :slug
 
       # references
-      t.references :ecm_categories_category
+      t.references :ecm_references_category
 
       t.timestamps
     end

data/lib/ecm/references/engine.rb

@@ -5,7 +5,7 @@ module Ecm
         ActiveAdmin.setup do |config|
           config.load_paths << File.join(root, 'app/admin')
         end
-      end
+      end if Gem::Specification.find_all_by_name('activeadmin').any?
     end
   end
 end

data/lib/ecm/references/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module References
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/ecm_references2.rb

@@ -1,5 +1,5 @@
-require 'active_admin-acts_as_list'
-require 'active_admin-awesome_nested_set'
+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 'acts_as_markup'
 require 'acts_as_published'

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

@@ -6,8 +6,14 @@ module Ecm
 
         source_root File.expand_path('../templates', __FILE__)
 
-        def generate_intializer
-          copy_file 'ecm_references.rb', 'config/initializers/ecm_references.rb'
+        def generate_initializer
+          copy_file 'initializer.rb', 'config/initializers/ecm_references.rb'
+        end
+
+        def generate_routes
+          inject_into_file 'config/routes.rb', before: "\nend" do
+            File.read(File.join(File.expand_path('../templates', __FILE__), 'routes.source'))
+          end
         end
       end
     end

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

@@ -0,0 +1,5 @@
+  
+  # ECM References Frontend Routing
+  localized do
+    Ecm::References::Routing.routes(self)
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_references2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,11 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: active_admin-acts_as_list
+  name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_admin-awesome_nested_set
+  name: acts_as_markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts_as_list
+  name: acts_as_published
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts_as_markup
+  name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts_as_published
+  name: awesome_nested_set-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set
+  name: ecm_pictures2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set-tools
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ecm_pictures2
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: friendly_id
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: bootstrap-kaminari-views
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,13 +165,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: rails-dummy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -185,13 +179,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-kaminari-views
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -199,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-dummy
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: route_translator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -241,21 +235,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activeadmin
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: ecm_lightbox2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -269,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: route_translator
+  name: less-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -283,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: less-rails
+  name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -297,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -311,21 +305,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
+  name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.pre2
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -339,7 +333,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: active_admin-acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -353,7 +347,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ecm_lightbox2
+  name: active_admin-awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -492,7 +486,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: References module for active admin.
+description: References module for ruby on rails.
 email:
 - roberto@vasquez-angel.de
 executables: []
@@ -531,7 +525,8 @@ files:
 - lib/ecm/references/version.rb
 - lib/ecm_references2.rb
 - lib/generators/ecm/references/install/install_generator.rb
-- lib/generators/ecm/references/install/templates/ecm_references.rb
+- lib/generators/ecm/references/install/templates/initializer.rb
+- lib/generators/ecm/references/install/templates/routes.source
 - lib/generators/ecm/references/locales/locales_generator.rb
 - lib/tasks/ecm_references_tasks.rake
 homepage: https://github.com/robotex82/ecm_references2
@@ -556,5 +551,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: References module for active admin.
+summary: References module for ruby on rails.
 test_files: []
+has_rdoc: