lolita-menu 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/app/models/menu_item.rb

@@ -9,6 +9,7 @@ class MenuItem < ActiveRecord::Base
   validates :url, :format => {:with => /^(\/)|(http).*/}, :unless=>:root?
 
   before_create :set_default_positions
+  before_save :normalize_url
   after_create :put_in_place
   before_validation :set_default_values, :if=>:new_record?
 
@@ -30,7 +31,7 @@ class MenuItem < ActiveRecord::Base
   # instance methods
 
   def active?(request,options={})
-    active_item = self_and_all_children.detect{|item|
+    active_item = self_and_descendants.detect{|item|
       item.url_match?(request,options[:fullpath])
     }
     
@@ -38,9 +39,8 @@ class MenuItem < ActiveRecord::Base
   end
 
   def url_match?(request,fullpath=false)
-    
-    if self.url.match(/^http/)
-      self.url==request.url
+    if self.url.strip.match(/^http/)
+      self.url.strip==request.url
     else
       only_path = (fullpath ? request.fullpath : request.path).gsub(/\?.*/,"")
       self.real_url(request.params) == only_path
@@ -48,7 +48,7 @@ class MenuItem < ActiveRecord::Base
   end
 
   def real_url(params)
-    self.url.gsub(/(:\w+)\/?/) do |m|
+    self.url.strip.gsub(/(:\w+)\/?/) do |m|
       params_key = $1.gsub(":","").to_sym
       params.has_key?(params_key) ? "#{params[params_key]}#{m[m.size-1]=="/" ? "/" : ""}" : ""
     end
@@ -78,11 +78,11 @@ class MenuItem < ActiveRecord::Base
     @children
   end
 
-  def self_and_all_children
-    @self_and_all_children||=self.class.where("lft>=:left AND rgt<=:right AND menu_id=:menu",{
+  def self_and_descendants
+    @self_and_descendants||=self.class.where("lft>=:left AND rgt<=:right AND menu_id=:menu",{
       :left => self.lft,:right => self.rgt, :menu=>self.menu_id 
     }).order("lft asc")
-    @self_and_all_children
+    @self_and_descendants
   end
 
   def root
@@ -159,4 +159,8 @@ class MenuItem < ActiveRecord::Base
     self.url||="/"
   end
 
+  def normalize_url
+    self.url = self.url.to_s.strip
+  end
+
 end

data/app/views/components/lolita/menu_items/_display.html.haml

@@ -1,7 +1,7 @@
 %button{:class => "add_new_menu_item",:"data-id" => menu.id,:"data-url" => menu_items_path(:menu_id=>menu.id)}
-  = "Pievienot jaunu"
+  = t("lolita.menu.add_new")
 %button{:class => "save_menu_tree", :"data-id" => "menu_tree_#{menu.id}"}
-  = "Saglabāt izvēlni"
+  = t("lolita.menu.save_menu")
 %ol{:class=>"menu-items-tree", :id=>"menu_tree_#{menu.id}", :"data-url"=>update_tree_menu_items_path(:menu_id=>menu.id)}
   - menu.children.each do |item|
     = render_component "lolita/menu_items", :row, :item => item, :menu => menu

data/config/locales/en.yml

@@ -4,4 +4,6 @@ en:
       notice: "Menu saved."
       error: "Couldn't save a menu. Try again."
       "branch created": "New menu item created."
-      "branch deleted": "Menu item deleted."
+      "branch deleted": "Menu item deleted."
+      add_new: "Add new"
+      save_menu: "Save menu"      

data/config/locales/lv.yml

@@ -4,4 +4,6 @@ lv:
       notice: "Izvēlne veiksmīgi saglabāta."
       error: "Izvēlni neizdevās saglabāt. Mēģiniet vēlreiz."
       "branch created": "Jauns izvēlnes sadaļa izveidota."
-      "branch deleted": "Izvēlnes sadaļa dzēsta."
+      "branch deleted": "Izvēlnes sadaļa dzēsta."
+      add_new: "Pievienot jaunu"
+      save_menu: "Saglabāt izvēlni"

data/lolita-menu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-menu}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = %q{2011-06-10}
+  s.date = %q{2011-08-11}
   s.description = %q{Manage public menus for each project inside Lolita.}
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-menu
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-10 00:00:00.000000000 +03:00
+date: 2011-08-11 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &84038000 !ruby/object:Gem::Requirement
+  requirement: &74478890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *84038000
+  version_requirements: *74478890
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &84037150 !ruby/object:Gem::Requirement
+  requirement: &74478580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84037150
+  version_requirements: *74478580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84036530 !ruby/object:Gem::Requirement
+  requirement: &74478210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *84036530
+  version_requirements: *74478210
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &84035790 !ruby/object:Gem::Requirement
+  requirement: &74477880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84035790
+  version_requirements: *74477880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &84035230 !ruby/object:Gem::Requirement
+  requirement: &74476870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *84035230
+  version_requirements: *74476870
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &84034600 !ruby/object:Gem::Requirement
+  requirement: &74476210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84034600
+  version_requirements: *74476210
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &84033680 !ruby/object:Gem::Requirement
+  requirement: &74475510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84033680
+  version_requirements: *74475510
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84032930 !ruby/object:Gem::Requirement
+  requirement: &74474950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *84032930
+  version_requirements: *74474950
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &84032030 !ruby/object:Gem::Requirement
+  requirement: &74452710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *84032030
+  version_requirements: *74452710
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &84024430 !ruby/object:Gem::Requirement
+  requirement: &74452180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84024430
+  version_requirements: *74452180
 description: Manage public menus for each project inside Lolita.
 email: support@ithouse.lv
 executables: []
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 795611633
+      hash: -50740721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: