the_comments 2.2.2 → 2.3.1

data/spec/dummy_app/config/routes.rb

@@ -10,6 +10,7 @@ App::Application.routes.draw do
   post   "sessions" => "sessions#create",  as: :sessions
 
   resources :posts
+  resources :users
 
   # TheComments routes
   concern   :user_comments,  TheComments::UserRoutes.new

data/spec/dummy_app/spec/models/user_counters_spec.rb

@@ -142,7 +142,7 @@ describe User do
   context "Written by me counters" do
     after(:all) { destroy_all }
     before(:all){ create_users_and_post }
-    it 'should has correct My counters values' do 
+    it 'should has correct My counters values' do
       @comment = Comment.create!(
         user: @user,
         commentable: @post,
@@ -280,7 +280,7 @@ describe User do
 
       my_comments_count_assert @post_holder, 0
       comments_count_assert    @post_holder, [0,0,0]
-      
+
       comcoms_count_assert    @post_holder, [0,9,0]
       comcoms_counters_assert @post_holder, [0,9,0]
 
@@ -304,7 +304,7 @@ describe User do
 
       my_comments_count_assert @post_holder, 0
       comments_count_assert    @post_holder, [0,0,0]
-      
+
       comcoms_count_assert    @post_holder, [0,5,4]
       comcoms_counters_assert @post_holder, [0,5,4]
 
@@ -332,8 +332,8 @@ describe User do
     #   end
     # end
 
-    # it 'has correct counters after comment destroy' do 
+    # it 'has correct counters after comment destroy' do
     #   pending("has correct counters after comment destroy")
     # end
   end
-end
+end

data/the_comments.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'state_machine'
-  gem.add_dependency 'the_sortable_tree'
+  gem.add_dependency 'state_machine',     '~> 1.2.0'
+  gem.add_dependency 'the_sortable_tree', '~> 2.5.0'
+  gem.add_dependency 'the_simple_sort',   '~> 0.0.2'
 
   # gem.add_dependency 'rails', '>= 4.0'
 end

data/views_converter.rb

@@ -1,4 +1,4 @@
-# gem install haml2slim --nori --nordoc
+# gem install haml2slim --no-ri --no-rdoc
 # ruby views_converter.rb
 
 from = "./app/views/the_comments/haml"
@@ -13,4 +13,4 @@ Dir.glob("#{to}/*.slim") do |slim_file|
   file = File.open slim_file, "w"
   file.write content
   file.close
-end
+end

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: the_comments
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.1
 platform: ruby
 authors:
 - Ilya N. Zykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: ' Comments with threading for Rails 4 '
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: the_simple_sort
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+description: " Comments with threading for Rails 4 "
 email:
 - zykin-ilya@ya.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset.example
-- .ruby-version.example
-- .rvmrc.example
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset.example"
+- ".ruby-version.example"
+- ".rvmrc.example"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -58,32 +72,41 @@ files:
 - app/assets/javascripts/the_comments_manage.js.coffee
 - app/assets/stylesheets/the_comments.css.scss
 - app/controllers/_templates_/comments_controller.rb
-- app/controllers/concerns/controller.rb
+- app/controllers/concerns/the_comments/controller.rb
+- app/controllers/concerns/the_comments/view_token.rb
 - app/helpers/render_comments_tree_helper.rb
 - app/models/_templates_/comment.rb
-- app/models/concerns/comment.rb
-- app/models/concerns/comment_states.rb
-- app/models/concerns/commentable.rb
-- app/models/concerns/user.rb
+- app/models/concerns/the_comments/comment.rb
+- app/models/concerns/the_comments/comment_states.rb
+- app/models/concerns/the_comments/commentable.rb
+- app/models/concerns/the_comments/user.rb
 - app/views/the_comments/_tree.html.erb
 - app/views/the_comments/haml/_additional_info.html.haml
 - app/views/the_comments/haml/_comment.html.haml
 - app/views/the_comments/haml/_comment_body.html.haml
 - app/views/the_comments/haml/_comment_edit.html.haml
 - app/views/the_comments/haml/_form.html.haml
+- app/views/the_comments/haml/_guest_form.html.haml
+- app/views/the_comments/haml/_logined_form.html.haml
 - app/views/the_comments/haml/_manage_controls.html.haml
 - app/views/the_comments/haml/_sidebar.html.haml
+- app/views/the_comments/haml/_sidebar_admin.html.haml
+- app/views/the_comments/haml/_sidebar_backlink.html.haml
+- app/views/the_comments/haml/_sidebar_user.html.haml
 - app/views/the_comments/haml/_tree.html.haml
-- app/views/the_comments/haml/index.html.haml
 - app/views/the_comments/haml/manage.html.haml
-- app/views/the_comments/haml/my_comments.html.haml
 - app/views/the_comments/slim/_additional_info.html.slim
 - app/views/the_comments/slim/_comment.html.slim
 - app/views/the_comments/slim/_comment_body.html.slim
 - app/views/the_comments/slim/_comment_edit.html.slim
 - app/views/the_comments/slim/_form.html.slim
+- app/views/the_comments/slim/_guest_form.html.slim
+- app/views/the_comments/slim/_logined_form.html.slim
 - app/views/the_comments/slim/_manage_controls.html.slim
 - app/views/the_comments/slim/_sidebar.html.slim
+- app/views/the_comments/slim/_sidebar_admin.html.slim
+- app/views/the_comments/slim/_sidebar_backlink.html.slim
+- app/views/the_comments/slim/_sidebar_user.html.slim
 - app/views/the_comments/slim/_tree.html.slim
 - app/views/the_comments/slim/index.html.slim
 - app/views/the_comments/slim/manage.html.slim
@@ -215,17 +238,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: the_comments by the-teacher

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

@@ -1,18 +0,0 @@
-- content_for :title do
-  = t "the_comments.management"
-
-- content_for :comments_sidebar do
-  = render partial: 'the_comments/haml/sidebar'
-
-- content_for :comments_main do
-  = paginate @comments
-
-  .comments
-    - @comments.each do |comment|
-      - klass = { published: :primary, draft: :warning, deleted: :danger }[comment.state.to_sym]
-      .panel{ class: "panel-#{klass}" }
-        .panel-heading= comment.title
-        .panel-body
-          = render partial: 'the_comments/haml/comment_body', locals: { comment: comment }
-
-  = paginate @comments

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

@@ -1,28 +0,0 @@
-- cuser = current_user
-
-- content_for :title do
-  = t "the_comments.management"
-
-- content_for :comments_sidebar do
-  = render partial: 'the_comments/haml/sidebar'
-
-- content_for :comments_main do
-  = paginate @comments
-
-  - if @comments.blank?
-    .alert.alert-info= t 'the_comments.no_comments_here'
-
-  .comments
-    - @comments.each do |comment|
-      - klass = { published: :primary, draft: :warning, deleted: :danger }[comment.state.to_sym]
-      .panel{ class: "panel-#{klass}" }
-        .panel-heading= comment.title
-        .panel-body
-          = render partial: 'the_comments/haml/comment_body', locals: { comment: comment }
-          
-          - if cuser.comments_admin?
-            = render partial: 'the_comments/haml/comment_edit',    locals: { comment: comment }
-            = render partial: 'the_comments/haml/manage_controls', locals: { comment: comment }
-            = render partial: 'the_comments/haml/additional_info', locals: { comment: comment }
-        
-  = paginate @comments