frame 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frame (0.0.4)
+    frame (0.0.5)
 
 GEM
   remote: http://rubygems.org/
@@ -136,6 +136,11 @@ GEM
     omniauth (1.0.0)
       hashie (~> 1.2)
       rack
+    omniauth-facebook (1.4.0)
+      omniauth-oauth2 (~> 1.0.2)
+    omniauth-github (1.0.1)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.0)
     omniauth-google-oauth2 (0.1.7)
       omniauth (~> 1.0)
       omniauth-oauth2
@@ -234,6 +239,8 @@ DEPENDENCIES
   mysql2
   oauth2
   omniauth
+  omniauth-facebook
+  omniauth-github
   omniauth-google-oauth2
   omniauth-twitter
   rails (= 3.2.8)

data/Rakefile

@@ -17,3 +17,14 @@ end
 
 desc "Run tests"
 task :default => :test
+
+task :build_gem do
+  gem_version = ''
+  STDOUT.puts "What is the gem version (x.x.x)?"
+  gem_version = STDIN.gets.chomp
+  #gem_version = ask("What is the gem version (x.x.x)?")
+  system("gem build frame.gemspec")
+  system("gem push frame-#{gem_version}.gem")
+  system("git tag -a v#{gem_version} -m 'version #{gem_version}'")
+  system("git push --tags")
+end

data/lib/generators/frame.rb

@@ -7,9 +7,9 @@ module Frame
         @_frame_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'frame', generator_name, 'templates'))
       end
 
-      #def self.banner
-      #  "rails generate frame:#{generator_name} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]"
-      #end
+      def self.banner
+        "rails generate frame:#{generator_name} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]"
+      end
 
       private
 

data/lib/generators/frame/admin/admin_generator.rb

@@ -8,6 +8,9 @@ module Frame
 
     desc "Installs Active Admin."
 
+    # Need to seed the production environment with:
+    #AdminUser.create!(:email=>'test@test.com',:username=>'test',:password=>'password')
+
     def add_gems
       add_gem("sass-rails", :group => "test")
       add_gem("meta_search", :group => "test")
@@ -32,11 +35,11 @@ module Frame
     end
 
     def update_admin_form
-      template 'pages.rb', 'app/admin/pages.rb'
+      template('app/admin/pages.rb')
     end
 
     def update_pages_controller
-      template 'pages_controller.rb', 'app/controller/pages_controller.rb'
+      template('app/controllers/pages_controller.rb')
     end
 
     def cleanup_page_routes
@@ -52,7 +55,7 @@ module Frame
             remove_file filename
           end
         }
-      template 'show.html.erb', 'app/views/pages/show.html.erb'
+      template('app/views/pages/show.html.erb')
     end
 
     private

data/lib/generators/frame/admin/templates/{pages_controller.rb → app/controllers/pages_controller.rb}

@@ -15,7 +15,7 @@ class PagesController < ApplicationController
         format.html
         format.json { render json: @page }
       else
-        format.html { redirect_to action: 'new' }
+        format.html { redirect_to :admin_root }
         format.json { render json: @page.errors, status: :unprocessable_entity }
       end
         

data/lib/generators/frame/devise/devise_generator.rb

@@ -26,31 +26,25 @@ module Frame
       end
     end
 
-    #def update_initializers
-    #  gsub_file 'config/initializers/devise.rb', /config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"/ do
-    #    default_mailer = "webmaster@proj_name.com"
-    #    mailer_sender = ask("What is the mail sender address? [#{default_mailer}]")
-    #    mailer_sender = default_mailer if mailer_sender.blank?
-    #    "config.mailer_sender = \"#{mailer_sender}\""
-    #  end
-    #end
+    def update_initializers
+      gsub_file 'config/initializers/devise.rb', /config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"/ do
+        default_mailer = "webmaster@econtriver.com"
+        mailer_sender = ask("What is the mail sender address? [#{default_mailer}]")
+        mailer_sender = default_mailer if mailer_sender.blank?
+        "config.mailer_sender = \"#{mailer_sender}\""
+      end
+    end
 
     def add_default_layout
       template 'defaults.html.erb', 'app/views/layouts/defaults.html.erb'
     end
 
-    def update_db
-      if yes?("Would you like to migrate the database?")
-        rake("db:migrate")
-      end
-    end
-
 
-      private
+      #private
 
 
-    def update_environmentss
-      default_mailer = "proj_name.com"
+    def update_environments
+      default_mailer = "econtriver.com"
       action_mailer = ask("What is the action mailer domain (normally just the domain)? [#{default_mailer}]")
       action_mailer = default_mailer if action_mailer.blank?
       application(nil, :env => "production") do
@@ -64,6 +58,12 @@ module Frame
       end
     end
 
+    def update_db
+      if yes?("Would you like to migrate the database?")
+        rake("db:migrate")
+      end
+    end
+
     end
   end
 end 

data/lib/generators/frame/{omniauth/templates → devise/templates/app/views/layouts}/defaults.html.erb

@@ -15,6 +15,7 @@
             <li class="right last lighter"><%%= current_user.email %></li>
         <%% else %>
             <%%= link_to '<li class="right hover">Sign in</li>'.html_safe, user_session_path %>
+            <%%= link_to '<li class="right hover">Sign up</li>'.html_safe, new_user_registration_path %>
         <%% end %>
       </ul>
     </nav>

data/lib/generators/frame/layout/layout_generator.rb

@@ -10,40 +10,34 @@ module Frame
 
     class_option :force, :type => :boolean, :default => false, :desc => "Force file regeneration"
 
-    #def add_gems
-    #  add_gem "mysql2"
-    #end
-    #Frame.Generators.PagesGenerator.add_gems
-
     def remove_index
       filename="public/index.html"
-      if File.exists?("filename") and yes?("Would you like to remove '#{filename}'?")
+      if File.exists?(filename) and yes?("Would you like to remove '#{filename}'?")
         remove_file filename
       end
     end
-    #Frame.Generators.PagesGenerator.remove_index
 
     def add_default_layout
-      template 'defaults.html.erb', 'app/views/layouts/defaults.html.erb'
-      template 'default_layout.html.erb', 'app/views/layouts/default_layout.html.erb'
+      template('app/views/layouts/defaults.html.erb')
+      template('app/views/layouts/default_layout.html.erb')
     end
 
     def add_page_helpers
-      template 'application_helper.rb', 'app/helpers/application_helper.rb'
+      template('app/helpers/application_helper.rb')
     end
 
     def add_images
-      template 'econ64.gif', 'app/assets/images/econ64.gif'
-      template 'favicon.ico', 'app/assets/images/favicon.ico'
+      template('app/assets/images/econ_f_64.gif')
+      template('app/assets/images/favicon.ico')
     end
 
     def replace_html_app
       @title = Rails.application.class.parent_name
-      template 'application.html.erb', 'app/views/layouts/application.html.erb'
+      template('app/views/layouts/application.html.erb')
     end
 
     def copy_css
-      template 'frame.css', 'app/assets/stylesheets/frame.css'
+      template('app/assets/stylesheets/frame.css')
       add_if_missing('app/assets/stylesheets/application.css', " *= require frame\n", :after => " *= require_self\n")
     end
 

data/lib/generators/frame/layout/templates/{application_helper.rb → app/helpers/application_helper.rb}

@@ -7,6 +7,6 @@ module ApplicationHelper
   end
 
   def logo
-    image_tag("econ64.gif", {:alt => "eContriver", :class => "round", :style => "width: 64px; height: 64px"})
+    image_tag("econ_f_64.gif", {:alt => "eContriver", :class => "round", :style => "width: 64px; height: 64px"})
   end
 end

data/lib/generators/frame/omniauth/omniauth_generator.rb

@@ -1,88 +1,99 @@
 require 'generators/frame'
 require 'rails/generators/migration'
-#require "omniauth-twitter"
 
 module Frame
   module Generators
     class OmniauthGenerator < Base
     include Rails::Generators::Migration
 
-    desc "Installs Devises Omniauth."
+    desc "Installs Omniauth."
 
     def install_omniauth
+
       gem 'omniauth'
-      gem 'oauth2'
       gem 'omniauth-twitter'
       gem 'omniauth-google-oauth2'
+      gem 'omniauth-github'
 
       Bundler.with_clean_env do
         run "bundle"
       end
+    end
 
-      generate("migration AddColumnsToUsers provider:string uid:string")
-      uncomment_lines('config/initializers/session_store.rb', "Tester::Application.config.session_store :active_record_store")
-      generate("session_migration")
-      rake("db:migrate")
-
-      add_if_missing('app/models/user.rb', ":provider, :uid,", :after => "  attr_accessible ")
-      add_if_missing('app/models/user.rb', ":omniauthable, ", :after => "  devise ")
-
-      add_if_missing('config/routes.rb', ", :controllers => { :omniauth_callbacks => \"users/omniauth_callbacks\" }", :after => "  devise_for :users")
-
-      template 'omniauth.rb', 'config/initializers/omniauth.rb'
-      template 'omniauth_callbacks_controller.rb', 'app/controllers/users/omniauth_callbacks_controller.rb'
-
-      add_if_missing('app/models/user.rb', '
-      def self.find_for_twitter_oauth(auth, signed_in_resource=nil)
-        Rails.logger.debug "(DEBUG) auth: #{auth.to_yaml}"
-        user = User.where(:provider => auth.provider, :uid => auth.uid).first
-        unless user
-                            #name:auth.extra.raw_info.name,
-          user = User.create(
-                             provider:auth.provider,
-                             uid:auth.uid,
-                             email:auth.info.email,
-                             password:Devise.friendly_token[0,20]
-          )
-        end
-        user
-      end', :before => "\nend")
-
-      add_if_missing('app/models/user.rb', '
-      def self.find_for_google_oauth(auth, signed_in_resource=nil)
-        Rails.logger.debug "(DEBUG) auth: #{auth.to_yaml}"
-        user = User.where(:provider => auth.provider, :uid => auth.uid).first
-        unless user
-                            #name:auth.extra.raw_info.name,
-          user = User.create(
-                             provider:auth.provider,
-                             uid:auth.uid,
-                             email:auth.info.email,
-                             password:Devise.friendly_token[0,20]
-          )
-        end
-        user
-      end', :before => "\nend")
-
-      add_if_missing('Rakefile', "
-files = ['config/initializers/omniauth.rb','config/database.yml','config/initializers/secret_token.rb']
-
-domain = \"#{Rails.application.class.parent_name.downcase}.econtriver.com\"
-set :user, \"root\"  # The server's user for deploys
-set :deploy_to, \"/srv/www/\#{domain}\"
-
-task :put_secret do
-  files.each do |f|
-    system(\"scp \#{f} \#{user}@\#{domain}:\#{File.join(deploy_to,'private',f)}\")
-  end
-end
+    def direct_devise_to_registrations
+      add_if_missing('config/routes.rb', ", :controllers => {:registrations => 'registrations'}", :after => "devise_for :users")
+    end
 
-task :get_secret do
-  files.each do |f|
-    system(\"scp \#{user}@\#{domain}:\#{File.join(deploy_to,'private',f)} \#{f}\")
-  end
-end", :after => "Tester::Application.load_tasks\n")
+    def generate_authentication_model
+      generate("model authentication user_id:integer provider:string uid:string")
+      add_if_missing('app/models/authentication.rb', "
+  belongs_to :user
+
+  def provider_name
+    if provider == 'open_id'
+      'OpenID'
+    elsif provider == 'google_oauth2'
+      'Google'
+    else
+      provider.titleize
+    end
+  end\n", :after => "class Authentication < ActiveRecord::Base\n")
+    end
+
+    # Leave the routes?
+    def generate_authentication_controller
+      generate('controller Authentications index create destroy')
+      template('app/controllers/authentications_controller.rb')
+      remove_file('app/views/authentications/index.html.erb')
+      remove_file('app/views/authentications/create.html.erb')
+      remove_file('app/views/authentications/destroy.html.erb')
+      # Need this index?
+      template('app/views/authentications/index.html.erb')
+    end
+
+    def generate_registration_controller
+      generate('controller Registrations edit new')
+      template('app/views/registrations/edit.html.erb')
+      template('app/views/registrations/new.html.erb')
+      template('app/controllers/registrations_controller.rb')
+    end
 
+    def add_routes
+      add_if_missing('config/routes.rb', "
+  match '/auth/failure' => 'authentications#failure'
+  match '/auth/:provider/callback' => 'authentications#create'
+  ", :after => "get \"authentications/destroy\"\n")
+    end
+
+    def add_username_to_user
+      generate("migration AddUsernameToUser username:string")
+    end
+
+    def update_user_model
+      template('app/models/user.rb')
+    end
+
+    def copy_images
+      template('app/assets/images/facebook_32.png')
+      template('app/assets/images/github_32.png')
+      template('app/assets/images/google_32.png')
+      template('app/assets/images/twitter_32.png')
+      template('app/assets/images/facebook_64.png')
+      template('app/assets/images/github_64.png')
+      template('app/assets/images/google_64.png')
+      template('app/assets/images/twitter_64.png')
+    end
+
+    def add_sign_in_to_devise
+      template('app/views/devise/sessions/new.html.erb')
+      template('app/views/shared/_open_auth.html.erb')
+      template('app/views/shared/_login_form.html.erb')
+    end
+
+    def update_db
+      if yes?("Would you like to migrate the database?")
+        rake("db:migrate")
+      end
     end
 
     end

data/lib/generators/frame/omniauth/templates/app/controllers/authentications_controller.rb

@@ -0,0 +1,54 @@
+class AuthenticationsController < ApplicationController
+  def index
+    @authentications = current_user.authentications if current_user
+  end
+
+  def create
+      omniauth = request.env["omniauth.auth"]
+      authentication = Authentication.find_by_provider_and_uid(omniauth['provider'], omniauth['uid'])
+      if authentication
+        flash[:info] = "Signed in successfully."
+        sign_in_and_redirect(:user, authentication.user)
+      elsif current_user
+        current_user.authentications.create!(:provider => omniauth['provider'], :uid => omniauth['uid'])
+        flash[:info] = "Authentication successful."
+        redirect_to authentications_url
+      else
+        user = User.new
+        user.apply_omniauth(omniauth)
+        if user.save
+          flash[:info] = "Signed in successfully."
+          sign_in_and_redirect(:user, user)
+        else
+          session[:omniauth] = omniauth.except('extra')
+          redirect_to new_user_registration_url
+        end
+      end
+  end
+
+  def failure
+    flash[:error] = "There was a problem authenticating with the selected service."
+    redirect_to new_user_registration_url
+  end
+
+  def destroy
+    if ( current_user.authentications.count == 1 && current_user.encrypted_password.empty? )
+      flash[:error] = "You must first set a password on the <a href=\"#{edit_user_registration_path}\">preferences page</a>".html_safe
+    else
+      @authentication = current_user.authentications.find(params[:id])
+      @authentication.destroy
+      flash[:success] = "Successfully destroyed authentication."
+    end
+    redirect_to authentications_url
+  end
+
+  protected
+
+  # This is necessary since Rails 3.0.4
+  # See https://github.com/intridea/omniauth/issues/185
+  # and http://www.arailsdemo.com/posts/44
+  def handle_unverified_request
+    true
+  end
+
+end

data/lib/generators/frame/omniauth/templates/app/controllers/registrations_controller.rb

@@ -0,0 +1,23 @@
+class RegistrationsController < Devise::RegistrationsController
+
+  def create
+    super
+    session[:omniauth] = nil unless @user.new_record?
+  end
+
+  def edit
+    @authentications = current_user.authentications if current_user
+    super
+  end
+  
+  private
+
+  def build_resource(*args)
+    super
+    if session[:omniauth]
+      @user.apply_omniauth(session[:omniauth])
+      @user.valid?
+    end
+  end
+  
+end

data/lib/generators/frame/omniauth/templates/app/models/user.rb

@@ -0,0 +1,54 @@
+class User < ActiveRecord::Base
+  validates :username, :presence => true, :uniqueness => true
+
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :lockable, :timeoutable, :confirmable and :activatable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  has_many :authentications, :dependent => :destroy
+
+  attr_accessor :login
+  attr_accessible :email, :password, :password_confirmation, :username, :login, :remember_me
+
+  def self.find_for_authentication(warden_conditions)
+    conditions = warden_conditions.dup
+    login = conditions.delete(:login)
+    where(conditions).where(["lower(username) = :value OR lower(email) = :value", {:value => login.downcase}]).first
+  end
+
+  def update_with_password(params={})
+    if params[:password].blank?
+      params.delete(:password)
+      params.delete(:password_confirmation) if params[:password_confirmation].blank?
+    end
+    update_attributes(params)
+  end
+
+  def apply_omniauth(omniauth)
+    if (omniauth['info'] && omniauth['info']['email'])
+      self.email = omniauth['info']['email'] if email.blank?
+    end
+    if (omniauth['info'] && omniauth['info']['nickname'])
+      self.username = omniauth['info']['nickname'] if username.blank?
+    else
+      self.username = derive_username if username.blank?
+    end
+    authentications.build(:provider => omniauth['provider'], :uid => omniauth['uid'])
+  end
+
+  def derive_username
+    split_email = self.email.split(/@/)
+    username_taken = User.where(:username => split_email[0]).first
+    unless username_taken
+      split_email[0]
+    else
+      nil
+    end
+  end
+
+  def password_required?
+    (authentications.empty? || !password.blank?) && super
+  end
+
+end

data/lib/generators/frame/omniauth/templates/app/views/authentications/index.html.erb

@@ -0,0 +1,13 @@
+<h2>Sign In Using...</h2>
+
+<%%= render 'shared/open_auth' %>
+
+<%% unless user_signed_in? %>
+    <div class="left span-12 last">
+      <h2 class="alt">... or a Normal Account:</h2>
+      <%%= render 'shared/login_form' %>
+      <%%= link_to "Forgot your password?", new_password_path('user') %>
+      <br/>
+      <%%= link_to "Sign up", new_user_registration_path %>
+    </div>
+<%% end %>

data/lib/generators/frame/omniauth/templates/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,11 @@
+<h2>Sign In Using...</h2>
+
+<%= render 'shared/open_auth' %>
+
+<% unless user_signed_in? %>
+    <div class="left span-9 last">
+      <h2 class="alt">... or a Normal Account:</h2>
+      <%= render 'shared/login_form' %>
+      <%= render "devise/shared/links" %>
+    </div>
+<% end %>

data/lib/generators/frame/omniauth/templates/app/views/registrations/edit.html.erb

@@ -0,0 +1,47 @@
+<div class="left span-9">
+  <h2>Edit <%%= resource_name.to_s.humanize %></h2>
+
+  <%%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:method => :put}) do |f| %>
+      <%%= render 'shared/error_messages', :object => f.object %>
+
+      <p><%%= f.label :username %></p>
+
+      <p><%%= f.text_field :username, :class => "text" %></p>
+
+      <p><%%= f.label :email %></p>
+
+      <p><%%= f.text_field :email, :class => "text" %></p>
+
+      <p><%%= f.label :password %> <span class="alt large">(leave blank if you don't want to change it)</span></p>
+
+      <p><%%= f.password_field :password, :class => "text" %></p>
+
+      <p><%%= f.label :password_confirmation %></p>
+
+      <p><%%= f.password_field :password_confirmation, :class => "text" %></p>
+
+      <p><%%= f.submit "Update" %></p>
+  <%% end %>
+</div>
+
+<div class="left span-9 last">
+  <%%= render 'shared/open_auth' %>
+  <p>To use another provider to logon, click the provider you want to use.</p>
+  <br />
+  <p>To tell your authentication provider to stop authenticating with our site, then visit:
+  <ul>
+    <li><a href="https://accounts.google.com/IssuedAuthSubTokens">Google</a></li>
+    <li><a href="https://www.facebook.com/appcenter/my">Facebook</a></li>
+    <li><a href="https://twitter.com/settings/applications">Twitter</a></li>
+    <li><a href="https://github.com/account/connections">GitHub</a></li>
+  </ul>
+  </p>
+</div>
+
+<h3 class="clear">Cancel my account</h3>
+
+<p>Want to delete your user and all associated
+  information? <%%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>
+  .</p>
+
+<%%= link_to "Back", :back %>

data/lib/generators/frame/omniauth/templates/app/views/registrations/new.html.erb

@@ -0,0 +1,25 @@
+<%% title "Sign up" %>
+
+<h2>Sign up</h2>
+
+<%%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+  <%%= render 'shared/error_messages', :object => f.object %>
+
+  <p><%%= f.label :username %></p>
+  <p><%%= f.text_field :username %></p>
+  
+  <p><%%= f.label :email %></p>
+  <p><%%= f.text_field :email %></p>
+
+<%% if @user.password_required? %>
+  <p><%%= f.label :password %></p>
+  <p><%%= f.password_field :password %></p>
+
+  <p><%%= f.label :password_confirmation %></p>
+  <p><%%= f.password_field :password_confirmation %></p>
+<%% end %>
+
+  <p><%%= f.submit "Sign up" %></p>
+<%% end %>
+
+<%%= render :partial => "devise/shared/links" %>

data/lib/generators/frame/omniauth/templates/app/views/shared/_login_form.html.erb

@@ -0,0 +1,14 @@
+<%%= form_for("user", :url => user_session_path) do |f| %>
+    <%%= f.label :login, "Login / Email" %>
+    <br/>
+    <%%= f.text_field :login, :class => "text" %>
+    <br/>
+    <%%= f.label :password %>
+    <br/>
+    <%%= f.password_field :password, :class => "text" %>
+    <br/>
+    <%%= f.check_box :remember_me %>
+    <%%= f.label :remember_me %>
+    <br/>
+    <%%= f.submit 'Sign in' %>
+<%% end %>

data/lib/generators/frame/omniauth/templates/app/views/shared/_open_auth.html.erb

@@ -0,0 +1,39 @@
+<div class="left span-9 last">
+  <h2 class="alt">Open Authentication:</h2>
+
+  <%% if @authentications %>
+      <%% unless @authentications.empty? %>
+          <p><strong>You can sign in to this account using:</strong></p>
+
+          <div class="authentications">
+            <%% for authentication in @authentications %>
+                <div class="authentication ui-corner-all left">
+                  <%%= link_to "X", authentication, :confirm => 'Are you sure you want to remove this authentication option?', :method => :delete, :class => "right", :title => "Remove" %>
+                  <%%= image_tag "#{authentication.provider_name.downcase}_32.png", :size => "32x32" %>
+                  <div class="provider"><%%= authentication.provider_name %></div>
+                  <!--div class="uid alt"><%%= authentication.uid %></div-->
+                </div>
+            <%% end %>
+            <div class="clear"></div>
+          </div>
+      <%% end %>
+      <p><strong>Link another account:</strong></p>
+  <%% end %>
+
+  <a href="/auth/google_oauth2" class="auth_provider">
+    <%%= image_tag "google_64.png", :size => "64x64", :alt => "Google" %>
+    Google
+  </a>
+  <a href="/auth/facebook" class="auth_provider">
+    <%%= image_tag "facebook_64.png", :size => "64x64", :alt => "Facebook" %>
+    Facebook
+  </a>
+  <a href="/auth/twitter" class="auth_provider">
+    <%%= image_tag "twitter_64.png", :size => "64x64", :alt => "Twitter" %>
+    Twitter
+  </a>
+  <a href="/auth/github" class="auth_provider">
+    <%%= image_tag "github_64.png", :size => "64x64", :alt => "github" %>
+    GitHub
+  </a>
+</div>

data/lib/generators/frame/omniauth/templates/config/initializers/omniauth.rb

@@ -0,0 +1,13 @@
+#require 'openid/store/filesystem'
+Rails.application.config.middleware.use OmniAuth::Builder do
+  #require 'omniauth-google-oauth2'
+  config.omniauth :google_oauth2, 'APP_ID', 'APP_SECRET', { :scope => 'https://www.googleapis.com/auth/userinfo.email', :redirect_uri => 'http://tester.econtriver.com/auth/google_oauth2/callback', :approval_prompt => 'auto' }
+
+  #require 'omniauth-twitter'
+  config.omniauth :twitter, 'APP_ID', 'APP_SECRET'
+
+  #require 'omniauth-github'
+  config.omniauth :github, 'APP_ID', 'APP_SECRET'
+
+  #provider :open_id, OpenID::Store::Filesystem.new('/tmp')
+end

data/lib/generators/frame/pages/pages_generator.rb

@@ -84,7 +84,7 @@ module Frame
         #run "bundle"
 
         string='
-      validates_presence_of :name
+      validates_presence_of :name, :location
 
       scope :topbar, where(:location => "topbar")
       scope :sidebar, where(:location => "sidebar")

data/lib/generators/frame/secret/secret_generator.rb

@@ -30,6 +30,11 @@ module Frame
       initializer("secret_token.rb", "#{Rails.application.class.parent_name}::Application.config.secret_token = '#{secret}'")
     end
 
+    def create_rake_file
+      #@title = Rails.application.class.parent_name.downcase
+      template('Rakefile')
+    end
+
     end
   end
 end 

data/lib/generators/frame/secret/templates/Rakefile

@@ -0,0 +1,39 @@
+#!/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__)
+
+Tester::Application.load_tasks
+
+files = ['config/initializers/omniauth.rb','config/database.yml','config/initializers/secret_token.rb']
+
+domain = "#{Rails.application.class.parent_name.downcase}.econtriver.com"
+user = "root"  # The server's user for deploys
+deploy_to = "/srv/www/#{domain}"
+
+task :setup_server_db do
+  system("ssh #{user}@#{domain} 'cd #{File.join(deploy_to,'current')};rake db:setup RAILS_ENV=production'")
+end
+
+task :put_secret do
+  files.each do |f|
+    system("scp #{f} #{user}@#{domain}:#{File.join(deploy_to,'private',f)}")
+  end
+end
+
+task :get_secret do
+  files.each do |f|
+    system("scp #{user}@#{domain}:#{File.join(deploy_to,'private',f)} #{f}")
+  end
+end
+
+task :backup, :roles => :db, :only => { :primary => true } do
+  filename = "#{Rails.application.class.parent_name.downcase}.db_backup.#{Time.now.to_f}.sql.bz2"
+  filepath = File.join(deploy_to,'current',filename)
+  config = YAML.load_file(File.join(deploy_to,'private', 'config', 'database.yml')
+  run "mysqldump -u #{config['production']['username']} -p #{config['production']['database']} | bzip2 -c > #{filepath}" do |ch, stream, out|
+    ch.send_data "#{config['production']['password']}\n" if out =~ /^Enter password:/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frame
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -187,6 +187,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-github
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-facebook
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -261,17 +293,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/generators/frame.rb
-- lib/generators/frame/layout/templates/defaults.html.erb
-- lib/generators/frame/layout/templates/application.html.erb
-- lib/generators/frame/layout/templates/application_helper.rb
-- lib/generators/frame/layout/templates/frame.css
-- lib/generators/frame/layout/templates/favicon.ico
-- lib/generators/frame/layout/templates/econ64.gif
-- lib/generators/frame/layout/templates/default_layout.html.erb
+- lib/generators/frame/layout/templates/app/stylesheets/frame.css
+- lib/generators/frame/layout/templates/app/views/layouts/defaults.html.erb
+- lib/generators/frame/layout/templates/app/views/layouts/application.html.erb
+- lib/generators/frame/layout/templates/app/views/layouts/default_layout.html.erb
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_16.png
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_256.png
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_32.png
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_64.png
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_128.png
+- lib/generators/frame/layout/templates/app/assets/images/favicon.ico
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_64.gif
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_32_loading.gif
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_128.gif
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_256.gif
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_32.gif
+- lib/generators/frame/layout/templates/app/assets/images/econ_f_16.gif
+- lib/generators/frame/layout/templates/app/helpers/application_helper.rb
 - lib/generators/frame/layout/layout_generator.rb
 - lib/generators/frame/layout/USAGE
 - lib/generators/frame/mysql/USAGE
 - lib/generators/frame/mysql/mysql_generator.rb
+- lib/generators/frame/secret/templates/Rakefile
 - lib/generators/frame/secret/templates/database.yml
 - lib/generators/frame/secret/secret_generator.rb
 - lib/generators/frame/secret/USAGE
@@ -285,21 +328,36 @@ files:
 - lib/generators/frame/pages/templates/_error_messages.html.erb
 - lib/generators/frame/pages/pages_generator.rb
 - lib/generators/frame/pages/USAGE
-- lib/generators/frame/omniauth/templates/defaults.html.erb
-- lib/generators/frame/omniauth/templates/omniauth_callbacks_controller.rb
-- lib/generators/frame/omniauth/templates/omniauth.rb
+- lib/generators/frame/omniauth/templates/app/views/authentications/index.html.erb
+- lib/generators/frame/omniauth/templates/app/views/registrations/new.html.erb
+- lib/generators/frame/omniauth/templates/app/views/registrations/edit.html.erb
+- lib/generators/frame/omniauth/templates/app/views/devise/sessions/new.html.erb
+- lib/generators/frame/omniauth/templates/app/views/shared/_open_auth.html.erb
+- lib/generators/frame/omniauth/templates/app/views/shared/_login_form.html.erb
+- lib/generators/frame/omniauth/templates/app/models/user.rb
+- lib/generators/frame/omniauth/templates/app/assets/images/twitter_64.png
+- lib/generators/frame/omniauth/templates/app/assets/images/github_32.png
+- lib/generators/frame/omniauth/templates/app/assets/images/google_64.png
+- lib/generators/frame/omniauth/templates/app/assets/images/facebook_64.png
+- lib/generators/frame/omniauth/templates/app/assets/images/twitter_32.png
+- lib/generators/frame/omniauth/templates/app/assets/images/facebook_32.png
+- lib/generators/frame/omniauth/templates/app/assets/images/google_32.png
+- lib/generators/frame/omniauth/templates/app/assets/images/github_64.png
+- lib/generators/frame/omniauth/templates/app/controllers/authentications_controller.rb
+- lib/generators/frame/omniauth/templates/app/controllers/registrations_controller.rb
+- lib/generators/frame/omniauth/templates/config/initializers/omniauth.rb
 - lib/generators/frame/omniauth/USAGE
 - lib/generators/frame/omniauth/omniauth_generator.rb
 - lib/generators/frame/all/USAGE
 - lib/generators/frame/all/all_generator.rb
 - lib/generators/frame/blueprint/USAGE
 - lib/generators/frame/blueprint/blueprint_generator.rb
-- lib/generators/frame/devise/templates/defaults.html.erb
+- lib/generators/frame/devise/templates/app/views/layouts/defaults.html.erb
 - lib/generators/frame/devise/USAGE
 - lib/generators/frame/devise/devise_generator.rb
-- lib/generators/frame/admin/templates/pages_controller.rb
-- lib/generators/frame/admin/templates/show.html.erb
-- lib/generators/frame/admin/templates/pages.rb
+- lib/generators/frame/admin/templates/app/views/pages/show.html.erb
+- lib/generators/frame/admin/templates/app/controllers/pages_controller.rb
+- lib/generators/frame/admin/templates/app/admin/pages.rb
 - lib/generators/frame/admin/USAGE
 - lib/generators/frame/admin/admin_generator.rb
 - lib/generators/frame/gitignore/gitignore_generator.rb

data/lib/generators/frame/devise/templates/defaults.html.erb

@@ -1,47 +0,0 @@
-<%% content_for :head do %>
-    <%%= favicon_link_tag('/assets/favicon.ico') %>
-    <%%= stylesheet_link_tag "application" %>
-    <%%= javascript_include_tag "application" %>
-    <%%= csrf_meta_tag %>
-<%% end %>
-
-<%% content_for :header do %>
-    <nav class="span-24 append-bottom">
-      <ul>
-        <%%= render :partial => "pages/links", :collection => @display_pages.topbar, :as => :page, :locals => {:classes => "left hover"} %>
-        <%% if user_signed_in? %>
-            <%%= link_to '<li class="left hover">Account</li>'.html_safe, edit_user_registration_path %>
-            <%%= link_to '<li class="right hover">Sign out</li>'.html_safe, destroy_user_session_path, :method => :delete %>
-            <li class="right last lighter"><%%= current_user.email %></li>
-        <%% else %>
-            <%%= link_to '<li class="right hover">Sign in</li>'.html_safe, user_session_path %>
-        <%% end %>
-      </ul>
-    </nav>
-    <banner>
-      <%%= link_to logo, root_path, {:class => "right prepend-1"} %>
-      <h1 class="left alt append-1"><%%= yield(:title) %></h1>
-      <%% flash.each do |key, value| %>
-          <div id="notice" class="left flash <%%= key %>"><%%= value %></div>
-      <%% end %>
-    </banner>
-    <hr/>
-<%% end %>
-
-<%% content_for :sidebar do %>
-    <%%= render 'shared/sidebar', :sidebar => @display_pages.sidebar %>
-<%% end %>
-
-<%% content_for :userbar do %>
-    <%% if user_signed_in? %>
-        <%%= render 'shared/sidebar', :sidebar => @display_pages.userbar %>
-    <%% end %>
-<%% end %>
-
-<%% content_for :footer do %>
-    <nav class="span-24 prepend-top last">
-      <ul>
-        <%%= render :partial => "pages/links", :collection => @display_pages.bottombar, :as => :page, :locals => {:classes => "left hover"} %>
-      </ul>
-    </nav>
-<%% end %>

data/lib/generators/frame/omniauth/templates/omniauth.rb

@@ -1,6 +0,0 @@
-Devise.setup do |config|
-  require 'omniauth-google-oauth2'
-  config.omniauth :google_oauth2, 'APP_ID', 'APP_SECRET', { :scope => 'https://www.googleapis.com/auth/userinfo.email', :redirect_uri => 'http://tester.econtriver.com/auth/google_oauth2/callback', :approval_prompt => 'auto' }
-  require 'omniauth-twitter'
-  config.omniauth :twitter, 'APP_ID', 'APP_SECRET'
-end

data/lib/generators/frame/omniauth/templates/omniauth_callbacks_controller.rb

@@ -1,38 +0,0 @@
-class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  #def facebook
-  #  @user = User.find_for_facebook_oauth(request.env["omniauth.auth"], current_user)
-  #
-  #  if @user.persisted?
-  #    flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Facebook"
-  #    sign_in_and_redirect @user, :event => :authentication
-  #  else
-  #    session["devise.facebook_data"] = request.env["omniauth.auth"]
-  #    redirect_to new_user_registration_url
-  #  end
-  #end
-
-  def twitter
-    @user = User.find_for_twitter_oauth(request.env["omniauth.auth"], current_user)
-
-    if @user.persisted?
-      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Twitter"
-      sign_in_and_redirect @user, :event => :authentication
-    else
-      session["devise.twitter_data"] = request.env["omniauth.auth"]
-      redirect_to new_user_registration_url
-    end
-  end
-
-  def google
-    @user = User.find_for_google_oauth(request.env["omniauth.auth"], current_user)
-
-    if @user.persisted?
-      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Google"
-      sign_in_and_redirect @user, :event => :authentication
-    else
-      session["devise.google_data"] = request.env["omniauth.auth"]
-      redirect_to new_user_registration_url
-    end
-  end
-
-end