the_sortable_tree 1.5.0 → 1.6.0

data/README.md

@@ -59,6 +59,43 @@ bundle
 2. gem 'haml'
 3. JQuery UI
 
+### Options
+
+**id** - id field (:id => :friendly_id etc. **:id** by default)
+
+**title** - title field of node (:title => :name etc. **:title** by default)
+
+**path** - path to custom view partials (:path => 'pages/the_sortable_tree')
+
+**title** - title field of node (:title => :name etc. **:title** by default)
+
+**max_levels** - how many draggable levels can be? (**3** by default). **Can't be 0 (zero) and negative**
+
+**namespace** - namespace for admin sections for example. (:namespace => :admin, **:namespace** => nil by default)
+
+**opts[:level]** - view helper define level of recursion for each node. You can call **opts[:level]** into view partials
+
+### Partials
+
+**_tree** - root container for nested set elements
+
+**_node** - element of tree (link to current node and nested set of children)
+
+**_link** - decoration of link to current element of tree
+
+**_children** - decoration of children
+
+**_new** - create new element link
+
+**_controls** - control elements for current node
+
+
+**_js_init_sortable_tree** - JS for sortable tree
+
+**_js_on_update_tree**- JS for sortable tree
+
+**_js_rebuild_ajax**- JS for sortable tree
+
 ### Example of using with Page Model
 
 ### Extend your Model
@@ -210,32 +247,12 @@ Customize and use it!
 = sortable_tree @pages, :new_url => new_page_path, :path => 'pages/the_sortable_tree', :max_levels => 2
 ```
 
-### Partials
-
-**_tree** - root container for nested set elements
-
-**_node** - element of tree (link to current node and nested set of children)
-
-**_link** - decoration of link to current element of tree
-
-**_children** - decoration of children
-
-**_new** - create new element link
-
-**_controls** - control elements for current node
-
-
-**_js_init_sortable_tree** - JS for sortable tree
-
-**_js_on_update_tree**- JS for sortable tree
-
-**_js_rebuild_ajax**- JS for sortable tree
-
 ### Contributors
 
 * https://github.com/the-teacher
 * https://github.com/winescout
 * https://github.com/gbrain
+* https://github.com/Mik-die
 
 ### Acknowledgments
 

data/app/helpers/the_sortable_tree_helper.rb

@@ -5,12 +5,16 @@ module TheSortableTreeHelper
   # github.com/the-teacher
   #-------------------------------------------------------------------------------------------------------
 
-  # = sortable_tree @pages, :new_url => new_page_url, :max_levels => 5
+  # = 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
 
   def define_class_of_elements_of tree
-    return nil if tree.empty?
-    tree.first.class.to_s.downcase
+    case
+      when tree.is_a?(ActiveRecord::Relation) then tree.name.to_s.downcase
+      when tree.empty? then nil
+      else tree.first.class.to_s.downcase
+    end
   end
 
   def sortable_tree(tree, opts= {})
@@ -18,7 +22,8 @@ module TheSortableTreeHelper
       :path  => opts[:path] || :the_sortable_tree,
       :klass => define_class_of_elements_of(tree),
       :title => opts[:title] || :title,
-      :max_levels => opts[:max_levels] || 3
+      :max_levels => opts[:max_levels] || 3,
+      :namespace => Array.wrap(opts[:namespace])
     })
     render :partial => "#{opts[:path]}/tree", :locals => { :tree => sortable_tree_builder(tree, opts), :opts => opts }
   end
@@ -36,7 +41,7 @@ module TheSortableTreeHelper
     node = opts[:node]
 
     unless node
-      roots = tree.select{|elem| elem.parent_id.nil?}      
+      roots = tree.select{|elem| elem.parent_id.nil?}
       roots.each do |root|
         _opts = opts.merge({:node => root, :root => true, :level => opts[:level].next})
         result << sortable_tree_builder(tree, _opts)
@@ -53,4 +58,4 @@ module TheSortableTreeHelper
     end
     raw result
   end# sortable_tree_builder
-end# module
+end# module

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

@@ -1,8 +1,8 @@
 -# EDIT
-- edit = link_to '', polymorphic_url(node, :action => :edit), :title => t('.edit_this'), :class => 'button edit'
+- edit = link_to '', polymorphic_url(opts[:namespace] + [node], :action => :edit), :title => t('.edit_this'), :class => 'button edit'
 -# DELETE
 - if opts[:has_children]
-  - delete =  link_to('', url_for(node),
+  - delete =  link_to('', url_for(opts[:namespace] + [node]),
     :title    =>  t('.delete'),
     :method   =>  :delete,
     :confirm  =>  t('.delete_confirm'),

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

@@ -1,7 +1,7 @@
 - title     = node.send opts[:title]
 - handle    = content_tag :i, '', :class => :handle
-- link      = link_to(title, url_for(node), :title => title)
+- link      = link_to(title, url_for(opts[:namespace] + [node]), :title => title)
 - controls  = render(:partial  =>  "#{opts[:path]}/controls", :locals  =>  { :node => node, :opts => opts })
 - controls  = content_tag(:b, controls, :class => :controls)
 - element   = handle + controls + link
-%div{ :class => "link#{' root' if root}" }= element
+%div{ :class => "link#{' root' if root}" }= element

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

@@ -1 +1 @@
-= link_to node.send(opts[:title]), url_for(node), :title => node.send(opts[:title])
+= link_to node.send(opts[:title]), url_for(opts[:namespace] + [node]), :title => node.send(opts[:title])

data/lib/the_sortable_tree/version.rb

@@ -1,3 +1,3 @@
 module TheSortableTree
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: the_sortable_tree
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
-- Ilya N. Zykin, Matthew Clark
+- Ilya N. Zykin, Matthew Clark, Mikhail Dieterle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &85024190 !ruby/object:Gem::Requirement
+  requirement: &77493650 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *85024190
+  version_requirements: *77493650
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &85023880 !ruby/object:Gem::Requirement
+  requirement: &77493170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85023880
+  version_requirements: *77493170
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85023400 !ruby/object:Gem::Requirement
+  requirement: &77492740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85023400
+  version_requirements: *77492740
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &85023110 !ruby/object:Gem::Requirement
+  requirement: &77492450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85023110
+  version_requirements: *77492450
 description: Drag&Drop GUI helper for awesome_nested_set gem. Sortable tree view helper
 email:
 - zykin-ilya@ya.ru