rails_nav 2.5.7 → 2.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTRiNzBkYTQzOWVlNTE4MWY2OTVkNDEzMDI4NjAxMjQxOGZhZmE1Nw==
+    NjAwZWFiOWZiYjJlMDJmODU0MTcxMzdhMjJlZjdjNzBhMmUzNTY4YQ==
   data.tar.gz: !binary |-
-    ODdmMGU5ZWE1NGFjMzAyYmI4ODlmZDU3NWQ2MzVlOThmYTAxNzJmYg==
+    MGMxOTdiOGMzNGUxODhhNzUyYmMzODBkYmU2MGJlODE3OGFjNzBlNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTMwYzFkYzI5NGYzOGQ4ZGMyNmJhNjJiMDU3ZmE2NjUyMTVmOTgyMTNiZDIy
-    ZDdmMjljNmE2NTQyYTVhNmZkMGRmYmIxOTgwYzk4Njk1ZTgzMjE0NWY3MmY1
-    MDhlMGYzMDE5YjQ3OTY3NGNiZDhkZTk5N2I5NTA0YjIwMmE5ZTQ=
+    MDA0MDZlYzdlMjZhOGIzNjhlNjUzYTk2ZTJmMGJkMzBlOTI3YjdmMmZhNDBm
+    ZGYzYWU0ZTVmNmJhNTVkZGE5NzFmYTgyZmQyMjc5NWNkYTU2YTQ0MTIyYzc0
+    NTkwOGU4YjRjNjIyNGJiNzFiM2UwNjcwYTZkZWZkMWY3OTA1ODc=
   data.tar.gz: !binary |-
-    ZjI4MzkwMTEwYjM2YjY0NWFiZTI0NGY3NWFmMDI2ZTBhMWViZGRlNjMzMGY4
-    M2Q2YTNjODIxYTBlYzFmNTgyZGNjOTA3N2U2ZWFjYjMyNmU1ODI5OWEzN2Uw
-    YzFkYmYzM2UyYmMyMjE5ZmZhZTNhMGViNzVhMWI5MTlkMTkyOWU=
+    NmQ0ZjBiM2RmZjJiYzNjM2ZiZDdjMzEwZGE1YzAzNjZjZDJhNTUzMWZmYzIz
+    MzU0YThiNzM0OTk5OTI5ZGIwMDg1OTM0NDAxYThiNDMzMzMzYTNhZDc3N2Ew
+    MGJkNmVjNjIxMGY4ZjVlYzQ1YzMzYTJkMTJlZmNiNDlhOWU3MGE=

data/lib/rails_nav.rb

@@ -7,7 +7,7 @@
   ##
   #
     def Nav.version()
-      '2.5.7'
+      '2.6.0'
     end
 
     def Nav.dependencies
@@ -146,9 +146,15 @@
           link.active = false
         end
 
-        no_clear_winner =
+        more_than_one_link =
+          size > 1
+
+        equivalently_active =
           weights.uniq.size < 2
 
+        no_clear_winner =
+          more_than_one_link && equivalently_active
+
         active_link =
           if no_clear_winner
             detect{|link| link.default}
@@ -239,51 +245,61 @@
       attr_accessor(:content)
       attr_accessor(:options)
       attr_accessor(:pattern)
-      attr_accessor(:active)
       attr_accessor(:compute_active)
+      attr_accessor(:active)
       attr_accessor(:default)
       attr_accessor(:weight)
       attr_accessor(:slug)
       attr_accessor(:config)
 
-      def initialize(nav, *args, &block)
-        @nav = nav
-
-        options =
+      def initialize(*args, &block)
+      #
+        @options =
           if args.last.is_a?(Hash)
             args.extract_options!.to_options!
           else
             {}
           end
+      #
+        args.each{|arg| @nav = arg if arg.is_a?(Nav)}
+        args.delete_if{|arg| arg.is_a?(Nav)}
 
-        @content        = options.delete(:content) || args.shift || 'Slash'
-        @url            = options.delete(:url)     || args.shift || {}
-        @pattern        = options.delete(:pattern) || args.shift || Link.default_active_pattern_for(@content)
-        @compute_active = options.delete(:active)  || block      || Link.default_active_block_for(@pattern)
-        @default        = options.delete(:default)
+        unless @nav
+          @nav = Nav.new
+          @nav.controller = Current.mock_controller
+        end
 
-        @options = options
+      #
+        @content        = getopt!(:content){ args.shift || 'Slash' }
+        @url            = getopt!(:url){ args.shift || {} }
+        @pattern        = getopt!(:pattern){ args.shift || Link.default_active_pattern_for(@content) }
+        @compute_active = getopt!(:active){ block || Link.default_active_block_for(@pattern) }
+        @default        = getopt!(:default){ nil }
 
+      #
         @slug = Slug.for(@content, :join => '-')
         @already_computed_active = nil
-        @active = nil
 
         @config = Map.new
       end
 
+      def getopt!(key, &block)
+        @options.has_key?(key) ? @options.delete(key) : (block && block.call)
+      end
+
       def compute_active!
-        @active = (@compute_active.respond_to?(:call) ? @nav.evaluate(@compute_active, link = self) : !!@compute_active)
+        @active = 
+          if @compute_active.respond_to?(:call)
+            @nav.evaluate(@compute_active, link = self)
+          else
+            !!@compute_active
+          end
       ensure
         @already_computed_active = true
       end
 
       def compute_active
         compute_active! unless @already_computed_active
-        @active
-      end
-
-      def active?
-        !!@active
       end
 
       def default?

data/rails_nav.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rails_nav"
-  spec.version = "2.5.7"
+  spec.version = "2.6.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rails_nav"
   spec.description = "declarative navigation for rails applications"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_nav
 version: !ruby/object:Gem::Version
-  version: 2.5.7
+  version: 2.6.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_current