lolita-menu 0.0.8 → 0.0.9

data/History.rdoc

@@ -1,3 +1,11 @@
+=== Version 0.0.9 / 2011-06-10
+* Enhancements
+  * Active item detection based on request
+  * Item urls with arguments
+
+* Bug fixes
+  * Delete works on newely added items
+  
 === Version 0.0.8 / 2011-06-09
 * Enhancements
   * Delete functionality

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/app/models/menu.rb

@@ -44,6 +44,7 @@ class Menu < ActiveRecord::Base
     end
     self.root.append(item)
     item.reload
+    item
   end
 
   def have_root?

data/app/models/menu_item.rb

@@ -6,7 +6,7 @@ class MenuItem < ActiveRecord::Base
   belongs_to :menu, :class_name => "Menu"
 
   validates :name,:presence => true
-  validates :url, :format => {:with => /^\/.*/}, :unless=>:root?
+  validates :url, :format => {:with => /^(\/)|(http).*/}, :unless=>:root?
 
   before_create :set_default_positions
   after_create :put_in_place
@@ -29,6 +29,31 @@ class MenuItem < ActiveRecord::Base
   end
   # instance methods
 
+  def active?(request,options={})
+    active_item = self_and_all_children.detect{|item|
+      item.url_match?(request,options[:fullpath])
+    }
+    
+    !!active_item
+  endg
+
+  def url_match?(request,fullpath=false)
+    
+    if self.url.match(/^http/)
+      self.url==request.url
+    else
+      only_path = (fullpath ? request.fullpath : request.path).gsub(/\?.*/,"")
+      self.real_url(request.params) == only_path
+    end
+  end
+
+  def real_url(params)
+    self.url.gsub(/(:\w+)\/?/) do |m|
+      params_key = $1.gsub(":","").to_sym
+      params.has_key?(params_key) ? "#{params[params_key]}#{m[m.size-1]=="/" ? "/" : ""}" : ""
+    end
+  end
+
   def visible?
     self.is_visible
   end
@@ -53,6 +78,13 @@ 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",{
+      :left => self.lft,:right => self.rgt, :menu=>self.menu_id 
+    }).order("lft asc")
+    @self_and_all_children
+  end
+
   def root
     if self.parent_id.nil?
       self

data/lolita-menu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-menu}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   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-09}
+  s.date = %q{2011-06-10}
   s.description = %q{Manage public menus for each project inside Lolita.}
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ithouse/lolita-menu}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Menu managing plugin for Lolita.}
   s.test_files = [
     "spec/controllers/menu_items_controller_spec.rb",

data/public/javascripts/lolita/menu-items.js

@@ -57,7 +57,7 @@ $(document).ready(function(){
     })
   })
 
-  $(".delete-menu-item").click(function(){
+  $(".delete-menu-item").live("click",function(){
     var self = this;
     $.ajax({
       url:$(this).attr("data-url"),

data/spec/models/menu_item_spec.rb

@@ -6,6 +6,36 @@ describe MenuItem do
     MenuItem.create!(:name=>"item",:url=>"/")
   end
 
+  describe "recognize active item" do
+
+    let(:menu){Menu.create!(:name=>"new menu")}
+
+    let(:request){
+      mock_obj = mock(Object)
+      mock_obj.stub!(:params).and_return({})
+      mock_obj
+    }
+
+    it "should recognize full paths" do
+      item = menu.append(MenuItem.create!(:name => "Name", :url => "http://google.lv"))
+      request.stub!(:url).and_return("http://google.lv")
+      item.active?(request).should be_true
+    end
+
+    it "should recognize relative paths" do
+      item = menu.append(MenuItem.create!(:name => "Name", :url => "/posts"))
+      request.stub!(:path).and_return("/posts?page=1")
+      item.active?(request).should be_true
+    end
+
+    it "should recognize relative paths with arguments" do
+      item = menu.append(MenuItem.create!(:name => "Name", :url => "/:whoes/posts"))
+      request.stub!(:path).and_return("/my/posts?page=1")
+      request.stub!(:params).and_return({:whoes => "my"})
+      item.active?(request).should be_true
+    end
+  end
+
   describe "positioning items" do
       
     let(:menu){Menu.create!(:name=>"new menu")}

metadata

@@ -1,139 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lolita-menu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - ITHouse
 - Arturs Meisters
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-09 00:00:00 +03:00
+date: 2011-06-10 00:00:00.000000000 +03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70928720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70928720
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70928030 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70928030
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70927320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70927320
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70926540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70926540
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70925910 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70925910
+- !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70925310 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70925310
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70924540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70924540
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70923830 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70923830
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70922920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70922920
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70916600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *70916600
 description: Manage public menus for each project inside Lolita.
 email: support@ithouse.lv
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - History.rdoc
@@ -179,36 +176,34 @@ files:
 - test_orm/rails/config/enviroment.rb
 has_rdoc: true
 homepage: http://github.com/ithouse/lolita-menu
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 336753427
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 276747599
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Menu managing plugin for Lolita.
-test_files: 
+test_files:
 - spec/controllers/menu_items_controller_spec.rb
 - spec/models/menu_item_spec.rb
 - spec/models/menu_spec.rb