navGATE 0.1.21 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291c99018a5fa97fdca58d16a220a62ef9452d03
-  data.tar.gz: 3a417976c1eddccef98e4b3c68957a2be0867965
+  metadata.gz: cfffca90e5a8c00a84fd93e7a425e0bfdaae75c1
+  data.tar.gz: 6c41bbb8e738392546be1d2e7f28b28af562728e
 SHA512:
-  metadata.gz: 7ca2989830edca020ee92519616d9cb73f90bd34a3aab6fce4fcbe307d190746e43c28d5caa63a10612a34a8b7dd1b6aac4b3de055df04ee98ac8661e477469f
-  data.tar.gz: a0b04ce2a4a6c03aad7959013e072ad6e1f1c45f00babbf095cb75a459b1141c5b842f093ba37e4460a2197092cf7b5b17c6ef22a08100d18c5b680cace73e00
+  metadata.gz: e43a5e747a2a6205b6993289b732fe3e3fc0500910446c92cc00ace3dbaa717f21caae97cf524e1361d14a8212f6bb2c87f0d5f5a0657f72b96417aa6640ec05
+  data.tar.gz: e4aebc4c1a2e42989efc237dddfad22345da5d6e4cb3d50092ccb4ecfeee764d1935558cc32324ecb2539d42a1c2e6b0ca95b9c35f7c1ff52c0d6ede882d30f3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'echoe'
 
 
-Echoe.new('navGATE','0.1.21') do |p|
+Echoe.new('navGATE','0.1.23') do |p|
   p.summary = "Allows the easy creation of navigation with config files"
   p.description = "Can create navigation from objects using the nav builder,from database tables or from a yaml file"
   p.url = "https://github.com/Thermatix/navGATE"

data/lib/navgate.rb

@@ -125,7 +125,7 @@ class Navgate
 
 
   def render_nav selection, controller, options
-    nav = select_nav(controller.split('/').last).render_it_with(options,selection).html_safe
+    nav = nav_cache(controller.split('/').last).render_it_with(options,selection).html_safe
     nav
   end
 
@@ -133,22 +133,37 @@ class Navgate
     if selection
       return selection
     else
-
-      return select_nav(controller).default.to_s
+      return nav_cache(controller.split('/').last).default.to_s
     end
   end
   private
+
+    def nav_cache controller
+      if @selected_nav
+        if @selected_nav.controller.is_a?(Array)
+          return @selected_nav if @selected_nav.controller.include?(controller)
+        else
+          return @selected_nav unless @selected_nav.controller != controller
+        end
+        @selected_nav = nil
+        nav_cache(controller)
+      else
+        @selected_nav ||= select_nav(controller)
+      end
+    end
+
     def select_nav controller
+      nav_to_return = nil
       self.navs.each do |nav|
         if nav.controller.is_a?(String)
-          return nav if (nav.controller) == controller.split('/').last
+          nav_to_return = nav if (nav.controller) == controller
         elsif nav.controller.is_a?(Array)
-          return nav if nav.controller.include?(controller)
+          nav_to_return = nav if nav.controller.include?(controller)
         else
           raise TypeError, "expecting nav.controller to be a String or an Array, got #{nav.controller.class} "
         end
       end
-      raise ArgumentError, "No matching controllers for #{controller}"
+      nav_to_return ?  (return nav_to_return) : (raise ArgumentError, "No matching controllers for #{controller}")
     end
 
     def not_bad_type? navs

data/navGATE.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "navGATE"
-  s.version = "0.1.21"
+  s.version = "0.1.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Becker"]
-  s.date = "2013-10-18"
+  s.date = "2013-10-24"
   s.description = "Can create navigation from objects using the nav builder,from database tables or from a yaml file"
   s.email = "mbeckerwork@gmail.com"
   s.extra_rdoc_files = ["lib/navgate.rb", "lib/navgate/base.rb", "lib/navgate/navgatehelpers.rb", "lib/readme.rdoc"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: navGATE
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.23
 platform: ruby
 authors:
 - Martin Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Can create navigation from objects using the nav builder,from database
   tables or from a yaml file