RubyGems - navi - Versions diffs - 0.0.17 → 0.1.3 - Mend

navi 0.0.17 → 0.1.3

Files changed (58) hide show

data/.gitignore +50 -0
data/.rvmrc +1 -1
data/Gemfile +1 -46
data/Gemfile.lock +136 -116
data/{README.textile → README.md} +32 -28
data/Rakefile +1 -44
data/features/step_definitions/category_steps.rb +1 -1
data/features/step_definitions/page_steps.rb +1 -1
data/lib/navi.rb +4 -11
data/lib/navi/navigable/base.rb +1 -0
data/lib/navi/navigable/instance_methods.rb +27 -1
data/lib/navi/version.rb +3 -0
data/navi.gemspec +44 -272
data/spec/dummy/Rakefile +1 -1
data/spec/dummy/app/assets/javascripts/application.js +7 -0
data/spec/dummy/{public → app/assets}/javascripts/jquery-ui.js +0 -0
data/spec/dummy/{public → app/assets}/javascripts/jquery-ui.min.js +0 -0
data/spec/dummy/{public → app/assets}/javascripts/jquery.js +0 -0
data/spec/dummy/{public → app/assets}/javascripts/jquery.min.js +0 -0
data/spec/dummy/{public → app/assets}/javascripts/jquery_ujs.js +0 -0
data/spec/dummy/{public → app/assets}/javascripts/menu_items/index.js +0 -0
data/spec/dummy/app/assets/stylesheets/application.css +7 -0
data/spec/dummy/app/controllers/categories_controller.rb +1 -0
data/spec/dummy/{lib/tasks → app/mailers}/.gitkeep +0 -0
data/spec/dummy/{public/stylesheets → app/models}/.gitkeep +0 -0
data/spec/dummy/app/views/layouts/application.html.erb +1 -1
data/spec/dummy/app/views/menu_items/index.html.haml +0 -3
data/spec/dummy/config/application.rb +14 -9
data/spec/dummy/config/boot.rb +1 -1
data/spec/dummy/config/database.yml +13 -7
data/spec/dummy/config/environments/development.rb +7 -3
data/spec/dummy/config/environments/production.rb +23 -12
data/spec/dummy/config/environments/test.rb +5 -1
data/spec/dummy/config/initializers/{navigable.rb → navi.rb} +0 -0
data/spec/dummy/config/initializers/secret_token.rb +1 -1
data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
data/spec/dummy/config/locales/en.yml +1 -1
data/spec/dummy/config/routes.rb +1 -57
data/spec/dummy/db/seeds.rb +4 -4
data/spec/dummy/{vendor/plugins → lib/assets}/.gitkeep +0 -0
data/spec/factories.rb +15 -0
data/spec/navi/navi_spec.rb +1 -1
data/spec/navi/navigable_spec.rb +23 -0
data/spec/navi/navigator_spec.rb +24 -12
data/spec/spec_helper.rb +18 -3
metadata +284 -504
data/VERSION +0 -1
data/spec/blueprints.rb +0 -23
data/spec/dummy/.gitignore +0 -6
data/spec/dummy/config/cucumber.yml +0 -8
data/spec/dummy/config/navigation.rb +0 -7
data/spec/dummy/lib/tasks/cucumber.rake +0 -57
data/spec/dummy/public/images/rails.png +0 -0
data/spec/dummy/public/index.html +0 -239
data/spec/dummy/public/javascripts/application.js +0 -2
data/spec/dummy/public/javascripts/rails.js +0 -315
data/spec/dummy/public/robots.txt +0 -5
data/spec/dummy/script/cucumber +0 -10

@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js ADDED

@@ -0,0 +1,7 @@
+// Place your application-specific JavaScript functions and classes here
+// This file is automatically included by javascript_include_tag :defaults
+//= require jquery
+//= require jquery-ui
+//= require jquery_ujs
+//= require 'nestedSortable/jquery.ui.nestedSortable'
+//= require 'menu_items/index'

data/spec/dummy/{public → app/assets}/javascripts/jquery-ui.js RENAMED

File without changes

data/spec/dummy/{public → app/assets}/javascripts/jquery-ui.min.js RENAMED

File without changes

data/spec/dummy/{public → app/assets}/javascripts/jquery.js RENAMED

File without changes

data/spec/dummy/{public → app/assets}/javascripts/jquery.min.js RENAMED

File without changes

data/spec/dummy/{public → app/assets}/javascripts/jquery_ujs.js RENAMED

File without changes

data/spec/dummy/{public → app/assets}/javascripts/menu_items/index.js RENAMED

File without changes

data/spec/dummy/app/assets/stylesheets/application.css ADDED

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree .
+*/

data/spec/dummy/app/controllers/categories_controller.rb CHANGED

@@ -1,4 +1,5 @@
 class CategoriesController < InheritedResources::Base
   def create
     create! do |success, failure|
       success.html {redirect_to categories_url}

data/spec/dummy/{lib/tasks → app/mailers}/.gitkeep RENAMED

File without changes

data/spec/dummy/{public/stylesheets → app/models}/.gitkeep RENAMED

File without changes

data/spec/dummy/app/views/layouts/application.html.erb CHANGED

@@ -3,7 +3,7 @@
 <head>
   <title>Dummy</title>
   <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
+  <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tag %>
   <%= yield :header %>
 </head>

data/spec/dummy/app/views/menu_items/index.html.haml CHANGED

@@ -1,6 +1,3 @@
-- content_for :header do
-  = javascript_include_tag "menu_items/index"
 %div#menu_items.index
   = render_widget :menu_editor

data/spec/dummy/config/application.rb CHANGED

@@ -1,13 +1,14 @@
 require File.expand_path('../boot', __FILE__)
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'rails/all'
 Bundler.require
-require "navi"
+# Don't know why I had to add these here, but did so because
+# Rails was complaining these things didn't exist.
+# Shouldn't Bundler be the one to load these in?
+require "inherited_resources"
+require "apotomo"
 module Dummy
   class Application < Rails::Application
@@ -33,13 +34,17 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    # JavaScript files you want as :defaults (application.js is always included).
-    config.action_view.javascript_expansions[:defaults] = %w(jquery jquery-ui.js rails nestedSortable/jquery.ui.nestedSortable.js)
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    # Enable the asset pipeline
+    config.assets.enabled = true
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end

data/spec/dummy/config/boot.rb CHANGED

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml CHANGED

@@ -1,19 +1,25 @@
 # SQLite version 3.x
 #   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
 development:
   adapter: sqlite3
-  database: "db/development.sql"
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test: &test
+test:
   adapter: sqlite3
-  database: "db/test.sql"
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
 production:
   adapter: sqlite3
-  database: "db/production.sql"
-cucumber:
-  <<: *test
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/dummy/config/environments/development.rb CHANGED

@@ -3,7 +3,7 @@ Dummy::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Dummy::Application.configure do
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
   # Don't care if the mailer can't send
@@ -22,5 +21,10 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
+  # Do not compress assets
+  config.assets.compress = false
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

data/spec/dummy/config/environments/production.rb CHANGED

@@ -1,7 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
@@ -9,14 +8,27 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+  # Generate digests for assets URLs
+  config.assets.digest = true
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +39,12 @@ Dummy::Application.configure do
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false

data/spec/dummy/config/environments/test.rb CHANGED

@@ -7,7 +7,11 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
   # Show full error reports and disable caching

data/spec/dummy/config/initializers/{navigable.rb → navi.rb} RENAMED

File without changes

data/spec/dummy/config/initializers/secret_token.rb CHANGED

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '0b31363e8ac2f3bd2717e057333527e99c428dd8d0cfb67788d8adb3e648faf8afe113911ad6a7ca34fd8519df8030193d2b253a09d0300cdf2fb9f83bdd5c74'
+Dummy::Application.config.secret_token = '8e022862346d535cb24318751060f3deb41ae4de345e0ee5a827fe9108d13f4927b2b4b51e22e7dd74d68646202b378b97f521b565620822157aa3455764b235'

data/spec/dummy/config/initializers/wrap_parameters.rb ADDED

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/spec/dummy/config/locales/en.yml CHANGED

@@ -1,5 +1,5 @@
 # Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
   hello: "Hello world"

data/spec/dummy/config/routes.rb CHANGED

@@ -1,61 +1,5 @@
-Dummy::Application.routes.draw do
+Rails.application.routes.draw do
   resources :menu_items
   resources :pages
   resources :categories
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-  # See how all your routes lay out with "rake routes"
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
 end

data/spec/dummy/db/seeds.rb CHANGED

@@ -8,8 +8,8 @@
 require '../../spec/blueprints'
-Page.make :name => "Home"
-Page.make :name => "About"
+Factory :page, :name => "Home"
+Factory :page, :name => "About"
-Category.make :name => "Cars"
-Category.make :name => "Animals"
+Factory :category, :name => "Cars"
+Factory :category, :name => "Animals"

data/spec/dummy/{vendor/plugins → lib/assets}/.gitkeep RENAMED

File without changes

data/spec/factories.rb ADDED

@@ -0,0 +1,15 @@
+FactoryGirl.define do
+  factory :category do
+    name "Name"
+  end
+  factory :menu_item do
+    label "Some menu item name"
+    url "http://somedomain.com"
+    site_id 1
+  end
+  factory :page do
+    name "Some page name"
+  end
+end

data/spec/navi/navi_spec.rb CHANGED

@@ -68,7 +68,7 @@ describe Navi do
   describe "#to_navigator!" do
     it "should immediately create the navigator item" do
-      category = Category.make
+      category = Factory :category
       navigator = category.to_navigator!
       navigator.should_not be_new_record
     end

data/spec/navi/navigable_spec.rb ADDED

@@ -0,0 +1,23 @@
+require 'spec_helper'
+describe "Navigable" do
+  context "when deleted" do
+    before do
+      page = Factory :page, :name => "Page name"
+      @menu_item = page.to_navigator!
+      page.destroy
+      @menu_item.reload
+    end
+    it "should nullify the navigator's (menu item) pointer to itself" do
+      @menu_item.navigable.should be_nil
+      @menu_item.navigable_id.should be_nil
+      @menu_item.navigable_type.should be_nil
+    end
+    it "should set the label and url" do
+      @menu_item.label.should == "Page name"
+      @menu_item.url.should == "#"
+    end
+  end
+end

data/spec/navi/navigator_spec.rb CHANGED

@@ -7,7 +7,7 @@ describe MenuItem do
       MenuItem.new.should_not be_valid
       MenuItem.new(:label => "Something").should_not be_valid
       MenuItem.new(:url => "Something").should_not be_valid
-      MenuItem.new(:navigable => Page.make).should be_valid
+      MenuItem.new(:navigable => Factory(:page)).should be_valid
       MenuItem.new(:label => "", :url => "").should_not be_valid
       MenuItem.new(:label => "Not blank", :url => "Some url").should be_valid
     end
@@ -15,10 +15,22 @@ describe MenuItem do
   describe "when configuring ordered_tree" do
     # After we run the tests, reset the ordered tree changes we may have made
-    after { MenuItem.class_eval {
-      ordered_tree # set ordered_tree with no args
-      def scope_condition; "1=1"; end # this is the default scope condition in ordered_tree gem
-    } }
+    before do
+      # Remove the constant to avoid warnings
+      Object.send(:remove_const, :MenuItemDup) if defined?(MenuItemDup)
+      # duplicate the MenuItem and modify MenuItem to set back later
+      MenuItemDup = MenuItem.dup
+      MenuItem.class_eval do
+        ordered_tree # set ordered_tree with no args
+        def scope_condition; "1=1"; end # this is the default scope condition in ordered_tree gem
+      end
+    end
+    after do
+      Object.send :remove_const, :MenuItem
+      MenuItem = MenuItemDup
+    end
     it "should allow overriding of ordered_tree's scope_condition" do
       MenuItem.class_eval do
@@ -26,9 +38,9 @@ describe MenuItem do
           "site_id = #{site_id}"
         end
       end
-      MenuItem.make(:site_id => 1)
-      MenuItem.make(:site_id => 2)
-      menu_item = MenuItem.make(:site_id => 1)
+      Factory(:menu_item, :site_id => 1)
+      Factory(:menu_item, :site_id => 2)
+      menu_item = Factory(:menu_item, :site_id => 1)
       menu_item.position.should == 2
     end
@@ -36,9 +48,9 @@ describe MenuItem do
       MenuItem.class_eval do
         ordered_tree :scope => :site
       end
-      MenuItem.make(:site_id => 3)
-      MenuItem.make(:site_id => 4)
-      menu_item = MenuItem.make(:site_id => 3)
+      Factory(:menu_item, :site_id => 3).position.should == 1
+      Factory(:menu_item, :site_id => 4)
+      menu_item = Factory(:menu_item, :site_id => 3)
       menu_item.position.should == 2
     end
   end
@@ -68,7 +80,7 @@ describe MenuItem do
           end
         end
       end
       describe "and there is no navigable model" do
         it "should return nil" do
           MenuItem.new.label.should == nil