navi 0.1.4 → 0.2.0

data/lib/navi/renderers/simple_navigation.rb

@@ -1,37 +1,11 @@
 module Navi
   module Renderers
-    class SimpleNavigation < Navi::Renderers::Base
-
-      def render(collection, *args)
-        options = Hash[*args]
-        options[:expand_all] ||= true
-        options[:items] ||= create_dynamic_items(collection)
-        @template.render_navigation options
-      end
-
-      private
-
-      # Create an array of hashes that can be easily fed into SimpleNavigation
-      # like in the following like:
-      # https://github.com/andi/simple-navigation/wiki/Dynamic-Navigation-Items
-      def create_dynamic_items(collection)
-        nav = []
-        collection.each do |nav_item|
-          item = {}
-          item[:key] = @template.dom_id(nav_item).to_sym
-          item[:name] = nav_item.label
-          if nav_item.url.is_a?(String)
-            item[:url] = nav_item.url
-          else # it's a database record then!
-            item[:url] = @template.polymorphic_path(nav_item.url)
-          end
-          item[:options] = {:title => nav_item.title, :class => nav_item.class.name.underscore}
-          item[:items] = create_dynamic_items(nav_item.children)
-
-          nav << item
-        end
-        nav
-      end
+    module SimpleNavigation
     end
   end
 end
+
+require 'navi/renderers/simple_navigation/renderer'
+require 'navi/renderers/simple_navigation/generates_uri'
+require 'navi/renderers/simple_navigation/dynamic_items'
+require 'navi/renderers/simple_navigation/dynamic_item'

data/lib/navi/renderers/simple_navigation/dynamic_item.rb

@@ -0,0 +1,18 @@
+module Navi
+  module Renderers
+    module SimpleNavigation
+      class DynamicItem < Hash
+
+        def initialize(template, nav_item, options={})
+          self[:key] = template.dom_id(nav_item).to_sym
+          self[:name] = nav_item.label
+          self[:url] = GeneratesUri.execute(template, nav_item, options)
+          self[:options] = {title: nav_item.title,
+                            class: nav_item.class.name.underscore}
+          self[:items] = DynamicItems.new(template, nav_item.children, options)
+        end
+
+      end
+    end
+  end
+end

data/lib/navi/renderers/simple_navigation/dynamic_items.rb

@@ -0,0 +1,26 @@
+# Create an array of hashes that can be easily fed into SimpleNavigation
+# like in the following like:
+# https://github.com/andi/simple-navigation/wiki/Dynamic-Navigation-Items
+module Navi
+  module Renderers
+    module SimpleNavigation
+      class DynamicItems < Array
+
+        def initialize(template, nav_items, options={})
+          @template = template
+          @options = options
+          nav_items.each do |nav_item|
+            self << dynamic_item_for(nav_item)
+          end
+        end
+
+        private
+
+        def dynamic_item_for(nav_item)
+          DynamicItem.new @template, nav_item, @options
+        end
+
+      end
+    end
+  end
+end

data/lib/navi/renderers/simple_navigation/generates_uri.rb

@@ -0,0 +1,32 @@
+module Navi
+  module Renderers
+    module SimpleNavigation
+      class GeneratesUri
+        easy_class_to_instance
+
+        def initialize(template, nav_item, options={})
+          @template = template
+          @nav_item = nav_item
+          @namespace = options[:namespace]
+        end
+
+        def execute
+          url.is_a?(String) ? url : generated_path
+        end
+
+        private
+
+        def url
+          @nav_item.url
+        end
+
+        def generated_path
+          args = [@namespace].flatten.compact
+          args << url
+          @template.polymorphic_path(args)
+        end
+
+      end
+    end
+  end
+end

data/lib/navi/renderers/simple_navigation/renderer.rb

@@ -0,0 +1,27 @@
+module Navi
+  module Renderers
+    module SimpleNavigation
+      class Renderer < Navi::Renderers::Base
+
+        def render(collection, *args)
+          options = Hash[*args]
+          options[:expand_all] ||= true
+
+          @dynamic_items_options = {}
+          @dynamic_items_options[:namespace] = options.delete(:namespace)
+
+          options[:items] ||= create_dynamic_items(collection)
+
+          template.render_navigation options
+        end
+
+        private
+
+        def create_dynamic_items(collection)
+          DynamicItems.new(template, collection, @dynamic_items_options)
+        end
+
+      end
+    end
+  end
+end

data/lib/navi/version.rb

@@ -1,3 +1,3 @@
 module Navi
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/navi.gemspec

@@ -22,31 +22,20 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activesupport", [">= 3.0.0"]
   s.add_runtime_dependency "activerecord", [">= 3.0.0"]
   s.add_runtime_dependency "ordered_tree", [">= 0.1.6"]
+  s.add_runtime_dependency 'simple-navigation', ['~> 3.11.0']
+  s.add_runtime_dependency 'easy_class_to_instance_method', '0.0.1'
 
-  s.add_development_dependency "rspec", ["~> 2.6.0"]
-  s.add_development_dependency "bundler", "~> 1.0.0"
-  s.add_development_dependency "simple-navigation", ["3.2.0"]
-  s.add_development_dependency 'inherited_resources', ["~> 1.3.0"]
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'libnotify'
-  s.add_development_dependency 'rb-inotify'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'apotomo', ['~> 1.2.2']
   s.add_development_dependency 'rails', ['~> 3.2.0']
-  s.add_development_dependency 'haml'
-  s.add_development_dependency 'simple-navigation', ['3.2.0']
-  s.add_development_dependency 'jquery-rails', ['~> 2.0.0']
-  s.add_development_dependency 'rspec-rails', ['~> 2.6.1']
+  s.add_development_dependency 'jquery-rails', ['~> 2.2.1']
+  s.add_development_dependency 'rspec-rails', ['~> 2.13.2']
   s.add_development_dependency 'cucumber-rails', ['0.5.2']
   s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'capybara', [">= 1.0.0.rc1"]
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'guard-cucumber', ['0.3.4']
-  s.add_development_dependency 'libnotify'
-  s.add_development_dependency 'rb-inotify'
   s.add_development_dependency 'nifty-generators'
-  s.add_development_dependency 'factory_girl', '~> 2.5.1'
-  s.add_development_dependency 'ruby-debug19'
+  s.add_development_dependency 'factory_girl', '~> 4.2.0'
 end
-

data/spec/dummy/app/assets/javascripts/application.js

@@ -3,5 +3,5 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery_ujs
-//= require 'nestedSortable/jquery.ui.nestedSortable'
+//= require 'nestedSortable'
 //= require 'menu_items/index'

data/spec/dummy/app/controllers/categories_controller.rb

@@ -1,8 +1,8 @@
-class CategoriesController < InheritedResources::Base
+class CategoriesController < ApplicationController
+  respond_to :html
 
   def create
-    create! do |success, failure|
-      success.html {redirect_to categories_url}
-    end
+    @category = Category.create(params[:category])
+    respond_with @category, location: categories_path
   end
 end

data/spec/dummy/app/controllers/menu_items_controller.rb

@@ -1,11 +1,18 @@
-class MenuItemsController < InheritedResources::Base
+class MenuItemsController < ApplicationController
   has_widgets do |root|
     root << widget(:menu_editor)
   end
 
+  respond_to :html
+
+  def index
+    @menu_items = MenuItem.scoped
+    respond_with @menu_items
+  end
+
   def update
-    update! do |success, failure|
-      success.html {redirect_to menu_items_path}
-    end
+    @menu_item = MenuItem.find(params[:id])
+    @menu_item.update_attributes params[:menu_item]
+    respond_with @menu_item, location: menu_items_path
   end
 end

data/spec/dummy/app/controllers/pages_controller.rb

@@ -1,7 +1,8 @@
-class PagesController < InheritedResources::Base
+class PagesController < ApplicationController
+  respond_to :html
+
   def create
-    create! do |success, failure|
-      success.html {redirect_to pages_path}
-    end
+    @page = Page.create(params[:page])
+    respond_with @page, location: pages_path
   end
 end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
+  <%= stylesheet_link_tag 'application' %>
   <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tag %>
   <%= yield :header %>

data/spec/dummy/config/application.rb

@@ -7,7 +7,6 @@ Bundler.require
 # Don't know why I had to add these here, but did so because
 # Rails was complaining these things didn't exist.
 # Shouldn't Bundler be the one to load these in?
-require "inherited_resources"
 require "apotomo"
 
 module Dummy

data/spec/dummy/db/seeds.rb

@@ -6,10 +6,8 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => cities.first)
 
-require '../../spec/blueprints'
+FactoryGirl.create :page, :name => "Home"
+FactoryGirl.create :page, :name => "About"
 
-Factory :page, :name => "Home"
-Factory :page, :name => "About"
-
-Factory :category, :name => "Cars"
-Factory :category, :name => "Animals"
+FactoryGirl.create :category, :name => "Cars"
+FactoryGirl.create :category, :name => "Animals"

data/spec/dummy/vendor/assets/javascripts/nestedSortable.js

@@ -0,0 +1,382 @@
+/*
+ * jQuery UI Nested Sortable
+ * v 1.3.6 / 28 apr 2011
+ * http://mjsarfatti.com/sandbox/nestedSortable
+ *
+ * Depends:
+ *	 jquery.ui.sortable.js 1.8+
+ *
+ * License CC BY-SA 3.0
+ * Copyright 2010-2011, Manuele J Sarfatti
+ */
+
+(function($) {
+  $.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+    options: {
+      tabSize: 20,
+      disableNesting: 'ui-nestedSortable-no-nesting',
+      errorClass: 'ui-nestedSortable-error',
+      listType: 'ol',
+      maxLevels: 0,
+      revertOnError: 1
+    },//options
+    _create: function() {
+      this.element.data('sortable', this.element.data('nestedSortable'));
+      return $.ui.sortable.prototype._create.apply(this, arguments);
+    },//create
+    destroy: function() {
+      this.element
+        .removeData("nestedSortable")
+        .unbind(".nestedSortable");
+      return $.ui.sortable.prototype.destroy.apply(this, arguments);
+    },//destroy
+    _mouseDrag: function(event) {
+      //Compute the helpers position
+      this.position = this._generatePosition(event);
+      this.positionAbs = this._convertPositionTo("absolute");
+
+      if (!this.lastPositionAbs) {
+        this.lastPositionAbs = this.positionAbs;
+      }
+
+      //Do scrolling
+      if(this.options.scroll) {
+        var o = this.options, scrolled = false;
+        if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+
+          if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+            this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+          else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+            this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+
+          if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+            this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+          else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+            this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+
+        } else {
+
+          if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+            scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+          else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+            scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+
+          if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+            scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+          else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+            scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+
+        }
+
+        if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+          $.ui.ddmanager.prepareOffsets(this, event);
+      }
+
+      //Regenerate the absolute position used for position checks
+      this.positionAbs = this._convertPositionTo("absolute");
+
+      //Set the helper position
+      if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+      if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+
+      //Rearrange
+      for (var i = this.items.length - 1; i >= 0; i--) {
+
+        //Cache variables and intersection, continue if no intersection
+        var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+        if (!intersection) continue;
+
+        if(itemElement != this.currentItem[0] //cannot intersect with itself
+            && this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+            && !$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+            && (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
+            //&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+          ) {
+
+          $(itemElement).mouseenter();
+
+          this.direction = intersection == 1 ? "down" : "up";
+
+          if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+            $(itemElement).mouseleave();
+            this._rearrange(event, item);
+          } else {
+            break;
+          }
+
+          // Clear emtpy ul's/ol's
+          this._clearEmpty(itemElement);
+
+          this._trigger("change", event, this._uiHash());
+          break;
+        }
+      }
+
+      var parentItem = (this.placeholder[0].parentNode.parentNode
+        && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
+        ? $(this.placeholder[0].parentNode.parentNode)
+        : null,
+        level = this._getLevel(this.placeholder),
+        childLevels = this._getChildLevels(this.helper),
+        previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
+
+      if (previousItem != null) {
+        while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
+          if (previousItem[0].previousSibling) {
+            previousItem = $(previousItem[0].previousSibling);
+          } else {
+            previousItem = null;
+            break;
+          }
+        }
+      }
+
+      newList = document.createElement(o.listType);
+
+      this.beyondMaxLevels = 0;
+
+      // If the item is moved to the left, send it to its parent level
+      if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
+        parentItem.after(this.placeholder[0]);
+        this._clearEmpty(parentItem[0]);
+        this._trigger("change", event, this._uiHash());
+      }
+      // If the item is below another one and is moved to the right, make it a children of it
+      else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
+        this._isAllowed(previousItem, level+childLevels+1);
+        if (!previousItem.children(o.listType).length) {
+          previousItem[0].appendChild(newList);
+        }
+        previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+        this._trigger("change", event, this._uiHash());
+      }
+      else {
+        this._isAllowed(parentItem, level+childLevels);
+      }
+
+      //Post events to containers
+      this._contactContainers(event);
+
+      //Interconnect with droppables
+      if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+      //Call callbacks
+      this._trigger('sort', event, this._uiHash());
+
+      this.lastPositionAbs = this.positionAbs;
+      return false;
+    },//_mouseDrag
+    _mouseStop: function(event, noPropagation) {
+      // If the item is in a position not allowed, send it back
+      if (this.beyondMaxLevels) {
+
+        this.placeholder.removeClass(this.options.errorClass);
+
+        if (this.options.revertOnError) {
+          if (this.domPosition.prev) {
+            $(this.domPosition.prev).after(this.placeholder);
+          } else {
+            $(this.domPosition.parent).prepend(this.placeholder);
+          }
+          this._trigger("revert", event, this._uiHash());
+        } else {
+          var parent = this.placeholder.parent().closest(this.options.items);
+
+          for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
+            parent = parent.parent().closest(this.options.items);
+          }
+
+          parent.after(this.placeholder);
+          this._trigger("change", event, this._uiHash());
+        }
+      }
+
+      // Clean last empty ul/ol
+      for (var i = this.items.length - 1; i >= 0; i--) {
+        var item = this.items[i].item[0];
+        this._clearEmpty(item);
+      }
+
+      $.ui.sortable.prototype._mouseStop.apply(this, arguments);
+    },//_mouseStop
+    serialize: function(o) {
+      // 'o' is a hash of the options of the plugin (?)
+
+      // items is an array the dom elements lifted from the page, so we can work on them.
+      // It looks something like [li#menu_item_37.menu_item, li#menu_item_38.menu_item, ...]
+      var items = this._getItemsAsjQuery(o && o.connected),
+        str = []; o = o || {};
+
+      // Now we go through each of these items
+      $(items).each(function() {
+        var res = ($(o.item || this).attr(o.attribute || 'id') || '')
+          .match(
+            o.expression || (/(.+)[-=_](.+)/)),
+            pid = ($(o.item || this).parent(o.listType)
+              .parent('li')
+              .attr(o.attribute || 'id') || '')
+              .match(o.expression || (/(.+)[-=_](.+)/));
+
+        // At this point...
+        // 'res' looks like this: ["menu_item_47", "menu_item", "47"]
+        // pid looks like this, IF the item (res) has a parent: ["menu_item_46", "menu_item", "46"] 
+
+        // Here we setup the response's parent_id
+        if (res) {
+          // Updated the following line to have res[0] (instead of res[2]), which will make the itemName be menu_item_47
+          itemName = (o.key && o.expression ? res[1] : res[0]);
+
+          // itemScope looks like this: menu_item[menu_item_37]
+          itemScope = o.key || res[1] + '[' + itemName + ']'
+
+          //create the parentId string, which will look like menu_item[menu_item_37][parent_id]=root
+          parentStr = itemScope + '[parent_id]=' + (pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root')
+
+          //create the position string, which will look like menu_item[menu_item_37][position]=0
+          //this is 0-based position
+          positionStr = itemScope + '[position]=' + $(this).index();
+
+          //push the parentStr and positionStr strings into the str array
+          str.push(parentStr);
+          str.push(positionStr);
+        }
+      });
+
+      if(!str.length && o.key) {
+        str.push(o.key + '=');
+      }
+
+      return str.join('&');
+    },//serialize
+    toHierarchy: function(o) {
+      o = o || {};
+      var sDepth = o.startDepthCount || 0,
+          ret = [];
+
+      $(this.element).children('li').each(function () {
+        var level = _recursiveItems($(this));
+        ret.push(level);
+      });
+
+      return ret;
+
+      function _recursiveItems(li) {
+        var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+        if (id) {
+          var item = {"id" : id[2]};
+          if ($(li).children(o.listType).children('li').length > 0) {
+            item.children = [];
+            $(li).children(o.listType).children('li').each(function() {
+              var level = _recursiveItems($(this));
+              item.children.push(level);
+            });
+          }
+          return item;
+        }
+      }
+    },//toHierarchy
+    toArray: function(o) {
+      o = o || {};
+      var sDepth = o.startDepthCount || 0,
+          ret = [],
+          left = 2;
+
+      ret.push({
+        "item_id": 'root',
+        "parent_id": 'none',
+        "depth": sDepth,
+        "left": '1',
+        "right": ($('li', this.element).length + 1) * 2
+      });
+
+      $(this.element).children('li').each(function () {
+        left = _recursiveArray(this, sDepth + 1, left);
+      });
+
+      ret = ret.sort(function(a,b){ return (a.left - b.left); });
+
+      return ret;
+
+      function _recursiveArray(item, depth, left) {
+        var right = left + 1,
+            id,
+            pid;
+
+        if ($(item).children(o.listType).children('li').length > 0) {
+          depth ++;
+          $(item).children(o.listType).children('li').each(function () {
+            right = _recursiveArray($(this), depth, right);
+          });
+          depth --;
+        }
+
+        id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
+
+        if (depth === sDepth + 1) {
+          pid = 'root';
+        } else {
+          var parentItem = ($(item).parent(o.listType)
+              .parent('li')
+              .attr(o.attribute || 'id'))
+            .match(o.expression || (/(.+)[-=_](.+)/));
+          pid = parentItem[2];
+        }
+        if (id) {
+          ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+        }
+        left = right + 1;
+        return left;
+      } //_recursiveArray
+    },//toArray
+    _clearEmpty: function(item) {
+      var emptyList = $(item).children(this.options.listType);
+      if (emptyList.length && !emptyList.children().length) {
+        emptyList.remove();
+      }
+    },//_clearEmpty
+    _getLevel: function(item) {
+      var level = 1;
+      if (this.options.listType) {
+        var list = item.closest(this.options.listType);
+        while (!list.is('.ui-sortable')) {
+          level++;
+          list = list.parent().closest(this.options.listType);
+        }
+      }
+      return level;
+    }, //_getLevel
+    _getChildLevels: function(parent, depth) {
+      var self = this,
+      o = this.options,
+      result = 0;
+      depth = depth || 0;
+
+      $(parent).children(o.listType).children(o.items).each(function (index, child) {
+        result = Math.max(self._getChildLevels(child, depth + 1), result);
+      });
+
+      return depth ? result + 1 : result;
+    }, //_getChildLevels
+    _isAllowed: function(parentItem, levels) {
+      var o = this.options;
+      // Are we trying to nest under a no-nest or are we nesting too deep?
+      if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
+        if (o.maxLevels < levels && o.maxLevels != 0) {
+          this.placeholder.addClass(o.errorClass);
+          this.beyondMaxLevels = levels - o.maxLevels;
+        } else {
+          this.placeholder.removeClass(o.errorClass);
+          this.beyondMaxLevels = 0;
+        }
+      } else {
+        this.placeholder.addClass(o.errorClass);
+        if (o.maxLevels < levels && o.maxLevels != 0) {
+          this.beyondMaxLevels = levels - o.maxLevels;
+        } else {
+          this.beyondMaxLevels = 1;
+        }
+      }
+    } //_isAllowed
+  }));//widget
+  $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
+})(jQuery);