ecm_tags 1.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48c7c394a3a5e2df86cc629b57e93534e82ab34d
-  data.tar.gz: 3bb976c8cc6d988a21caf96e4af0ab1629a40f30
+  metadata.gz: 8104551bb3079c872697c2ef2326969d4e92eeec
+  data.tar.gz: ec77be070876b144b3584d177d1b3dc5d0219d28
 SHA512:
-  metadata.gz: c4b9abfebe2c615b16944a3c5f7d3a4fb5ed364e0fd007feccccf2f8bc71a74833ef0bfdcc0dafacb68c92244d27bbf5c4338807bbe80b1eb32c63f364377f39
-  data.tar.gz: 72304783882c072c0fc5017621c674d209a65f3e5b8114e69edc377809e04808dec313ec1c1c8443db1169c9efc34bcf56f72f51a729f8672a6004c18ba5fd70
+  metadata.gz: b2e7e3771df88f49098225c547a2d73177cffaf9b37f276bcca64f51177c632ffbd57b7cf698650e543e92927fc3c9efdd1fa80e1f9b7844d24c675967665a79
+  data.tar.gz: 4b1ca17e0f524fd03172994ec0860452115445789f469a3cf93c0e7e476096f38443afbdde95a2a6295638978eac0448f052a58ad3e89a6222438aa1f8986328

data/app/assets/javascripts/ecm/tags/application.js

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require_tree ./application

data/app/assets/javascripts/ecm_tags.js

@@ -0,0 +1 @@
+//= require ./ecm/tags/application

data/app/assets/stylesheets/ecm/tags/application.css

@@ -9,6 +9,6 @@
  * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
  * files in this directory. It is generally better to create a new file per style scope.
  *
- *= require_tree .
+ *= require_tree ./application
  *= require_self
  */

data/app/assets/stylesheets/ecm/tags/application/tag-labels.css

@@ -0,0 +1,4 @@
+.tags-for-resource a.label {
+  display: inline-block;
+  margin-right: 0.25em;
+}

data/app/assets/stylesheets/ecm_tags.css

@@ -0,0 +1,3 @@
+/*
+ *= require ./ecm/tags/application
+ */

data/app/concerns/model/ecm/tags/taggable_concern.rb

@@ -0,0 +1,13 @@
+module Model
+  module Ecm
+    module Tags
+      module TaggableConcern
+        extend ActiveSupport::Concern
+
+        included do
+          acts_as_taggable
+        end
+      end
+    end
+  end
+end

data/app/controllers/ecm/tags/tag_searchs_controller.rb

@@ -13,7 +13,11 @@ module Ecm
       end
 
       def create
-        @tag_search = TagSearch.new(permitted_params)
+        if request.get?
+          @tag_search = TagSearch.new(tag_list: permitted_params)
+        else
+          @tag_search = TagSearch.new(permitted_params)
+        end
         @result = @tag_search.result
         respond_with @tag_search do |format|
           format.html { render :new }
@@ -28,7 +32,11 @@ module Ecm
       end
 
       def permitted_params
-        params.require(:tag_search).permit(:tag_list, :exact)
+        if request.get?
+          params.require(:tag)
+        else
+          params.require(:tag_search).permit(:tag_list, :exact)
+        end
       end
     end
   end

data/app/helpers/ecm/tags/application_helper.rb

@@ -5,6 +5,10 @@ module Ecm
         @tag_search ||= Ecm::Tags::TagSearch.new
         render partial: 'ecm/tags/search_box'
       end
+
+      def tag_labels_for(resource)
+        render 'ecm/tags/tag_labels_for_resource', resource: resource
+      end
     end
   end
 end

data/app/models/ecm/tags/null_tag.rb

@@ -0,0 +1,9 @@
+module Ecm
+  module Tags
+    class NullTag
+      def name
+        'Not tagged'
+      end
+    end
+  end
+end

data/app/models/ecm/tags/tag_search.rb

@@ -39,7 +39,7 @@ module Ecm::Tags
     end
 
     def taggable_classes
-      @taggable_classes ||= Ecm::Tags::Tagging.uniq.pluck(:taggable_type)
+      @taggable_classes ||= Ecm::Tags::Tagging.distinct.pluck(:taggable_type)
     end
 
     def exact
@@ -47,7 +47,11 @@ module Ecm::Tags
     end
 
     def exact=(value)
-      @exact = ActiveRecord::Type::Boolean.new.type_cast_from_database(value)
+      if Rails.version < '5.1'
+        @exact = ActiveRecord::Type::Boolean.new.type_cast_from_database(value)
+      else
+        @exact = ActiveRecord::Type::Boolean.new.cast(value)
+      end
     end
 
     private

data/app/views/ecm/tags/_tag_labels_for_resource.html.haml

@@ -0,0 +1,4 @@
+%span.tags-for-resource
+  - resource.tags.each do |tag|
+    = link_to(ecm_tags.tag_path(tag: CGI::escape(tag.name)), class: 'label label-default', style: "background-color: #{tag.color}") do
+      = tag.name

data/app/views/ecm/tags/tag_searchs/new.haml

@@ -1,7 +1,8 @@
-= simple_form_for(@tag_search, url: ecm_tags.tag_searchs_path) do |f|
-  = f.input :tag_list
-  = f.input :exact, as: :boolean
-  = f.button :submit, class: 'btn btn-primary'
+- unless params[:tag].present?
+  = simple_form_for(@tag_search, url: ecm_tags.tag_searchs_path) do |f|
+    = f.input :tag_list
+    = f.input :exact, as: :boolean
+    = f.button :submit, class: 'btn btn-primary'
 
 #tag_search_result
   - @result.each do |class_name, resources|

data/config/locales/de.yml

@@ -1,4 +1,6 @@
 de:
+  classes:
+    ecm/tags/engine: Tags
   attributes:
     tag_list: Tags
   activerecord:
@@ -15,11 +17,11 @@ de:
       ecm/tags/tag_search:
         exact: Wortgenau
         tag_list: Tags
-    model:
+    models:
       ecm/tags/tag:
         one: Tag
         other: Tags
-      ecm/tags/tag:
+      ecm/tags/tagging:
         one: Tagging
         other: Taggings
   ecm:
@@ -31,5 +33,4 @@ de:
       tag_search:
         create: 'Suchen'
   routes:
-    mount:
-      ecm_tags: '/backend/tags'
+    ecm_tags_engine: tags

data/config/locales/en.yml

@@ -1,4 +1,6 @@
 en:
+  classes:
+    ecm/tags/engine: Tags
   attributes:
     tag_list: Tags
   activerecord:
@@ -28,5 +30,4 @@ en:
       tag_search:
         create: 'Search'
   routes:
-    mount:
-      ecm_tags: '/backend/tags'
+    ecm_tags_engine: tags

data/config/routes.rb

@@ -1,7 +1,13 @@
 Ecm::Tags::Engine.routes.draw do
-  resources :tag_searchs, only: [:new, :create] do
-    get '/', on: :collection, to: "tag_searchs#create"
-  end
+  localized do
+    scope :ecm_tags_engine do
+      resources :tag_searchs, only: [:new, :create] do
+        get '/', on: :collection, to: "tag_searchs#create"
+      end
+
+      get '/:tag', to: "tag_searchs#create", as: 'tag'
 
-  root to: 'tag_searchs#new'
+      root to: 'tag_searchs#new'
+    end
+  end
 end

data/db/migrate/20160208121254_create_ecm_tags_tags.rb

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

data/db/migrate/20160208121300_create_ecm_tags_taggings.rb

@@ -1,5 +1,5 @@
 # This migration comes from ecm_tags (originally 20160208121300)
-class CreateEcmTagsTaggings < ActiveRecord::Migration
+class CreateEcmTagsTaggings < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_tags_taggings do |t|
       t.integer  'tag_id'

data/db/migrate/20161101170254_add_color_to_ecm_tags_tags.rb

@@ -0,0 +1,5 @@
+class AddColorToEcmTagsTags < ActiveRecord::Migration[4.2]
+  def change
+    add_column :ecm_tags_tags, :color, :string
+  end
+end

data/lib/ecm/tags/configuration.rb

@@ -11,6 +11,11 @@ module Ecm
       mattr_accessor(:base_controller) { 'FrontendController' }
       mattr_accessor(:add_submit_button_to_search_box) { true }
       mattr_accessor(:tag_search_exact_default_value) { false }
+      mattr_accessor(:taggable_models) { [] }
+
+      def self.taggable_models
+        @@taggable_models.map(&:constantize)
+      end
     end
   end
 end

data/lib/ecm/tags/engine.rb

@@ -2,6 +2,13 @@ module Ecm
   module Tags
     class Engine < ::Rails::Engine
       isolate_namespace Ecm::Tags
+
+      config.after_initialize do
+        Configuration.taggable_models.each do |model|
+          puts "Including Models::Ecm::Tags::TaggableConcern in #{model}"
+          model.send(:include, Model::Ecm::Tags::TaggableConcern)
+        end
+      end
     end
   end
 end

data/lib/ecm/tags/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Tags
-    VERSION = '1.0.0'.freeze
+    VERSION = '2.0.2'.freeze
   end
 end

data/lib/generators/ecm/tags/install/templates/initializer.rb

@@ -16,4 +16,11 @@ Ecm::Tags.configure do |config|
   # Default: config.tag_search_exact_default_value = false
   # 
   config.tag_search_exact_default_value = false
+
+
+  # Specify the models to be tagged.
+  # 
+  # Default: config.taggable_models = %w()
+  # 
+  config.taggable_models = %w()
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_tags
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -231,22 +231,31 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/javascripts/ecm/tags/application.js
+- app/assets/javascripts/ecm/tags/application/dummy.js
+- app/assets/javascripts/ecm_tags.js
 - app/assets/stylesheets/ecm/tags/application.css
+- app/assets/stylesheets/ecm/tags/application/tag-labels.css
+- app/assets/stylesheets/ecm_tags.css
 - app/attribute_renderers/tag_list_renderer.rb
+- app/concerns/model/ecm/tags/taggable_concern.rb
 - app/controllers/ecm/tags/application_controller.rb
 - app/controllers/ecm/tags/tag_searchs_controller.rb
 - app/helpers/ecm/tags/application_helper.rb
+- app/models/ecm/tags/null_tag.rb
 - app/models/ecm/tags/tag.rb
 - app/models/ecm/tags/tag_search.rb
 - app/models/ecm/tags/tagging.rb
 - app/views/ecm/tags/_search_box.haml
+- app/views/ecm/tags/_tag_labels_for_resource.html.haml
 - app/views/ecm/tags/tag_searchs/new.haml
 - app/views/layouts/ecm/tags/application.html.erb
+- config/initializers/assets.rb
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20160208121254_create_ecm_tags_tags.rb
 - db/migrate/20160208121300_create_ecm_tags_taggings.rb
+- db/migrate/20161101170254_add_color_to_ecm_tags_tags.rb
 - lib/ecm/tags.rb
 - lib/ecm/tags/configuration.rb
 - lib/ecm/tags/engine.rb
@@ -277,9 +286,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: Easy tagging for itsf backend
 test_files: []
-has_rdoc: