the_sortable_tree 2.3.2 → 2.3.3

data/README.md

@@ -1,9 +1,14 @@
-# TheSortableTree v2.3.2
+# TheSortableTree v2.3.3
 
 > tested with rails 3.2.13 + haml 4
 
 Nested Set + Drag&Drop GUI. Very fast! Best render helper! **2000 nodes/sec**. Ready for rails 4 ([RubyGems](http://rubygems.org/gems/the_sortable_tree))
 
+### Test Application
+
+* [spec/the_sortable_tree_app](https://github.com/the-teacher/the_sortable_tree/tree/master/spec/the_sortable_tree_app)
+* [spec/the_sortable_tree_app/README.md](https://github.com/the-teacher/the_sortable_tree/blob/master/spec/the_sortable_tree_app/README.md)
+
 ## Sortable tree. Drag&Drop GUI
 
 ![Drag&Drop GUI. Sotrable tree](https://raw.github.com/the-teacher/the_sortable_tree/master/docs/sortable.jpg)

data/app/helpers/render_nested_options_helper.rb

@@ -7,10 +7,13 @@ module RenderNestedOptionsHelper
         @h, @options = h, options
 
         node = options[:node]
-        selected = (options[:selected] == node) ? ' selected' : nil
+
+        this_node      = options[:selected] == node
+        selected_class = this_node ? ' selected' : nil
+        selected       = this_node ? " selected='selected'" : nil
 
         "
-        <option value='#{node[:id]}' class='l_#{ options[:level] }#{selected}'>#{ node.send(options[:title]) }</option>
+        <option value='#{node[:id]}' class='l_#{ options[:level] }#{selected_class}' #{selected}>#{ node.send(options[:title]) }</option>
         #{ options[:children] }
         "
       end

data/lib/the_sortable_tree/version.rb

@@ -1,3 +1,3 @@
 module TheSortableTree
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

data/spec/{controlllers → old_tests/controlllers}/controller_mixin_spec.rb

@@ -46,4 +46,4 @@ describe TheSortableTreeController do
       end
     end
   end
-end
+end

data/spec/the_sortable_tree_app/Gemfile

@@ -0,0 +1,20 @@
+source 'http://rubygems.org'
+
+gem 'rails'
+gem 'sqlite3'
+
+gem 'json'
+gem 'haml'
+gem 'haml-rails'
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+
+gem 'awesome_nested_set'
+gem 'the_sortable_tree', path: '../../'
+
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
+  gem 'faker'
+end

data/spec/the_sortable_tree_app/Gemfile.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: ../../
+  specs:
+    the_sortable_tree (2.3.2)
+      rails (>= 3.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    awesome_nested_set (2.1.6)
+      activerecord (>= 3.0.0)
+    builder (3.0.4)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.2)
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    faker (1.1.2)
+      i18n (~> 0.5)
+    haml (4.0.3)
+      tilt
+    haml-rails (0.4)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (>= 3.1, < 4.1)
+      railties (>= 3.1, < 4.1)
+    hike (1.2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (3.0.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.0.3)
+      jquery-rails
+      railties (>= 3.1.0)
+    json (1.8.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    multi_json (1.7.6)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sass (3.2.9)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+    uglifier (2.1.1)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_nested_set
+  coffee-rails
+  faker
+  haml
+  haml-rails
+  jquery-rails
+  jquery-ui-rails
+  json
+  rails
+  sass-rails
+  sqlite3
+  the_sortable_tree!
+  uglifier

data/spec/the_sortable_tree_app/README.md

@@ -0,0 +1,9 @@
+## TheSortableTree Test Application 
+
+#### Ruby 1.9.3 + Rails 3.2.13 + Haml 4 + the_sortable_tree (2.3.0)
+
+rake db:create && rake db:migrate && rake db:seed
+
+bin/rails s
+
+localhost:3000

data/spec/the_sortable_tree_app/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+TheSortableTreeTest::Application.load_tasks

data/spec/the_sortable_tree_app/app/assets/javascripts/application.js

@@ -0,0 +1,16 @@
+/*
+  // This is a manifest file that'll be compiled into including all the files listed below.
+  // Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+  // be included in the compiled file accessible from http://example.com/assets/application.js
+  // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+  // the compiled file.
+
+  //= require jquery
+  //= require jquery_ujs
+  //= require jquery.ui.core
+  //= require jquery.ui.sortable
+  
+  //= require jquery.ui.nestedSortable
+  //= require sortable_tree/initializer
+  // require expandable_tree/initializer
+*/

data/spec/the_sortable_tree_app/app/assets/stylesheets/application.css

@@ -0,0 +1,11 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+
+ *= require tree
+ *= require sortable_tree
+ *= require nested_options
+ * require expandable_tree
+*/

data/spec/the_sortable_tree_app/app/controllers/admin/pages_controller.rb

@@ -0,0 +1,31 @@
+class Admin::PagesController < ApplicationController
+  include TheSortableTreeController::Rebuild
+
+  def index
+    @pages = Admin::Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
+  def manage
+    @pages = Admin::Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
+  def nested_options
+    @pages = Admin::Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
+  def node_manage
+    @root  = Admin::Page.root
+    @pages = @root.self_and_descendants.nested_set.select('id, title, content, parent_id').limit(15)
+    render template: 'admin/pages/manage'
+  end
+
+  protected 
+
+  def sortable_model
+    Admin::Page
+  end
+
+  def sortable_collection
+    'admin_pages'
+  end
+end

data/spec/the_sortable_tree_app/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/spec/the_sortable_tree_app/app/controllers/article_categories_controller.rb

@@ -0,0 +1,11 @@
+class ArticleCategoriesController < ApplicationController
+  include TheSortableTreeController::Rebuild
+
+  def index
+    @article_categories = ArticleCategory.nested_set.all
+  end
+
+  def manage
+    @article_categories = ArticleCategory.nested_set.all
+  end
+end

data/spec/the_sortable_tree_app/app/controllers/inventory/categories_controller.rb

@@ -0,0 +1,15 @@
+class Inventory::CategoriesController < ApplicationController
+  include TheSortableTreeController::Rebuild
+
+  def index
+    @inventory_categories = Inventory::Category.nested_set.all
+  end
+
+  def manage
+    @inventory_categories = Inventory::Category.nested_set.all
+  end
+
+  def sortable_model
+    Inventory::Category
+  end
+end

data/spec/the_sortable_tree_app/app/controllers/pages_controller.rb

@@ -0,0 +1,26 @@
+class PagesController < ApplicationController
+  include TheSortableTreeController::Rebuild
+  # include TheSortableTreeController::ExpandNode
+
+  def index
+    @pages = Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
+  def nested_options
+    @pages = Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
+  def manage
+    @pages = Page.nested_set.select('id, title, content, parent_id')
+  end
+
+  def node_manage
+    @root  = Page.root
+    @pages = @root.self_and_descendants.nested_set.select('id, title, content, parent_id').limit(15)
+    render template: 'pages/manage'
+  end
+
+  def expand
+    @pages = Page.nested_set.roots.select('id, title, content, parent_id')
+  end
+end

data/spec/the_sortable_tree_app/app/controllers/welcome_controller.rb

@@ -0,0 +1,3 @@
+class WelcomeController < ApplicationController
+  def index; end
+end

data/spec/the_sortable_tree_app/app/models/admin/page.rb

@@ -0,0 +1,4 @@
+class Admin::Page < ActiveRecord::Base
+  acts_as_nested_set
+  include TheSortableTree::Scopes
+end

data/spec/the_sortable_tree_app/app/models/admin.rb

@@ -0,0 +1,5 @@
+module Admin
+  def self.table_name_prefix
+    'admin_'
+  end
+end

data/spec/the_sortable_tree_app/app/models/article_category.rb

@@ -0,0 +1,4 @@
+class ArticleCategory < ActiveRecord::Base
+  acts_as_nested_set
+  include TheSortableTree::Scopes
+end

data/spec/the_sortable_tree_app/app/models/inventory/category.rb

@@ -0,0 +1,4 @@
+class Inventory::Category < ActiveRecord::Base
+  acts_as_nested_set
+  include TheSortableTree::Scopes
+end

data/spec/the_sortable_tree_app/app/models/inventory.rb

@@ -0,0 +1,5 @@
+module Inventory
+  def self.table_name_prefix
+    'inventory_'
+  end
+end

data/spec/the_sortable_tree_app/app/models/page.rb

@@ -0,0 +1,5 @@
+class Page < ActiveRecord::Base
+  acts_as_nested_set
+  include TheSortableTree::Scopes
+  # attr_accessible :name, :parent_id
+end

data/spec/the_sortable_tree_app/app/views/admin/pages/index.html.haml

@@ -0,0 +1,8 @@
+- content_for :css do
+  = stylesheet_link_tag :tree
+
+%h1 Admin::Pages#index
+
+%p= link_to raw('← back'), '/'
+
+%ol.tree= build_server_tree @pages

data/spec/the_sortable_tree_app/app/views/admin/pages/manage.html.haml

@@ -0,0 +1,3 @@
+%p= link_to raw('← back'), '/'
+%ol.sortable_tree{ data: { rebuild_url: rebuild_admin_pages_url } }
+  = build_server_tree @pages, type: :sortable

data/spec/the_sortable_tree_app/app/views/admin/pages/namespaced_link.html.haml

@@ -0,0 +1,3 @@
+%p= link_to raw('← back'), '/'
+%ol.sortable_tree{ data: { rebuild_url: rebuild_admin_pages_url } }
+  = build_server_tree @pages, type: :sortable

data/spec/the_sortable_tree_app/app/views/admin/pages/nested_options.html.haml

@@ -0,0 +1,3 @@
+%p= link_to raw('← back'), '/'
+
+= select_tag :pages, nested_options(@pages, selected: @pages.last), class: :nested_options

data/spec/the_sortable_tree_app/app/views/admin/pages/node_manage.html.haml

@@ -0,0 +1,12 @@
+%h1 Admin::Pages#manage
+
+%p= link_to raw('← back'), '/'
+
+%ol.sortable_tree{ :data => { :rebuild_url => rebuild_pages_url } }
+  = build_server_tree @pages, :type => :sortable
+
+%h2 Root:
+%div= @root.inspect
+
+%h2 Root's children:
+%div= @pages.inspect

data/spec/the_sortable_tree_app/app/views/article_categories/index.html.haml

@@ -0,0 +1,3 @@
+%p= link_to raw('← back'), '/'
+
+%ol.tree= build_server_tree @article_categories

data/spec/the_sortable_tree_app/app/views/article_categories/manage.html.haml

@@ -0,0 +1,4 @@
+%p= link_to raw('← back'), '/'
+
+%ol.sortable_tree{ :data => { :max_levels => 3, :rebuild_url => rebuild_article_categories_url } }
+  = build_server_tree @article_categories, :type => :sortable

data/spec/the_sortable_tree_app/app/views/inventory/categories/index.html.haml

@@ -0,0 +1,3 @@
+%p= link_to raw('← back'), '/'
+
+%ol.tree= build_server_tree @inventory_categories

data/spec/the_sortable_tree_app/app/views/inventory/categories/manage.html.haml

@@ -0,0 +1,4 @@
+%p= link_to raw('← back'), '/'
+
+%ol.sortable_tree{ data: { max_levels: 3, rebuild_url: rebuild_inventory_categories_url } }
+  = build_server_tree @inventory_categories, type: :sortable

data/spec/the_sortable_tree_app/app/views/layouts/application.html.erb

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>TheSortableTreeTest</title>
+  <%= stylesheet_link_tag    :application %>
+  <%= javascript_include_tag :application %>
+  <%= csrf_meta_tags %>
+
+  <%= yield :css %>
+  <%= yield :js %>
+
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/the_sortable_tree_app/app/views/pages/expand.html.haml

@@ -0,0 +1,7 @@
+%p= link_to raw('← back'), '/'
+
+%p= link_to 'Create New Page', new_page_path
+
+Count: #{ @pages.count }
+%ol.sortable_tree{ :data => { :rebuild_url => rebuild_pages_url, :expand_node_url => expand_node_pages_url, :tree_type => :expandable } }
+  = expandable_tree @pages

data/spec/the_sortable_tree_app/app/views/pages/expand_children.html.haml

@@ -0,0 +1 @@
+%ol.nested_set= expandable_tree @children

data/spec/the_sortable_tree_app/app/views/pages/index.html.haml

@@ -0,0 +1,3 @@
+%p= link_to raw('← back'), '/'
+
+%ol.tree= just_tree @pages

data/spec/the_sortable_tree_app/app/views/pages/manage.html.haml

@@ -0,0 +1,8 @@
+%p= link_to raw('← back'), '/'
+
+%p= link_to 'Create New Page', new_page_path
+
+Count: #{ @pages.count }
+
+%ol.sortable_tree{ data: { rebuild_url: rebuild_pages_url } }
+  = sortable_tree @pages, namespace: :admin

data/spec/the_sortable_tree_app/app/views/pages/nested_options.html.haml

@@ -0,0 +1,3 @@
+%p= link_to raw('← back'), '/'
+
+= select_tag :pages, nested_options(@pages, selected: @pages.last), class: :nested_options

data/spec/the_sortable_tree_app/app/views/welcome/index.html.haml

@@ -0,0 +1,40 @@
+%h1 Welcome to TheSortableTree test application!
+
+%h4 Default views
+
+%h5 Pages (model Pages)
+
+%ul
+  %li= link_to 'pages/index (just tree)',           pages_path
+  %li= link_to 'pages/nested_options',              nested_options_pages_path
+  %li= link_to 'pages/manage (sortable tree)',      manage_pages_path
+  %li= link_to 'pages/node_manage (sortable tree)', node_manage_pages_path
+  -#%li= link_to 'pages/expand (expandable tree)', expand_pages_path
+
+%h5 Admin::Pages (model Admin::Pages + namespace :admin)
+
+%ul
+  %li= link_to '/admin/pages/index (just tree)',           admin_pages_path
+  %li= link_to '/admin/pages/nested_options',              nested_options_admin_pages_path
+  %li= link_to '/admin/pages/manage (sortable tree)',      manage_admin_pages_path
+  %li= link_to '/admin/pages/node_manage (sortable tree)', node_manage_admin_pages_path
+
+%h5 Сompound model name (Inventory::Category)
+
+%ul
+  %li= link_to 'inventory/categories/index',                  inventory_categories_path
+  %li= link_to 'inventory/categories/manage (sortable tree)', manage_inventory_categories_path
+
+%h5 Сompound model name (ArticleCategory)
+
+%ul
+  %li= link_to 'article_categories/index',                  article_categories_path
+  %li= link_to 'article_categories/manage (sortable tree)', manage_article_categories_path
+
+%h4 Customized views
+
+-#
+  %ul
+    %li= link_to 'comments/index (min)', comments_path
+    %li= link_to 'comments/manage (sortable tree)', manage_comments_path
+    %li= link_to 'comments/manage (Tree of Comments)', comments_comments_path