navGATE 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c426cea708d1e3f35edfdf8c516cea62d6761a
-  data.tar.gz: dbabb9a4f1b658f771923fd1d83c781bb9eb8298
+  metadata.gz: 63ca97abca52aba21054660fff6be9290fc01ed6
+  data.tar.gz: 01d56b71610b89892c59aa85a9d9323c61342c94
 SHA512:
-  metadata.gz: 0a97de027736363a02273a3add6ec14103dfabec2e1d8fdba0e00bb8ea646b3bfdea13157f74b0b1b052e318742add0c9d94f4576a06c163963492b0a82c1d7b
-  data.tar.gz: fb83fbe23438f7bb79d20016964b135a03fede0d4b5106ffe597e88d063dbb78d7fa32cee3659f4308faa7dd7c441793b8cda9f8a854534d6907f2b8c14bfcff
+  metadata.gz: 1534caaf5ef23e63fae080d8d0a2d6fb5c3a67e1fec161441bc0811422724f2a4dd8e1f1e8d4473c4cc79d6db2cb351408763ec05277ae058b427fa8a9b86d23
+  data.tar.gz: d473eead02eb00d376cd475a2172e18220cf0a708717ff0bbfca9e0c9e82499f2745607d39ea0306e5e34c1c9860a98cb6c79a22b3971a16dd787df6f858c124

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'echoe'
 
 
-Echoe.new('navGATE','0.1.17') do |p|
+Echoe.new('navGATE','0.1.18') 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

@@ -100,24 +100,30 @@ class Navgate
 
 
   def render_nav params, options
-    select_nav(params[:controller]).render_it_with(options).html_safe
+    nav = select_nav(params[:controller].split('/').last).render_it_with(options).html_safe
+    ap nav.inspect
+    nav
   end
 
   def select params
-    nav = select_nav(params[:controller])
-    raise ArgumentError, "params[:selection] is blank or nil" if !params[:selection] || params[:selection].blank?
-    return params[:selection] ? params[:selection] : nav.default
+
+    if params[:selection]
+      return params[:selection]
+    else
+      return select_nav(params[:controller]).default.to_s
+    end
   end
   private
     def select_nav controller
       self.navs.each do |nav|
-          if nav.controller.is_a?(String)
-            return nav if (nav.controller) == controller.split('/').last
-          elsif nav.controller.is_a?(Array)
-            return nav if nav.controller.include?(controller.split('/').last)
-          else
-            raise TypeError, "expecting nav.controller to be a String or an Array, got #{nav.controller.class} "
-          end
+        if nav.controller.is_a?(String)
+          ap nav.inspect
+          return nav if (nav.controller) == controller.split('/').last
+        elsif nav.controller.is_a?(Array)
+          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
     end
 

data/lib/navgate/navgatehelpers.rb

@@ -1,7 +1,7 @@
 module NavGateHelpers
   def make_menu
     @navgate = NAVGATE
-    @selected ||= @navgate.select(params) if params[:selection]
+    @selected ||= @navgate.select(params)
   end
   def render_navigation options = nil
     @navgate.render_nav(params, options)

data/navGATE.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "navGATE"
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Becker"]
-  s.date = "2013-10-17"
+  s.date = "2013-10-18"
   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.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Martin Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies: []
 description: Can create navigation from objects using the nav builder,from database
   tables or from a yaml file