the_sortable_tree 1.9.4 → 2.0.0

data/app/helpers/the_sortable_tree_helper.rb

@@ -1,13 +1,19 @@
 module TheSortableTreeHelper
   # Publicated by MIT
   # Nested Set View Helper
-  # Ilya Zykin, zykin-ilya@ya.ru, Russia, Ivanovo 2009-2012
+
+  # Ilya Zykin, zykin-ilya@ya.ru, Russia [Ivanovo, Saint Petersburg] 2009-2013
   # github.com/the-teacher
-  #-------------------------------------------------------------------------------------------------------
 
-  # = sortable_tree @pages,    :new_url => new_page_url, :max_levels => 5
-  # = sortable_tree @products, :new_url => new_product_url, :path => 'products/the_sortable_tree'
-  # = sortable_tree @catalogs, :namespace => :admin, :new_url => new_catalog_url, :max_levels => 5
+  # Default renderers
+  TREE_RENDERERS = {
+    :tree     => RenderTreeHelper,
+    :sortable => RenderSortableTreeHelper
+  }
+
+  ###############################################
+  # Common Base Methods
+  ###############################################
 
   def define_class_of_elements_of tree
     case
@@ -17,74 +23,83 @@ module TheSortableTreeHelper
     end
   end
 
-  # 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 }
+  def build_tree_html context, render_module, options = {}
+    render_module::Render::render_node(self, options)
   end
 
-  def sortable_tree_builder(tree, options= {})
+  ###############################################
+  # Server Side Render Tree Helper
+  ###############################################
+
+  def build_server_tree(tree, options= {})
     result = ''
     opts   = {
-      :id    => :id,        # node id field
-      :node  => nil,        # node
-      :root  => false,      # is it root node?
-      :level => 0           # recursion level
+      # node and base node params
+      :id    => :id,      # node id field
+      :title => :title,   # name of title fileld
+      :node  => nil,      # node
+      # base options
+      :type  => :tree,    # tree type
+      :root  => false,    # is it root node?
+      :level => 0,        # recursion level
+      :namespace => [],   # :admin
+      # SYSTEM boost array
+      :boost => []       # BOOST! array
     }.merge!(options)
 
+    # Basic vars
     root = opts[:root]
     node = opts[:node]
 
+    # namespace prepare [Rails require]
+    opts[:namespace] = Array.wrap opts[:namespace]
+
+    # Module with **Render** class
+    opts[:render_module] = TREE_RENDERERS[opts[:type]] unless opts[:render_module]
+
+    # Define tree class
+    opts[:klass] = define_class_of_elements_of(tree) unless opts[:klass]
+
+    # BOOST PATCH (BUILD ONCE)
+    if opts[:boost].empty?
+      tree.each do |item|
+        num = item.parent_id || 0
+        opts[:boost][num] = [] unless opts[:boost][num]
+        opts[:boost][num].push item
+      end
+    end
+
     unless node
-      roots = tree.select{ |elem| elem.parent_id.nil? }
+      # RENDER ROOTS
+      roots = opts[:boost][0]
 
-      # TODO: try to remove compact
-      # children rendering
-      if roots.empty? && !tree.empty?
+      # define roots, if it's need
+      if roots.nil? && !tree.empty?
         min_parent_id = tree.map(&:parent_id).compact.min
         roots = tree.select{ |elem| elem.parent_id == min_parent_id }
       end
 
+      # children rendering
       roots.each do |root|
-        _opts  =  opts.merge({:node => root, :root => true, :level => opts[:level].next})
-        result << sortable_tree_builder(tree, _opts)
+        _opts  =  opts.merge({ :node => root, :root => true, :level => opts[:level].next, :boost => opts[:boost] })
+        result << build_server_tree(tree, _opts)
       end
     else
+      # RENDER NODE'S CHILDREN
       children_res = ''
-      children = tree.select{|elem| elem.parent_id == node.id}
-      opts.merge!({:has_children => children.blank?})
-      children.each do |elem|
-        _opts        =  opts.merge({:node => elem, :root => false, :level => opts[:level].next})
-        children_res << sortable_tree_builder(tree, _opts)
+      children     = opts[:boost][node.id]
+      opts.merge!({ :has_children => children.blank? })
+
+      unless children.nil?
+        children.each do |elem|
+          _opts        =  opts.merge({ :node => elem, :root => false, :level => opts[:level].next, :boost => opts[:boost] })
+          children_res << build_server_tree(tree, _opts)
+        end
       end
-      result << render(:partial => "#{opts[:path]}/node", :locals => {:opts => opts, :root => root, :node => node, :children => children_res})
+
+      result << build_tree_html(self, opts[:render_module], opts.merge({ :root => root, :node => node, :children => children_res }))
     end
+
     raw result
   end
 end

data/app/views/sortable/client/_tree.html.erb

@@ -0,0 +1,9 @@
+<% unless tree.blank? %>
+  <i class='sortable_tree' style='display:none'>
+    <i class='data'><%=   tree.to_json           %></i>
+    <i class='locale'><%= t(:sortable).to_json   %></i>
+    <i class='klass'><%=  opts[:klass]           %></i>
+    <i class='plural'><%= opts[:klass].pluralize %></i>
+    <i class='rebuild_url'><%= url_for(:controller => opts[:klass].pluralize, :action => :rebuild) %></i>
+  </i>
+<% end %>

data/app/views/tree/client/_tree.html.erb

@@ -0,0 +1,23 @@
+<h1><%= tree.size %></h1>
+
+<div class='tree_block'>
+  <ol class='tree'>
+    <%= server_build_tree(tree) %>
+  </ol>
+</div>
+
+<% unless tree.blank? %>
+  <i class='render_tree' style='display:none' data-locale="<%= t(:tree).to_json %>" data-klass="<%= opts[:klass] %>" data-plural="<%= opts[:klass].pluralize %>">
+  </i>
+<% end %>
+
+<% tree.each do |item| %>
+
+  <li>
+    <div class='item'>
+    <h4><a href='#'><%= item.title %></a></h4>
+    <p><%=  item.content %></p>
+    </div>
+  </li>
+
+<% end %>

data/lib/fake.example

@@ -0,0 +1,44 @@
+book = {
+  'Programs' => {
+    'Lexical Structure' => [
+      'Comments',
+      'Documentation',
+      'Whitespace',
+      'Literals',
+      'Identifiers'
+    ]
+  }
+}
+
+def create_hub user, title
+  obj          = user.send(:hubs).new
+  obj.title    = title
+  obj.hub_type = :book
+  obj.state    = :published
+  obj.save!
+  obj
+end
+
+def build_page_tree user, book, parent_obj = nil
+  book.each_pair do |key, value|
+    obj = create_hub(user, key)
+    obj.move_to_child_of(parent_obj) if parent_obj
+    parent_obj = obj
+
+    if value.is_a? Hash
+      build_page_tree(user, value, parent_obj)
+    end
+
+    if value.is_a? Array
+      value.each do |key|
+        obj = create_hub(user, key)
+        obj.move_to_child_of(parent_obj)
+      end
+    end
+
+  end
+end
+
+build_page_tree(User.first, book)
+
+Hub.roots.of_(:book).last.self_and_descendants

data/lib/generators/the_sortable_tree/views_generator.rb

@@ -4,31 +4,42 @@ module TheSortableTree
       source_root File.expand_path('../../../../app/views', __FILE__)
 
       def self.banner
-        <<-BANNER.chomp
-rails g the_sortable_tree:views MODEL [tree|sortable|comments]
-  Copies files for rendering sortable nested set
-        BANNER
+<<-BANNER.chomp
+
+bundle exec rails g the_sortable_tree:views tree
+bundle exec rails g the_sortable_tree:views sortable
+bundle exec rails g the_sortable_tree:views helper
+
+bundle exec rails g the_sortable_tree:views assets
+
+BANNER
       end
 
       def copy_sortable_tree_files
-        # sortable
-        # comments
-        # tree
-        if ARGV[1] == 'sortable'
-          directory "../assets/javascripts/sortable", "app/assets/javascripts/sortable"
-          directory "sortable/base", "app/views/#{folder}/sortable/base"
-        elsif ARGV[1] == 'comments'
-          directory "../assets/javascripts/comments", "app/assets/javascripts/comments"
-          directory "comments/base", "app/views/#{folder}/comments/base"
-        else
-          directory "tree/base", "app/views/#{folder}/tree/base"
-        end
+        copy_helper_files
       end
 
       private
 
-      def folder
-        name.pluralize.downcase
+      def param_name
+        name.downcase
+      end
+
+      def copy_helper_files
+        if param_name == 'tree'
+          puts "Copy of tree render helper file"
+          copy_file "../helpers/render_tree_helper.rb", "app/helpers/render_tree_helper.rb"
+        elsif param_name == 'sortable'
+          puts "Copy of sortable tree render helper file"
+          copy_file "../helpers/render_sortable_tree_helper.rb", "app/helpers/render_sortable_tree_helper.rb"
+        elsif param_name == 'helper'
+          puts "Copy of base nested set render helper file"
+          copy_file "../helpers/the_sortable_tree_helper.rb", "app/helpers/the_sortable_tree_helper.rb"
+        elsif param_name == 'assets'
+          directory "../assets/javascripts", "app/assets/javascripts"
+        else
+          puts "Wrong params - use only [assets | tree | sortable] values"
+        end
       end
 
     end

data/lib/the_sortable_tree.rb

@@ -1,18 +1,14 @@
-# So, ERB and SLIM fans want to make gem became independent of HAML
-# Ok, let it be. But you will convert view partials youself
-# require "haml"
-
 require "the_sortable_tree/engine"
 require "the_sortable_tree/version"
 
+# include TheSortableTree::Scopes
 module TheSortableTree
-  # include TheSortableTree::Scopes
   module Scopes
     def self.included(base)
       base.class_eval do
-        scope :nested_set,          order('lft ASC')
-        scope :reversed_nested_set, order('lft DESC')
+        scope :nested_set,          -> { order('lft ASC')  }
+        scope :reversed_nested_set, -> { order('lft DESC') }
       end
     end
   end
-end
+end

data/lib/the_sortable_tree/engine.rb

@@ -3,4 +3,4 @@ require 'rails'
 
 module TheSortableTree
   class Engine < Rails::Engine; end
-end#TheRole
+end

data/lib/the_sortable_tree/version.rb

@@ -1,3 +1,3 @@
 module TheSortableTree
-  VERSION = "1.9.4"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: the_sortable_tree
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
-- Ilya N. Zykin, Matthew Clark, Mikhail Dieterle
+- Ilya N. Zykin, Mikhail Dieterle, Matthew Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69384430 !ruby/object:Gem::Requirement
+  requirement: &84664520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *69384430
+  version_requirements: *84664520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &69384220 !ruby/object:Gem::Requirement
+  requirement: &84664130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69384220
+  version_requirements: *84664130
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &69374790 !ruby/object:Gem::Requirement
+  requirement: &84663700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69374790
+  version_requirements: *84663700
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &69374570 !ruby/object:Gem::Requirement
+  requirement: &84663410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,9 +54,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69374570
-description: Sortable awesom_nested_set, Drag&Drop GUI for awesom_nested_set, View
-  Helper for nested set, Nested Comments
+  version_requirements: *84663410
+description: Drag&Drop GUI for awesom_nested_set. Render Tree Helper. Very fast! Ready
+  for Rails 4
 email:
 - zykin-ilya@ya.ru
 executables: []
@@ -65,57 +65,28 @@ extra_rdoc_files:
 - README.md
 files:
 - app/controllers/the_sortable_tree_controller.rb
-- app/assets/images/iconza/red/edit.png
-- app/assets/images/iconza/red/down.png
-- app/assets/images/iconza/red/zoom.png
-- app/assets/images/iconza/red/trash.png
-- app/assets/images/iconza/red/newspaper.png
-- app/assets/images/iconza/red/delete.png
-- app/assets/images/iconza/red/up.png
-- app/assets/images/iconza/red/add.png
-- app/assets/images/iconza/gray/mail.png
-- app/assets/images/iconza/gray/edit.png
-- app/assets/images/iconza/gray/down.png
-- app/assets/images/iconza/gray/delete.png
-- app/assets/images/iconza/gray/push_pin.png
-- app/assets/images/iconza/gray/up.png
-- app/assets/images/iconza/gray/add.png
-- app/assets/images/iconza/gray/lock.png
-- app/assets/images/iconza/blue/edit.png
-- app/assets/images/iconza/blue/down.png
-- app/assets/images/iconza/blue/downloads_folder.png
-- app/assets/images/iconza/blue/move.png
-- app/assets/images/iconza/blue/delete.png
-- app/assets/images/iconza/blue/up.png
-- app/assets/images/iconza/blue/add.png
+- app/assets/images/iconza/icons/edit.png
+- app/assets/images/iconza/icons/red_edit.png
+- app/assets/images/iconza/icons/red_delete.png
+- app/assets/images/iconza/icons/red_move.png
+- app/assets/images/iconza/icons/red_add.png
+- app/assets/images/iconza/icons/move.png
+- app/assets/images/iconza/icons/delete.png
+- app/assets/images/iconza/icons/add.png
 - app/assets/stylesheets/tree.css.scss
-- app/assets/stylesheets/comments_tree.css.scss
-- app/assets/stylesheets/sortable.css.scss
-- app/assets/javascripts/comments/base.js.coffee
-- app/assets/javascripts/sortable/base.js.coffee
+- app/assets/stylesheets/sortable_tree.css.scss
 - app/assets/javascripts/jquery.ui.nestedSortable.js
-- 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/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/assets/javascripts/render_tree_helper.js.coffee
+- app/assets/javascripts/sortable_tree/initializer.js.coffee
+- app/views/sortable/client/_tree.html.erb
+- app/views/tree/client/_tree.html.erb
+- app/helpers/render_tree_helper.rb
 - app/helpers/the_sortable_tree_helper.rb
-- config/locales/ru.yml
-- config/locales/en.yml
+- app/helpers/render_sortable_tree_helper.rb
 - lib/the_sortable_tree/version.rb
 - lib/the_sortable_tree/engine.rb
-- lib/tasks/the_sortable_tree.rake
 - lib/generators/the_sortable_tree/views_generator.rb
+- lib/fake.example
 - lib/the_sortable_tree.rb
 - MIT-LICENSE
 - Rakefile
@@ -175,8 +146,8 @@ rubyforge_project: the_sortable_tree
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Sortable awesom_nested_set, Drag&Drop GUI for awesom_nested_set, View Helper
-  for nested set, Nested Comments
+summary: Drag&Drop GUI for awesom_nested_set. Render Tree Helper. Very fast! Ready
+  for Rails 4
 test_files:
 - spec/controlllers/controller_mixin_spec.rb
 - spec/spec_helper.rb