semantic_navigation 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWNmMmQxYWZiZmUwMjZjYzgxYjlhMGYwODg2OGFhMDgxZDFjYjc0Yw==
+    YTJlZmViMTQyN2MwYzdkOWEzNGM3MjI3NzdhYjdmNDMxZTQ3YzI1ZQ==
   data.tar.gz: !binary |-
-    ZTA1ODBlZTdkNmFlYjU2ZWMzMDM2ZjgwYjcyYjBjNGNhNjU0M2FmOA==
+    ZTYzMGYzYzVjZTJhNjg5YzQ4NzMyMDE4YTZhODJhYzkyNGY4MjVjYw==
 SHA512:
   metadata.gz: !binary |-
-    N2M0ZGY1NjNhN2Y0NzJiZWUyOWUwMjU3YTQ0MzZjNGQxZTNiNWJjMGFjY2Y3
-    NzI0ZTIyMTAxZGVkYTdlYzQ4NTQ1N2ZmZTU2NTIyMDNjODBhOWQ2ZTRmNWZm
-    MzUyYzdjMGZjM2M4MGFlZGFjYTAyNDQ0ZjZmNzllNjQwYWNiNzQ=
+    ZjIzODE1YzM1YWQ5OTlhYjA1Njk3NGMyOTc4ZWYxNzU3NDQ0ZTg4OTMyMWJk
+    NTgzZTNjMmM3Mjk5Zjk1YmQ2YjM3OWM0MmVlOTM3MDQ5YjlhZGI5NTc1Nzgx
+    YmFkN2EyNDUxYTExZGNjNDk3ZGY1MTllZWJhZWI2MzczMjZkYWU=
   data.tar.gz: !binary |-
-    YTRiZjNlYmJkOTQ3ZGYzMzkyNzk0Zjg2NzgzMGQwNTc5OWM5YTI1NTcxYzMy
-    NzE1OGIxOTZiZjNlNTEwYTE0YWIzOWM0YWMwNDQ3NTY5YjA2Yzc5MDY4ZThj
-    MTE1YmUzMWI3ZDhhODNlOTU2YWY4NDE5NmMwNTFiNDM2YTBmZDU=
+    Zjk0YTU4YzQyYTExNDU1Mjg5ZjZiYTdmZTliOGI4OTZiMjBmZjEwODQwODc0
+    NTFkOTM2OWYyNTUxZWI5Y2VlMTZmYjljOTRkYzMyZjRlNzY1Y2I3NmIyNzdj
+    OWU4NjcxZDAxMzcyYzNlNmIwYzgxNzk0YjFkZWMyZThlMTYxNzQ=

data/TODO

@@ -9,7 +9,6 @@ Concept:
   - Move bootstrap renderers to bootstrap version 4.0.0
   - Possible to make dynamic items in menu (database or something else)
   - Pattern routes, can accept Proc
-  - scope can set default url params
   - active_if method, can accept Proc
   - add possibility for routes like {controller: 'some_controller', actions: ['index', 'new', 'create']}, or
     "some_controller#(index|new|create)"

data/lib/semantic_navigation/core/mix_in/dsl_methods.rb

@@ -0,0 +1,95 @@
+module SemanticNavigation
+  module Core
+    module MixIn
+      module DslMethods
+
+        def item(id, url=nil, options={}, &block)
+          options[:id] = id.to_sym
+          options[:render_if] ||= @scope_options[:render_if]
+  
+          if url.is_a?(Array)
+            options[:url] = [url].flatten(1).map{|url| scope_url_params(decode_url(url))}
+          else
+            options[:url] = scope_url_params(decode_url(url))
+          end
+  
+          options[:i18n_name] = @i18n_name
+  
+          if block_given?
+            element = Node.new(options, @level+1)
+            element.instance_eval &block
+          else
+            element = Leaf.new(options, @level+1)
+            #Deprecation warning message
+            #TODO:Should be deleted after moving the header and divider definition via item
+            if element.url.nil? && !element.name.empty?
+              SemanticNavigation.deprecation_message(:method,
+                                                     'item',
+                                                     'header',
+                                                     'header definition')
+            elsif element.url.nil? && element.name.empty?
+              SemanticNavigation.deprecation_message(:method,
+                                                     'item',
+                                                     'header',
+                                                     'divider definition')
+            end
+          end
+  
+          @sub_elements.push element
+        end
+
+        def header(id, options={})
+          options[:id] = id.to_sym
+          options[:render_if] ||= @scope_options[:render_if]
+          options[:url] = nil
+          options[:i18n_name] = @i18n_name
+          @sub_elements.push Leaf.new(options, @level+1)
+        end
+  
+        def divider(options = {})
+          options[:id] = :divider
+          options[:render_if] ||= @scope_options[:render_if]
+          options[:url] = nil
+          options[:i18n_name] = nil
+          options[:name] = nil
+          @sub_elements.push Leaf.new(options, @level+1)
+        end
+
+        def method_missing(m,*args,&block)
+          if m.to_s.match(/^[_]+$/).to_a.size > 0
+            divider
+          else
+            super(m,args,&block)
+          end
+        end
+
+        def scope(options = {}, &block)
+          @scope_options = options
+          self.instance_eval &block
+          @scope_options = {}
+        end
+
+        private
+
+        def scope_url_params(url)
+          if url.is_a? Hash
+          	(@scope_options[:url] || {}).merge(url)
+          else
+          	url
+          end
+        end
+
+        def decode_url(url)
+          if url.is_a? String
+            controller_name, action_name = url.split('#')
+            if controller_name && action_name
+              decoded_url = {:controller => controller_name, :action => action_name}
+            end
+          end
+          decoded_url || url
+        end        
+
+      end
+    end
+  end
+end

data/lib/semantic_navigation/core/navigation.rb

@@ -1,78 +1,14 @@
 module SemanticNavigation
   module Core
     class Navigation < Base
+      include MixIn::DslMethods
+
       attr_accessor :sub_elements
 
-      def initialize(options, level = 0)
+      def initialize(options)
         @sub_elements = []
         @scope_options = {}
-        super options, level
-      end
-
-      def item(id, url=nil, options={}, &block)
-        options[:id] = id.to_sym
-        options[:render_if] ||= @scope_options[:render_if]
-
-        if url.is_a?(Array)
-          options[:url] = [url].flatten(1).map{|url| decode_url(url)}
-        else
-          options[:url] = decode_url(url)
-        end
-
-        options[:i18n_name] = @i18n_name
-
-        if block_given?
-          element = Node.new(options, @level+1)
-          element.instance_eval &block
-        else
-          element = Leaf.new(options, @level+1)
-          #Deprecation warning message
-          #TODO:Should be deleted after moving the header and divider definition via item
-          if element.url.nil? && !element.name.empty?
-            SemanticNavigation.deprecation_message(:method,
-                                                   'item',
-                                                   'header',
-                                                   'header definition')
-          elsif element.url.nil? && element.name.empty?
-            SemanticNavigation.deprecation_message(:method,
-                                                   'item',
-                                                   'header',
-                                                   'divider definition')
-          end
-        end
-
-        @sub_elements.push element
-      end
-
-      def header(id, options={})
-        options[:id] = id.to_sym
-        options[:render_if] ||= @scope_options[:render_if]
-        options[:url] = nil
-        options[:i18n_name] = @i18n_name
-        @sub_elements.push Leaf.new(options, @level+1)
-      end
-
-      def divider(options = {})
-        options[:id] = :divider
-        options[:render_if] ||= @scope_options[:render_if]
-        options[:url] = nil
-        options[:i18n_name] = nil
-        options[:name] = nil
-        @sub_elements.push Leaf.new(options, @level+1)
-      end
-
-      def method_missing(m,*args,&block)
-        if m.to_s.match(/^[_]+$/).to_a.size > 0
-          divider
-        else
-          super(m,args,&block)
-        end
-      end
-
-      def scope(options = {}, &block)
-        @scope_options = options
-        self.instance_eval &block
-        @scope_options = {}
+        super options, 0
       end
 
       def mark_active
@@ -82,18 +18,6 @@ module SemanticNavigation
         @active = !@sub_elements.find{|element| element.active}.nil?
       end
 
-      private
-
-      def decode_url(url)
-        if url.is_a? String
-          controller_name, action_name = url.split('#')
-          if controller_name && action_name
-            decoded_url = {:controller => controller_name, :action => action_name}
-          end
-        end
-        decoded_url || url
-      end
-
     end
   end
 end

data/lib/semantic_navigation/core/node.rb

@@ -1,16 +1,19 @@
 module SemanticNavigation
   module Core
-    class Node < Navigation
+    class Node < Base
       include MixIn::UrlMethods
       include MixIn::NameMethods
+      include MixIn::DslMethods
 
       attr_accessor :link_classes, :node_classes,
-                    :link_html, :node_html
+                    :link_html, :node_html, :sub_elements
 
       def initialize(options, level)
         @url = []
         @link_html = {}
         @node_html = {}
+        @scope_options = {}
+        @sub_elements = []
         super options, level
       end
 

data/lib/semantic_navigation/core.rb

@@ -2,6 +2,7 @@
 base
 mix_in/url_methods
 mix_in/name_methods
+mix_in/dsl_methods
 navigation
 leaf
 node

data/lib/semantic_navigation/version.rb

@@ -1,3 +1,3 @@
 module SemanticNavigation
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/lib/semantic_navigation/core/navigation_spec.rb

@@ -221,7 +221,7 @@ describe SemanticNavigation::Core::Navigation do
 
   end
 
-  describe "#render_if scope" do
+  describe "#scope" do
     before :each do
       @navigation = SemanticNavigation::Core::Navigation.new({})
 
@@ -238,43 +238,92 @@ describe SemanticNavigation::Core::Navigation do
       @navigation.sub_elements.size.should == 2
     end
 
-    it "scopes the creating items options" do
-      some_condition = mock
-      @navigation.scope :render_if => some_condition do
-        item :first_item, "controller1#action"
-        item :second_item, "controller2#action"
+    describe ':url' do
+      it 'scopes hashed url' do
+        @navigation.scope url: {controller: 'common_controller'} do
+          item :first_item, {action: 'first_action'}
+          item :second_item, {action: 'second_item'}
+        end
+
+        @navigation.sub_elements[0..1].each do |element|
+          url = element.instance_variable_get(:"@url")
+          url[:controller].should == 'common_controller'
+        end
       end
 
-      @navigation.sub_elements[0..1].each do |element|
-        element.instance_variable_get(:"@render_if").should == some_condition
+      it 'scopes route like urls' do
+        @navigation.scope url: {some_attr: 'some_attr'} do
+          item :first_item, "controller1#action"
+          item :second_item, "controller2#action"
+        end
+         
+        url1 = @navigation.sub_elements[0].instance_variable_get(:"@url")
+        url1.should == {controller: 'controller1', action: 'action', some_attr: 'some_attr'}
+        url2 = @navigation.sub_elements[1].instance_variable_get(:"@url")
+        url2.should == {controller: 'controller2', action: 'action', some_attr: 'some_attr'}        
       end
-    end
 
-    it "doesnt scope unscoped items" do
-      some_condition = mock
-      @navigation.scope render_if: some_condition do
-        item :first_item, "controller1#action"
-        item :second_item, "controller2#action"
+      it 'scopes array of urls' do
+        @navigation.scope url: {some_attr: 'some_attr'} do
+          item :item, ["controller#action1", "controller#action2"]
+        end
+
+        urls = @navigation.sub_elements[0].instance_variable_get(:"@url")
+        urls[0].should == {controller: 'controller', action: 'action1', some_attr: 'some_attr'}
+        urls[1].should == {controller: 'controller', action: 'action2', some_attr: 'some_attr'}
       end
-      @navigation.item :third_item, "controller3#action"
 
-      last_item = @navigation.sub_elements.last
-      last_item.instance_variable_get(:"@render_if").should == nil
+      it "can't override defined url attributes" do
+        @navigation.scope url: {some_attr: 'some_attr'} do
+          item :item, {controller: 'controller', action: 'action', some_attr: 'old_attr'}
+        end
+
+        url = @navigation.sub_elements[0].instance_variable_get(:"@url")
+        url[:some_attr].should == 'old_attr'
+      end
     end
 
-    it "doesnt override defined scopes" do
-      some_condition = mock
-      some_condition2 = mock
-      @navigation.scope :render_if => some_condition do
-        item :first_item, "controller1#action", render_if: some_condition2
-        item :second_item, "controller2#action"
+    describe ':render_if' do
+
+
+      it "scopes the creating items options" do
+        some_condition = mock
+        @navigation.scope :render_if => some_condition do
+          item :first_item, "controller1#action"
+          item :second_item, "controller2#action"
+        end
+
+        @navigation.sub_elements[0..1].each do |element|
+          element.instance_variable_get(:"@render_if").should == some_condition
+        end
+      end
+
+      it "doesnt scope unscoped items" do
+        some_condition = mock
+        @navigation.scope render_if: some_condition do
+          item :first_item, "controller1#action"
+          item :second_item, "controller2#action"
+        end
+        @navigation.item :third_item, "controller3#action"
+
+        last_item = @navigation.sub_elements.last
+        last_item.instance_variable_get(:"@render_if").should == nil
       end
 
-      first_item = @navigation.sub_elements.first
-      second_item = @navigation.sub_elements.last
+      it "doesnt override defined scopes" do
+        some_condition = mock
+        some_condition2 = mock
+        @navigation.scope :render_if => some_condition do
+          item :first_item, "controller1#action", render_if: some_condition2
+          item :second_item, "controller2#action"
+        end
 
-      first_item.instance_variable_get(:"@render_if").should == some_condition2
-      second_item.instance_variable_get(:"@render_if").should == some_condition
+        first_item = @navigation.sub_elements.first
+        second_item = @navigation.sub_elements.last
+
+        first_item.instance_variable_get(:"@render_if").should == some_condition2
+        second_item.instance_variable_get(:"@render_if").should == some_condition
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_navigation
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sergey Gribovski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,6 +100,7 @@ files:
 - lib/semantic_navigation/core.rb
 - lib/semantic_navigation/core/base.rb
 - lib/semantic_navigation/core/leaf.rb
+- lib/semantic_navigation/core/mix_in/dsl_methods.rb
 - lib/semantic_navigation/core/mix_in/name_methods.rb
 - lib/semantic_navigation/core/mix_in/url_methods.rb
 - lib/semantic_navigation/core/navigation.rb