contour 0.7.0 → 0.7.1

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 0.7.1
+
+* Bug Fix
+  * Settings default menu item removed
+
+* Documentation
+  * Contour Menu Items no longer require a unique id
+  * README updated to reflects that Contour requires Rails 3.1.3 for ~> 0.7.0
+
 == 0.7.0
 
 * Enhancements

data/README.rdoc

@@ -36,7 +36,7 @@ In order to get registration working, you can use the modified Contour Authentic
 
 == Setting up a new project with quick authentication
 
-Make sure you have Rails 3.1.1
+Make sure you have Rails 3.1.3
 
   rails -v
   

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

@@ -18,30 +18,4 @@
       <%= image_tag "contour/#{image_name}_32.png", :align => 'absmiddle', :height => "28px", :title => provider_name %>
     </a>
   </li>
-<% end %>
-
-
-
-<% if false %>
-<% PROVIDERS.each do |provider| %>
-  <% url_params = (provider == :google_apps) ? '?domain=gmail.com' : '' %>
-  <% if provider == :open_id %>
-    <% provider_name = 'OpenID' %>
-    <% image_name = 'openid' %>
-  <% elsif provider == :linked_in %>
-    <% provider_name = 'LinkedIn' %>
-    <% image_name = 'linkedin' %>
-  <% elsif [:LDAP, :CAS].include?(provider) %>
-    <% provider_name = provider.to_s.upcase %>
-    <% image_name = provider.to_s.downcase %>
-  <% else %>
-    <% provider_name = provider.to_s.titleize %>
-    <% image_name = provider.to_s.downcase %>
-  <% end %>
-  <div style="float:right;top:-4px;position:relative;height:20px;margin-right:15px">
-    <a href="<%= request.script_name %><%= "/" + OmniAuth.config.path_prefix.split('/').last.to_s %><%= "/" + provider.to_s.downcase %><%= url_params %>" class="noicon">
-      <%= image_tag "contour/#{image_name}_32.png", :align => 'absmiddle', :height => "28px", :title => provider_name %>
-    </a>
-  </div>
-<% end %>
 <% end %>

data/contour.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |s|
   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,20 +30,19 @@ module Contour
   mattr_accessor :menu_items
   @@menu_items = [
     {
-      :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: 'Login', 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', :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: 'current_user.name', eval: true, 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: 'Authentications', path: 'authentications_path', condition: 'not PROVIDERS.blank?' },
+              { html: "<br />" },
+              { name: 'Logout', path: 'destroy_user_session_path' }]
     },
     {
-      :name => 'Home', :id => 'home', :display => 'always', :path => 'root_path', :position => 'left',
-      :links => []
+      name: 'Home', display: 'always', path: 'root_path', position: 'left', condition: 'true', image: '', image_options: {},
+      links: []
     }
   ]
    

data/lib/contour/version.rb

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

data/lib/generators/templates/contour.rb

@@ -17,22 +17,24 @@ Contour.setup do |config|
   # config.header_title_image = ''
   
   # Enter the items you wish to see in the menu
-  # config.menu_items = [{
-  #   :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', :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', :path => 'root_path', :position => 'left', :condition => 'true', :image => '', :image_options => {},
-  #   :links => []
-  # }]
+  # config.menu_items = 
+  # [
+  #   {
+  #     name: 'Login', 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, 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: 'Authentications', path: 'authentications_path', condition: 'not PROVIDERS.blank?' },
+  #             { html: "<br />" },
+  #             { name: 'Logout', path: 'destroy_user_session_path' }]
+  #   },
+  #   {
+  #     name: '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.
   # config.news_feed = ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70299534040200 !ruby/object:Gem::Requirement
+  requirement: &70257688319100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70299534040200
+  version_requirements: *70257688319100
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70299534039240 !ruby/object:Gem::Requirement
+  requirement: &70257688317920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *70299534039240
+  version_requirements: *70257688317920
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70299534038680 !ruby/object:Gem::Requirement
+  requirement: &70257688316320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70299534038680
+  version_requirements: *70257688316320
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70299534037920 !ruby/object:Gem::Requirement
+  requirement: &70257688315460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.17
   type: :runtime
   prerelease: false
-  version_requirements: *70299534037920
+  version_requirements: *70257688315460
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []