lolita-menu 0.3.6 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c32003725ace089823b958a151e48af409e4f6ee
+  data.tar.gz: 8e070736fa01c1271542089f3a3ca291246d0161
+SHA512:
+  metadata.gz: 233a2a06346cf39630c4c5a5a50d8821a8ab470773c6f80f2b31b593473c1e023615a96f6f82f1d5f9887ab70f1f9efc16495c868f6599c388d06262d041c5bd
+  data.tar.gz: cdeae6f3a7fcf2efe92b7d54a0337b49a69494e6445d6aa9ad6ddfbd6768253618d0aa9baf7709809cf579f48ec16f9f002de4d38ae6b4bb4fdf04020053962e

data/.gitignore

@@ -0,0 +1,47 @@
+# rcov generated
+test_orm/log/*.log
+test_orm/rails/log/*.log
+Gemfile.lock
+coverage
+.project
+.rvmrc
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+*.swp

data/Gemfile

@@ -1,13 +1,10 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem 'lolita','~>3.2.0.rc.14'
+gemspec
 
-group :development, :test do
-  gem "rails", "~>3.2.0"
-  gem 'rspec', '~>2.9.0'
-  gem "sqlite3"
-  gem 'rspec-rails', '~>2.9.0'
-  gem 'haml-rails'
-  gem "jeweler", "~> 1.6.0"
-	gem "database_cleaner", "~>0.6.7"
-end
+group :test do
+  gem 'rails', '~> 3.2.12'
+  gem 'sqlite3', '~> 1.3.7'
+  gem 'rspec-rails', '~> 2.14'
+	gem 'database_cleaner', '~> 1.0.1'
+end

data/Rakefile

@@ -1,46 +1,7 @@
 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 'rspec/core/rake_task'
 
-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 = "lolita-menu"
-  gem.homepage = "http://github.com/ithouse/lolita-menu"
-  gem.license = "MIT"
-  gem.summary = %Q{Menu managing plugin for Lolita.}
-  gem.description = %Q{Manage public menus for each project inside Lolita.}
-  gem.email = "support@ithouse.lv"
-  gem.authors = ["ITHouse","Arturs Meisters"]
-  # 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
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "lolita-menu #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/app/assets/javascripts/lolita/menu/autocomplete-rails.js

@@ -22,7 +22,7 @@ $(document).ready(function(){
 {
   var self = null;
   jQuery.fn.railsAutocomplete = function() {
-    return this.live('focus',function() {
+    return this.on('focus',this,function() {
       if (!this.railsAutoCompleter) {
         this.railsAutoCompleter = new jQuery.railsAutocomplete(this);
       }

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

@@ -11,7 +11,7 @@ $(document).ready(function(){
         success:function(){
           tree.data("old_positions",tree.nestedSortable('serialize'))
         }
-      })  
+      })
     }
   }
 
@@ -41,7 +41,7 @@ $(document).ready(function(){
     var that=this
     $(".subrow").hide(0)
     $("#branch_"+$(this).attr("data-id")).show(0);
-    
+
     //event.preventDefault();
   })
 
@@ -57,7 +57,7 @@ $(document).ready(function(){
     })
   })
 
-  $(".delete-nested-tree-item").live("click",function(){
+  $(document).on("click",".delete-nested-tree-item",function(){
     var self = this;
     $.ajax({
       url:$(this).attr("data-url"),
@@ -70,11 +70,11 @@ $(document).ready(function(){
     })
   })
 
-  $(".nested-tree-content input").live("focus",function(){
+  $(document).on("focus",".nested-tree-content input",function(){
     $(this).data("value",$(this).val())
   })
 
-  $(".nested-tree-content input").live("blur",function(){
+  $(document).on("blur",".nested-tree-content input",function(){
     var input=$(this);
     if(input.data("value")!=input.val()){
       var match = input.attr("name").match(/\[(\w+)\]$/);

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

@@ -1,7 +1,13 @@
+button.add_new_nested_tree_item {
+  margin-top: 10px;
+}
 ol.nested-tree-items-tree li{
   list-style:none;
   width:390px;
 }
+ol.nested-tree-items-tree{
+  margin-bottom: 10px;
+}
 div.nested-tree-content{
   width:500px;
 }
@@ -11,6 +17,21 @@ div.nested-tree-content{
   padding: 0;
   margin-right: 10px;
 }
+#main div.nested-tree-content form input {
+border: 1px solid #cdcdcd;
+-moz-border-radius: 3px;
+-webkit-border-radius: 3px;
+border-radius: 3px;
+-moz-box-sizing: border-box;
+-webkit-box-sizing: border-box;
+box-sizing: border-box;
+padding: 3px 10px;
+color: #494949;
+}
+#main div.nested-tree-content span img {
+  position: relative;
+  top: 4px;
+}
 li.placeholder{
   background-color:white;
 }

data/app/controllers/menu_items_controller.rb

@@ -3,6 +3,10 @@ class MenuItemsController < NestedTreesController
 
   before_filter :authenticate_lolita_user!
   
+  def index
+    super
+  end
+  
   def autocomplete_menu_item_url
     authorization_proxy.authorize!(:read, Menu)
     urls = Lolita::Menu::Autocomplete::Collector.new(params[:term])

data/app/controllers/nested_trees_controller.rb

@@ -1,86 +1,86 @@
 class NestedTreesController < Lolita::RestController
-	include Lolita::ControllerAdditions
+  include Lolita::ControllerAdditions
 
   before_filter :authenticate_lolita_user!
 
-	def index
-		super
-	end
+  def index
+    super
+  end
 
-	def create
+  def create
     authorization_proxy.authorize!(:create, tree_class)
-		item = tree_class.build_empty_branch(attributes.merge(scopes))
+    item = tree_class.build_empty_branch(attributes.merge(scopes))
     item.save!
-		item.reload
+    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
+    render_component "lolita/menu/nested_tree/branch_builder", :row, :item => item, :scope => scope
+  end
 
-	def update
+  def update
     authorization_proxy.authorize!(:update,tree_class)
-		if params[:attribute].present? && item = tree_class.find_by_id(params[:id]) 
+    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
+    else
       render :json=>{:status=>"error"}
-		end
-	end
+    end
+  end
 
-	def update_tree
+  def update_tree
     authorization_proxy.authorize!(:update,tree_class)
-		if tree_class.update_whole_tree(params[:items], scopes)
+    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
+  end
 
-	def destroy
+  def destroy
     authorization_proxy.authorize!(:destroy,tree_class)
-		item = tree_class.find_by_id(params[:id])
-		item.destroy
+    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
+  end
 
   def lolita_mapping
     @lolita_mapping ||= Lolita.mappings[resource_class.to_s.underscore.to_sym]
   end
 
   def resource_name
-		"nested_tree"
+    "nested_tree"
   end
 
-	def resource_class
-		tree_class
-	end
+  def resource_class
+    tree_class
+  end
 
-	private
+  private
 
-	# URL:
-	# /nested_trees?tree_class=MenuItem
-	def tree_class
-		@tree_class ||= params[:tree_class].constantize
-	end
+  # 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 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 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
+  def attributes
+    @attributes ||= tree_class.lolita.tabs.first.fields.inject({}) do |result, field|
+      result[field.name.to_sym] = params[field.name.to_sym] if params[field.name.to_sym]
+      result
+    end
+  end
 end

data/app/models/menu.rb

@@ -1,7 +1,6 @@
 class Menu < ActiveRecord::Base
-  
+  self.table_name = 'lolita_menus'
   has_many :items, :class_name => "MenuItem", :dependent => :destroy
-
   validates :name, :presence => true
 
   include Lolita::Configuration
@@ -27,9 +26,4 @@ class Menu < ActiveRecord::Base
     end
   end
 
-  class << self
-    def table_name
-      "lolita_menus"
-    end
-  end
 end

data/app/models/menu_item.rb

@@ -1,6 +1,7 @@
 class MenuItem < ActiveRecord::Base
-	include Lolita::Configuration
-	include Lolita::Menu::NestedTree
+  include Lolita::Configuration
+  include Lolita::Menu::NestedTree
+  self.table_name = 'lolita_menu_items'
   
   belongs_to :menu, :class_name => "Menu"
   attr_accessible :lft, :rgt, :depth, :parent_id, :menu_id, :url, :name
@@ -10,9 +11,9 @@ class MenuItem < ActiveRecord::Base
 
   before_save :normalize_url
   
-	lolita_nested_tree :scope => :menu, :build_method => :build_new_item
+  lolita_nested_tree :scope => :menu, :build_method => :build_new_item
 
-	lolita do
+  lolita do
     list do 
       action :edit do 
         title ::I18n.t("lolita.shared.edit")
@@ -25,20 +26,15 @@ class MenuItem < ActiveRecord::Base
         html :method => :delete, :confirm => ::I18n.t("lolita.list.confirm")
       end
     end
-		tab(:default) do
-			field :name
-			field :url do 
+    tab(:default) do
+      field :name
+      field :url do 
         builder :name => "/lolita/menu_item", :state => :display, :if => {:state => :display} 
       end
-		end
-	end
-
-  class << self
-
-    def table_name
-      "lolita_menu_items"
     end
+  end
 
+  class << self
     def build_new_item(attributes)
       self.new(attributes.merge(:url => "/", :name => ::I18n.t("lolita.menu_item.new")))
     end
@@ -51,9 +47,9 @@ class MenuItem < ActiveRecord::Base
     !!active_item
   end
 
-	def visible?
-		self.is_visible
-	end
+  def visible?
+    self.is_visible
+  end
 
   def url_match?(request,fullpath=false)
     if self.url.strip.match(/^http/)

data/app/views/components/lolita/menu/nested_tree/_display.html.haml

@@ -2,7 +2,6 @@
   = javascript_include_tag "lolita/menu/application.js"
 - content_for :style do
   = stylesheet_link_tag "lolita/menu/application.css"
-
 - has_scopes = list.dbi.klass.lolita_nested_tree.scope_keys.any?
 .box
   = render_component list, :title