contour 0.2.1 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+== 0.3.0
+
+* Enhancements
+  * Update dependencies to Devise 1.4.4, (needed for Rails 3.1.0)
+  * Menu items are now rendered using html_safe
+  * Links and menu items can now have a :condition parameter passed to it which is a string that can be evaluated to true or false
+    * ex: :condition => 'current_user.admin?'
+
+* Testing
+  * Created limited tests for authentications controller and registrations
+
 == 0.2.1
 
 * Bug Fix

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

@@ -4,18 +4,20 @@
 <% end %>
 
 <% Contour.menu_items.each do |menu_item| %>
-  <% if display.include?(menu_item[:display]) %>
+  <% 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]), "$('#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">
           <% menu_item[:links].each do |link| %>
-            <% if link[:html].blank? %>
-              <div style="white-space:nowrap">
-                <%= link_to (link[:eval] ? eval(link[:name]) : link[:name]), eval(link[:path]), :class => 'noicon' %>
-              </div>
-            <% else %>
-              <%= link[:eval] ? eval(link[:html]).html_safe : link[:html].html_safe %>
+            <% 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), eval(link[:path]), :class => 'noicon' %>
+                </div>
+              <% else %>
+                <%= link[:eval] ? eval(link[:html]).html_safe : link[:html].html_safe %>
+              <% end %>
             <% end %>
           <% end %>
         </div>

data/contour.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.authors = ["Remo Mueller"]
   s.description = "Basic Rails Framework files and assets for layout and authentication"
 
-  s.add_dependency("devise", "~> 1.3.4")
+  s.add_dependency("devise", "~> 1.4.4")
   s.add_dependency("omniauth", "~> 0.2.6")
   
   s.files = `git ls-files`.split("\n")

data/lib/contour/version.rb

@@ -1,3 +1,3 @@
 module Contour
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/generators/templates/contour.rb

@@ -15,15 +15,15 @@ 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',
+  #   :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 => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :position => 'right', :position_class => 'right',
+  #   :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.name+"</div>"', :eval => true}, {:html => '"<div class=\"small quiet\">"+current_user.email+"</div>"', :eval => true}, {:name => 'Authentications', :path => 'authentications_path'}, {:html => "<hr>"}, {:name => 'Logout', :path => 'destroy_user_session_path'}]
   # },
   # {
-  #   :name => 'Home', :id => 'home', :display => 'always', :position => 'left', :position_class => 'left',
+  #   :name => 'Home', :id => 'home', :display => 'always', :position => 'left', :position_class => 'left', :condition => 'true',
   #   :links => [{:name => 'Home', :path => 'root_path'}, {:html => "<hr>"}, {:name => 'About', :path => 'about_path'}]
   # }]
   

data/test/fixtures/authentications.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  user_id: 1
+  provider: provider
+  uid: UniqueIDOne
+  
+two:
+  user_id: 2
+  provider: provider
+  uid: UniqueIDOne

data/test/functional/authentications_controller_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+class AuthenticationsControllerTest < ActionController::TestCase
+  setup do
+    login(users(:valid))
+    @request.env["omniauth.auth"] = {'provider' => 'google_apps', 'user_info'=> {'email' => 'test@example.com'}}
+    @authentication = authentications(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:authentications)
+  end
+
+  # TODO: Remove
+  # test "should get new" do
+  #   get :new
+  #   assert_response :success
+  # end
+
+  # TODO Redirects to Authentication Controller if user logged in, if not redirect to user sign up.
+  test "should create authentication" do
+    assert_difference('Authentication.count') do
+      post :create, :authentication => @authentication.attributes
+    end
+
+    assert_redirected_to authentications_path
+  end
+
+  # TODO: Remove
+  # test "should show authentication" do
+  #   get :show, :id => @authentication.to_param
+  #   assert_response :success
+  # end
+
+  # TODO: Remove
+  # test "should get edit" do
+  #   get :edit, :id => @authentication.to_param
+  #   assert_response :success
+  # end
+
+  # TODO: Remove
+  # test "should update authentication" do
+  #   put :update, :id => @authentication.to_param, :authentication => @authentication.attributes
+  #   assert_redirected_to authentication_path(assigns(:authentication))
+  # end
+
+  test "should destroy authentication" do
+    assert_difference('Authentication.count', -1) do
+      delete :destroy, :id => @authentication.to_param
+    end
+
+    assert_redirected_to authentications_path
+  end
+end

data/test/functional/registrations_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class RegistrationsControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/test/unit/authentication_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class AuthenticationTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/test/unit/helpers/registrations_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class RegistrationsHelperTest < ActionView::TestCase
+end

data/vendor/assets/stylesheets/contour.css

@@ -3,13 +3,13 @@
  * 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 jquery-ui-1.8.10.custom
- *= require bluetrip-screen
- *= require global
- *= require header
- *= require message
- *= require menu
- *= require popup
- *= require authentication
+ *= require external/jquery-ui-1.8.10.custom
+ *= require external/bluetrip-screen
+ *= require contour/global
+ *= require contour/header
+ *= require contour/message
+ *= require contour/menu
+ *= require contour/popup
+ *= require contour/authentication
  *= require_tree . 
 */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70197105513840 !ruby/object:Gem::Requirement
+  requirement: &70325710820340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70197105513840
+  version_requirements: *70325710820340
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70197105513340 !ruby/object:Gem::Requirement
+  requirement: &70325710801360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70197105513340
+  version_requirements: *70325710801360
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -70,6 +70,11 @@ files:
 - lib/generators/templates/omniauth.rb
 - lib/generators/templates/omniauth_fix.rb
 - lib/generators/templates/rack_fix.rb
+- test/fixtures/authentications.yml
+- test/functional/authentications_controller_test.rb
+- test/functional/registrations_controller_test.rb
+- test/unit/authentication_test.rb
+- test/unit/helpers/registrations_helper_test.rb
 - vendor/assets/images/authbuttons/cas_32.png
 - vendor/assets/images/authbuttons/cas_64.png
 - vendor/assets/images/authbuttons/facebook_32.png
@@ -126,23 +131,23 @@ files:
 - vendor/assets/images/stock/visited.png
 - vendor/assets/images/stock/xls.png
 - vendor/assets/javascripts/contour.js
-- vendor/assets/javascripts/errors.js.coffee
+- vendor/assets/javascripts/contour/errors.js.coffee
+- vendor/assets/javascripts/contour/global.js.coffee
+- vendor/assets/javascripts/contour/menu.js.coffee
+- vendor/assets/javascripts/contour/popup.js.coffee
 - vendor/assets/javascripts/external/exporting-2.1.4.src.js
 - vendor/assets/javascripts/external/highcharts-2.1.4.src.js
 - vendor/assets/javascripts/external/jquery-ui-1.8.10.custom.min.js
 - vendor/assets/javascripts/external/waypoints.js
-- vendor/assets/javascripts/global.js.coffee
-- vendor/assets/javascripts/menu.js.coffee
-- vendor/assets/javascripts/popup.js.coffee
-- vendor/assets/stylesheets/authentication.css
-- vendor/assets/stylesheets/bluetrip-screen.css
 - vendor/assets/stylesheets/contour.css
-- vendor/assets/stylesheets/global.css
-- vendor/assets/stylesheets/header.css
-- vendor/assets/stylesheets/jquery-ui-1.8.10.custom.css
-- vendor/assets/stylesheets/menu.css
-- vendor/assets/stylesheets/message.css
-- vendor/assets/stylesheets/popup.css
+- vendor/assets/stylesheets/contour/authentication.css
+- vendor/assets/stylesheets/contour/global.css
+- vendor/assets/stylesheets/contour/header.css
+- vendor/assets/stylesheets/contour/menu.css
+- vendor/assets/stylesheets/contour/message.css
+- vendor/assets/stylesheets/contour/popup.css
+- vendor/assets/stylesheets/external/bluetrip-screen.css
+- vendor/assets/stylesheets/external/jquery-ui-1.8.10.custom.css
 homepage: https://github.com/remomueller
 licenses: []
 post_install_message: