semantic_navigation 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abaa34622db084f42353e8bd203fc9a8033dc5bb
-  data.tar.gz: a03e0dd5a7cacb1051566512b85a61a40ee39909
+  metadata.gz: 216bc40dad2085d5902d0b24ad7a1b3546f85d50
+  data.tar.gz: a6c3fb15468b760f1b59a248b22ba5cea9c56009
 SHA512:
-  metadata.gz: 1d9059d2ce1e114d204295bde77b555c2be3fe27b527d105fbc66454fed87212057f88499fb1963ec85964c68f11e296ac4c64ad26f43a7032b595d7e0dbc51b
-  data.tar.gz: 9f0a9ad6f392626b0a4e6ef11f8082821351ce019ea5f84f0fab314f7e14ba6d2e345e13f04b2e80c75339c2415f4e8243a63bcd673b8d2da6f14bfd9ae9924b
+  metadata.gz: 372129da53b76e11bf4bd3c199246629b0c23f0abcd63a0e612ebf64f6c69de87b52fc59505f50991896a2b66452f7dd35e01e8ba74b1af4a3db3c3ce62fd6c4
+  data.tar.gz: 8f4e7d2972a64454e941728685e3b8f1203b8da10ea141df9dba9b538d9abece3e8f6d4960fad82d7ac8555f75de57c60d61fa8d56646cd9c0e59e183b46a56c

data/lib/semantic_navigation/helper_methods.rb

@@ -11,7 +11,7 @@ module SemanticNavigation::HelperMethods
     if block_given?
       capture(item, &block)  
     else
-      item != navigation ? item.name(:active_item_for) : ''
+      !item.is_a?(SemanticNavigation::Core::Navigation) ? item.name(:active_item_for) : ''
     end
   end
 

data/lib/semantic_navigation/railtie.rb

@@ -37,7 +37,9 @@ module SemanticNavigation
        SemanticNavigation::Railtie.register_bootstrap_renderers
      }
     else
