navi 0.1.4 → 0.2.0

data/.gitignore

@@ -48,3 +48,4 @@ rerun.txt
 spec/dummy/db/*.sql
 spec/dummy/db/*.sqlite3
 spec/dummy/log
+spec/dummy/tmp

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p286

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 0.2.0
+
+Add ability to pass namespace to generate all links under. `navi_render items, namespace: 'admin'`

data/Gemfile

@@ -1,3 +1,8 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
+
+gem 'haml'
+gem 'apotomo', '~> 1.2.3'
+gem 'simple-navigation'
+gem 'pry'

data/Gemfile.lock

@@ -1,62 +1,62 @@
 PATH
   remote: .
   specs:
-    navi (0.1.3)
+    navi (0.2.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
+      easy_class_to_instance_method (= 0.0.1)
       ordered_tree (>= 0.1.6)
+      simple-navigation (~> 3.11.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    apotomo (1.2.2)
+    addressable (2.3.4)
+    apotomo (1.2.3)
       cells (>= 3.6.7)
       hooks (~> 0.2.0)
       onfire (~> 0.2.0)
-    archive-tar-minitar (0.5.2)
-    arel (3.0.0)
-    builder (3.0.0)
-    capybara (1.1.2)
+    arel (3.0.2)
+    builder (3.0.4)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    cells (3.8.1)
-      actionpack (~> 3.0)
-      railties (~> 3.0)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
-    columnize (0.3.6)
+      xpath (~> 2.0)
+    cells (3.8.8)
+      actionpack (>= 3.0)
+      railties (>= 3.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
     cucumber (0.10.7)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -68,12 +68,14 @@ GEM
       cucumber (>= 0.10.5)
       nokogiri (>= 1.4.4)
       rack-test (>= 0.5.7)
-    database_cleaner (0.7.1)
-    diff-lcs (1.1.3)
+    database_cleaner (1.0.1)
+    diff-lcs (1.2.4)
+    easy_class_to_instance_method (0.0.1)
+      activesupport (>= 3.0.0)
     erubis (2.7.0)
-    factory_girl (2.5.1)
-      activesupport
-    ffi (1.0.11)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    ffi (1.8.1)
     gherkin (2.4.21)
       json (>= 1.4.6)
     guard (0.3.4)
@@ -81,136 +83,117 @@ GEM
     guard-cucumber (0.3.4)
       cucumber (~> 0.10.0)
       guard (~> 0.3.0)
-    guard-rspec (0.3.1)
-      guard (>= 0.2.2)
-    haml (3.1.4)
-    has_scope (0.5.1)
-    hike (1.2.1)
-    hooks (0.2.0)
-    i18n (0.6.0)
-    inherited_resources (1.3.0)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6.0)
-    journey (1.0.1)
-    jquery-rails (2.0.0)
-      railties (>= 3.2.0.beta, < 5.0)
-      thor (~> 0.14)
-    json (1.6.5)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
-    libnotify (0.7.2)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
+    haml (4.0.3)
+      tilt
+    hike (1.2.3)
+    hooks (0.2.2)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.2.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    launchy (2.3.0)
+      addressable (~> 2.3)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    method_source (0.8.1)
+    mime-types (1.23)
+    multi_json (1.7.6)
     nifty-generators (0.4.6)
-    nokogiri (1.5.0)
+    nokogiri (1.5.9)
     onfire (0.2.0)
     ordered_tree (0.2.1)
       activerecord (>= 3.1.1)
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rdoc (3.12)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    responders (0.6.5)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.18.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.32.1)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      multi_json (~> 1.0)
       rubyzip
-    simple-navigation (3.2.0)
+      websocket (~> 1.0.4)
+    simple-navigation (3.11.0)
       activesupport (>= 2.3.2)
-    sprockets (2.1.2)
+    slop (3.4.4)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
+    sqlite3 (1.3.7)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    tilt (1.4.1)
+    tins (0.8.0)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    xpath (0.1.4)
+    tzinfo (0.3.37)
+    websocket (1.0.7)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  apotomo (~> 1.2.2)
-  bundler (~> 1.0.0)
+  apotomo (~> 1.2.3)
   capybara (>= 1.0.0.rc1)
   cucumber
   cucumber-rails (= 0.5.2)
   database_cleaner
-  factory_girl (~> 2.5.1)
+  factory_girl (~> 4.2.0)
   guard-cucumber (= 0.3.4)
-  guard-rspec
   haml
-  inherited_resources (~> 1.3.0)
-  jquery-rails (~> 2.0.0)
+  jquery-rails (~> 2.2.1)
   launchy
-  libnotify
   navi!
   nifty-generators
+  pry
   rails (~> 3.2.0)
-  rb-inotify
-  rspec (~> 2.6.0)
-  rspec-rails (~> 2.6.1)
-  ruby-debug19
-  simple-navigation (= 3.2.0)
+  rspec-rails (~> 2.13.2)
+  selenium-webdriver
+  simple-navigation
   sqlite3

data/README.md

@@ -58,6 +58,14 @@ You must supply an array of top-most items to render. What do I mean? "top-most"
 
 You can create your own renderer too. For this, see the wiki. I could add these into the gem. Send me a pull request.
 
+## Namespace
+
+You can render all your links in a namespace:
+
+    <%= navi_render NavItem.roots, namespace: 'preview' %>
+
+This is useful if you want to generate the same links but have them all point to a different route. For example, you have a CMS and there's a preview section where you want the links that are generated to be the same, yet point to all other preview pages in the CMS.
+
 # Contributing to navigable
 
 _To develop and run tests, see the Gemfile and read the comments right above the :development, :test, :cucumber group._

data/features/step_definitions/category_steps.rb

@@ -1,3 +1,3 @@
 Given /^a category "([^"]*)" exists$/ do |name|
-  Factory :category, :name => name
+  FactoryGirl.create :category, name: name
 end

data/features/step_definitions/page_steps.rb

@@ -1,3 +1,3 @@
 Given /^a page "([^"]*)" exists$/ do |name|
-  Factory :page, :name => name
+  FactoryGirl.create :page, :name => name
 end

data/features/support/env.rb

@@ -1,6 +1,10 @@
 ENV["RAILS_ENV"] ||= "test"
-require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
-require File.expand_path("../../../spec/blueprints.rb",  __FILE__)
+SPEC_DIR = File.join(File.dirname(__FILE__), '..', '..', 'spec')
+require File.join(SPEC_DIR, 'dummy', 'config', 'environment')
+
+require 'factory_girl'
+require File.join(SPEC_DIR, 'factories')
+Dir.glob(File.join(SPEC_DIR, 'factories', '**', '*.rb')).each {|f| require f}
 
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'cucumber/rails/rspec'
@@ -56,6 +60,7 @@ if defined?(ActiveRecord::Base)
   begin
     require 'database_cleaner'
     DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean
   rescue LoadError => ignore_if_database_cleaner_not_present
   end
 end

data/lib/navi.rb

@@ -1,3 +1,4 @@
+require 'easy_class_to_instance_method'
 require 'active_support'
 require "active_support/core_ext/module" # so we can use mattr_accessor
 require 'active_record'
@@ -18,5 +19,5 @@ module Navi
   @@navigator ||= :nav_item
 
   mattr_accessor :renderer
-  @@renderer ||= Navi::Renderers::SimpleNavigation
+  @@renderer ||= Navi::Renderers::SimpleNavigation::Renderer
 end

data/lib/navi/renderers/base.rb

@@ -5,8 +5,6 @@ module Navi
 
       def initialize(context)
         @context = context
-        @controller = controller_from @context
-        @template = template_from @controller
       end
 
       def render(collection)
@@ -15,16 +13,20 @@ module Navi
 
       private
 
-      # Pretty much lifted from 
-      # https://github.com/andi/simple-navigation/blob/master/lib/simple_navigation/adapters/rails.rb
-      def controller_from(context)
-        context.respond_to?(:controller) ? context.controller : context
+      def controller
+        @controller ||= if @context.respond_to?(:controller)
+                          @context.controller
+                        else
+                          @context
+                        end
       end
 
-      # Pretty much lifted from 
-      # https://github.com/andi/simple-navigation/blob/master/lib/simple_navigation/adapters/rails.rb
-      def template_from(controller)
-        controller.respond_to?(:view_context) ? controller.view_context : controller.instance_variable_get(:@template)
+      def template
+        @template ||= if controller.respond_to?(:view_context)
+                        controller.view_context
+                      else
+                        controller.instance_variable_get(:@template)
+                      end
       end
     end
   end