sortable_nested_set 0.1.24 → 0.1.25

data/app/helpers/sortable_nested_set_helper.rb

@@ -3,16 +3,16 @@ include CollectiveIdea::Acts::NestedSet::Helper
 
 module SortableNestedSetHelper
   def sortable_nested_set_tree(class_or_category)
-    if class_or_category.is_a? Class
+    if class_or_category.is_a?(Class)
       @category_class = class_or_category
-      @categories = class_or_category.all :include => class_or_category.sns_items_type, :order => :lft
+      @categories = class_or_category.all(:include => class_or_category.sns_items_type, :order => :lft)
     else
       @category_class = class_or_category.class
       @categories = class_or_category.self_and_descendants_with_items
       @root = class_or_category
     end
 
-    @sortable_ids = @categories.collect &:id
+    @sortable_ids = @categories.collect(&:id)
 
     render 'sortable_nested_set/tree',
            :category_class => @category_class,

data/app/views/sortable_nested_set/_category.html.erb

@@ -3,27 +3,29 @@
 <%= render 'sortable_nested_set/toggle',
            :category_type => category.class.name.underscore,
            :id => category.id,
-           :state => 'open' %>
+           :state => :open %>
 
 <%= content_tag :span, category, :class => :handle %>
 
-<%= content_tag :span, link_to('-', category), :id => "toggle_actions_category_#{category.id}", :class => :mega %>
+<% unless local_assigns[:show_mega_menu] == false %>
+  <%= content_tag :span, link_to('-', category), :id => "toggle_actions_category_#{category.id}", :class => :mega %>
 
-<%= content_tag :div, :id => "actions_category_#{category.id}", :class => :links do %>
-  <%= link_to_unless_current 'show', category %> |
-  <%= link_to 'edit', send("edit_#{cpath}", category) %> |
-  <% unless current_page? send(cpath, category) %>
-    <%= link_to 'remove',
-                send("sns_destroy_category_#{cpath}", category),
-                :confirm => 'Are you sure?',
-                :method => :delete,
-                :remote => true %> |
+  <%= content_tag :div, :id => "actions_category_#{category.id}", :class => :links do %>
+    <%= link_to_unless_current 'show', category %> |
+    <%= link_to 'edit', send("edit_#{cpath}", category) %> |
+    <% unless current_page? send(cpath, category) %>
+      <%= link_to 'remove',
+                  send("sns_destroy_category_#{cpath}", category),
+                  :confirm => 'Are you sure?',
+                  :method => :delete,
+                  :remote => true %> |
+    <% end %>
+    <%= link_to "add #{category.class.sns_subcategories_type.to_s.singularize}",
+                send("sns_add_subcategory_#{cpath}", category) %> |
+    <%= link_to "add #{category.class.sns_items_type.to_s.singularize}", send("sns_add_item_#{cpath}", category) %>
   <% end %>
-  <%= link_to 'add subcategory', send("sns_add_subcategory_#{cpath}", category) %> |
-  <%= link_to 'add item', send("sns_add_item_#{cpath}", category) %>
 <% end %>
 
 <%= content_tag :div, :id => "items_#{category.id}", :class => :items do %>
-  <%= render :partial => 'sortable_nested_set/item',
-             :collection => category.sns_items %>
+  <%= render :partial => 'sortable_nested_set/item', :collection => category.sns_items %>
 <% end %>

data/app/views/sortable_nested_set/_tree.html.erb

@@ -1,8 +1,6 @@
 <%= stylesheet_link_tag 'mega_menu', 'menu_tree' %>
-
 <%= javascript_tag nil, :src => 'http://www.google.com/jsapi' %>
 <%= javascript_tag "google.load('jquery', '1.4.2')" %>
-
 <%= javascript_include_tag 'jquery.hoverIntent.minified.js', 'mega_menu' %>
 
 <%= content_tag :ul, :id => :menu, :class => :menu_links do %>
@@ -14,8 +12,10 @@
     <%=raw '</ul></li>' if level <= prev_level %>
     <%=raw '</ul>' * (prev_level - level) if level < prev_level %>
 
-    <li id="category_<%= category.id %>" class="category">
-      <%= render :partial => 'sortable_nested_set/category', :object => category %>
+    <li id="category_<%= category.id %>" <%=raw 'class="category"' unless category == root %>>
+      <%= render :partial => 'sortable_nested_set/category',
+                 :object => category,
+                 :locals => {:show_mega_menu => (category != root)} %>
 
       <ul id="subcategories_<%= category.id %>" class="sub_menu_links">
         <%= content_tag :li, :class => :placeholder do %>
@@ -29,6 +29,8 @@
 <% end %>
 
 <% unless categories.empty? %>
+  <% cpath = categories.first.class.name.pluralize.underscore + '_path' %>
+
   <% for category_id in sortable_ids %>
     <%= sortable_element_reporting_target "items_#{category_id}",
                                           :moved,
@@ -36,7 +38,7 @@
                                           :dropOnEmpty => true,
                                           :method => :put,
                                           :tag => :div,
-                                          :url => sns_sort_items_categories_path %>
+                                          :url => send("sns_sort_items_#{cpath}") %>
   <% end %>
 
   <%= sortable_element_reporting_target   :menu,
@@ -47,5 +49,5 @@
                                           :method => :put,
                                           :only => [ :category, :placeholder ],
                                           :tree => true,
-                                          :url => sns_sort_categories_categories_path(:root => root) %>
+                                          :url => send("sns_sort_categories_#{cpath}", :root => root) %>
 <% end %>

data/lib/sortable_nested_set/handles_sortable_nested_set.rb

@@ -128,7 +128,7 @@ EOF
                           :partial => 'sortable_nested_set/toggle',
                           :locals => { :category_type => params[:category_type],
                                        :id => params[:id],
-                                       :state => (params[:state] == 'open' ? 'closed' : 'open') }
+                                       :state => (params[:state] == :open ? :closed : :open) }
       end
     end
 

data/lib/sortable_nested_set/routes.rb

@@ -1,7 +1,12 @@
 module ActionDispatch::Routing
   class Mapper
     def sortable_nested_set_for(category_type)
+      item_type = category_type.to_s.classify.constantize.sns_items_type
+
       resources category_type do
+        resources category_type, :as => "sub#{category_type}"
+        resources item_type
+
         member do
           get :sns_toggle
           get :sns_add_subcategory
@@ -15,7 +20,7 @@ module ActionDispatch::Routing
         end
       end
 
-      resources category_type.to_s.classify.constantize.sns_items_type do
+      resources item_type do
         delete :sns_destroy_item, :on => :member, :controller => category_type
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 24
-  version: 0.1.24
+  - 25
+  version: 0.1.25
 platform: ruby
 authors: 
 - Jason Murad
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -04:00
+date: 2010-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency