the_comments 2.1.0 → 2.2.0

data/README.md

@@ -30,7 +30,7 @@ TheComments - probably, best commenting system for Rails
 **Gemfile**
 
 ```ruby
-gem "the_comments", "~> 2.0.1"
+gem "the_comments", "~> 2.1.0"
 
 gem 'haml'                # or gem 'slim'
 gem 'awesome_nested_set'  # or same gem
@@ -144,7 +144,7 @@ class Post < ActiveRecord::Base
 end
 ```
 
-### 5. Mount Engine routes
+### 5. Add routes
 
 **config/routes.rb**
 
@@ -155,7 +155,10 @@ MyApp::Application.routes.draw do
 
   # ...
 
-  mount TheComments::Engine => '/', as: :comments
+  # TheComments routes
+  concern   :user_comments,  TheComments::UserRoutes.new
+  concern   :admin_comments, TheComments::AdminRoutes.new
+  resources :comments, concerns:  [:user_comments, :admin_comments]
 end
 ```
 

data/app/helpers/render_comments_tree_helper.rb

@@ -89,7 +89,7 @@ module RenderCommentsTreeHelper
 
       def moderator_controls
         if moderator?
-          h.link_to(t('the_comments.edit'), h.comments.edit_comment_url(@comment), class: :edit)
+          h.link_to(t('the_comments.edit'), h.edit_comment_url(@comment), class: :edit)
         end
       end
 

data/app/views/the_comments/haml/_comment_edit.html.haml

@@ -1,5 +1,5 @@
 .edit_form{ style: "display:none" }
-  = form_for [comments, comment], remote: true, html:{ role: :form } do |f|
+  = form_for comment, remote: true, html:{ role: :form } do |f|
     %table.table.table-striped.table-hover
       %tr{ style: "width: 100px;"}
         %td

data/app/views/the_comments/haml/_form.html.haml

@@ -1,7 +1,7 @@
 %h3
   = link_to t('the_comments.new'), '#', id: :new_root_comment
 
-= form_for [comments, Comment.new], remote: true, authenticity_token: true do |f|
+= form_for Comment.new, remote: true, authenticity_token: true do |f|
   .error_notifier{ style: "display:none" }
   %label= t('the_comments.form.title')
   %p= f.text_field :title

data/app/views/the_comments/haml/_manage_controls.html.haml

@@ -7,21 +7,21 @@
 
     - to_hide = comment.published? ? hidden : nil
     - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [comments, :to_published, comment], opts.merge(class: "btn btn-primary to_published") do
+    = link_to [:to_published, comment], opts.merge(class: "btn btn-primary to_published") do
       = t('the_comments.to_published')
     
     - to_hide = comment.draft? ? hidden : nil
     - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [comments, :to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
+    = link_to [:to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
       = t('the_comments.to_draft')
 
     - to_hide = comment.deleted? ? hidden : nil
     - opts    = { remote: true, style: to_hide, method: :delete, data: { confirm: t('the_comments.delete_confirm') } }
-    = link_to [comments, :to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
+    = link_to [:to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
       = t('the_comments.to_deleted')
 
     - opts = { remote: true, method: :post}
-    = link_to [comments, :to_spam, comment], opts.merge(class: "btn btn-danger to_spam") do
+    = link_to [:to_spam, comment], opts.merge(class: "btn btn-danger to_spam") do
       = t('the_comments.to_spam')
   .col-md-3.text-right
     = link_to t('the_comments.additional_info'), "#", class: "additional_info btn btn-info"

data/app/views/the_comments/haml/_sidebar.html.haml

@@ -8,21 +8,21 @@
 
     %h5= t 'the_comments.incoming'
     %ul
-      %li= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [comments, :draft,     :comments]
-      %li= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [comments, :published, :comments]
-      %li= link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [comments, :deleted,   :comments]
-      %li= link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [comments, :spam,      :comments]
+      %li= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [:draft,     :comments]
+      %li= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [:published, :comments]
+      %li= link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [:deleted,   :comments]
+      %li= link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [:spam,      :comments]
 
     %h5= t 'the_comments.written_by_me'
     %ul
-      %li= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [comments, :my_draft,     :comments]
-      %li= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [comments, :my_published, :comments]
-      %li= link_to t("the_comments.my_comments",        num: cuser.my_comments_count),           [comments, :my_comments,  :comments]
+      %li= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [:my_draft,     :comments]
+      %li= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [:my_published, :comments]
+      %li= link_to t("the_comments.my_comments",        num: cuser.my_comments_count),           [:my_comments,  :comments]
 
     - if cuser.comments_admin?
       %h5= t 'the_comments.in_system'
       %ul
-        %li= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [comments, :total_draft,     :comments]
-        %li= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [comments, :total_published, :comments]
-        %li= link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [comments, :total_deleted,   :comments]
-        %li= link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [comments, :total_spam,      :comments]
+        %li= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [:total_draft,     :comments]
+        %li= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [:total_published, :comments]
+        %li= link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [:total_deleted,   :comments]
+        %li= link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [:total_spam,      :comments]

data/app/views/the_comments/slim/_comment_edit.html.slim

@@ -1,5 +1,5 @@
 .edit_form  style: "display:none"  
-  = form_for [comments, comment], remote: true, html:{ role: :form } do |f|
+  = form_for comment, remote: true, html:{ role: :form } do |f|
     table.table.table-striped.table-hover
       tr  style: "width: 100px;" 
         td

data/app/views/the_comments/slim/_form.html.slim

@@ -1,7 +1,7 @@
 h3
   = link_to t('the_comments.new'), '#', id: :new_root_comment
 
-= form_for [comments, Comment.new], remote: true, authenticity_token: true do |f|
+= form_for Comment.new, remote: true, authenticity_token: true do |f|
   .error_notifier  style: "display:none"  
   label= t('the_comments.form.title')
   p= f.text_field :title

data/app/views/the_comments/slim/_manage_controls.html.slim

@@ -7,21 +7,21 @@
 
     - to_hide = comment.published? ? hidden : nil
     - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [comments, :to_published, comment], opts.merge(class: "btn btn-primary to_published") do
+    = link_to [:to_published, comment], opts.merge(class: "btn btn-primary to_published") do
       = t('the_comments.to_published')
     
     - to_hide = comment.draft? ? hidden : nil
     - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [comments, :to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
+    = link_to [:to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
       = t('the_comments.to_draft')
 
     - to_hide = comment.deleted? ? hidden : nil
     - opts    = { remote: true, style: to_hide, method: :delete, data: { confirm: t('the_comments.delete_confirm') } }
-    = link_to [comments, :to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
+    = link_to [:to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
       = t('the_comments.to_deleted')
 
     - opts = { remote: true, method: :post}
-    = link_to [comments, :to_spam, comment], opts.merge(class: "btn btn-danger to_spam") do
+    = link_to [:to_spam, comment], opts.merge(class: "btn btn-danger to_spam") do
       = t('the_comments.to_spam')
   .col-md-3.text-right
     = link_to t('the_comments.additional_info'), "#", class: "additional_info btn btn-info"

data/app/views/the_comments/slim/_sidebar.html.slim

@@ -8,21 +8,21 @@
 
     h5= t 'the_comments.incoming'
     ul
-      li= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [comments, :draft,     :comments]
-      li= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [comments, :published, :comments]
-      li= link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [comments, :deleted,   :comments]
-      li= link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [comments, :spam,      :comments]
+      li= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [:draft,     :comments]
+      li= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [:published, :comments]
+      li= link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [:deleted,   :comments]
+      li= link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [:spam,      :comments]
 
     h5= t 'the_comments.written_by_me'
     ul
-      li= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [comments, :my_draft,     :comments]
-      li= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [comments, :my_published, :comments]
-      li= link_to t("the_comments.my_comments",        num: cuser.my_comments_count),           [comments, :my_comments,  :comments]
+      li= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [:my_draft,     :comments]
+      li= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [:my_published, :comments]
+      li= link_to t("the_comments.my_comments",        num: cuser.my_comments_count),           [:my_comments,  :comments]
 
     - if cuser.comments_admin?
       h5= t 'the_comments.in_system'
       ul
-        li= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [comments, :total_draft,     :comments]
-        li= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [comments, :total_published, :comments]
-        li= link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [comments, :total_deleted,   :comments]
-        li= link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [comments, :total_spam,      :comments]
+        li= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [:total_draft,     :comments]
+        li= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [:total_published, :comments]
+        li= link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [:total_deleted,   :comments]
+        li= link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [:total_spam,      :comments]

data/config/routes.rb

@@ -1,28 +1,36 @@
-TheComments::Engine.routes.draw do
-  resources :comments do
-    member do
-      post   :to_spam
-      post   :to_draft
-      post   :to_published
-      delete :to_deleted
-    end
+module TheComments
+  class UserRoutes
+    def call mapper, options = {}
+      mapper.collection do
+        mapper.get :manage
 
-    collection do
-      get :manage
+        mapper.get :my_draft
+        mapper.get :my_published
+        mapper.get :my_comments
 
-      get :my_draft
-      get :my_published
-      get :my_comments
+        mapper.get :draft
+        mapper.get :published
+        mapper.get :deleted
+        mapper.get :spam
+      end
 
-      get :total_draft
-      get :total_published
-      get :total_deleted
-      get :total_spam
+      mapper.member do
+        mapper.post   :to_spam
+        mapper.post   :to_draft
+        mapper.post   :to_published
+        mapper.delete :to_deleted
+      end
+    end
+  end
 
-      get :draft
-      get :published
-      get :deleted
-      get :spam
+  class AdminRoutes
+    def call mapper, options = {}
+      mapper.collection do
+        mapper.get :total_draft
+        mapper.get :total_published
+        mapper.get :total_deleted
+        mapper.get :total_spam
+      end
     end
   end
 end

data/docs/advanced_installation.md

@@ -140,7 +140,10 @@ MyApp::Application.routes.draw do
 
   # ...
 
-  mount TheComments::Engine => '/', as: :comments
+  # TheComments routes
+  concern   :user_comments,  TheComments::UserRoutes.new
+  concern   :admin_comments, TheComments::AdminRoutes.new
+  resources :comments, concerns:  [:user_comments, :admin_comments]
 end
 ```
 

data/docs/documentation.md

@@ -1,7 +1,7 @@
 #### INSTALLATION
 * :white_check_mark:   [ADVANCED INSTALLATION](advanced_installation.md)
 * :white_check_mark:   [ADMIN UI INSTALLATION](admin_ui_installation.md)
-* :white_check_mark:   [Mountable Routing](mountable_routes.md)
+* :white_check_mark:   [Routing](routes.md)
 * :white_check_mark:   [Generators](generators.md)
 
 #### API

data/docs/{mountable_routes.md → routes.md}

@@ -1,12 +1,6 @@
 ←   [documentation](documentation.md)
 
-## Mountable Routes
-
-Now gem has mountable routes. It's was not my idea, but guys said - it's very helpful. So, ok!
-
-You should mount routes to your app.
-
-:warning:   Default views based on **as: :comments** argument. If, you want to change it - you should customize default views.
+## TheComments Routes
 
 **config/routes.rb**
 
@@ -17,7 +11,10 @@ MyApp::Application.routes.draw do
 
   # ...
 
-  mount TheComments::Engine => '/', as: :comments
+  # TheComments routes
+  concern   :user_comments,  TheComments::UserRoutes.new
+  concern   :admin_comments, TheComments::AdminRoutes.new
+  resources :comments, concerns:  [:user_comments, :admin_comments]
 end
 ```
 
@@ -60,21 +57,21 @@ And now you can use url helpers with 2 ways:
 ### Way 1. Url Helpers
 
 ```ruby
-= link_to 'link', comments.comments_path
-= link_to 'link', comments.manage_comments_path
-= link_to 'link', comments.new_comment_path
+= link_to 'link', comments_path
+= link_to 'link', manage_comments_path
+= link_to 'link', new_comment_path
 
-= link_to 'link', comments.comment_path(@comment)
-= link_to 'link', comments.to_spam_comment_path(@comment)
+= link_to 'link', comment_path(@comment)
+= link_to 'link', to_spam_comment_path(@comment)
 ```
 
 ### Way 2. Array notation
 
 ```ruby
-= link_to 'link', [comments, :index]
-= link_to 'link', [comments, :manage]
-= link_to 'link', [comments, :new]
+= link_to 'link', [:index,  :comments]
+= link_to 'link', [:manage, :comments]
+= link_to 'link', [:draft,  :comments]
 
-= link_to 'link', [comments, @comment]
-= link_to 'link', [comments, :to_spam, @comment]
+= link_to 'link', [@comment]
+= link_to 'link', [:to_spam, @comment]
 ```

data/gem_version.rb

@@ -1,3 +1,3 @@
 module TheComments
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/lib/the_comments.rb

@@ -4,16 +4,16 @@ require 'the_sortable_tree'
 require 'the_comments/config'
 require 'the_comments/version'
 
+_root_ = File.expand_path('../../',  __FILE__)
+
 module TheComments
   class Engine < Rails::Engine; end
 end
 
 # Loading of concerns
+require "#{_root_}/config/routes.rb"
+require "#{_root_}/app/controllers/concerns/controller.rb"
 
-# controllers
-require File.expand_path('../../app/controllers/concerns/controller.rb', __FILE__)
-
-# models
 %w[ comment_states comment user commentable ].each do |concern|
-  require File.expand_path("../../app/models/concerns/#{concern}.rb", __FILE__)
+  require "#{_root_}/app/models/concerns/#{concern}.rb"
 end

data/spec/dummy_app/.gitignore

@@ -6,6 +6,7 @@
 
 # Ignore bundler config.
 /.bundle
+.rvmrc
 
 # Ignore the default SQLite database.
 /db/*.db

data/spec/dummy_app/.rvmrc.example

@@ -0,0 +1 @@
+rvm use ruby-2.0.0-p247@the_comments --create

data/spec/dummy_app/Gemfile

@@ -12,7 +12,7 @@ gem 'sass-rails', '~> 4.0.0'
 gem 'coffee-rails', '~> 4.0.0'
 
 gem 'thin', group: [:development]
-gem 'therubyracer', platforms: :ruby
+# gem 'therubyracer', platforms: :ruby
 gem 'sdoc', require: false, group: [:doc]
 
 # App gems

data/spec/dummy_app/app/views/layouts/application.html.haml

@@ -14,7 +14,7 @@
       - if current_user
         User: #{current_user.username}
         \|
-        = link_to "Comments Manage (+#{current_user.draft_comcoms_count})", comments.manage_comments_path
+        = link_to "Comments Manage (+#{current_user.draft_comcoms_count})", manage_comments_path
       - else
         Guest
     = yield

data/spec/dummy_app/config/routes.rb

@@ -11,5 +11,8 @@ App::Application.routes.draw do
 
   resources :posts
 
-  mount TheComments::Engine => '/', as: :comments
+  # TheComments routes
+  concern   :user_comments,  TheComments::UserRoutes.new
+  concern   :admin_comments, TheComments::AdminRoutes.new
+  resources :comments, concerns:  [:user_comments, :admin_comments]
 end

data/the_comments.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["zykin-ilya@ya.ru"]
   gem.description   = %q{ Comments with threading for Rails 4 }
   gem.summary       = %q{ the_comments by the-teacher }
-  gem.homepage      = "https://github.com/open-cook/the_comments"
+  gem.homepage      = "https://github.com/the-teacher/the_comments"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,43 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: the_comments
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Ilya N. Zykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &82514850 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *82514850
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &82514530 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *82514530
 description: ! ' Comments with threading for Rails 4 '
 email:
 - zykin-ilya@ya.ru
@@ -103,8 +98,8 @@ files:
 - docs/denormalization_and_recent_comments.md
 - docs/documentation.md
 - docs/generators.md
-- docs/mountable_routes.md
 - docs/pagination.md
+- docs/routes.md
 - docs/screencast.jpg
 - docs/the_comments.jpg
 - docs/the_comments_view_1.gif
@@ -127,6 +122,7 @@ files:
 - spec/dummy_app/.rspec
 - spec/dummy_app/.ruby-gemset
 - spec/dummy_app/.ruby-version
+- spec/dummy_app/.rvmrc.example
 - spec/dummy_app/Gemfile
 - spec/dummy_app/README.md
 - spec/dummy_app/Rakefile
@@ -205,34 +201,36 @@ files:
 - spec/dummy_app/vendor/assets/stylesheets/.keep
 - the_comments.gemspec
 - views_converter.rb
-homepage: https://github.com/open-cook/the_comments
+homepage: https://github.com/the-teacher/the_comments
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: the_comments by the-teacher
 test_files:
 - spec/dummy_app/.gitignore
 - spec/dummy_app/.rspec
 - spec/dummy_app/.ruby-gemset
 - spec/dummy_app/.ruby-version
+- spec/dummy_app/.rvmrc.example
 - spec/dummy_app/Gemfile
 - spec/dummy_app/README.md
 - spec/dummy_app/Rakefile

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1ee632ba5de08ebc509b8bee50ff36a33aad11e2
-  data.tar.gz: bd13f415bec98398f1a6fb6490aacf90bf8f2ef2
-SHA512:
-  metadata.gz: 19588969de25f0760bbe5a55bf60ee38510248e462f84c1a2cff6e6ee85d3496491f889b123d25d8b50a8da0f870ea868d8ff014dc4bacac7633c81da1352b10
-  data.tar.gz: afcc6443ea637efd7fda0f0ac74fb292688dad0f3c06dde0d76473eefeda6d65c64197a12126447dc63ea8b0b34ae467535820c66a0af0139845a7530f3e0ef8