sortable_nested_set 0.1.26 → 0.2.2

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/Gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+gem "nested_set"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "shoulda", ">= 0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.1"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,62 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    nested_set (1.6.1)
+      activerecord (>= 3.0.0)
+      railties (>= 3.0.0)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rcov (0.9.9)
+    shoulda (2.11.3)
+    thor (0.14.6)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.5.1)
+  nested_set
+  rcov
+  shoulda

data/README

@@ -1,3 +1,29 @@
-To copy support files (images, stylesheets, javascript, etc.), run:
+jQuery is required.
 
-rake sortable_nested_set:sync
+In the Gemfile
+  gem 'sortable_nested_set'
+
+In each "Category" model (e.g. "Directory"):
+  acts_as_sortable_nested_set_of :items
+where :items is the pluralized Item model (e.g. "File").
+
+In each "Category" controller:
+  handles_sortable_nested_set
+to include menu actions.
+
+In the routes config file:
+  sortable_nested_set_for :categories
+for each pluralized "Category" model.
+
+In each "Category" migration:
+  name:string
+  lft:integer
+  rgt:integer
+
+In each "Item" migration:
+  position:integer
+
+Helpers:
+  sns_options
+  sns_lineage
+  sortable_nested_set_tree

data/README.rdoc

@@ -0,0 +1,19 @@
+= sortable_nested_set
+
+Description goes here.
+
+== Contributing to sortable_nested_set
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2010 Jason Murad. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -0,0 +1,53 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "sortable_nested_set"
+  gem.homepage = "http://github.com/jrmurad/sortable_nested_set"
+  gem.license = "MIT"
+  gem.summary = %Q{reusable menu for navigation and modification or hierarchical categories}
+  gem.description = %Q{reusable menu for navigation and modification or hierarchical categories}
+  gem.email = "jason@thriess.com"
+  gem.authors = ["Jason Murad"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "sortable_nested_set #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.2.2

data/app/helpers/sortable_nested_set_helper.rb

@@ -1,36 +1,39 @@
-require 'awesome_nested_set/helper'
-include CollectiveIdea::Acts::NestedSet::Helper
-
 module SortableNestedSetHelper
   def sortable_nested_set_tree(class_or_category)
     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.for_indented_list_with_items.all
     else
       @category_class = class_or_category.class
-      @categories = class_or_category.self_and_descendants_with_items
-      @root = class_or_category
+      @categories = class_or_category.self_and_descendants.for_indented_list_with_items
     end
 
-    @sortable_ids = @categories.collect(&:id)
-
-    render 'sortable_nested_set/tree',
-           :category_class => @category_class,
-           :categories => @categories,
-           :sortable_ids => @sortable_ids,
-           :root => @root
+    render 'sortable_nested_set/tree', :categories => @categories, :category_class => @category_class
   end
 
-  def sns_lineage(category, options=Hash.new)
-    content_tag :p, category.lineage(options).collect { |a| link_to(a.name, a) }
-                                             .join(image_tag('folder_closed.png', :class => :descent)).html_safe
+  def sns_lineage(category, options={})
+    content_for :head do
+      stylesheet_link_tag 'sortable_nested_set'
+    end
+
+    ancestors = category.send(options[:include_self] ? :self_and_ancestors : :ancestors)
+
+    links = ancestors.select([:id, :name]).collect do |c|
+      link_to(c.name, c, :class => :lineage)
+    end
+
+    content_tag :p, links.join.html_safe unless links.empty?
   end
 
-  def sns_options(class_or_category, mover=nil)
-    nested_set_options(class_or_category, mover) do |category, descendants, level|
-      "#{'.' * level} #{category.name}"
+  def sns_options(category_class, mover=nil)
+    options = []
+
+    category_class.each_with_level(category_class.for_indented_list) do |category, level|
+      if mover.nil? || mover.new_record? || mover.move_possible?(category)
+        options << ['.' * level + category.name, category.id]
+      end
     end
+
+    options
   end
 end
-
-ActionView::Base.send :include, SortableNestedSetHelper

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

@@ -1,31 +1,18 @@
-<% cpath = category.class.name.underscore + '_path' %>
-
-<%= render 'sortable_nested_set/toggle',
-           :category_type => category.class.name.underscore,
-           :id => category.id,
-           :state => :open %>
-
-<%= content_tag :span, category, :class => :handle %>
-
-<% 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 %>
+<div>
+  <span class="toggle open"></span>
+  <span class="handle"><%= category %></span>
+  <span class="mega_menu"></span>
+  <div class="mega_menu_links">
     <%= 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 'edit', send("edit_#{@cpath}", category) %> |
+    <%= link_to 'remove',
+                send("sns_destroy_category_#{@cpath}", category),
+                :confirm => 'Are you sure?',
+                :method => :delete,
+                :remote => !current_page?(send(@cpath, category)) %> |
     <%= 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 %>
-<% end %>
-
-<%= content_tag :div, :id => "items_#{category.id}", :class => :items do %>
-  <%= render :partial => 'sortable_nested_set/item', :collection => category.sns_items %>
-<% end %>
+                send("sns_add_subcategory_#{@cpath}", category) %> |
+    <%= link_to "add #{category.class.sns_items_type.to_s.singularize}",
+                send("sns_add_item_#{@cpath}", category) %>
+  </div>
+</div>

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

@@ -1,16 +1,15 @@
-<%= content_tag :div, :id => "item_#{item.id}", :class => :item do %>
-  <%= content_tag :span, item, :class => :handle %>
-
-  <%= content_tag :span, link_to('-', item), :id => "toggle_actions_item_#{item.id}", :class => :mega %>
-
-  <%= content_tag :div, :id => "actions_item_#{item.id}", :class => :links do %>
-    <%= link_to 'show', item %> |
-    <%= link_to 'edit', send("edit_#{item.class.name.underscore}_path", item) %> |
-    <%= link_to 'remove',
-                send("sns_destroy_item_#{item.class.name.underscore}_path", item),
-                :confirm => 'Are you sure?',
-                :method => :delete,
-                :remote => true %>
-  <% end %>
-<% end %>
-
+<li id="<%= "#{item.class.name.underscore}_#{item.id}" %>" class="item">
+  <div>
+    <div class="handle"><%= item %></div>
+    <span class="mega_menu"></span>
+    <div class="mega_menu_links">
+      <%= link_to 'show', item %> |
+      <%= link_to 'edit', send("edit_#{item.class.name.underscore}_path", item) %> |
+      <%= link_to 'remove',
+                  send("sns_destroy_item_#{item.class.name.underscore}_path", item),
+                  :confirm => 'Are you sure?',
+                  :method => :delete,
+                  :remote => true %>
+    </div>
+  </div>
+</li>

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

@@ -1,53 +1,23 @@
-<%= 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 %>
-  <%= content_tag :li, nil, :class => :placeholder unless local_assigns[:root] %>
+<% content_for :head do %>
+  <%= stylesheet_link_tag 'sortable_nested_set' %>
+  <%= javascript_include_tag 'sortable_nested_set' %>
+<% end %>
 
-  <% prev_level = -1 %>
+<% @cpath = category_class.name.underscore + '_path' %>
+<% prev_level = -1 %>
 
+<ol id="menu" class="sortable" data-url="<%= send "sns_sort_#{category_class.name.underscore.pluralize}_path" %>">
   <% category_class.each_with_level(categories) do |category, level| %>
-    <%=raw '</ul></li>' if level <= prev_level %>
-    <%=raw '</ul>' * (prev_level - level) if level < prev_level %>
-
-    <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)} %>
+    <%=raw '</ol></li>' if level <= prev_level %>
+    <%=raw '</ol>' * (prev_level - level) if level < prev_level %>
 
-      <ul id="subcategories_<%= category.id %>" class="sub_menu_links">
-        <%= content_tag :li, :class => :placeholder do %>
-          <%= content_tag :span, nil, :class => :handle %>
-        <% end %>
+    <li id="<%= category_class.name.underscore %>_<%= category.id %>" class="category">
+      <%= render :partial => 'sortable_nested_set/category', :object => category %>
+      <ol>
+        <%= render :partial => 'sortable_nested_set/item', :collection => category.sns_items %>
 
     <% prev_level = level %>
   <% end %>
 
-  <%=raw '</ul></li>' * (prev_level + 1) if prev_level > -1 %>
-<% 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,
-                                          :containment => sortable_ids.collect { |cid| "items_#{cid}" },
-                                          :dropOnEmpty => true,
-                                          :method => :put,
-                                          :tag => :div,
-                                          :url => send("sns_sort_items_#{cpath}") %>
-  <% end %>
-
-  <%= sortable_element_reporting_target   :menu,
-                                          :moved,
-                                          :ghosting => true,
-                                          :handle => :handle,
-                                          :hoverclass => "'hovered'",
-                                          :method => :put,
-                                          :only => [ :category, :placeholder ],
-                                          :tree => true,
-                                          :url => send("sns_sort_categories_#{cpath}", :root => root) %>
-<% end %>
+  <%=raw '</ol></li>' * (prev_level + 1) if prev_level > -1 %>
+</ol>

data/app/views/sortable_nested_set/sns_destroy_category.js.erb

@@ -0,0 +1 @@
+$('#category_<%= @category.id %>').remove();

data/app/views/sortable_nested_set/sns_destroy_item.js.erb

@@ -0,0 +1 @@
+$('#item_<%= @item.id %>').remove();

data/lib/sortable_nested_set/acts_as_sortable_nested_set.rb

@@ -1,15 +1,14 @@
-require 'awesome_nested_set'
+require 'nested_set'
 include CollectiveIdea::Acts::NestedSet
 
 module SortableNestedSet
   def self.included(base)
     base.extend ClassMethods
+    base.send :include, InstanceMethods
   end
 
   module ClassMethods
     def acts_as_sortable_nested_set_of(items_type)
-      send :include, InstanceMethods
-
       @subcategories_type = "sub#{name.tableize}".to_sym
       @items_type = items_type
 
@@ -25,40 +24,36 @@ module SortableNestedSet
 
       acts_as_nested_set :parent_column => name.foreign_key
 
-      belongs_to name.underscore
+      attr_accessible parent_column_name
+
+      belongs_to name.underscore.to_sym
 
       has_many @subcategories_type, :class_name => name, :dependent => :destroy
       has_many @items_type, :order => :position, :dependent => :destroy
+
+      scope :for_indented_list,
+            :select => [parent_column_name, :id, :name, left_column_name, right_column_name],
+            :order => left_column_name
+      scope :for_indented_list_with_items, lambda { self.for_indented_list.includes(sns_items_type) }
     end
   end
 
   module InstanceMethods
-    def self_and_descendants_with_items
-      nested_set_scope.scoped :include => self.class.sns_items_type, :conditions => [
-        "#{self.class.quoted_table_name}.#{quoted_left_column_name} >= ? AND
-         #{self.class.quoted_table_name}.#{quoted_right_column_name} <= ?", left, right
-      ]
-    end
-
-    def lineage(options=Hash.new)
-      conditions = [ 'lft <= ? AND rgt >= ?', lft, rgt ]
-      unless options[:include_self] == true
-        conditions[0] << ' AND id != ?'
-        conditions << id
+    def move(parent, children)
+      if children.size == 1
+        move_to_child_of(parent)
+      else
+        prev_sibling = nil
+
+        for i in 0...children.size
+          if children[i] == id
+            prev_sibling ? move_to_right_of(prev_sibling) : move_to_left_of(children[i+1])
+            break
+          end
+
+          prev_sibling = children[i]
+        end
       end
-
-      self.class.find(:all, :select => 'id, name', :conditions => conditions, :order => 'lft ASC')
-    end
-
-    # descendents() does "SELECT *" but only id field required
-    def descendant_subcategory_ids(options=Hash.new)
-      conditions = [ 'lft >= ? AND rgt <= ?', lft, rgt ]
-      unless options[:include_self] == true
-        conditions[0] << ' AND id != ?'
-        conditions << id
-      end
-
-      self.class.find(:all, :select => :id, :conditions => conditions).collect(&:id)
     end
   end
 end

data/lib/sortable_nested_set/engine.rb

@@ -1,13 +1,7 @@
-require 'sortable_nested_set'
-require 'rails'
-
 module SortableNestedSet
   class Engine < Rails::Engine
     initializer 'sortable_nested_set.add_middleware' do |app|
       app.middleware.use ActionDispatch::Static, "#{root}/public"
     end
-    config.to_prepare do
-      ApplicationController.helper(SortableNestedSetHelper)
-    end
   end
 end