contour 0.6.1 → 0.7.0

data/app/views/contour/layouts/_menu.html.erb

@@ -3,32 +3,26 @@
   <% display = ['signed_in', 'always'] %>
 <% end %>
 
-<% Contour.menu_items.each do |menu_item| %>
-  <% if display.include?(menu_item[:display]) and (menu_item[:condition].blank? or eval(menu_item[:condition])) %>
-    <div style="float:<%= menu_item[:position] %>">
-      <%= link_to_function (menu_item[:eval] ? eval(menu_item[:name]) : menu_item[:name].html_safe + (menu_item[:image].blank? ? '' : image_tag(menu_item[:image], menu_item[:image_options]))), "$('#menu_#{menu_item[:id]}').show();", :onmouseover => "$('#menu_#{menu_item[:id]}').show();" %>
-      <div style="position:relative;">
-        <div id="menu_<%= menu_item[:id] %>" class="menu_dropdown_<%= menu_item[:position_class] %>" style="display:none">
+<ul class="ul-menu">
+  <% Contour.menu_items.each do |menu_item| %>
+    <% if display.include?(menu_item[:display]) and (menu_item[:condition].blank? or eval(menu_item[:condition])) %>
+      <li class="parent li_<%= menu_item[:position] %>">
+        <%= link_to (menu_item[:eval] ? eval(menu_item[:name]) : menu_item[:name].html_safe + (menu_item[:image].blank? ? '' : image_tag(menu_item[:image], menu_item[:image_options]))), eval(menu_item[:path]), :class => 'noicon', :target => menu_item[:target] %>
+        <% if menu_item[:links].size > 0 %>
+          <ul>
           <% menu_item[:links].each do |link| %>
             <% if link[:condition].blank? or eval(link[:condition]) %>
               <% if link[:html].blank? %>
-                <div style="white-space:nowrap">
-                  <%= link_to (link[:eval] ? eval(link[:name]) : link[:name].html_safe + (link[:image].blank? ? '' : image_tag(link[:image], link[:image_options]))), eval(link[:path]), :class => 'noicon', :target => link[:target] %>
-                </div>
+                <li><%= link_to (link[:eval] ? eval(link[:name]) : link[:name].html_safe + (link[:image].blank? ? '' : image_tag(link[:image], link[:image_options]))), eval(link[:path]), :class => 'noicon', :target => link[:target] %></li>
               <% else %>
-                <%= link[:eval] ? eval(link[:html]).html_safe : link[:html].html_safe %>
+                <li><%= link[:eval] ? eval(link[:html]).html_safe : link[:html].html_safe %></li>
               <% end %>
             <% end %>
           <% end %>
-        </div>
-      </div>
-    </div>
+          </ul>
+        <% end %>
+      </li>
+    <% end %>
   <% end %>
-<% end %>
-
-<% ids = Contour.menu_items.select{|mi| display.include?(mi[:display])}.collect{|mi| mi[:id]} %>
-<%= javascript_tag "hideOnMouseOut([#{ids.collect{|id| "'#menu_#{id}'"}.join(',')}]);" %>
-
-<%= render :partial => 'contour/authentications/menu' unless user_signed_in? %>
-
-<div style="clear:both"></div>
+  <%= render :partial => 'contour/authentications/menu' unless user_signed_in? %>
+</ul>

data/app/views/contour/layouts/application.html.erb

@@ -24,10 +24,8 @@
     </div>
   </div>
 
-  <div style="height:29px">
-    <div id="menu" class="container">
-      <%= render :partial => 'contour/layouts/menu' %>
-    </div>
+  <div id="menu" class="container shadow">
+    <%= render :partial => 'contour/layouts/menu' %>
   </div>
 
   <div id="content" class="container">

data/app/views/contour/sessions/new.html.erb

@@ -2,7 +2,7 @@
 
 <table class="blank padded">
   <tr>
-    <td valign="middle">
+    <td style="vertical-align:top">
       <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
         <fieldset style="width:235px">
           <legend><%= @title %></legend>
@@ -29,7 +29,7 @@
         </div>
       <% end %>
     </td>
-    <td>
+    <td style="vertical-align:top">
       <%= render :partial => 'contour/layouts/latest_news' %>
     </td>
   </tr>

data/config/routes.rb

@@ -0,0 +1,16 @@
+Rails.application.routes.draw do
+  
+  match '/auth/failure' => 'contour/authentications#failure'
+  match '/auth/:provider/callback' => 'contour/authentications#create'
+  match '/auth/:provider' => 'contour/authentications#passthru'
+  match '/contour' => 'contour/samples#index'
+
+  resources :authentications, controller: 'contour/authentications'
+  
+  # devise_for :users, controllers: { registrations:  'contour/registrations',
+  #                                   sessions:       'contour/sessions',
+  #                                   passwords:      'contour/passwords' },
+  #                    path_names:  { sign_up:        'register',
+  #                                   sign_in:        'login' }
+  
+end

data/contour.gemspec

@@ -11,17 +11,21 @@ require 'contour/version'
 
 Gem::Specification.new do |s|
   s.name = 'contour'
-  s.version = Contour::VERSION::STRING
-  s.platform = Gem::Platform::RUBY
-  s.summary = 'Basic Rails framework files and assets for layout and authentication'
-  s.email = 'remosm@gmail.com'
-  s.homepage = 'https://github.com/remomueller'
-  s.authors = ['Remo Mueller']
+  s.version     = Contour::VERSION::STRING
+  s.authors     = ['Remo Mueller']
+  s.email       = 'remosm@gmail.com'
+  s.homepage    = 'https://github.com/remomueller'
+  s.summary     = 'Basic Rails framework files and assets for layout and authentication'
   s.description = 'Basic Rails Framework files and assets for layout and authentication'
-
-  s.add_dependency('devise', '~> 1.4.9')
-  s.add_dependency('omniauth', '=0.2.6')
-  s.add_dependency('jquery-rails', '~> 1.0.17')
   
-  s.files = `git ls-files`.split("\n")
+  s.platform = Gem::Platform::RUBY
+  
+  s.add_dependency 'rails',         '~> 3.1.3'
+  s.add_dependency 'devise',        '~> 1.4.9'
+  s.add_dependency 'omniauth',      '=0.2.6'
+  s.add_dependency 'jquery-rails',  '~> 1.0.17'
+  
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["CHANGELOG.rdoc", "contour.gemspec", "LICENSE", "Rakefile", "README.rdoc"]
+  # s.files = `git ls-files`.split("\n")
+  s.test_files = Dir["test/**/*"]
 end

data/lib/contour.rb

@@ -30,16 +30,20 @@ module Contour
   mattr_accessor :menu_items
   @@menu_items = [
     {
-      :name => 'Login', :id => 'auth', :display => 'not_signed_in', :position => 'right', :position_class => 'right',
-      :links => [{:name => 'Login', :path => 'new_user_session_path'}, {:html => "<hr>"}, {:name => 'Sign Up', :path => 'new_user_registration_path'}]
+      :name => 'Login', :id => 'auth', :display => 'not_signed_in', :path => 'new_user_session_path', :position => 'right',
+      :links => [{:name => 'Sign Up', :path => 'new_user_registration_path'}]
     },
     {
-      :name => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :position => 'right', :position_class => 'right', :condition => 'true',
-      :links => [{:html => '"<div style=\"white-space:nowrap\">"+(current_user.methods.include?(:name) ? current_user.name.to_s : "")+"</div>"', :eval => true}, {:html => '"<div class=\"small quiet\">"+current_user.email+"</div>"', :eval => true}, {:name => 'Authentications', :path => 'authentications_path', :condition => 'not PROVIDERS.blank?'}, {:html => "<hr>"}, {:name => 'Logout', :path => 'destroy_user_session_path'}]
+      :name => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :path => 'user_path(current_user)', :position => 'right', :condition => 'true',
+      links: [{ :html => '"<div class=\"small\" style=\"color:#bbb\">"+current_user.email+"</div>"', :eval => true },
+              { :name => 'Settings', :path => 'settings_path' },
+              { :name => 'Authentications', :path => 'authentications_path', :condition => 'not PROVIDERS.blank?' },
+              { :html => "<br />" },
+              { :name => 'Logout', :path => 'destroy_user_session_path' }]
     },
     {
-      :name => 'Home', :id => 'home', :display => 'always', :position => 'left', :position_class => 'left',
-      :links => [{:name => 'Home', :path => 'root_path'}]
+      :name => 'Home', :id => 'home', :display => 'always', :path => 'root_path', :position => 'left',
+      :links => []
     }
   ]
    

data/lib/contour/engine.rb

@@ -1,6 +1,5 @@
 require "contour"
 require "rails"
-require 'contour/engine/routes'
 
 module Contour
   class Engine < Rails::Engine

data/lib/contour/version.rb

@@ -1,8 +1,8 @@
 module Contour
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
-    TINY = 1
+    MINOR = 7
+    TINY = 0
     BUILD = nil # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')

data/lib/generators/contour/install_generator.rb

@@ -20,10 +20,11 @@ module Contour
 
       def add_contour_route
         contour_routes = []
-        contour_routes << "match '/auth/failure' => 'contour/authentications#failure'"
-        contour_routes << "match '/auth/:provider/callback' => 'contour/authentications#create'"
-        contour_routes << "match '/auth/:provider' => 'contour/authentications#passthru'"
-        contour_routes << "resources :authentications, :controller => 'contour/authentications'"
+        # These are now included in the routes file.
+        # contour_routes << "match '/auth/failure' => 'contour/authentications#failure'"
+        # contour_routes << "match '/auth/:provider/callback' => 'contour/authentications#create'"
+        # contour_routes << "match '/auth/:provider' => 'contour/authentications#passthru'"
+        # contour_routes << "resources :authentications, :controller => 'contour/authentications'"
         # contour_routes << "devise_for :users, :controllers => {:registrations => 'contour/registrations', :sessions => 'contour/sessions', :passwords => 'contour/passwords'}, :path_names => { :sign_up => 'register', :sign_in => 'login' }"
         contour_routes.reverse.each do |contour_route|
           route contour_route

data/lib/generators/templates/contour.rb

@@ -18,16 +18,20 @@ Contour.setup do |config|
   
   # Enter the items you wish to see in the menu
   # config.menu_items = [{
-  #   :name => 'Login', :id => 'auth', :display => 'not_signed_in', :position => 'right', :position_class => 'right', :condition => 'true',
-  #   :links => [{:name => 'Login', :path => 'new_user_session_path'}, {:html => "<hr>"}, {:name => 'Sign Up', :path => 'new_user_registration_path'}]
+  #   :name => 'Login', :id => 'auth', :display => 'not_signed_in', :path => 'new_user_session_path', :position => 'right', :condition => 'true',
+  #   :links => [{:name => 'Sign Up', :path => 'new_user_registration_path'}]
   # },
   # {
-  #   :name => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :position => 'right', :position_class => 'right', :condition => 'true',
-  #   :links => [{:html => '"<div style=\"white-space:nowrap\">"+(current_user.methods.include?(:name) ? current_user.name.to_s : "")+"</div>"', :eval => true}, {:html => '"<div class=\"small quiet\">"+current_user.email+"</div>"', :eval => true}, {:name => 'Authentications', :path => 'authentications_path', :condition => 'not PROVIDERS.blank?'}, {:html => "<hr>"}, {:name => 'Logout', :path => 'destroy_user_session_path'}]
+  #   :name => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :path => 'user_path(current_user)', :position => 'right', :condition => 'true',
+  #   links: [{ :html => '"<div class=\"small\" style=\"color:#bbb\">"+current_user.email+"</div>"', :eval => true },
+  #           { :name => 'Settings', :path => 'settings_path' },
+  #           { :name => 'Authentications', :path => 'authentications_path', :condition => 'not PROVIDERS.blank?' },
+  #           { :html => "<br />" },
+  #           { :name => 'Logout', :path => 'destroy_user_session_path' }]
   # },
   # {
-  #   :name => 'Home', :id => 'home', :display => 'always', :position => 'left', :position_class => 'left', :condition => 'true', :image => '', :image_options => {},
-  #   :links => [{:name => 'Home', :path => 'root_path', :image => '', :image_options => {}}]
+  #   :name => 'Home', :id => 'home', :display => 'always', :path => 'root_path', :position => 'left', :condition => 'true', :image => '', :image_options => {},
+  #   :links => []
   # }]
   
   # Enter an address of a valid RSS Feed if you would like to see news on the sign in page.

data/test/contour_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ContourTest < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, Contour
+  end
+end

data/test/dummy/Rakefile

@@ -0,0 +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__)
+
+Dummy::Application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,8 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require contour
+//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,8 @@
+/*
+ * 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 contour
+ *= require_tree . 
+*/

data/test/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/dummy/app/models/user.rb

@@ -0,0 +1,45 @@
+# rails g model Authentication user_id:integer provider:string uid:string
+# rails g migration CreateUsers first_name:string last_name:string
+
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :encryptable, :confirmable, :lockable and :omniauthable
+  devise :database_authenticatable, :registerable, :timeoutable, :token_authenticatable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :first_name, :last_name
+
+  # Named Scopes
+  scope :current, :conditions => { :deleted => false }
+  
+  # Model Relationships
+  has_many :authentications
+  
+  def name
+    first_name + ' ' + last_name
+  end
+  
+  def reverse_name
+    last_name + ', ' + first_name
+  end
+
+  # Overriding Devise built-in active? method
+  def active_for_authentication?
+    super # and self.status == 'active' and not self.deleted?
+  end
+  
+  def apply_omniauth(omniauth)
+    unless omniauth['user_info'].blank?
+      self.email = omniauth['user_info']['email'] if email.blank?
+      self.first_name = omniauth['user_info']['first_name'] if first_name.blank?
+      self.last_name = omniauth['user_info']['last_name'] if last_name.blank?
+    end
+    authentications.build(:provider => omniauth['provider'], :uid => omniauth['uid'])
+  end
+
+  def password_required?
+    (authentications.empty? || !password.blank?) && super
+  end
+  
+end

data/test/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/test/dummy/config/application.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require
+require "contour"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # 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/test/dummy/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/database.yml

@@ -0,0 +1,37 @@
+# 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.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:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.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:
+#   adapter: sqlite3
+#   database: ":memory:"
+# 
+# production:
+#   adapter: sqlite3
+#   database: ":memory:"

data/test/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/test/dummy/config/environments/development.rb

@@ -0,0 +1,30 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # 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 web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end