the_sortable_tree 2.6.1 → 2.6.2

data/app/helpers/the_sortable_tree_helper.rb

@@ -7,9 +7,9 @@ module TheSortableTreeHelper
 
   # Default renderers
   TREE_RENDERERS = {
-    :tree     => RenderTreeHelper,
-    :sortable => RenderSortableTreeHelper,
-    :expandable => RenderExpandableTreeHelper,
+    :tree           => RenderTreeHelper,
+    :sortable       => RenderSortableTreeHelper,
+    :expandable     => RenderExpandableTreeHelper,
     :nested_options => RenderNestedOptionsHelper
   }
 

data/gem_version.rb

@@ -1,3 +1,3 @@
 module TheSortableTree
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end

data/spec/dummy_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 4.1.0'
+gem 'rails', '4.2'
 gem 'sqlite3'
 
 gem 'json'
@@ -10,13 +10,16 @@ gem 'jquery-rails'
 gem 'jquery-ui-rails'
 
 gem 'quiet_assets'
+gem 'sass-rails'
 
 gem 'awesome_nested_set', github: "collectiveidea/awesome_nested_set"
 gem 'the_sortable_tree', path: '../../'
+# gem 'the_sortable_tree', '2.6.1'
+
+gem 'protozaur', github: "the-teacher/protozaur"
 
 group :assets do
   gem 'uglifier'
-  gem 'sass-rails'
   gem 'coffee-rails'
 end
 
@@ -37,4 +40,4 @@ end
 group :test do
   gem 'factory_girl'
   gem 'database_cleaner'
-end
+end

data/spec/dummy_app/README.md

@@ -1,48 +1,38 @@
-## TheSortableTree Test Application 
+## TheSortableTree Test Application
 
-#### Ruby 2.0.0p247 + Rails 4 + Haml 4 + the_sortable_tree (2.3.0)
+* Ruby 2.3.3
+* Rails 4
+* Haml 4
+* the_sortable_tree
 
+### Setup the App
 
-### Install App and try to use TheSortableTree
+1. Copy and configure `database.yml`
 
-Create Database config file
+  ```
+  cp config/database.yml.example config/database.yml
+  ```
 
-```
-cp config/database.yml.example config/database.yml
-```
+2. Create DB and Seeds for development
 
-Create Database and Test data
+  ```
+  rake db:bootstrap_and_seed
+  ```
 
-```
-rake db:bootstrap_and_seed
-```
+3. Launch the App
 
-Start Rails 4
+  ```
+  bin/rails s
+  ```
 
-```
-rails s
-```
+  or
 
-or
+  ```
+  bin/rails s -p 3000 -b site.com
+  ```
 
-```
-rails s -p 3000 -b site.com
-```
+4. Visit the Index page
 
-Open browser
-
-```
-localhost:3000
-```
-
-### How to run tests for TheSortable tree
-
-```ruby
-git clone git@github.com:the-teacher/the_sortable_tree.git
-cd the_sortable_tree/spec/dummy_app/
-
-# cp config/database.yml.example config/database.yml
-
-rake db:bootstrap RAILS_ENV=test
-rspec
-```
+  ```
+  localhost:3000
+  ```

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

@@ -1,20 +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/jquery.cookie
-  //= require expandable_tree/restorable
-  //= require expandable_tree/hashchange
-  //= require expandable_tree/initializer
+  //= require the_sortable_tree/jquery.ui.nestedSortable
+
+  //= require the_sortable_tree/sortable_ui/base
+  //= require the_sortable_tree/sortable_ui/initializer
+
+  //= require the_sortable_tree/expandable_tree/jquery.cookie
+  //= require the_sortable_tree/expandable_tree/restorable
+  //= require the_sortable_tree/expandable_tree/hashchange
+  //= require the_sortable_tree/expandable_tree/initializer
 */

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

@@ -1,11 +1,10 @@
 /*
- * 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 ptz/reset
+  //= require ptz/base
+  //= require ptz/framework
 
- *= require tree
- *= require sortable_tree
- *= require nested_options
- *= require expandable_tree
-*/
+  //= require the_sortable_tree/sortable_ui/base
+
+  //= require the_sortable_tree/tree
+  //= require the_sortable_tree/expandable_tree
+*/

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

@@ -2,7 +2,5 @@
   = stylesheet_link_tag :tree
 
 %h1 Admin::Pages#index
-
 %p= link_to raw('← back'), '/'
-
-%ol.tree= build_server_tree @pages
+%ol.tst_tree= build_server_tree @pages

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

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

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

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

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

@@ -2,7 +2,7 @@
 
 %p= link_to raw('← back'), '/'
 
-%ol.sortable_tree{ :data => { :rebuild_url => rebuild_pages_url } }
+%ol.the_sortable_tree{ :data => { :rebuild_url => rebuild_pages_url } }
   = build_server_tree @pages, :type => :sortable
 
 %h2 Root:

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

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

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

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

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

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

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

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

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

@@ -12,7 +12,11 @@
 </head>
 <body>
 
-<%= yield %>
+  <div class='ma w80p p20'>
+    <%= yield %>
+  </div>
 
 </body>
+
+<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
 </html>

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

@@ -4,5 +4,5 @@
 
 Count: #{ @pages.to_a.count }
 
-%ol.sortable_tree.expandable{ data: { max_levels: 5, rebuild_url: rebuild_pages_url, expand_node_url: expand_node_pages_url, cookie_store: :true, cookie_scope: @pages.first.class } }
+%ol.the_sortable_tree.expandable{ data: { max_levels: 5, rebuild_url: rebuild_pages_url, expand_node_url: expand_node_pages_url, cookie_store: :true, cookie_scope: @pages.first.class } }
   = expandable_tree @pages

data/spec/dummy_app/app/views/pages/expand_node.html.haml

@@ -1 +1 @@
-%ol.nested_set= expandable_tree @children
+%ol.the_sotrable_tree-nested_set= expandable_tree @children

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

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

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

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

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

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

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

@@ -1,40 +1,41 @@
-%h1 Welcome to TheSortableTree test application!
+.w800.ma.fs16.ffa.lh150
+  %h1.mb30 Welcome to TheSortableTree test application!
 
-%h4 Default views
+  %h4.mb20 Default views
 
-%h5 Pages (model Pages)
+  %h5.mb20 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
+  %ul.ml40.mb20
+    %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)
+  %h5.mb20 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
+  %ul.ml40.mb20
+    %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)
+  %h5.mb20 С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
+  %ul.ml40.mb20
+    %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)
+  %h5.mb20 С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
+  %ul.ml40.mb20
+    %li= link_to 'article_categories/index',                  article_categories_path
+    %li= link_to 'article_categories/manage (sortable tree)', manage_article_categories_path
 
-%h4 Customized views
+  -# %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
+  -#
+    %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

data/spec/dummy_app/bin/bundler

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("bundler", "bundler")

data/spec/dummy_app/bin/coderay

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'coderay' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("coderay", "coderay")

data/spec/dummy_app/bin/erubis

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("erubis", "erubis")

data/spec/dummy_app/bin/haml

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'haml' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("haml", "haml")