navi 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    navi (0.1.0)
+    navi (0.1.3)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       ordered_tree (>= 0.1.6)
@@ -71,7 +71,7 @@ GEM
     database_cleaner (0.7.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (2.1.2)
+    factory_girl (2.5.1)
       activesupport
     ffi (1.0.11)
     gherkin (2.4.21)
@@ -197,7 +197,7 @@ DEPENDENCIES
   cucumber
   cucumber-rails (= 0.5.2)
   database_cleaner
-  factory_girl (~> 2.1.0)
+  factory_girl (~> 2.5.1)
   guard-cucumber (= 0.3.4)
   guard-rspec
   haml

data/lib/navi/navigable/instance_methods.rb

@@ -26,9 +26,11 @@ module Navi
       end
 
       def prepare_standalone_navigator!
-        set_navigator_label_to_self!
-        set_navigator_url_to_hash!
-        nullify_navigator_pointer_to_self!
+        if navigator_instance
+          set_navigator_label_to_self!
+          set_navigator_url_to_hash!
+          nullify_navigator_pointer_to_self!
+        end
       end
 
       def set_navigator_label_to_self!

data/lib/navi/version.rb

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

data/navi.gemspec

@@ -46,8 +46,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'libnotify'
   s.add_development_dependency 'rb-inotify'
   s.add_development_dependency 'nifty-generators'
-  s.add_development_dependency 'factory_girl', '~> 2.1.0'
-  #s.add_development_dependency 'factory_girl_rails', '~> 1.2'
+  s.add_development_dependency 'factory_girl', '~> 2.5.1'
   s.add_development_dependency 'ruby-debug19'
 end
 

data/spec/navi/navigable_spec.rb

@@ -2,22 +2,34 @@ require 'spec_helper'
 
 describe "Navigable" do
   context "when deleted" do
-    before do
-      page = Factory :page, :name => "Page name"
-      @menu_item = page.to_navigator!
-      page.destroy
-      @menu_item.reload
-    end
+    context "and the navigator has a navigable item" do
+      before do
+        page = Factory :page, :name => "Page name"
+        @menu_item = page.to_navigator!
+        page.destroy
+        @menu_item.reload
+      end
+
+      it "should nullify the navigator's (menu item) pointer to itself" do
+        @menu_item.navigable.should be_nil
+        @menu_item.navigable_id.should be_nil
+        @menu_item.navigable_type.should be_nil
+      end
 
-    it "should nullify the navigator's (menu item) pointer to itself" do
-      @menu_item.navigable.should be_nil
-      @menu_item.navigable_id.should be_nil
-      @menu_item.navigable_type.should be_nil
+      it "should set the label and url" do
+        @menu_item.label.should == "Page name"
+        @menu_item.url.should == "#"
+      end
     end
 
-    it "should set the label and url" do
-      @menu_item.label.should == "Page name"
-      @menu_item.url.should == "#"
+    context "and the navigable has no navigator item" do
+      before do
+        @page = Factory :page, :name => "Page name"
+      end
+
+      it "should not blow up" do
+        expect {@page.destroy}.to_not raise_error
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &69526220 !ruby/object:Gem::Requirement
+  requirement: &71496270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *69526220
+  version_requirements: *71496270
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &69283630 !ruby/object:Gem::Requirement
+  requirement: &71495990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *69283630
+  version_requirements: *71495990
 - !ruby/object:Gem::Dependency
   name: ordered_tree
-  requirement: &69283240 !ruby/object:Gem::Requirement
+  requirement: &71495600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *69283240
+  version_requirements: *71495600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &69282850 !ruby/object:Gem::Requirement
+  requirement: &71495120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *69282850
+  version_requirements: *71495120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &69282480 !ruby/object:Gem::Requirement
+  requirement: &71494710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *69282480
+  version_requirements: *71494710
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &69282130 !ruby/object:Gem::Requirement
+  requirement: &71494330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *69282130
+  version_requirements: *71494330
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &69281810 !ruby/object:Gem::Requirement
+  requirement: &71493890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *69281810
+  version_requirements: *71493890
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &69281550 !ruby/object:Gem::Requirement
+  requirement: &71493600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69281550
+  version_requirements: *71493600
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &69281130 !ruby/object:Gem::Requirement
+  requirement: &71493250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69281130
+  version_requirements: *71493250
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &69280550 !ruby/object:Gem::Requirement
+  requirement: &71492760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69280550
+  version_requirements: *71492760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &69280310 !ruby/object:Gem::Requirement
+  requirement: &71492240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69280310
+  version_requirements: *71492240
 - !ruby/object:Gem::Dependency
   name: apotomo
-  requirement: &69280000 !ruby/object:Gem::Requirement
+  requirement: &71491680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.2.2
   type: :development
   prerelease: false
-  version_requirements: *69280000
+  version_requirements: *71491680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69279550 !ruby/object:Gem::Requirement
+  requirement: &71491240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *69279550
+  version_requirements: *71491240
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &69279170 !ruby/object:Gem::Requirement
+  requirement: &71490990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69279170
+  version_requirements: *71490990
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &69278650 !ruby/object:Gem::Requirement
+  requirement: &71490490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,10 +175,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *69278650
+  version_requirements: *71490490
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &69278140 !ruby/object:Gem::Requirement
+  requirement: &71490060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *69278140
+  version_requirements: *71490060
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &69277830 !ruby/object:Gem::Requirement
+  requirement: &71489660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *69277830
+  version_requirements: *71489660
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &69277250 !ruby/object:Gem::Requirement
+  requirement: &71485240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -208,10 +208,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *69277250
+  version_requirements: *71485240
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &69277020 !ruby/object:Gem::Requirement
+  requirement: &71484950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69277020
+  version_requirements: *71484950
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &69276710 !ruby/object:Gem::Requirement
+  requirement: &71484560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 1.0.0.rc1
   type: :development
   prerelease: false
-  version_requirements: *69276710
+  version_requirements: *71484560
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &69276490 !ruby/object:Gem::Requirement
+  requirement: &71484310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69276490
+  version_requirements: *71484310
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &69276180 !ruby/object:Gem::Requirement
+  requirement: &71483940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69276180
+  version_requirements: *71483940
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &69275900 !ruby/object:Gem::Requirement
+  requirement: &71483570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -263,10 +263,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *69275900
+  version_requirements: *71483570
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &69209750 !ruby/object:Gem::Requirement
+  requirement: &71483280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69209750
+  version_requirements: *71483280
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &69209490 !ruby/object:Gem::Requirement
+  requirement: &71482950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69209490
+  version_requirements: *71482950
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &69208730 !ruby/object:Gem::Requirement
+  requirement: &71482520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,21 +296,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69208730
+  version_requirements: *71482520
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &69208420 !ruby/object:Gem::Requirement
+  requirement: &71481890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.5.1
   type: :development
   prerelease: false
-  version_requirements: *69208420
+  version_requirements: *71481890
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &69208140 !ruby/object:Gem::Requirement
+  requirement: &71481250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,7 +318,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69208140
+  version_requirements: *71481250
 description: Allows you to save menu items in the database. You can create your own
   renderer.
 email: