the_comments 1.0.0 → 1.1.0

data/README.md

@@ -134,6 +134,9 @@ bundle exec rails g the_comments install
 ```ruby
 config/initializers/the_comments.rb
 
+app/models/ip_black_list.rb
+app/models/user_agent_black_list.rb
+
 app/controllers/comments_controller.rb
 app/controllers/ip_black_lists_controller.rb
 app/controllers/user_agent_black_lists_controller.rb
@@ -351,7 +354,7 @@ I use denormalization of commentable objects to solve this problem.
 
 My practice shows - We need 3 denormalized fields into comment for (request-free) building of recent comments list:
 
-<img src="https://raw.github.com/open-cook/the-teacher/master/docs/the_comments_view_5.gif" alt="the_comments">
+<img src="https://raw.github.com/the-teacher/the_comments/master/docs/the_comments_view_5.gif" alt="the_comments">
 
 * **Comment#commentable_title** - for example: "My first post about Ruby On Rails"
 * **Comment#commentable_url** - for example: "/posts/1-my-first-post-about-ruby-on-rails"

data/app/models/concerns/the_comments_base.rb

@@ -2,8 +2,11 @@ module TheCommentsBase
   extend ActiveSupport::Concern
 
   included do
+    # attr_accessible :parent_id
+    # attr_accessible :ip, :referer, :user_agent, :tolerance_time
+    # attr_accessible :user, :title, :contacts, :raw_content, :view_token, :state
+
     # Nested Set
-    attr_accessible :parent_id
     acts_as_nested_set scope: [:commentable_type, :commentable_id]
 
     # Comments State Machine
@@ -12,9 +15,6 @@ module TheCommentsBase
     # TheSortableTree
     include TheSortableTree::Scopes
 
-    attr_accessible :user, :title, :contacts, :raw_content, :view_token, :state
-    attr_accessible :ip, :referer, :user_agent, :tolerance_time
-
     validates :raw_content, presence: true
 
     # relations

data/app/models/concerns/the_comments_black_ip.rb

@@ -2,8 +2,7 @@ module TheCommentsBlackIp
   extend ActiveSupport::Concern
   
   included do
-    attr_accessible :ip, :state
-
+    # attr_accessible :ip, :state    
     validates :ip, presence:   true
     validates :ip, uniqueness: true
   end

data/app/models/concerns/the_comments_black_user_agent.rb

@@ -2,8 +2,7 @@ module TheCommentsBlackUserAgent
   extend ActiveSupport::Concern
 
   included do
-    attr_accessible :ip, :state
-
+    # attr_accessible :ip, :state
     validates :user_agent, presence:   true
     validates :user_agent, uniqueness: true
   end  

data/lib/generators/the_comments/USAGE

@@ -9,6 +9,10 @@ Generators:
 
   This will create:
    config/initializers/the_comments.rb
+   
+   app/models/ip_black_list.rb
+   app/models/user_agent_black_list.rb
+
    app/controllers/comments_controller.rb
    app/controllers/ip_black_lists_controller.rb
    app/controllers/user_agent_black_lists_controller.rb

data/lib/generators/the_comments/templates/ip_black_list.rb

@@ -0,0 +1,3 @@
+class IpBlackList < ActiveRecord::Base
+  include TheCommentsBlackIp
+end

data/lib/generators/the_comments/templates/the_comments_black_ip.rb

@@ -0,0 +1,9 @@
+module TheCommentsBlackIp
+  extend ActiveSupport::Concern
+  
+  included do
+    # attr_accessible :ip, :state    
+    validates :ip, presence:   true
+    validates :ip, uniqueness: true
+  end
+end

data/lib/generators/the_comments/templates/the_comments_black_user_agent.rb

@@ -0,0 +1,9 @@
+module TheCommentsBlackUserAgent
+  extend ActiveSupport::Concern
+
+  included do
+    # attr_accessible :ip, :state
+    validates :user_agent, presence:   true
+    validates :user_agent, uniqueness: true
+  end  
+end

data/lib/generators/the_comments/templates/user_agent_black_list.rb

@@ -0,0 +1,3 @@
+class UserAgentBlackList < ActiveRecord::Base
+  include TheCommentsBlackUserAgent
+end

data/lib/generators/the_comments/the_comments_generator.rb

@@ -8,6 +8,8 @@ class TheCommentsGenerator < Rails::Generators::NamedBase
       cp_controllers
     elsif gen_name == 'controllers'
       cp_controllers
+    elsif gen_name == 'models'
+      cp_models
     else
       puts 'TheComments Generator - wrong Name'
       puts 'Try to use [install|controllers]'
@@ -24,6 +26,11 @@ class TheCommentsGenerator < Rails::Generators::NamedBase
     copy_file 'the_comments.rb', 'config/initializers/the_comments.rb'
   end
 
+  def cp_models
+    copy_file 'ip_black_list.rb',         'app/models/ip_black_list.rb'
+    copy_file 'user_agent_black_list.rb', 'app/models/user_agent_black_list.rb'
+  end
+
   def cp_controllers
     copy_file 'comments_controller.rb',               'app/controllers/comments_controller.rb'
     copy_file 'ip_black_lists_controller.rb',         'app/controllers/ip_black_lists_controller.rb'

data/lib/the_comments/version.rb

@@ -1,3 +1,3 @@
 module TheComments
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_comments
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &78157620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78157620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
-  requirement: &78157410 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78157410
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! ' Comments with threading for Rails 4 '
 email:
 - zykin-ilya@ya.ru
@@ -78,8 +88,12 @@ files:
 - docs/the_comments_view_5.gif
 - lib/generators/the_comments/USAGE
 - lib/generators/the_comments/templates/comments_controller.rb
+- lib/generators/the_comments/templates/ip_black_list.rb
 - lib/generators/the_comments/templates/ip_black_lists_controller.rb
 - lib/generators/the_comments/templates/the_comments.rb
+- lib/generators/the_comments/templates/the_comments_black_ip.rb
+- lib/generators/the_comments/templates/the_comments_black_user_agent.rb
+- lib/generators/the_comments/templates/user_agent_black_list.rb
 - lib/generators/the_comments/templates/user_agent_black_lists_controller.rb
 - lib/generators/the_comments/the_comments_generator.rb
 - lib/generators/the_comments/views_generator.rb
@@ -107,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: the_comments by the-teacher