lolita-menu 0.1.6 → 0.1.7

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -1,14 +1,18 @@
 source "http://rubygems.org"
 
-gem 'lolita','~>3.2.0.rc.6'
+
+if File.exist?(File.expand_path('../lolita'))
+  gem 'lolita', :path=>File.expand_path('../../lolita',__FILE__)
+else
+  gem 'lolita','~>3.2.0.rc.9'
+end
 
 group :development, :test do
-  gem 'rspec', '~>2.6.0'
+  gem "rails", "~>3.2.0"
+  gem 'rspec', '~>2.9.0'
   gem "sqlite3"
-  gem 'rspec-rails', '~>2.6.0'
+  gem 'rspec-rails', '~>2.9.0'
   gem 'haml-rails'
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
-  gem "rcov", ">= 0"
+	gem "database_cleaner", "~>0.6.7"
 end

data/README.rdoc

@@ -7,7 +7,7 @@ In your project Gemfile put
 And run
   bundle install
 Like with other Lolita gems call
-  rails g lolita_menu:install
+  rails g lolita:menu:install
 Since this gem comes with migrations
   rake db:migrate 
 === Using autocomplete

data/Rakefile

@@ -33,13 +33,6 @@ Rake::TestTask.new(:test) do |test|
   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'

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/app/assets/javascripts/lolita/menu/menu-items.js

@@ -15,7 +15,7 @@ $(document).ready(function(){
     }
   }
 
-  $("ol.menu-items-tree").nestedSortable({
+  $("ol.nested-tree-items-tree").nestedSortable({
     disableNesting: 'no-nest',
     forcePlaceholderSize: true,
     handle: 'div',
@@ -33,23 +33,23 @@ $(document).ready(function(){
     }
   })
 
-  $("ol.menu-items-tree").each(function(){
+  $("ol.nested-tree-items-tree").each(function(){
     $(this).data("old_positions",$(this).nestedSortable("serialize"))
   })
 
   $(".openable-row").click(function(event){
     var that=this
     $(".subrow").hide(0)
-    $("#menu_items_"+$(this).attr("data-id")).show(0);
+    $("#branch_"+$(this).attr("data-id")).show(0);
     
     //event.preventDefault();
   })
 
-  $(".add_new_menu_item").click(function(){
+  $(".add_new_nested_tree_item").click(function(){
     $.ajax({
       url:$(this).attr("data-url"),
       type:"post",
-      context: $("#menu_tree_"+$(this).attr("data-id")),
+      context: $("#nested_tree_"+$(this).attr("data-id")),
       dataType:"html",
       success:function(html_data){
         $(this).append(html_data)
@@ -57,7 +57,7 @@ $(document).ready(function(){
     })
   })
 
-  $(".delete-menu-item").live("click",function(){
+  $(".delete-nested-tree-item").live("click",function(){
     var self = this;
     $.ajax({
       url:$(this).attr("data-url"),
@@ -65,29 +65,26 @@ $(document).ready(function(){
       dataType: "json",
       success:function(data){
         $($(self).attr("data-row")).remove();
-        save_menu_tree($($(self).attr("data-menu")));
+        save_menu_tree($($(self).attr("data-scope")));
       }
     })
   })
 
-  $(".save_menu_tree").click(function(){
-    save_menu_tree($(this).attr("data-id"))
-  })
-
-  $(".menu-tree-content input").live("focus",function(){
+  $(".nested-tree-content input").live("focus",function(){
     $(this).data("value",$(this).val())
   })
 
-  $(".menu-tree-content input").live("blur",function(){
+  $(".nested-tree-content input").live("blur",function(){
     var input=$(this);
     if(input.data("value")!=input.val()){
+      var match = input.attr("name").match(/\[(\w+)\]$/);
       input.data("value",input.val())
       $.ajax({
-        url:input.attr("data-url"),
+        url: input.closest("form").attr("action"),
         type:"put",
         context:$(this),
         dataType:"json",
-        data:{attribute:input.attr("name"),value:input.val()},
+        data:{attribute: match[1], value: input.val()},
         success:function(data){
           var color=(data.status=="error" ? "#ff5656" : "#aaff56");
           $(this).css("backgroundColor",color);
@@ -96,4 +93,4 @@ $(document).ready(function(){
       })
     }
   })
-})
+})

data/app/assets/stylesheets/lolita/menu/application.css

@@ -1,13 +1,16 @@
-/*
-*=require_directory ./jquery-ui
-*/
-ol.menu-items-tree li{
+ol.nested-tree-items-tree li{
   list-style:none;
   width:390px;
 }
-div.menu-tree-content{
+div.nested-tree-content{
   width:500px;
 }
+#main div.nested-tree-content form {
+  background: none;
+  float: left;
+  padding: 0;
+  margin-right: 10px;
+}
 li.placeholder{
   background-color:white;
 }
@@ -16,4 +19,4 @@ input.url-input{
 }
 .list table tbody tr.subrow:hover{
   background:none !important;
-}
+}

data/app/controllers/menu_items_controller.rb

@@ -1,53 +1,11 @@
 # encoding: utf-8
-class MenuItemsController < ActionController::Base
-  include Lolita::Controllers::UserHelpers
-  include Lolita::Controllers::InternalHelpers
+class MenuItemsController < NestedTreesController
 
   before_filter :authenticate_lolita_user!
   
   def autocomplete_menu_item_url
+    authorization_proxy.authorize!(:read, Menu)
     urls = Lolita::Menu::Autocomplete::Collector.new(params[:term])
     render :json => urls.to_json
   end
-
-  def create
-    menu=Menu.find_by_id(params[:menu_id])
-    item=MenuItem.create!(:name=>"new item",:url=>"/",:menu_id => params[:menu_id])
-    menu.append(item)
-    notice(I18n.t("lolita.menu.branch created"))
-    render_component "lolita/menu_items", :row, :item => item, :menu => menu
-  end
-
-  def update
-    if item=MenuItem.find_by_id(params[:id])
-      item.send(:"#{params[:attribute]}=",params[:value])
-      item.save
-      render :json=>{:status=>item.errors.any? ? "error" : "saved"}
-    else
-      render :json=>{:status=>"error"}
-    end
-  end
-
-  def update_tree
-    menu=Menu.find_by_id(params[:menu_id])
-
-    if menu && menu.update_whole_tree(params[:items])
-      notice I18n.t("lolita.menu.notice")
-    else
-      error I18n.t("lolita.menu.error")
-    end
-
-    render :nothing=>true
-  end
-
-  def destroy
-    item=MenuItem.find_by_id(params[:id])
-    item.destroy
-    notice I18n.t("lolita.menu.branch deleted")
-    render :json=>{:id=>item.id}
-  end
-
-  def is_lolita_resource?
-    true
-  end 
 end

data/app/controllers/nested_trees_controller.rb

@@ -0,0 +1,86 @@
+class NestedTreesController < Lolita::RestController
+	include Lolita::ControllerAdditions
+
+  before_filter :authenticate_lolita_user!
+
+	def index
+		super
+	end
+
+	def create
+    authorization_proxy.authorize!(:create, tree_class)
+		item = tree_class.build_empty_branch(attributes.merge(scopes))
+    item.save!
+		item.reload
+    notice(I18n.t("lolita.nested_tree.branch created", :name => tree_class.model_name.human))
+		render_component "lolita/menu/nested_tree/branch_builder", :row, :item => item, :scope => scope
+	end
+
+	def update
+    authorization_proxy.authorize!(:update,tree_class)
+		if params[:attribute].present? && item = tree_class.find_by_id(params[:id]) 
+      item.send(:"#{params[:attribute]}=",params[:value])
+      item.save
+      render :json=>{:status=>item.errors.any? ? "error" : "saved"}
+		else
+      render :json=>{:status=>"error"}
+		end
+	end
+
+	def update_tree
+    authorization_proxy.authorize!(:update,tree_class)
+		if tree_class.update_whole_tree(params[:items], scopes)
+      notice I18n.t("lolita.nested_tree.notice", :name => tree_class.model_name.human)
+    else
+      error I18n.t("lolita.nested_tree.error", :name => tree_class.model_name.human)
+    end
+
+    render :nothing=>true
+	end
+
+	def destroy
+    authorization_proxy.authorize!(:destroy,tree_class)
+		item = tree_class.find_by_id(params[:id])
+		item.destroy
+    notice I18n.t("lolita.nested_tree.branch deleted", :name => tree_class.model_name.human)
+    render :json=>{:id=>item.id}
+	end
+
+  def lolita_mapping
+    @lolita_mapping ||= Lolita.mappings[resource_class.to_s.underscore.to_sym]
+  end
+
+  def resource_name
+		"nested_tree"
+  end
+
+	def resource_class
+		tree_class
+	end
+
+	private
+
+	# URL:
+	# /nested_trees?tree_class=MenuItem
+	def tree_class
+		@tree_class ||= params[:tree_class].constantize
+	end
+
+	def scopes
+		@scopes ||= tree_class.lolita_nested_tree.scope_keys.inject({}) do |result, key|
+			result[key] = params[key]
+			result
+		end
+	end
+
+	def scope
+		tree_class.lolita_nested_tree.scope_classes.first && tree_class.lolita_nested_tree.scope_classes.first.find_by_id(scopes.values.first)
+	end
+
+	def attributes
+		@attributes ||= tree_class.lolita.tabs.first.fields.inject({}) do |result, field|
+			result[field.name.to_sym] = params[field.name.to_sym]
+			result
+		end
+	end
+end

data/app/helpers/lolita/menu_helper.rb

@@ -0,0 +1,31 @@
+module Lolita
+	module MenuHelper
+		def lolita_menu_data_attributes_for_branch(scope)
+			if scope
+				key = self.resource_class.lolita_nested_tree.scope_key_for(scope.class)
+				{:"data-id" => scope.id, :"data-url" => nested_trees_path(key.to_sym => scope.id, :tree_class => resource_class.to_s)}
+			else
+				{:"data-id" => "", :"data-url" => nested_trees_path(:tree_class => resource_class.to_s)}
+			end
+		end
+
+		def lolita_menu_data_attributes_for_tree(scope)
+			if scope
+				key = self.resource_class.lolita_nested_tree.scope_key_for(scope.class)
+				{:id => "nested_tree_#{scope.id}", :"data-url" => update_tree_nested_trees_path(key.to_sym => scope.id, :tree_class => resource_class.to_s)}
+			else
+				{:id => "nested_tree_", :"data-url" => update_tree_nested_trees_path(:tree_class => resource_class.to_s)}
+			end
+		end
+
+		def lolita_menu_data_attributes_for_branch_delete(scope, item)
+			default = {:"data-url" => nested_tree_path(item.id, :tree_class => resource_class.to_s), :"data-row" => "#item-#{item.id}"}
+			if scope
+				key = self.resource_class.lolita_nested_tree.scope_key_for(scope.class)
+				default.merge({:"data-scope" => "#nested_tree_#{scope.id}"})
+			else
+				default.merge({:"data-scope" => "#nested_tree_"})
+			end
+		end
+	end
+end

data/app/models/menu.rb

@@ -1,140 +1,35 @@
 class Menu < ActiveRecord::Base
-  set_table_name "lolita_menus"
   
   has_many :items, :class_name => "MenuItem", :dependent => :destroy
 
   validates :name, :presence => true
 
-  after_create :create_root, :unless=>:have_root?
-
   include Lolita::Configuration
 
   lolita do
     list do
       column :name
-      builder :name=>"/lolita/menu",:state=>"list", :if=>{:state=>:display}
-    end
-    tab(:content) do
-      field :name
-    end
-  end
-
-  POSITION_ATTRIBUTES = {:left => :lft,:right => :rgt,:depth => :depth,:parent_id => :parent_id}
-  ROOT = "root"
-  NONE = "none"
-
-  def position_attributes
-    POSITION_ATTRIBUTES
-  end
-
-  def root
-    if item=self.items.first
-      item.root
-    end
-  end
-
-  def children
-    self.root.children
-  end
-
-  def append(item)
-    unless item.menu_id == self.id
-      item.menu_id = self.id
-      item.save!
-    end
-    self.root.append(item)
-    item.reload
-    item
-  end
-
-  def have_root?
-    !!self.root
-  end
-
-  def update_whole_tree(items)
-    begin
-      self.class.transaction do
-        update_all_items(items)
-        true
+      column :system_name
+      action :edit do 
+        title ::I18n.t("lolita.shared.edit")
+        url Proc.new{|view,record| view.send(:edit_lolita_resource_path, Lolita.mappings[:menu], :id => record.id)}
       end
-    end
-  end
-
-  protected
-
-
-  def update_all_items(items)
-    items_ids=items_with_acumulated_ids(items) do |item|
-      update_item(item)
-    end
-    remove_deleted_items(items_ids)
-  end
 
-  def items_with_acumulated_ids(items)
-    item_ids=[]
-    items.each do |key,item|
-      item_ids << item[:item_id]
-      yield item
-    end
-    return item_ids
-  end
-
-  def update_item(item)
-    if is_root?(item)
-      update_root(item)
-    else
-      update_branch(item)
-    end
-  end
-
-  def is_root?(item)
-    item[:item_id]==ROOT
-  end
-
-  def update_root(item)
-    MenuItem.update_all(update_values_for(item),"id=#{root.id}")
-  end
-
-  def update_branch(item)
-    MenuItem.update_all(update_values_for(item),"id=#{item[:item_id].to_i}")
-  end
-
-  def update_values_for(item)
-    values=[]
-    position_attributes.each do |attr_name,field|
-      value = value_for_attribute(attr_name,item)
-      values<<"#{field}=#{value}"
+      action :destroy do 
+        title ::I18n.t("lolita.shared.delete")
+        url Proc.new{|view,record| view.send(:lolita_resource_path,Lolita.mappings[:menu],:id => record.id)}
+        html :method => :delete, :confirm => ::I18n.t("lolita.list.confirm")
+      end
     end
-    values.join(", ")
-  end
-
-  def value_for_attribute(attr_name,item)
-    if item[attr_name]==NONE || !item[attr_name]
-      "NULL"
-    elsif item[attr_name]==ROOT
-      root.id
-    else
-      item[attr_name].to_i
+    tab(:content) do
+      field :name
+      field :system_name, :on => :create
     end
   end
 
-  def remove_deleted_items(ids)
-    deleted_ids=deleted_items_ids(ids)
-    if deleted_ids.any?
-      MenuItem.delete_all("id IN (#{deleted_ids.join(",")})")
+  class << self
+    def table_name
+      "lolita_menus"
     end
   end
-
-  def deleted_items_ids(ids)
-    ids = ids.map{|id| id=="root" ? root.id : id.to_i}
-    all_ids = MenuItem.where(:menu_id=>self.id).map{|item| item.id}
-    all_ids - ids
-  end
-
-  private
-
-  def create_root
-    MenuItem.create_root!(self)
-  end
-
 end