the_sortable_tree 1.8.6 → 1.9.0

data/README.md

@@ -1,40 +1,51 @@
 ### TheSortableTree
 
-Engine Based Drag&Drop GUI for awesome_nested_set gem. **Rails >= 3.1**
+Awesome Helper for building sortable nested sets
 
-School teacher came to help! TaDa! ;)
+### Keywords
 
-**Drag&Drop sortable tree**
+Sortable awesom_nested_set, Drag&Drop GUI for awesom_nested_set, View Helper for nested set, Nested Comments
 
-![TheSortableTree](https://github.com/the-teacher/the_sortable_tree/raw/master/pic.jpg)
+### Description
+
+**sortable_tree** - recursive helper-method for rendering sortable awesome_nested_set tree.
+
+**sortable_tree** uses partials for rendering, that's why it is **so easy to customize**!
+
+### Capabilities
 
-**Simple nested sets (__min__ option)**
+**Just Tree [default or tree option)**
 
 ![TheSortableTree](https://github.com/the-teacher/the_sortable_tree/raw/master/pic_min.jpg)
 
-**sortable_tree** - recursive helper-method for render sortable awesome_nested_set tree.
+**Drag&Drop Sortable Tree [sortable option]**
 
-**sortable_tree** uses partials for rendering, that's why it is **so easy to customize**!
+![TheSortableTree](https://github.com/the-teacher/the_sortable_tree/raw/master/pic.jpg)
+
+**Comments Tree [__comments__ option]**
 
-### List of available variants of rendering 
+With New Comment form and reply functionality
 
-* Drag&Drop sortable tree
-* Simple nested sets (**min** option)
-* Nested sets with expand/collapse animation (**expand** option) [under development]
-* Nested comments (**comments** option) [under development]
+![TheSortableTree](https://github.com/the-teacher/the_sortable_tree/raw/dev/comments.gif)
 
 ### Can I use gem with Rails 2 or Rails 3.0?
 
-Take files from the gem and put it in your rails 2 application.
+There is no strong dependencies for Rails 3.
 
-View helper and view files does not depend on the version of rails.
+Take files from the gem and put it in your Rails 2 application.
 
-Copy and Paste rebuild function from TheSortableTreeController.
+And fix errors :) Ha-Ha-Ha! You can ask me if you will do it.
 
-Perhaps, you may have to slightly change the function of the controller.
+### LiveDemo and App for testcase creating
+
+https://github.com/the-teacher/the_sortable_tree_test_app
 
 ### Changelog
 
+1.9.0 - 1) **Helper API changed!** 2) Comments tree with sand form and reply fu! 3) Way to manual set sortable Model klass into controller.
+
+1.8.6 - fixed CamelCase names definition (by andisthejackass)
+
 1.8.5 - helper can rendering a part tree
 
 1.8.0 - stable release
@@ -51,17 +62,15 @@ Rendered by 50 sec.
 
 I think it is good result for rendering by partials.
 
-Can you makes it faster? Welcome!
-
-### ERB vs HAML vs SLIM
+### It's can be faster?
 
-So, ERB and SLIM fans want to make gem independent of HAML.
+Perhaps. Read next idea to learn more. There is no implementation now, sorry.
 
-Ok, let it be. But you will convert view partials youself. It's my revenge ;)
+https://github.com/the-teacher/the_sortable_tree/issues/milestones?with_issues=no
 
-Read project wiki for looking ERB partials
+### ERB vs HAML vs SLIM
 
-**By default I'm use HAML, and now you should define it manually in your Gemfile.**
+HAML by default. You can use any Template Engine, but convert partials by yourself, plz.
 
 ### Install
 
@@ -69,13 +78,9 @@ Read project wiki for looking ERB partials
     gem 'awesome_nested_set' # gem 'nested_set'
     gem 'the_sortable_tree'
 
+```ruby
 bundle
-
-### Require
-
-1. gem 'nested_set' or gem 'awesome_nested_set'
-2. gem 'haml'
-3. JQuery UI
+```
 
 ### Example of using with Page Model
 
@@ -160,82 +165,72 @@ class PagesController < ApplicationController
 end
 ```
 
-### Render your tree with TheSortableTree (Haml markup)
+### Extend your Layout (erb)
 
 ``` ruby
-- content_for :css do
-  = stylesheet_link_tag 'the_sortable_tree', :media => :screen
-- content_for :js do
-  = javascript_include_tag 'jquery.ui.nestedSortable'
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+
+  <%= javascript_include_tag 'jquery.ui.nestedSortable' %>
+  <%= javascript_include_tag 'comments_tree' %>
 
-= sortable_tree @pages, :new_url => new_page_path, :max_levels => 4
+  <%= stylesheet_link_tag    'tree',          :media => :all %>
+  <%= stylesheet_link_tag    'sortable',      :media => :all %>
+  <%= stylesheet_link_tag    'comments_tree', :media => :all %>
 ```
 
-or (without administrator controls and drag&drop)
 
-``` ruby
-- content_for :css do
-  = stylesheet_link_tag 'the_sortable_tree_min', :media => :screen
+### Render your tree
 
-= sortable_tree @pages, :new_url => new_page_path, :path => 'the_sortable_tree_min'
+``` ruby
+= sortable_tree @pages, :new_url => new_page_path
 ```
 
-### Customize tree for User (min version)
-
-**Use sortable_tree as view helper for simple rendering of nested_set tree**
+### Render your sortable tree
 
 ``` ruby
-rails g the_sortable_tree:views pages min
+= sortable_tree @pages, :new_url => new_page_path, :type => :sortable, :max_levels => 4
 ```
 
-It's will generate minimal set of view partials for **sortable_tree** helper
+### Render your comments tree (with New Form and Reply)
+
+Plz, read **Comments Doc** before using this
 
 ``` ruby
-create  app/views/pages/the_sortable_tree_min
-create  app/views/pages/the_sortable_tree_min/_children.html.haml
-create  app/views/pages/the_sortable_tree_min/_node.html.haml
-create  app/views/pages/the_sortable_tree_min/_link.html.haml
-create  app/views/pages/the_sortable_tree_min/_tree.html.haml
+= sortable_tree @comments, :title => :name, :type => :comments
 ```
 
-Just use it or Customize and use it!
+### Comments Doc
+
+Coming soon...
+
+### Customization
+
+TheSortableTree view generator will copy a set of partials from gem to your View directory.
 
 ``` ruby
-- content_for :css do
-  = stylesheet_link_tag 'the_sortable_tree_min', :media => :screen
-= sortable_tree @pages, :new_url => new_page_path, :path => 'pages/the_sortable_tree_min'
+rails g the_sortable_tree:views Model [option]
 ```
 
-### Customize tree for Administrator (full version)
+## Examples
+
+### Customize your tree
 
 ``` ruby
-rails g the_sortable_tree:views pages
+rails g the_sortable_tree:views Page
 ```
 
-It's will generate view partials for **sortable_tree** helper
+### Customize your sortable tree
 
 ``` ruby
-create  app/views/pages/the_sortable_tree
-create  app/views/pages/the_sortable_tree/_controls.html.haml
-create  app/views/pages/the_sortable_tree/_node.html.haml
-create  app/views/pages/the_sortable_tree/_js_init_sortable_tree.html.haml
-create  app/views/pages/the_sortable_tree/_js_on_update_tree.html.haml
-create  app/views/pages/the_sortable_tree/_js_rebuild_ajax.html.haml
-create  app/views/pages/the_sortable_tree/_link.html.haml
-create  app/views/pages/the_sortable_tree/_children.html.haml
-create  app/views/pages/the_sortable_tree/_new.html.haml
-create  app/views/pages/the_sortable_tree/_tree.html.haml
+rails g the_sortable_tree:views Page sortable
 ```
 
-Customize and use it!
+### Customize your comments tree
 
 ``` ruby
-- content_for :css do
-  = stylesheet_link_tag 'the_sortable_tree', :media => :screen
-- content_for :js do
-  = javascript_include_tag 'jquery.ui.nestedSortable'
-
-= sortable_tree @pages, :new_url => new_page_path, :path => 'pages/the_sortable_tree', :max_levels => 2
+rails g the_sortable_tree:views Comment comments
 ```
 
 ### Rendering a part of tree
@@ -250,9 +245,27 @@ Customize and use it!
 = sortable_tree @pages, :new_url => new_page_path
 ```
 
-### LiveDemo
+### Troubleshooting
 
-https://github.com/the-teacher/the_sortable_tree_test_app
+If **TheSortableTree** can't correctly define a Name of your Model, just add **sortable_model** into your Controller:
+
+``` ruby
+class Inventory::CategoriesController < ApplicationController
+  include TheSortableTreeController::Rebuild
+
+  def sortable_model
+    Inventory::Category
+  end
+
+  def index
+    @inventory_categories = Inventory::Category.nested_set.all
+  end
+
+  def manage
+    @inventory_categories = Inventory::Category.nested_set.all
+  end
+end
+```
 
 ### Options
 

data/app/assets/javascripts/comments_tree.js.coffee

@@ -0,0 +1,46 @@
+$ ->
+  class @CommentsTreeInit
+    # SELECTORS
+    reply_links:      $('.comments_tree .comment .reply')
+    skip_link:        $('.comments_tree .new_comment .skip')
+    new_comment_form: $('.comments_tree form.new_comment')
+    parent_input:     $(".comments_tree form.new_comment input[name='comment[parent_id]']")
+
+    constructor: ->
+
+      @reply_links.click (event) =>
+        # GET DATA
+        link         = $ event.target
+        comment      = link.parents('.comment')
+        title        = comment.find('.title .main')
+        hidden_field = comment.find('input:hidden')
+        parent_id    = hidden_field.val()
+
+        form         = @new_comment_form
+        for_block    = form.find('.for')
+        name_field   = for_block.find('i')
+
+        # SET DATA
+        name_field.html   title.html()
+        @parent_input.val parent_id 
+
+        # SHOW and JUMP
+        for_block.show()
+        window.location.hash = '#new_comment'
+
+        false
+
+      @skip_link.click (event) =>
+        link       = $ event.target
+        form       = @new_comment_form
+        for_block  = form.find('.for')
+        name_field = for_block.find('i')
+
+        name_field.html   ''
+        @parent_input.val ''
+
+        for_block.hide()
+
+        false
+
+  new @CommentsTreeInit

data/app/assets/stylesheets/comments_tree.css.scss

@@ -0,0 +1,84 @@
+.comments_tree{
+  * {
+    margin: 0; padding: 0;
+    list-style:none;
+  }
+
+  .new_comment{
+    padding: 10px;
+    margin-bottom: 10px;
+    border: 1px solid Blue;
+    border-radius: 5px;
+    p{
+      margin-bottom: 10px;
+    }
+    input[type=text], textarea{
+      border: 1px solid Grey;
+      border-left: 2px solid Grey;
+      width: 90%;
+    }
+  }
+
+  .nested_set{
+    margin-bottom: 25px;
+  }
+
+  ol{
+
+    margin: 0;
+    padding: 0;
+    list-style:none;
+
+    &.nested_set {
+      list-style:none;
+      font-size: 16px;
+
+      li{
+        font-size: 0.95em;
+        line-height: 130%;
+        margin-bottom: 5px;
+        list-style:none;
+        list-style-position: outside;
+
+        .comment{
+          border: 1px solid LightGray;
+          border-radius: 4px;
+          padding: 10px;
+          
+          .title, .contacts{
+            margin-bottom: 5px;
+          }
+
+          .title{
+            color: blue;
+            .reply a{
+              font-size: 0.9em;
+              font-family: Arial;
+              color: green;
+              text-decoration: none;
+              &:hover{ text-decoration: underline; }
+            }
+          }
+          .contacts{
+            font-style: italic;
+          }
+          .content{
+            background: LightGray;
+            border-radius: 2px;
+            font-family: Arial;
+            padding: 5px;
+          }
+        }
+      }
+
+      ol{
+        border-left: 1px dashed LightGreen;
+        padding-left: 10px;
+        margin-left: 15px;
+        margin-top: 5px;
+
+        li{ font-weight: normal; }
+      }
+    }
+  }
+}

data/app/assets/stylesheets/sortable.css.scss

@@ -0,0 +1,106 @@
+.sortable{
+  * {
+    margin: 0; padding: 0;
+    list-style: none;
+  }
+
+  .nested_set_new_image{
+    vertical-align: middle;
+    border: none;
+  }
+
+  .nested_set_new{
+    margin: 25px 0;
+    a{ font-size: 14pt }
+  }
+
+  .nested_set{
+    margin: 0; padding: 0;
+    list-style: none;
+    font-size: 16px;
+
+    a{
+      color: #000;
+      font-size: 10pt;
+      font-weight: normal;
+      text-decoration: none;
+      line-height: 150%;
+      margin-left: 30px;
+      margin-right: 120px;
+      display: block;
+
+      &:hover{
+        color: #2476FF;
+        text-decoration: none;
+      }
+
+      img{
+        float: left
+      }
+    }
+
+    ol{
+      margin: 0 0 0 25px;
+      border-left: 1px dashed gray;
+      li{ margin-bottom: 5px; }
+    }
+
+    .root{
+      a{ font-weight: bold; }
+    }
+    .handle{
+      width: 16px;
+      height: 16px;
+      float: left;
+      cursor: move;
+      background: transparent url(/assets/iconza/blue/move.png) no-repeat scroll center center;
+    }
+    .link{
+      position: relative;
+      overflow: hidden;
+      zoom: 1;
+      padding: 5px;
+      margin: 0 0 5px 5px;
+      background: #EFEFEF;
+      border-radius: 5px;
+      &:hover{
+        background: #FEE;
+      }
+    }
+    .controls{
+      position: absolute;
+      top: 5px; right: 10px;
+    }
+    .button{
+      width: 20px;
+      height: 20px;
+      display: block;
+      float: left;
+      margin: 0 0 0 3px;
+      cursor: pointer;
+
+      .new{
+        background: transparent url(/assets/iconza/blue/add.png) no-repeat scroll center center;
+        &:hover{ background: transparent url(/assets/iconza/red/add.png) no-repeat scroll center center }
+      }
+      .edit{
+        background: transparent url(/assets/iconza/blue/edit.png) no-repeat scroll center center;
+        &:hover{ background: transparent url(/assets/iconza/red/edit.png) no-repeat scroll center center }
+      }
+      .delete{
+        background: transparent url(/assets/iconza/blue/delete.png) no-repeat scroll center center;
+        &:hover{ background: transparent url(/assets/iconza/red/delete.png) no-repeat scroll center center }
+      }
+      .undeleted{ background: transparent url(/assets/iconza/gray/delete.png) no-repeat scroll center center  }
+    }
+
+    .placeholder {
+      background-color: #EEF;
+      border: 1px dashed blue;
+    }
+    .ui-nestedSortable-error {
+      background: #FAA;
+      color: #8a1f11;
+    }
+  }
+}

data/app/assets/stylesheets/tree.css.scss

@@ -0,0 +1,38 @@
+.tree{
+  * {
+    margin: 0; padding: 0;
+    list-style:none;
+  }
+
+  ol{
+
+    margin: 0; padding: 0;
+    list-style:none;
+
+    &.nested_set {
+      list-style:none;
+      font-size: 16px;
+
+      li{
+        font-size: 0.9em;
+        line-height: 130%;
+        margin-bottom: 5px;
+        font-weight: bold;
+        list-style:none;
+        list-style-position: outside;
+      }
+
+      ol{
+        border-left: 1px dashed #AAA;
+        padding-left: 10px;
+        margin-left: 15px;
+        margin-top: 5px;
+
+        li{ font-weight: normal; }
+      }
+
+      a:hover { color: #003A89 !important; }
+      a:visited { color: #809dc4; }  
+    }
+  }
+}

data/app/controllers/the_sortable_tree_controller.rb

@@ -5,12 +5,12 @@ module TheSortableTreeController
   module DefineVariablesMethod
     public
     def the_define_common_variables
-      collection =  self.class.to_s.split(':').last.sub(/Controller/,"").underscore.downcase # recipes
-      variable =    collection.singularize                      # recipe
-      klass =       variable.classify.constantize               # Recipe
+      collection = self.class.to_s.split(':').last.sub(/Controller/,'').underscore.downcase                 # recipes
+      variable   = collection.singularize                                                                   # recipe  
+      klass      = self.respond_to?(:sortable_model) ? self.sortable_model : variable.classify.constantize  # Recipe
       ["@#{variable}", collection, klass]
     end
-  end#DefineVariablesMethod
+  end
 
   module Rebuild
     include DefineVariablesMethod
@@ -36,7 +36,7 @@ module TheSortableTreeController
 
       render(:nothing => true)
     end
-  end#Rebuild
+  end
   
   module ReversedRebuild
     include DefineVariablesMethod
@@ -62,6 +62,5 @@ module TheSortableTreeController
 
       render(:nothing => true)
     end
-  end#ReversedRebuild
-
+  end
 end

data/app/helpers/the_sortable_tree_helper.rb

@@ -12,28 +12,49 @@ module TheSortableTreeHelper
   def define_class_of_elements_of tree
     case
       when tree.is_a?(ActiveRecord::Relation) then tree.name.to_s.underscore.downcase
-      when tree.empty? then nil
+      when tree.empty?                        then nil
       else tree.first.class.to_s.underscore.downcase
     end
   end
 
-  def sortable_tree(tree, opts= {})
-    opts.merge!({
-      :path  => opts[:path] || :the_sortable_tree,
-      :klass => define_class_of_elements_of(tree),
-      :title => opts[:title] || :title,
-      :max_levels => opts[:max_levels] || 3,
-      :namespace => Array.wrap(opts[:namespace])
-    })
+  # types:
+  #   tree
+  #   sortable
+  #   comments
+  def sortable_tree(tree, options= {})
+    opts = {
+      :max_levels => 3,
+      :type       => :tree,
+      :js         => false,
+      :path       => false,
+      :title      => :title,
+      :klass      => define_class_of_elements_of(tree),
+      # comments options
+      :node_id            => :id,
+      :contacts_field     => :email,
+      :content_field      => :content,
+      :raw_content_field  => :raw_content
+    }.merge! options
+
+    # RAILS require
+    opts[:namespace] = Array.wrap opts[:namespace]
+
+    # PATH building
+    unless opts[:path]
+      variant      = 'base'
+      variant      = 'js' if opts[:js]
+      opts[:path]  = "#{opts[:type]}/#{variant}"
+    end
+
     render :partial => "#{opts[:path]}/tree", :locals => { :tree => sortable_tree_builder(tree, opts), :opts => opts }
   end
 
   def sortable_tree_builder(tree, options= {})
     result = ''
-    opts = {
-      :id => :id,           # node id field
-      :node => nil,         # node
-      :root => false,       # is it root node?
+    opts   = {
+      :id    => :id,        # node id field
+      :node  => nil,        # node
+      :root  => false,      # is it root node?
       :level => 0           # recursion level
     }.merge!(options)
 
@@ -66,4 +87,4 @@ module TheSortableTreeHelper
     end
     raw result
   end
-end
+end

data/app/views/comments/base/_comment.html.haml

@@ -0,0 +1,7 @@
+.comment
+  = hidden_field :comment, :id, :value => node.send(opts[:node_id]), :id => nil
+  .title
+    %span.main= node.send opts[:title]
+    %span.reply= link_to t('.reply'), '#'
+  .contacts= node.send opts[:contacts_field]
+  .content=  raw node.send opts[:content_field]

data/app/views/comments/base/_new_comment_form.html.haml

@@ -0,0 +1,18 @@
+= form_for Comment.new, :class => :new_comment do |f|
+  = f.hidden_field :parent_id
+
+  %label= t('.title')
+  %p= f.text_field opts[:title]
+
+  %label= t('.contacts')
+  %p= f.text_field opts[:contacts_field]
+
+  %label
+    = t('.content')
+    %span.for{ :style => 'display:none' }
+      = t('.for')
+      %i Undefined
+      = link_to t('.skip'), '#', :class => :skip
+  %p= f.text_area opts[:raw_content_field]
+
+  %div= f.submit t('.submit')

data/app/views/comments/base/_node.html.haml

@@ -0,0 +1,3 @@
+%li
+  = raw render(:partial => "#{opts[:path]}/comment", :locals => {:opts => opts, :root => root, :node => node})
+  = render(:partial => "#{opts[:path]}/children", :locals => {:opts => opts, :parent => node, :children => children}) unless children.blank?

data/app/views/comments/base/_tree.html.haml

@@ -0,0 +1,5 @@
+.comments_tree
+  - unless tree.empty?
+    %ol.nested_set= raw tree
+
+  = raw render(:partial => "#{opts[:path]}/new_comment_form", :locals => {:opts => opts})

data/app/views/sortable/base/_tree.html.haml

@@ -0,0 +1,7 @@
+.sortable
+  = render :partial => "#{opts[:path]}/new", :locals => { :opts => opts }
+  - unless tree.empty?
+    = render :partial => "#{opts[:path]}/js_init_sortable_tree", :locals => { :opts => opts }
+    = render :partial => "#{opts[:path]}/js_on_update_tree"
+    = render :partial => "#{opts[:path]}/js_rebuild_ajax", :locals => { :opts => opts }
+    %ol.ui-sortable.sortable.nested_set{ :id => "#{opts[:klass]}_nested_set" }= raw tree

data/app/views/tree/base/_children.html.haml

@@ -0,0 +1 @@
+= content_tag :ol, raw(children)

data/app/views/tree/base/_tree.html.haml

@@ -0,0 +1,3 @@
+.tree
+  - unless tree.empty?
+    %ol.nested_set= raw tree

data/config/locales/en.yml

@@ -1,10 +1,31 @@
 en:
-  the_sortable_tree:
-    new:
-      create: Add element
-    controls:
-      edit_this: Edit element
-      delete: Delete element
-      delete_confirm: Do you want to delete element? 
-      cant_be_deleted: Cant be deleted. Has nested elements
-      delete_nested_elements: Delete all nested elements
+  sortable:
+    base:
+      new:
+        create: Add element
+      controls:
+        edit_this: Edit element
+        delete: Delete element
+        delete_confirm: Do you want to delete element? 
+        cant_be_deleted: Cant be deleted. Has nested elements
+        delete_nested_elements: Delete all nested elements
+
+  comments:
+    base:
+      new_comment_form:
+        title: Name
+        conatacts: Email
+        content: Your comment
+        for: for
+        skip: '[skip]'
+        submit: Send Comment
+      comment:
+        reply: '[reply]'
+      new:
+        create: Add element
+      controls:
+        edit_this: Edit element
+        delete: Delete element
+        delete_confirm: Do you want to delete element? 
+        cant_be_deleted: Cant be deleted. Has nested elements
+        delete_nested_elements: Delete all nested elements

data/lib/generators/the_sortable_tree/views_generator.rb

@@ -5,16 +5,21 @@ module TheSortableTree
 
       def self.banner
         <<-BANNER.chomp
-rails g the_sortable_tree:views MODEL [min]
+rails g the_sortable_tree:views MODEL [tree|sortable|comments]
   Copies files for rendering sortable nested set
         BANNER
       end
 
       def copy_sortable_tree_files
-        if ARGV[1] == 'min'
-          directory "the_sortable_tree_min", "app/views/#{folder}/the_sortable_tree_min"
+        # sortable
+        # comments
+        # tree
+        if ARGV[1] == 'sortable'
+          directory "sortable/base", "app/views/#{folder}/sortable/base"
+        elsif ARGV[1] == 'comments'
+          directory "comments/base", "app/views/#{folder}/comments/base"
         else
-          directory "the_sortable_tree", "app/views/#{folder}/the_sortable_tree"
+          directory "tree/base", "app/views/#{folder}/tree/base"
         end
       end
 
@@ -24,6 +29,6 @@ rails g the_sortable_tree:views MODEL [min]
         name.pluralize.downcase
       end
 
-    end#ViewsGenerator
+    end
   end
 end

data/lib/the_sortable_tree/version.rb

@@ -1,3 +1,3 @@
 module TheSortableTree
-  VERSION = "1.8.6"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_sortable_tree
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000Z
+date: 2012-05-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &83063190 !ruby/object:Gem::Requirement
+  requirement: &76895850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *83063190
+  version_requirements: *76895850
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &83062980 !ruby/object:Gem::Requirement
+  requirement: &76895640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83062980
+  version_requirements: *76895640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83062750 !ruby/object:Gem::Requirement
+  requirement: &76895410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83062750
+  version_requirements: *76895410
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83062540 !ruby/object:Gem::Requirement
+  requirement: &76895200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +54,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83062540
-description: Drag&Drop GUI helper for awesome_nested_set gem. Sortable tree view helper
+  version_requirements: *76895200
+description: Sortable awesom_nested_set, Drag&Drop GUI for awesom_nested_set, View
+  Helper for nested set, Nested Comments
 email:
 - zykin-ilya@ya.ru
 executables: []
@@ -87,22 +88,29 @@ files:
 - app/assets/images/iconza/blue/delete.png
 - app/assets/images/iconza/blue/up.png
 - app/assets/images/iconza/blue/add.png
-- app/assets/stylesheets/the_sortable_tree.css
-- app/assets/stylesheets/the_sortable_tree_min.css
+- app/assets/stylesheets/tree.css.scss
+- app/assets/stylesheets/comments_tree.css.scss
+- app/assets/stylesheets/sortable.css.scss
 - app/assets/javascripts/jquery.ui.nestedSortable.js
-- app/views/the_sortable_tree/_children.html.haml
-- app/views/the_sortable_tree/_node.html.haml
-- app/views/the_sortable_tree/_link.html.haml
-- app/views/the_sortable_tree/_tree.html.haml
-- app/views/the_sortable_tree/_new.html.haml
-- app/views/the_sortable_tree/_controls.html.haml
-- app/views/the_sortable_tree/_js_rebuild_ajax.html.haml
-- app/views/the_sortable_tree/_js_init_sortable_tree.html.haml
-- app/views/the_sortable_tree/_js_on_update_tree.html.haml
-- app/views/the_sortable_tree_min/_children.html.haml
-- app/views/the_sortable_tree_min/_node.html.haml
-- app/views/the_sortable_tree_min/_link.html.haml
-- app/views/the_sortable_tree_min/_tree.html.haml
+- app/assets/javascripts/comments_tree.js.coffee
+- app/views/comments/base/_children.html.haml
+- app/views/comments/base/_node.html.haml
+- app/views/comments/base/_tree.html.haml
+- app/views/comments/base/_comment.html.haml
+- app/views/comments/base/_new_comment_form.html.haml
+- app/views/sortable/base/_children.html.haml
+- app/views/sortable/base/_node.html.haml
+- app/views/sortable/base/_link.html.haml
+- app/views/sortable/base/_tree.html.haml
+- app/views/sortable/base/_new.html.haml
+- app/views/sortable/base/_controls.html.haml
+- app/views/sortable/base/_js_rebuild_ajax.html.haml
+- app/views/sortable/base/_js_init_sortable_tree.html.haml
+- app/views/sortable/base/_js_on_update_tree.html.haml
+- app/views/tree/base/_children.html.haml
+- app/views/tree/base/_node.html.haml
+- app/views/tree/base/_link.html.haml
+- app/views/tree/base/_tree.html.haml
 - app/helpers/the_sortable_tree_helper.rb
 - config/locales/ru.yml
 - config/locales/en.yml
@@ -169,7 +177,8 @@ rubyforge_project: the_sortable_tree
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Drag&Drop GUI helper for awesome_nested_set gem. Sortable tree view helper
+summary: Sortable awesom_nested_set, Drag&Drop GUI for awesom_nested_set, View Helper
+  for nested set, Nested Comments
 test_files:
 - spec/controlllers/controller_mixin_spec.rb
 - spec/spec_helper.rb

data/app/assets/stylesheets/the_sortable_tree.css

@@ -1,120 +0,0 @@
-ol.nested_set * {
-  margin: 0; padding: 0;
-  list-style:none;
-}
-.nested_set{
-  padding: 0;
-  list-style:none;
-  font-size: 16px;
-}
-.nested_set ol{
-  margin:0 0 0 25px;
-  border-left:1px dashed gray;
-}
-.nested_set li{
-  margin-bottom:5px;
-}
-.nested_set a{
-  color:#000;
-  font-size:10pt;
-  font-weight:normal;
-  text-decoration:none;
-  line-height: 150%;
-  margin-left:30px;
-  margin-right:120px;
-  display:block;
-}
-.nested_set a img{float:left;}
-
-.nested_set .root a{
-  font-weight:bold;
-}
-.nested_set a:hover{
-  color:#2476FF;
-  text-decoration:none;
-}
-.nested_set .handle{
-  cursor: move;
-}
-.nested_set .link{
-  position: relative;
-  overflow: hidden;
-  zoom:1;
-  padding:5px;
-  margin:0 0 5px 5px;
-  background:#EFEFEF;
-  -moz-border-radius:5px;
-}
-.nested_set .link:hover{
-  background:#FEE;
-}
-.nested_set .controls{
-  position: absolute;
-  top: 5px; right: 10px;
-}
-.nested_set .button{
-  width:20px;
-  height:20px;
-  display:block;
-  float:left;
-  margin:0 0 0 3px;
-  cursor:pointer;
-}
-.nested_set_new_image{
-  vertical-align:middle;
-  border:none;
-}
-.nested_set_new{
-  margin:25px 0;
-}
-.nested_set_new a{
-  font-size:14pt;
-}
-.nested_set .handle{
-  width:16px;
-  height:16px;
-  float:left;
-  background:transparent url(/assets/iconza/blue/move.png) no-repeat scroll center center;
-}
-.nested_set .placeholder {
-  background-color:#EEF;
-  border:1px dashed blue;
-}
-.nested_set .ui-nestedSortable-error {
-  background:#FAA;
-  color:#8a1f11;
-}
-.nested_set .button.new{ background:transparent url(/assets/iconza/blue/add.png) no-repeat scroll center center; }
-.nested_set .button.new:hover{ background:transparent url(/assets/iconza/red/add.png) no-repeat scroll center center;}
-
-.nested_set .button.edit{ background:transparent url(/assets/iconza/blue/edit.png) no-repeat scroll center center; }
-.nested_set .button.edit:hover{ background:transparent url(/assets/iconza/red/edit.png) no-repeat scroll center center;}
-
-.nested_set .button.up{ background:transparent url(/assets/iconza/blue/up.png) no-repeat scroll center center; }
-.nested_set .button.up:hover{ background:transparent url(/assets/iconza/red/up.png) no-repeat scroll center center;}
-
-.nested_set .button.down{ background:transparent url(/assets/iconza/blue/down.png) no-repeat scroll center center; }
-.nested_set .button.down:hover{ background:transparent url(/assets/iconza/red/down.png) no-repeat scroll center center;}
-
-.nested_set .button.delete{ background:transparent url(/assets/iconza/blue/delete.png) no-repeat scroll center center; }
-.nested_set .button.delete:hover{ background:transparent url(/assets/iconza/red/delete.png) no-repeat scroll center center;}
-
-.nested_set .button.hard_delete{ background:transparent url(/assets/iconza/gray/delete.png) no-repeat scroll center center; }
-.nested_set .button.hard_delete:hover{ background:transparent url(/assets/iconza/red/delete.png) no-repeat scroll center center;}
-
-.nested_set .undeleted{ background:transparent url(/assets/iconza/gray/delete.png) no-repeat scroll center center; }
-.nested_set .cantup{ background:transparent url(/assets/iconza/gray/up.png) no-repeat scroll center center; }
-.nested_set .cantdown{ background:transparent url(/assets/iconza/gray/down.png) no-repeat scroll center center; }
-
-/*STATES*/
-.nested_set .unsafe{ background:transparent url(/assets/modern/mini-icons/unsafe.png) no-repeat scroll center center; cursor: help; }
-.nested_set .draft{ background:transparent url(/assets/modern/mini-icons/draft.png) no-repeat scroll center center; cursor: help;}
-.nested_set .published{ background:transparent url(/assets/modern/mini-icons/publiched.png) no-repeat scroll center center; cursor: help;}
-.nested_set .restricted{ background:transparent url(/assets/modern/mini-icons/restricted.png) no-repeat scroll center center; cursor: help;}
-.nested_set .archived{ background:transparent url(/assets/modern/mini-icons/archived.png) no-repeat scroll center center; cursor: help;}
-.nested_set .deleted{ background:transparent url(/assets/modern/mini-icons/bin.png) no-repeat scroll center center; cursor: help;}
-
-/* Moderation states*/
-.nested_set .moderation_unsafe{ background:transparent url(/assets/modern/mini-icons/moderation_unsafe.png) no-repeat scroll center center; cursor: help;}
-.nested_set .moderation_safe{ background:transparent url(/assets/modern/mini-icons/shield.png) no-repeat scroll center center; cursor: help;}
-.nested_set .moderation_blocked{ background:transparent url(/assets/modern/mini-icons/moderation_blocked.png) no-repeat scroll center center; cursor: help;}

data/app/assets/stylesheets/the_sortable_tree_min.css

@@ -1,26 +0,0 @@
-ol.nested_set_min * {
-  margin: 0; padding: 0;
-  list-style:none;
-}
-ol.nested_set_min {
-  list-style:none;
-  font-size: 16px;
-}
-ol.nested_set_min li{
-    font-size: 0.9em;
-    line-height: 130%;
-    margin-bottom: 5px;
-    font-weight: bold;
-    list-style:none;
-    list-style-position: outside;
-}
-ol.nested_set_min ol{
-    border-left: 1px dashed #AAA;
-    padding-left: 10px;
-    margin-left: 15px;
-    margin-top: 5px;
-}
-ol.nested_set_min ol li{ font-weight: normal; }
-
-.nested_set_min a:hover { color: #003A89 !important; }
-.nested_set_min a:visited { color: #809dc4; }

data/app/views/the_sortable_tree/_tree.html.haml

@@ -1,6 +0,0 @@
-= render :partial => "#{opts[:path]}/new", :locals => { :opts => opts }
-- unless tree.empty?
-  = render :partial => "#{opts[:path]}/js_init_sortable_tree", :locals => { :opts => opts }
-  = render :partial => "#{opts[:path]}/js_on_update_tree"
-  = render :partial => "#{opts[:path]}/js_rebuild_ajax", :locals => { :opts => opts }
-  %ol.ui-sortable.sortable.nested_set{ :id => "#{opts[:klass]}_nested_set" }= raw tree

data/app/views/the_sortable_tree_min/_tree.html.haml

@@ -1,2 +0,0 @@
-- unless tree.empty?
-  %ol.nested_set_min= raw tree