Merge pull request #1 from maximalink/optgroup

Optgroup

Author: nyjt

.gitignore

@@ -4,7 +4,7 @@ pkg/*
 spec/dummy_app/config/database.yml
 spec/dummy_app/db/*.db
 spec/dummy_app/log/*.log
-.Gemfile.lock
+Gemfile.lock
 
 .DS_Store
 *.sublime-workspace

README.md

@@ -29,6 +29,10 @@ Nested Set + Drag&Drop GUI. Very fast! Best render helper! **2000 nodes/sec**. R
 
 ![Indented options](docs/indented_options.jpg)
 
+## Render Optgroup
+
+![Optgroup](docs/optgroup.jpg)
+
 ## Expandable tree
 
 ![Expandable](docs/expandable.jpg)
@@ -162,6 +166,25 @@ build_server_tree(tree, options)
 
 This uses CSS styling, for indenting with spaces, use **indented_options** instead.
 
+## Render Indented Options Tree
+
+```haml
+= select_tag :page_id, indented_options(@pages, :selected => Page.last)
+```
+
+**indented_options** is just alias of **build_server_tree(tree, type: :indented_options)**
+
+## Render Optgroup Tree
+
+```haml
+= select_tag :page_id, optgroup(@pages, :selected => Page.last)
+```
+
+**optgroup** is just alias of **build_server_tree(tree, type: :indented_options)**
+The only difference between **indented_options** and **optgroup** is the selectable of parent nodes.
+Indented options allows to select parent nodes, but optgroup does not. 
+
+
 
 ## build_server_tree options
 

app/helpers/jquery_sortable_tree_helper.rb

@@ -6,7 +6,8 @@ module JquerySortableTreeHelper
     sortable: RenderSortableTreeHelper,
     expandable: RenderExpandableTreeHelper,
     nested_options: RenderNestedOptionsHelper,
-    indented_options: RenderIndentedOptionsHelper
+    indented_options: RenderIndentedOptionsHelper,
+    optgroup: RenderOptgroupHelper
   }.freeze
 
   ###############################################
@@ -49,6 +50,7 @@ def space(height)
   end
 
   def fake_node(options)
+    options[:title] ||= 'title'
     OpenStruct.new(options[:title] => '', id: ':id', children: nil)
   end
 
@@ -82,15 +84,19 @@ def add_new_node_form(options)
   end
 
   def nested_options(tree, options = {})
-    build_server_tree(tree, { type: :nested_options }.merge!(options))
+    build_server_tree(tree, { type: :nested_options }.merge(options))
   end
 
   def indented_options(tree, options = {})
-    build_server_tree(tree, { type: :indented_options }.merge!(options))
+    build_server_tree(tree, { type: :indented_options }.merge(options))
   end
 
   def expandable_tree(tree, options = {})
-    build_server_tree(tree, { type: :expandable }.merge!(options))
+    build_server_tree(tree, { type: :expandable }.merge(options))
+  end
+
+  def optgroup(tree, options = {})
+    build_server_tree(tree, { type: :optgroup }.merge(options))
   end
 
   ###############################################

app/helpers/jquery_sortable_tree_helper/render_expandable_tree_helper.rb

@@ -9,12 +9,6 @@
 module JquerySortableTreeHelper
   module RenderExpandableTreeHelper
     class Render < JquerySortableTreeHelper::RenderSortableTreeHelper::Render
-      attr_accessor :h, :options
-
-      def initialize(h, options)
-        @h, @options = h, options
-      end
-
       def div_item
         h.content_tag(:div, handle + expand_button + edit_link + controls, class: :item)
       end

app/helpers/jquery_sortable_tree_helper/render_indented_options_helper.rb

@@ -1,12 +1,6 @@
 module JquerySortableTreeHelper
   module RenderIndentedOptionsHelper
-    class Render
-      attr_accessor :h, :options
-
-      def initialize(h, options)
-        @h, @options = h, options
-      end
-
+    class Render < JquerySortableTreeHelper::RenderSortableTreeHelper::Render
       def render_node
         h.content_tag(:option, title, tag_options) + children
       end
@@ -25,10 +19,6 @@ def tag_options
         html_options
       end
 
-      def node
-        @options[:node]
-      end
-
       def children
         @options[:children].html_safe
       end

app/helpers/jquery_sortable_tree_helper/render_nested_options_helper.rb

@@ -1,12 +1,6 @@
 module JquerySortableTreeHelper
   module RenderNestedOptionsHelper
-    class Render
-      attr_accessor :h, :options
-
-      def initialize(h, options)
-        @h, @options = h, options
-      end
-
+    class Render < JquerySortableTreeHelper::RenderSortableTreeHelper::Render
       def render_node
         @h.content_tag(:option, options[:node].send(options[:title]), tag_options) + children
       end

app/helpers/jquery_sortable_tree_helper/render_optgroup_helper.rb

@@ -0,0 +1,11 @@
+module JquerySortableTreeHelper
+  module RenderOptgroupHelper
+    class Render < JquerySortableTreeHelper::RenderIndentedOptionsHelper::Render
+      def tag_options
+        html_options = super
+        html_options[:disabled] = 'true' unless options[:children].blank?
+        html_options
+      end
+    end
+  end
+end

app/helpers/jquery_sortable_tree_helper/render_sortable_tree_helper.rb

@@ -18,7 +18,7 @@ def initialize(h, options)
       def render_node
         return h.content_tag(:li, div_item + children,
           class: :node,
-          data: { node_id: options[:node].id }
+          data: { node_id: node.id }
         )
       end
 
@@ -31,13 +31,13 @@ def handle
       end
 
       def edit_link
-        h.content_tag(:h4, h.link_to(options[:node].send(options[:title]), show_path, class: :edit))
+        h.content_tag(:h4, h.link_to(node.send(options[:title]), show_path, class: :edit))
       end
 
       def show_link
         h.content_tag(:h4,
-                      h.link_to(options[:node].send(options[:title]),
-                      h.url_for(options[:namespace] + [options[:node]]))
+                      h.link_to(node.send(options[:title]),
+                      h.url_for(options[:namespace] + [node]))
         )
       end
 
@@ -57,6 +57,10 @@ def children
         h.content_tag(:ol, options[:children].html_safe, class: :nested_set) unless options[:children].blank?
       end
 
+      def node
+        @options[:node]
+      end
+
       def show_path
         h.url_for(controller: (options[:controller] || (options[:klass] && options[:klass].pluralize)), action: :show, id: options[:node].id, format: :json)
       end

app/helpers/jquery_sortable_tree_helper/render_tree_helper.rb

@@ -9,12 +9,6 @@
 module JquerySortableTreeHelper
   module RenderTreeHelper
     class Render < JquerySortableTreeHelper::RenderSortableTreeHelper::Render
-      attr_accessor :h, :options
-
-      def initialize(h, options)
-        @h, @options = h, options
-      end
-
       def div_item
         h.content_tag(:div, show_link, class: :item)
       end

app/inputs/indented_collection_select_input.rb

@@ -22,4 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sqlite3', '~> 1.3'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-rails', '~> 3.0'
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'faker'
+  s.add_development_dependency 'awesome_nested_set', '~> 3.0.0.rc5'
 end

docs/indented_options.jpg

@@ -1,3 +1,3 @@
 module JquerySortableTree
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

docs/optgroup.jpg

@@ -1,20 +1,21 @@
 class Admin::PagesController < ApplicationController
   include JquerySortableTreeController::Rebuild
 
+  before_action :load_pages, only: [:index, :manage, :nested_options, :indented_options, :optgroup]
+
   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 indented_options
-    @pages = Admin::Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
+  def optgroup
   end
 
   def node_manage
@@ -25,6 +26,10 @@ def node_manage
 
   protected
 
+  def load_pages
+    @pages = Admin::Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
   def sortable_model
     Admin::Page
   end

jquery_sortable_tree.gemspec

@@ -2,16 +2,18 @@ class PagesController < ApplicationController
   include JquerySortableTreeController::Rebuild
   include JquerySortableTreeController::ExpandNode
 
+  before_action :load_pages, only: [:index, :nested_options, :indented_options, :optgroup]
+
   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 indented_options
-    @pages = Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
+
+  def optgroup
   end
 
   def manage
@@ -27,4 +29,10 @@ def node_manage
   def expand
     @pages = Page.nested_set.roots.select('id, title, content, parent_id')
   end
+
+  private
+
+  def load_pages
+    @pages = Page.nested_set.select('id, title, content, parent_id').limit(15)
+  end
 end

lib/jquery_sortable_tree/version.rb

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

spec/dummy_app/spec/build_tree_helper.rb renamed to spec/build_tree_helper.rb

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

spec/dummy_app/app/controllers/admin/pages_controller.rb

@@ -8,16 +8,19 @@
   %li= link_to 'pages/index (just tree)',           pages_path
   %li= link_to 'pages/nested_options',              nested_options_pages_path
   %li= link_to 'pages/indented_options',            indented_options_pages_path
+  %li= link_to 'pages/optgroup',                    optgroup_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/indented_options',            indented_options_admin_pages_path
+  %li= link_to '/admin/pages/optgroup',                    optgroup_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
 

spec/dummy_app/app/controllers/pages_controller.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'awesome_nested_set'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line

spec/dummy_app/app/views/admin/pages/optgroup.html.haml

@@ -1,17 +1,17 @@
 JquerySortableTreeTest::Application.routes.draw do
-  get "category/index"
-
-  get "category/manage"
+  get 'category/index'
+  get 'category/manage'
 
   root to: 'welcome#index'
 
   resources :pages do
     collection do
-      get  :nested_options
-      get  :indented_options
-      get  :manage
-      get  :node_manage
-      get  :expand
+      get :nested_options
+      get :indented_options
+      get :optgroup
+      get :manage
+      get :node_manage
+      get :expand
 
       post :rebuild
       post :expand_node
@@ -21,7 +21,7 @@
   namespace :admin do
     resources :pages do
       collection do
-        get  :nested_options, :indented_options, :manage, :node_manage
+        get  :nested_options, :indented_options, :optgroup, :manage, :node_manage
         post :rebuild
       end
     end
@@ -42,12 +42,4 @@
       end
     end
   end
-
-  # resources :comments do
-  #   collection do
-  #     post :rebuild
-  #     get  :manage
-  #     get  :comments
-  #   end
-  # end
 end