-     ActionDispatch::Callbacks.before {
+     ActionDispatch::Callbacks.to_prepare {
+       require 'pry'
+       binding.pry
        load SemanticNavigation.actual_config_location
        SemanticNavigation::Railtie.register_bootstrap_renderers
      }

data/lib/semantic_navigation/version.rb

@@ -1,3 +1,3 @@
 module SemanticNavigation
-  VERSION = "0.1.9"
+  VERSION = "0.2.1"
 end

data/spec/lib/semantic_navigation/configuration_spec.rb

@@ -39,7 +39,7 @@ describe SemanticNavigation::Configuration do
     end
 
     it 'passes received block to navigation class instance' do
-      navigation = mock
+      navigation = double
       navigation.should_receive(:instance_eval)
       SemanticNavigation::Core::Navigation.should_receive(:new).and_return navigation
       SemanticNavigation::Configuration.navigate :some_menu do
@@ -72,10 +72,10 @@ describe SemanticNavigation::Configuration do
       styles = SemanticNavigation::Configuration.class_variable_get("@@render_styles")
       styles[:some_renderer].should == proc_object
 
-      mock_renderer = mock
-      mock_renderer.should_receive(:do_something1).with(true)
-      mock_renderer.should_receive(:do_something2).with('some_attr')
-      mock_renderer.instance_eval &proc_object
+      double_renderer = double
+      double_renderer.should_receive(:do_something1).with(true)
+      double_renderer.should_receive(:do_something2).with('some_attr')
+      double_renderer.instance_eval &proc_object
     end
   end
 
@@ -108,13 +108,13 @@ describe SemanticNavigation::Configuration do
 
     it 'registers a new helper method based on name of a renderer and depending on method navigation_for' do
       SemanticNavigation::Configuration.register_renderer SomeRenderer
-      SemanticNavigation::HelperMethods.method_defined?(:some_renderer_for).should be_true
+      expect(SemanticNavigation::HelperMethods).to be_method_defined(:some_renderer_for)
 
       class SomeClass
         include SemanticNavigation::HelperMethods
       end
       some_class_instance = SomeClass.new
-      some_class_instance.should_receive(:navigation_for).with(:some_menu, {:as => :some_renderer})
+      expect(some_class_instance).to receive(:navigation_for).with(:some_menu, {as: :some_renderer})
 
       some_class_instance.some_renderer_for :some_menu
     end
@@ -123,11 +123,11 @@ describe SemanticNavigation::Configuration do
   describe '#render' do
 
     before :each do
-      @view_object = mock
-      @renderer = mock
-      @renderer_instance = mock
+      @view_object = double
+      @renderer = double
+      @renderer_instance = double
       @renderer.should_receive(:new).and_return @renderer_instance
-      @navigation = mock
+      @navigation = double
 
       SemanticNavigation::Configuration.class_variable_set "@@renderers", {:renderer => @renderer}
       SemanticNavigation::Configuration.class_variable_set "@@navigations", {:some_menu => @navigation}
@@ -151,7 +151,7 @@ describe SemanticNavigation::Configuration do
     it 'execs default renderer styles from configuration' do
       render_styles = proc{}
       SemanticNavigation::Configuration.class_variable_set "@@render_styles", {:renderer => render_styles}
-      @renderer_instance.should_receive(:instance_eval).with(&render_styles)
+      expect(@renderer_instance).to receive(:instance_eval)
       @renderer_instance.should_receive(:name=).with(:renderer)
       @navigation.should_receive(:mark_active)
       @navigation.should_receive(:render).with(@renderer_instance)

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

@@ -89,8 +89,8 @@ describe SemanticNavigation::Core::Leaf do
   describe '#mark_active' do
 
     before :each do
-      @view_object = mock
-      SemanticNavigation::Configuration.stub!(:view_object).and_return @view_object
+      @view_object = double
+      allow(SemanticNavigation::Configuration).to receive(:view_object).and_return @view_object
     end
 
     context :marked do
@@ -98,50 +98,56 @@ describe SemanticNavigation::Core::Leaf do
       it 'as active even if controller name starts from `/`' do
         leaf = SemanticNavigation::Core::Leaf.new({url: {controller: '/first', action: 'index'}}, 1)
         @view_object.stub(:params).and_return({controller: 'first', action: 'index'})
-        leaf.mark_active.should be_true
-        leaf.active.should be_true
+        
+        expect(leaf.mark_active).to eq true
+        expect(leaf.active).to eq true
       end
 
       it 'as active if have active url with symbol names' do
         leaf = SemanticNavigation::Core::Leaf.new({:url => {:controller => :first, :action => :index}}, 1)
         @view_object.stub(:params).and_return({:controller => 'first', :action => 'index'})
-        leaf.mark_active.should be_true
-        leaf.active.should be_true
+        
+        expect(leaf.mark_active).to eq true
+        expect(leaf.active).to eq true
       end
 
       it 'as active if have active url with string names' do
         leaf = SemanticNavigation::Core::Leaf.new({:url => {:controller => "first", :action => "index"}}, 1)
         @view_object.stub(:params).and_return({:controller => 'first', :action => 'index'})
-        leaf.mark_active.should be_true
-        leaf.active.should be_true
+        
+        expect(leaf.mark_active).to eq true
+        expect(leaf.active).to eq true
       end
 
       it 'as inactive if have inactive url with symbol names' do
         leaf = SemanticNavigation::Core::Leaf.new({:url => {:controller => :first, :action => :index}}, 1)
         @view_object.stub(:params).and_return({controller: "second", action: 'index'})
-        leaf.mark_active.should be_false
-        leaf.active.should be_false
+        expect(leaf.mark_active).to eq false
+        expect(leaf.active).to eq false
       end
 
       it 'as inactive if have inactive url with string names' do
         leaf = SemanticNavigation::Core::Leaf.new({:url => {:controller => "first", :action => "index"}}, 1)
         @view_object.stub(:params).and_return({controller: "second", action: 'index'})
-        leaf.mark_active.should be_false
-        leaf.active.should be_false
+        
+        expect(leaf.mark_active).to eq false
+        expect(leaf.active).to eq false
       end
 
       it 'as inactive if have nil url' do
         leaf = SemanticNavigation::Core::Leaf.new({},1)
-        leaf.mark_active.should be_false
-        leaf.active.should be_false
+        
+        expect(leaf.mark_active).to eq false
+        expect(leaf.active).to eq false
       end
 
       it 'as active if at least one url in passed array is active' do
         leaf = SemanticNavigation::Core::Leaf.new({:url => [{:controller => :leaf_controller1, :action => :action},
                                                             {:controller => :leaf_controller2, :action => :action}]},1)
         @view_object.stub(:params).and_return(:controller => 'leaf_controller2', :action => 'action')
+        
         leaf.mark_active
-        leaf.active.should be_true
+        expect(leaf.active).to eq true
       end
 
     end

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

@@ -7,19 +7,22 @@ describe SemanticNavigation::Core::Navigation do
     it 'creates instance of navigation with level 0 and empty subitems' do
       navigation = SemanticNavigation::Core::Navigation.new({})
       navigation.level.should == 0
-      navigation.sub_elements.should be_empty
+      
+      expect(navigation.sub_elements).to be_empty
     end
 
     it 'creates instance and save sended options' do
       navigation = SemanticNavigation::Core::Navigation.new :id => :some_id,
                                                             :classes => [:one, :two]
       navigation.id.should == :some_id
-      navigation.classes.should == [:one,:two]
+      
+      expect(navigation.classes).to eq [:one, :two]
     end
 
     it 'creates instance and save unintended properties' do
       navigation = SemanticNavigation::Core::Navigation.new :some_attribute => :some_value
-      navigation.instance_variable_get("@some_attribute").should == :some_value
+      
+      expect(navigation.instance_variable_get("@some_attribute")).to eq :some_value
     end
 
   end
@@ -32,7 +35,8 @@ describe SemanticNavigation::Core::Navigation do
     it "receives item method and make the leaf" do
       @navigation.item :some_id, 'some_url'
       @navigation.sub_elements.size.should == 1
-      @navigation.sub_elements.first.is_a?(SemanticNavigation::Core::Leaf).should be_true
+      
+      expect(@navigation.sub_elements.first).to be_is_a(SemanticNavigation::Core::Leaf)
     end
 
     it "receives item method with block and create node" do
@@ -40,27 +44,31 @@ describe SemanticNavigation::Core::Navigation do
         item :leaf_id, 'leaf_url'
       end
       @navigation.sub_elements.size.should == 1
-      @navigation.sub_elements.first.is_a?(SemanticNavigation::Core::Node).should be_true
+      
+      expect(@navigation.sub_elements.first).to be_is_a(SemanticNavigation::Core::Node)
     end
 
     it "receives item method with array of urls and save them properly" do
       @navigation.item :leaf_id, ['string/url',"controller#action",:symbolic_name,['array','like','url']]
       urls = @navigation.sub_elements.first.instance_variable_get("@url")
-      urls.should == ['string/url',
-                      {:controller => 'controller', :action => 'action'},
-                      :symbolic_name,
-                      ['array','like','url']]
+      
+      expect(urls).to eq ['string/url',
+                         {:controller => 'controller', :action => 'action'},
+                         :symbolic_name,
+                         ['array','like','url']]
     end
 
     it "receives item with Proc url and decode it to normal url (leaf)" do
       @navigation.item :leaf_id, proc{'some' + 'func'}
-      @navigation.sub_elements.first.url.should == 'somefunc'
+      
+      expect(@navigation.sub_elements.first.url).to eq 'somefunc'
     end
 
     it 'receives item with array of urls one of each is a Proc (leaf)' do
       @navigation.item :leaf_id, ['string_url',proc{'some' + 'func'}]
       urls = @navigation.sub_elements.first.send :urls
-      urls.should == ['string_url', 'somefunc']
+      
+      expect(urls).to eq ['string_url', 'somefunc']
     end
 
     it "receives item with Proc url and decode it to normal url (node)" do
@@ -68,7 +76,8 @@ describe SemanticNavigation::Core::Navigation do
         item :first_value, '#'
         item :second_value, '#'
       end
-      @navigation.sub_elements.first.url.should == 'somefunc'
+      
+      expect(@navigation.sub_elements.first.url).to eq 'somefunc'
     end
 
     it 'receives item with array of urls one of each is a Proc (node)' do
@@ -77,7 +86,8 @@ describe SemanticNavigation::Core::Navigation do
         item :second_value, '#'
       end
       urls = @navigation.sub_elements.first.send :urls
-      urls.should == ['string_url', 'somefunc']
+      
+      expect(urls).to eq ['string_url', 'somefunc']
     end
   end
 
@@ -88,8 +98,8 @@ describe SemanticNavigation::Core::Navigation do
     end
 
     it "creates item with nil url" do
-      @navigation.sub_elements.size.should == 1
-      @navigation.sub_elements.first.url.should be_nil
+      expect(@navigation.sub_elements.size).to eq 1
+      expect(@navigation.sub_elements.first.url).to be_nil
     end
   end
 
@@ -100,18 +110,18 @@ describe SemanticNavigation::Core::Navigation do
 
     it "creates divider item with nil url and name" do
       @navigation.divider
-      @navigation.sub_elements.size.should == 1
-      @navigation.sub_elements.first.url.should be_nil
-      @navigation.sub_elements.first.name.should be_empty
+      expect(@navigation.sub_elements.size).to eq 1
+      expect(@navigation.sub_elements.first.url).to be_nil
+      expect(@navigation.sub_elements.first.name).to be_empty
     end
 
     it "receives any length method containing char `_` and create divider" do
-
       (1..10).each do |c|
         @navigation.send ('_'*c).to_sym
       end
-      @navigation.sub_elements.size.should == 10
-      @navigation.sub_elements.map(&:id).should == [:divider]*10
+
+      expect(@navigation.sub_elements.size).to eq 10
+      expect(@navigation.sub_elements.map(&:id)).to eq [:divider]*10
     end
   end
 
@@ -122,11 +132,12 @@ describe SemanticNavigation::Core::Navigation do
     end
 
     it "while creating the item make support for urls in format controller#action" do
-      view_object = mock
+      view_object = double
 
       @navigation.item :some_id, 'controller#action'
       @navigation.sub_elements.size.should == 1
-      @navigation.sub_elements.first.url.should == {:controller => "controller", :action => "action"}
+      
+      expect(@navigation.sub_elements.first.url).to eq({:controller => "controller", :action => "action"})
     end
   end
 
@@ -134,17 +145,18 @@ describe SemanticNavigation::Core::Navigation do
     context :returns do
       it 'true if render_if proc is nil' do
         navigation = SemanticNavigation::Core::Navigation.new({})
-        navigation.render_if.should be_true
+        
+        expect(navigation.render_if).to eq true
       end
 
       it 'true if render_if proc return true' do
         navigation = SemanticNavigation::Core::Navigation.new({:render_if => proc{true}})
-        navigation.render_if.should be_true
+        expect(navigation.render_if).to eq true
       end
 
       it 'false if render_if proc return false' do
         navigation = SemanticNavigation::Core::Navigation.new({:render_if => proc{false}})
-        navigation.render_if.should be_false
+        expect(navigation.render_if).to eq false
       end
 
     end
@@ -152,16 +164,16 @@ describe SemanticNavigation::Core::Navigation do
     context :passes do
       it 'self to passed proc' do
         navigation = SemanticNavigation::Core::Navigation.new({:id => :some_id, :render_if => proc{|o| o.id == :some_id}})
-        navigation.render_if.should be_true
+        expect(navigation.render_if).to eq true
         navigation = SemanticNavigation::Core::Navigation.new({:id => :another_id, :render_if => proc{|o| o.id == :some_id}})
-        navigation.render_if.should be_false
+        expect(navigation.render_if).to eq false
       end
     end
   end
 
   describe '#render' do
     it 'calls renderer class :render_navigation method' do
-      renderer = mock
+      renderer = double
       navigation = SemanticNavigation::Core::Navigation.new({})
       renderer.should_receive(:render_navigation).with(navigation)
       navigation.render(renderer)
@@ -172,7 +184,7 @@ describe SemanticNavigation::Core::Navigation do
     before :each do
       @navigation = SemanticNavigation::Core::Navigation.new({})
 
-      @view_object = mock
+      @view_object = double
       SemanticNavigation::Configuration.stub(:view_object).and_return @view_object
     end
 
@@ -205,8 +217,8 @@ describe SemanticNavigation::Core::Navigation do
       @view_object.stub(:params).and_return({:controller => "controller1", :action => "action", :some_other_params => "blablabla"})
 
       @navigation.mark_active
-      @navigation.sub_elements[0].active.should be_true
-      @navigation.sub_elements[1].active.should be_false
+      expect(@navigation.sub_elements[0].active).to eq true
+      expect(@navigation.sub_elements[1].active).to eq false
     end
 
     it 'works for route like urls as good as for Hash url params' do
@@ -215,8 +227,8 @@ describe SemanticNavigation::Core::Navigation do
       @view_object.stub(:params).and_return({:controller => "controller1", :action => "action", :some_other_params => "blablabla"})
 
       @navigation.mark_active
-      @navigation.sub_elements[0].active.should be_true
-      @navigation.sub_elements[1].active.should be_false
+      expect(@navigation.sub_elements[0].active).to eq true
+      expect(@navigation.sub_elements[1].active).to eq false
     end
 
   end
@@ -225,7 +237,7 @@ describe SemanticNavigation::Core::Navigation do
     before :each do
       @navigation = SemanticNavigation::Core::Navigation.new({})
 
-      @view_object = mock
+      @view_object = double
       SemanticNavigation::Configuration.stub(:view_object).and_return @view_object
     end
 
@@ -287,7 +299,7 @@ describe SemanticNavigation::Core::Navigation do
 
 
       it "scopes the creating items options" do
-        some_condition = mock
+        some_condition = double
         @navigation.scope :render_if => some_condition do
           item :first_item, "controller1#action"
           item :second_item, "controller2#action"
@@ -299,7 +311,7 @@ describe SemanticNavigation::Core::Navigation do
       end
 
       it "doesnt scope unscoped items" do
-        some_condition = mock
+        some_condition = double
         @navigation.scope render_if: some_condition do
           item :first_item, "controller1#action"
           item :second_item, "controller2#action"
@@ -311,8 +323,8 @@ describe SemanticNavigation::Core::Navigation do
       end
 
       it "doesnt override defined scopes" do
-        some_condition = mock
-        some_condition2 = mock
+        some_condition = double
+        some_condition2 = double
         @navigation.scope :render_if => some_condition do
           item :first_item, "controller1#action", render_if: some_condition2
           item :second_item, "controller2#action"

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

@@ -64,7 +64,7 @@ describe SemanticNavigation::Core::Node do
       @node = SemanticNavigation::Core::Node.new({:url => [{:controller => :node_controller, :action => :action},
                                                            {:controller => :node_controller2, :action => :action}]},1)
 
-      @view_object = mock
+      @view_object = double
       @view_object.stub(:params).and_return({:action => "some", :action => "some"})
       SemanticNavigation::Configuration.stub(:view_object).and_return @view_object
     end
@@ -73,7 +73,7 @@ describe SemanticNavigation::Core::Node do
 
       it '@active variable to false if no active sub_elements and node url is not active' do
         @node.mark_active
-        @node.instance_variable_get("@active").should be_false
+        expect(@node.instance_variable_get("@active")).to eq false
       end
 
       it '@active variable to true if at least one sub_element is active' do
@@ -83,9 +83,9 @@ describe SemanticNavigation::Core::Node do
         @view_object.should_receive(:current_page?).with('222').and_return false
 
         @node.mark_active
-        @node.sub_elements[0].active.should be_true
-        @node.sub_elements[1].active.should be_false
-        @node.active.should be_true
+        expect(@node.sub_elements[0].active).to eq true
+        expect(@node.sub_elements[1].active).to eq false
+        expect(@node.active).to eq true
       end
 
       it '@active variable to false if all sub_elements is unactive' do
@@ -95,9 +95,9 @@ describe SemanticNavigation::Core::Node do
         @view_object.should_receive(:current_page?).with('444').and_return false
 
         @node.mark_active
-        @node.sub_elements[0].active.should be_false
-        @node.sub_elements[1].active.should be_false
-        @node.active.should be_false
+        expect(@node.sub_elements[0].active).to eq false
+        expect(@node.sub_elements[1].active).to eq false
+        expect(@node.active).to eq false
       end
     end
 
@@ -107,9 +107,9 @@ describe SemanticNavigation::Core::Node do
       @view_object.stub(:params).and_return({:controller => "controller1", :action => "action", :some_other_params => "blablabla"})
 
       @node.mark_active
-      @node.sub_elements[0].active.should be_true
-      @node.sub_elements[1].active.should be_false
-      @node.active.should be true
+      expect(@node.sub_elements[0].active).to eq true
+      expect(@node.sub_elements[1].active).to eq false
+      expect(@node.active).to eq true
     end
 
     it 'works for route like urls as good as for Hash url params' do
@@ -118,15 +118,15 @@ describe SemanticNavigation::Core::Node do
       @view_object.stub(:params).and_return({:controller => "controller1", :action => "action", :some_other_params => "blablabla"})
 
       @node.mark_active
-      @node.sub_elements[0].active.should be_true
-      @node.sub_elements[1].active.should be_false
-      @node.active.should be true
+      expect(@node.sub_elements[0].active).to eq true
+      expect(@node.sub_elements[1].active).to eq false
+      expect(@node.active).to eq true
     end
 
     it 'is active if at least one url in passed array is active' do
       @view_object.stub(:params).and_return(:controller => 'node_controller2', :action => 'action')
       @node.mark_active
-      @node.active.should be_true
+      expect(@node.active).to eq true
     end
 
     it 'accepts array like urls with other urls' do

data/spec/lib/semantic_navigation/helper_methods_spec.rb

@@ -11,7 +11,7 @@ describe SemanticNavigation::HelperMethods do
   describe "#navigation_for" do
 
     before :each do
-      SemanticNavigation::Configuration.stub!(:new).and_return (@config_instance = mock)
+      allow(SemanticNavigation::Configuration).to receive(:new).and_return (@config_instance = double)
     end
 
     it 'default renderer is :list' do

data/spec/lib/semantic_navigation/renderers/deprecations_spec.rb

@@ -17,10 +17,8 @@ describe 'SemanticNavigation::Deprecations' do
           puts e
         end
       end
-
-      (SomeRenderer.include?(
-        SemanticNavigation::Renderers::MixIn::RenderHelpers
-      ) rescue false).should be_true
+      
+      expect(SomeRenderer).to be_include(SemanticNavigation::Renderers::MixIn::RenderHelpers)
     end
   end
 
@@ -38,9 +36,7 @@ describe 'SemanticNavigation::Deprecations' do
         end
       end
 
-      (SomeRenderer.include?(
-        SemanticNavigation::Renderers::MixIn::ActsAsBreadcrumb
-      ) rescue false).should be_true
+      expect(SomeRenderer).to be_include(SemanticNavigation::Renderers::MixIn::ActsAsBreadcrumb)
     end
   end
 
@@ -58,9 +54,7 @@ describe 'SemanticNavigation::Deprecations' do
         end
       end
 
-      (SomeRenderer.include?(
-        SemanticNavigation::Renderers::MixIn::ActsAsList
-      ) rescue false).should be_true
+      expect(SomeRenderer).to be_include(SemanticNavigation::Renderers::MixIn::ActsAsList)
     end
   end
 

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ SemanticNavigation::Configuration.run do |c|
 end
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  # throw config.methods.select{|s| s.to_s =~ /color/}
+  config.color = true
   config.formatter     = 'documentation'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_navigation
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
 platform: ruby
 authors:
 - Sergey Gribovski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec