contour 0.5.3 → 0.5.4

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.2

data/CHANGELOG.rdoc

@@ -1,8 +1,18 @@
+== 0.5.4
+
+* Enhancements
+  * Added arrow.png image asset
+  * Added config.news_feed options that allows users to specify an RSS feed url that is displayed on the login page
+  * Added config.news_feed_items to be able to specify the maximum number of items displayed in the News Feed
+
+* Refactoring
+  * Code cleanup and additional logger information for Devise Registrations (Omniauth) controller
+
 == 0.5.3
 
 * Enhancements
   * Added warning.png image asset
-
+  
 == 0.5.2
 
 * Bug Fix

data/app/controllers/contour/authentications_controller.rb

@@ -23,13 +23,16 @@ class Contour::AuthenticationsController < ApplicationController
       logger.info "OMNI AUTH INFO: #{omniauth.inspect}"
       omniauth['user_info']['email'] = omniauth['extra']['user_hash']['email'] if omniauth['user_info'] and omniauth['user_info']['email'].blank? and omniauth['extra'] and omniauth['extra']['user_hash']
       if authentication
+        logger.info "Existing authentication found."
         session["user_return_to"] = request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] if request.env and request.env["action_dispatch.request.unsigned_session_cookie"] and request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] and session["user_return_to"].blank?
         flash[:notice] = "Signed in successfully." if authentication.user.active_for_authentication?
         sign_in_and_redirect(:user, authentication.user)
       elsif current_user
+        logger.info "Logged in user found, creating associated authentication."
         current_user.authentications.create!(:provider => omniauth['provider'], :uid => omniauth['uid'])
         redirect_to authentications_path, :notice => "Authentication successful."
       else
+        logger.info "Creating new user with new authentication."
         user = User.new(params[:user])
         user.apply_omniauth(omniauth)
         if user.save

data/app/controllers/contour/sessions_controller.rb

@@ -1,3 +1,22 @@
+require 'rss/2.0'
+require 'open-uri'
+
 class Contour::SessionsController < Devise::SessionsController
   
+  def new
+    @news_feed = ''
+    unless Contour.news_feed.blank?
+      begin
+        open(Contour.news_feed) do |http|
+          response = http.read
+          @news_feed = RSS::Parser.parse(response, false)
+        end
+      rescue => e
+        logger.info "\n\nRSS Feed #{Contour.news_feed}\nRSS Feed Error: #{e}\n\n"
+      end
+    end
+    
+    super
+  end
+  
 end

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

@@ -1,5 +1,4 @@
 <% PROVIDERS.each do |provider| %>
-
   <% url_params = (provider == :google_apps) ? '?domain=gmail.com' : '' %>
   <% if provider == :open_id %>
     <% provider_name = 'OpenID' %>
@@ -14,12 +13,8 @@
     <% provider_name = provider.to_s.titleize %>
     <% image_name = provider.to_s.downcase %>
   <% end %>
-<% if false %>
-  <div style="float:right;margin-right:15px;width:32px;position:relative">&nbsp;
-      <div style="position:absolute;top:-4px;">
-<% end %>
   <div style="float:right;top:-4px;position:relative;height:20px;margin-right:15px">
-    <a href="<%#= Contour.application_site_url.to_s + "/" %><%= request.script_name %><%= "/" + OmniAuth.config.path_prefix.split('/').last.to_s %><%= "/" + provider.to_s.downcase %><%= url_params %>" class="noicon">
+    <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>

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

@@ -1,4 +1,3 @@
-<!-- authentications/index.html.erb -->
 <% @title = "Authentications" %>
 
 <h1><%= @title %></h1>

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

@@ -0,0 +1,16 @@
+<% unless @news_feed.blank? %>
+  <fieldset>
+    <legend>Latest News</legend>
+    
+    <h4><%= link_to @news_feed.channel.title, @news_feed.channel.link, :target => '_blank' %></h4>
+    <br />
+    <% @news_feed.items.each_with_index do |item, i| %>
+      <% if i < Contour.news_feed_items.to_i %>
+        <div class="field">
+          <label><%= link_to item.title, item.link, :target => '_blank' %></label><br />
+          <ul style="list-style: none"><li><%= item.description.gsub("[...]", link_to('[read more]', item.link, :target => '_blank')).html_safe %></li></ul>
+        </div>
+      <% end %>
+    <% end %>
+  </fieldset>
+<% end %>

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

@@ -1,27 +1,36 @@
 <% @title = 'Login' %>
 
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <fieldset style="width:235px">
-    <legend><%= @title %></legend>
+<table class="blank padded">
+  <tr>
+    <td valign="middle">
+      <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+        <fieldset style="width:235px">
+          <legend><%= @title %></legend>
     
-    <div class="field">
-      <%= f.label :email %><br />
-      <%= f.text_field :email %>
-    </div>
-    <div class="field">
-      <%= f.label :password %><br />
-      <%= f.password_field :password %>
-    </div>
-  </fieldset>
-  <div class="actions">
-    <% form_name = "#{resource.class.name.underscore}_new" %>
-    <%= link_to_function image_tag('contour/tick.png', :alt => '') + "Login", "$('##{form_name}').submit();", :class => "button positive" %>
-    <% if devise_mapping.rememberable? -%>
-      <div style="padding-top:5px;padding-bottom:4px;"><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-    <% end -%>
-    <% if devise_mapping.recoverable? && controller_name != 'passwords' %>
-      <div style="clear:both"></div><br />
-      <%= link_to "Forgot your password?", new_password_path(resource_name) %> or <%= link_to "Register here!", new_registration_path(resource_name) %>
-    <% end %>
-  </div>
-<% end %>
+          <div class="field">
+            <%= f.label :email %><br />
+            <%= f.text_field :email %>
+          </div>
+          <div class="field">
+            <%= f.label :password %><br />
+            <%= f.password_field :password %>
+          </div>
+        </fieldset>
+        <div class="actions">
+          <% form_name = "#{resource.class.name.underscore}_new" %>
+          <%= link_to_function image_tag('contour/tick.png', :alt => '') + "Login", "$('##{form_name}').submit();", :class => "button positive" %>
+          <% if devise_mapping.rememberable? -%>
+            <div style="padding-top:5px;padding-bottom:4px;"><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+          <% end -%>
+          <% if devise_mapping.recoverable? && controller_name != 'passwords' %>
+            <div style="clear:both"></div><br />
+            <%= link_to "Forgot your password?", new_password_path(resource_name) %> or <%= link_to "Register here!", new_registration_path(resource_name) %>
+          <% end %>
+        </div>
+      <% end %>
+    </td>
+    <td>
+      <%= render :partial => 'contour/layouts/latest_news' %>
+    </td>
+  </tr>
+</table>

data/lib/contour.rb

@@ -42,7 +42,15 @@ module Contour
       :links => [{:name => 'Home', :path => 'root_path'}]
     }
   ]
-    
+   
+  # Default news feed
+  mattr_accessor :news_feed
+  @@news_feed = nil
+  
+  # Default max number of items displayed in the news feed
+  mattr_accessor :news_feed_items
+  @@news_feed_items = 5
+  
   def self.setup
     yield self
   end

data/lib/contour/version.rb

@@ -1,3 +1,3 @@
 module Contour
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/generators/templates/contour.rb

@@ -30,4 +30,10 @@ Contour.setup do |config|
   #   :links => [{:name => 'Home', :path => 'root_path', :image => '', :image_options => {}}]
   # }]
   
+  # Enter an address of a valid RSS Feed if you would like to see news on the sign in page.
+  # config.news_feed = ''
+  
+  # Enter the max number of items you want to see in the news feed.
+  # config.news_feed_items = 5
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70126968581260 !ruby/object:Gem::Requirement
+  requirement: &70176180355640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70126968581260
+  version_requirements: *70176180355640
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70126968578180 !ruby/object:Gem::Requirement
+  requirement: &70176180354940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70126968578180
+  version_requirements: *70176180354940
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -40,6 +40,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
@@ -51,6 +52,7 @@ files:
 - app/views/contour/authentications/_index.html.erb
 - app/views/contour/authentications/_menu.html.erb
 - app/views/contour/authentications/index.html.erb
+- app/views/contour/layouts/_latest_news.html.erb
 - app/views/contour/layouts/_menu.html.erb
 - app/views/contour/layouts/_message.html.erb
 - app/views/contour/layouts/application.html.erb
@@ -80,6 +82,7 @@ files:
 - test/unit/authentication_test.rb
 - test/unit/helpers/registrations_helper_test.rb
 - vendor/assets/images/contour/addfile.png
+- vendor/assets/images/contour/arrow.png
 - vendor/assets/images/contour/blank.png
 - vendor/assets/images/contour/cas_32.png
 - vendor/assets/images/contour/cas_64.png