frame 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frame (0.1.1)
+    frame (0.1.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/generators/frame.rb

@@ -14,14 +14,14 @@ module Frame
       private
 
       def add_if_missing(file, string, options = {}, unless_match = string)
-        puts "\n\n==> Adding the following to '#{file}' file:\n'#{string}' unless it already exists"
+        #puts "\n\n==> Adding the following to '#{file}' file:\n'#{string}' unless it already exists"
         file_content = File.read(file)
         #File.open(file, 'a') { |f| f.write("\n") } unless file_content =~ /\n\Z/
         insert_into_file file, string, options unless file_content.include? unless_match
       end
 
       def add_gem(name, options = {})
-        #add_if_missing(destination_path("Gemfile"),)
+        #add_if_missing(destination_path("Gemfile"), name, options)
         gemfile_content = File.read(destination_path("Gemfile"))
         File.open(destination_path("Gemfile"), 'a') { |f| f.write("\n") } unless gemfile_content =~ /\n\Z/
         gem name, options unless gemfile_content.include? name

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

@@ -17,7 +17,7 @@ module Frame
     end
 
     def install_active_admin
-      if yes?("Would you like to install Active Admin?")
+      #if yes?("Would you like to install Active Admin?")
         gem("activeadmin")
         Bundler.with_clean_env do
           run "bundle install"
@@ -25,13 +25,13 @@ module Frame
         generate("active_admin:install")
         default_model = "page"
         generate("active_admin:resource #{default_model}")
-      end
+      #end
     end
 
     def update_db
-      if yes?("Would you like to migrate the database?")
+      #if yes?("Would you like to migrate the database?")
         rake("db:migrate")
-      end
+      #end
     end
 
     def update_admin_form
@@ -51,9 +51,9 @@ module Frame
     def remove_pages_cud
       filenames = ["app/views/pages/new.html.erb", "app/views/pages/edit.html.erb", "app/views/pages/index.html.erb", "app/views/pages/_form.html.erb"]
         filenames.each { |filename|
-          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
         }
       template('app/views/pages/show.html.erb')
     end

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

@@ -12,31 +12,39 @@ module Frame
       gem("rspec-rails", :group => "test, development")
       gem("cucumber-rails", :group => "test, development")
 
-      if yes?("Would you like to install Devise?")
+      #if yes?("Would you like to install Devise?")
         gem("devise")
         Bundler.with_clean_env do
           run "bundle"
         end
         generate("devise:install")
         default_model = "User"
-        model_name = ask("What would you like the user model to be called? [#{default_model}]")
-        model_name = default_model if model_name.blank?
+        #model_name = ask("What would you like the user model to be called? [#{default_model}]")
+        #model_name = default_model if model_name.blank?
+        model_name = default_model
         generate("devise", model_name)
         generate("devise:views")
-      end
+      #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?
+        #mailer_sender = ask("What is the mail sender address? [#{default_mailer}]")
+        #mailer_sender = default_mailer if mailer_sender.blank?
+        mailer_sender = default_mailer
         "config.mailer_sender = \"#{mailer_sender}\""
       end
     end
 
     def add_default_layout
-      template 'defaults.html.erb', 'app/views/layouts/defaults.html.erb'
+      template('app/views/layouts/defaults.html.erb')
+    end
+
+    def add_routes
+      add_if_missing('config/routes.rb', "
+  resources :authentications
+  ", :after => "devise_for :admin_users, ActiveAdmin::Devise.config\n")
     end
 
 
@@ -45,23 +53,26 @@ module Frame
 
     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
-        "config.action_mailer.default_url_options = { :host => #{action_mailer} }"
+      #action_mailer = ask("What is the action mailer domain (normally just the domain)? [#{default_mailer}]")
+      #action_mailer = default_mailer if action_mailer.blank?
+      action_mailer = default_mailer
+      application(nil, :env => "production") do "
+  config.action_mailer.default_url_options = { :host => \"#{action_mailer}\" }
+  config.action_mailer.smtp_settings = { :openssl_verify_mode  => 'none' }"
       end
       application(nil, :env => "test") do
         "config.action_mailer.default_url_options = { :host => 'localhost:3000' }"
       end
-      application(nil, :env => "development") do
-        "config.action_mailer.default_url_options = { :host => 'localhost:3000' }"
+      application(nil, :env => "development") do "
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+  config.assets.debug = false"
       end
     end
 
     def update_db
-      if yes?("Would you like to migrate the database?")
+      #if yes?("Would you like to migrate the database?")
         rake("db:migrate")
-      end
+      #end
     end
 
     end

data/lib/generators/frame/devise_omniauth/USAGE

@@ -0,0 +1,11 @@
+Description:
+    Generates devise omniauthable installation.
+
+Usage:
+    Use to generate install and setup omniauthable devise for a project.
+
+Examples:
+    rails generate frame:devise_omniauth
+
+Methods:
+    There are several methods generated which you can use in your application.

data/lib/generators/frame/devise_omniauth/devise_omniauth_generator.rb

@@ -0,0 +1,89 @@
+require 'generators/frame'
+require 'rails/generators/migration'
+
+module Frame
+  module Generators
+    class DeviseOmniauthGenerator < Base
+    include Rails::Generators::Migration
+
+    desc "Installs Devise and makes it Omniauthable."
+
+    def install_devise
+      gem("rspec-rails", :group => "test, development")
+      gem("cucumber-rails", :group => "test, development")
+      gem("devise")
+      gem("omniauth-twitter")
+      gem("omniauth-facebook")
+      gem("omniauth-github")
+      gem("omniauth-google-oauth2")
+      Bundler.with_clean_env do
+        run "bundle"
+      end
+      generate("devise:install")
+      generate("devise", "User")
+      generate("devise:views")
+    end
+
+    def add_callback_controller
+      template('app/controllers/omniauth_callbacks_controller.rb')
+    end
+
+    def make_omniauthable
+      template('app/models/user.rb')
+    end
+
+    def add_do_routes
+      template('config/routes.rb')
+    end
+
+    def add_omni_services
+      add_if_missing('config/initializers/devise.rb', "\n  config.omniauth :twitter, 'APP_ID', 'APP_SECRET'", :after => "# config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'")
+      add_if_missing('config/initializers/devise.rb', "\n  config.omniauth :google_oauth2, 'APP_ID', 'APP_SECRET'", :after => "# config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'")
+      add_if_missing('config/initializers/devise.rb', "\n  config.omniauth :facebook, 'APP_ID', 'APP_SECRET'", :after => "# config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'")
+      uncomment_lines('config/initializers/devise.rb', "config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'")
+    end
+
+    def add_default_layout
+      template('app/views/layouts/defaults.html.erb')
+    end
+
+    def update_initializers
+      gsub_file 'config/initializers/devise.rb', /config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"/ do
+        "config.mailer_sender = \"webmaster@econtriver.com\""
+      end
+    end
+
+    def update_environments
+      application(nil, :env => "production") do "
+  config.action_mailer.default_url_options = { :host => \"econtriver.com\" }
+  config.action_mailer.smtp_settings = { :openssl_verify_mode  => 'none' }"
+      end
+      application(nil, :env => "test") do
+        "config.action_mailer.default_url_options = { :host => 'localhost:3000' }"
+      end
+      application(nil, :env => "development") do
+        "config.action_mailer.default_url_options = { :host => 'localhost:3000' }"
+      end
+    end
+
+    def replace_email_username
+      template("app/views/devise/sessions/new.html.erb")
+      template("app/views/devise/registrations/new.html.erb")
+      template("app/views/devise/registrations/edit.html.erb")
+    end
+
+    def add_omniauth_to_users
+      generate("migration AddOmniauthToUsers provider:string uid:string")
+    end
+
+    def add_username_to_users
+      generate("migration AddUsernameToUsers username:string")
+    end
+
+    def update_db
+      rake("db:migrate")
+    end
+
+    end
+  end
+end 

data/lib/generators/frame/devise_omniauth/templates/app/controllers/omniauth_callbacks_controller.rb

@@ -0,0 +1,16 @@
+class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def all
+    user = User.from_omniauth(request.env["omniauth.auth"])
+    if user.persisted?
+      flash.notice = "Signed in!"
+      sign_in_and_redirect user
+    else
+      session["devise.user_attributes"] = user.attributes
+      redirect_to new_user_registration_url
+    end
+  end
+  alias_method :facebook, :all
+  alias_method :twitter, :all
+  alias_method :github, :all
+  alias_method :google_oauth2, :all
+end

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

@@ -0,0 +1,40 @@
+class User < ActiveRecord::Base
+  devise :database_authenticatable, :registerable, :omniauthable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :username
+
+  validates_presence_of :username
+  validates_uniqueness_of :username
+
+  def self.from_omniauth(auth)
+    where(auth.slice(:provider, :uid)).first_or_create do |user|
+      user.provider = auth.provider
+      user.uid = auth.uid
+      user.username = auth.info.nickname
+    end
+  end
+
+  def self.new_with_session(params, session)
+    if session["devise.user_attributes"]
+      new(session["devise.user_attributes"], without_protection: true) do |user|
+        user.attributes = params
+        user.valid?
+      end
+    else
+      super
+    end
+  end
+
+  def password_required?
+    super && provider.blank?
+  end
+
+  def update_with_password(params, *options)
+    if encrypted_password.blank?
+      update_attributes(params, *options)
+    else
+      super
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+<h2>Edit <%%= resource_name.to_s.humanize %></h2>
+
+<%%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%%= devise_error_messages! %>
+
+  <div><%%= f.label :email %><br />
+  <%%= f.email_field :email, :class => "text"  %></div>
+
+  <div><%%= f.label :username %><br />
+  <%%= f.text_field :username, :class => "text"  %></div>
+
+  <div><%%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <%%= f.password_field :password, :autocomplete => "off", :class => "text"  %></div>
+
+  <div><%%= f.label :password_confirmation %><br />
+  <%%= f.password_field :password_confirmation, :class => "text"  %></div>
+
+  <div><%%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%%= f.password_field :current_password, :class => "text"  %></div>
+
+  <div><%%= f.submit "Update" %></div>
+<%% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
+
+<%%= link_to "Back", :back %>

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

@@ -0,0 +1,21 @@
+<h2>Sign up</h2>
+
+<%%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+  <%%= devise_error_messages! %>
+
+  <div><%%= f.label :email %><br />
+  <%%= f.email_field :email, :class => "text"  %></div>
+
+  <div><%%= f.label :username %><br />
+  <%%= f.text_field :username, :class => "text"  %></div>
+
+  <div><%%= f.label :password %><br />
+  <%%= f.password_field :password, :class => "text"  %></div>
+
+  <div><%%= f.label :password_confirmation %><br />
+  <%%= f.password_field :password_confirmation, :class => "text"  %></div>
+
+  <div><%%= f.submit "Sign up" %></div>
+<%% end %>
+
+<%%= render "devise/shared/links" %>

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

@@ -0,0 +1,17 @@
+<h2>Sign in</h2>
+
+<%%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <div><%%= f.label :username %><br />
+  <%%= f.text_field :username, :class => "text" %></div>
+
+  <div><%%= f.label :password %><br />
+  <%%= f.password_field :password, :class => "text" %></div>
+
+  <%% if devise_mapping.rememberable? -%>
+    <div><%%= f.check_box :remember_me %> <%%= f.label :remember_me %></div>
+  <%% end -%>
+
+  <div><%%= f.submit "Sign in" %></div>
+<%% end %>
+
+<%%= render "devise/shared/links" %>

data/lib/generators/frame/devise_omniauth/templates/app/views/layouts/defaults.html.erb

@@ -0,0 +1,48 @@
+<%% 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 %>
+            <%%= link_to '<li class="right hover">Sign up</li>'.html_safe, new_user_registration_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/devise_omniauth/templates/config/routes.rb

@@ -0,0 +1,7 @@
+Deom::Application.routes.draw do
+  devise_for :users, path_names: {sign_in: "login", sign_out: "logout"},
+             controllers: {omniauth_callbacks: "omniauth_callbacks"}
+  resources :pages
+  get 'sessions/new'
+  root :to => 'pages#show', :id => 0
+end

data/lib/generators/frame/gitignore/gitignore_generator.rb

@@ -9,7 +9,7 @@ module Frame
     desc "Installs Gitignore if it doesn't already exist."
       
     def create_gitignore
-      template ".gitignore", ".gitignore"
+      template ".gitignore"
     end
 
     end

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

@@ -12,9 +12,9 @@ module Frame
 
     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
     end
 
     def add_default_layout

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

@@ -1,11 +1,16 @@
 module ApplicationHelper
   def title(page_title)
+    view_flow.content.delete(:title)
     content_for :title do
       page_title
     end
     page_title
   end
 
+  def default_title(page_title)
+    title page_title unless content_for?(:title)
+  end
+
   def logo
     image_tag("econ_f_64.gif", {:alt => "eContriver", :class => "round", :style => "width: 64px; height: 64px"})
   end

data/lib/generators/frame/layout/templates/app/views/layouts/application.html.erb

@@ -1,3 +1,3 @@
-<%% title '<%= @title %>' %>
+<%% default_title '<%= @title %>' %>
 <%%= render :template => 'layouts/defaults' %>
 <%%= render :template => 'layouts/default_layout' %>

data/lib/generators/frame/mysql/mysql_generator.rb

@@ -6,7 +6,7 @@ module Frame
     class MysqlGenerator < Base
     include Rails::Generators::Migration
 
-    desc "Update MySQL with user priveleges."
+    desc "Update MySQL with user privileges."
 
     def add_gems
       gem("mysql2")
@@ -22,7 +22,7 @@ module Frame
       puts "database: #{db}"
       output = create_file 'tmp/drop_db.sql', "DROP DATABASE IF EXISTS #{db};"
       puts "output: #{output}\nEnter mysql root password"
-      system "mysql -u root -p < #{output}"
+      system "mysql -u root < #{output}"
     end
 
     def add_user
@@ -33,7 +33,7 @@ module Frame
       puts "using pw: #{pw}"
       output = create_file 'tmp/create_user.sql', "CREATE USER '#{user}'@localhost IDENTIFIED BY '#{pw}';"
       puts "output: #{output}\nEnter mysql root password"
-      system "mysql -u root -p < #{output}"
+      system "mysql -u root < #{output}"
     end
 
     def grant_user
@@ -44,10 +44,11 @@ module Frame
       puts "all on db: #{db}"
       output = create_file 'tmp/grant_user.sql', "GRANT ALL PRIVILEGES ON #{db}.* TO '#{user}'@localhost;"
       puts "output: #{output}\nEnter mysql root password"
-      system "mysql -u root -p < #{output}"
+      system "mysql -u root < #{output}"
     end
 
     def create_db
+      rake("db:reset")
       rake("db:setup")
     end
 

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

@@ -8,12 +8,17 @@ module Frame
 
     desc "Installs Omniauth."
 
+    def add_omniauth_secret
+      template('config/initializers/omniauth.rb')
+    end
+
     def install_omniauth
 
       gem 'omniauth'
+      gem 'omniauth-github'
+      gem 'omniauth-facebook'
       gem 'omniauth-twitter'
       gem 'omniauth-google-oauth2'
-      gem 'omniauth-github'
 
       Bundler.with_clean_env do
         run "bundle"
@@ -41,17 +46,18 @@ module Frame
     end
 
     # Leave the routes?
-    def generate_authentication_controller
+    def g_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')
+      #template('app/views/authentications/index.html.erb')
+      #remove_file('app/views/authentications')
     end
 
-    def generate_registration_controller
+    def g_registration_controller
       generate('controller Registrations edit new')
       template('app/views/registrations/edit.html.erb')
       template('app/views/registrations/new.html.erb')
@@ -75,12 +81,12 @@ module Frame
 
     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_32.png')
       template('app/assets/images/github_64.png')
+      template('app/assets/images/google_32.png')
       template('app/assets/images/google_64.png')
+      template('app/assets/images/twitter_32.png')
       template('app/assets/images/twitter_64.png')
     end
 
@@ -91,9 +97,9 @@ module Frame
     end
 
     def update_db
-      if yes?("Would you like to migrate the database?")
+      #if yes?("Would you like to migrate the database?")
         rake("db:migrate")
-      end
+      #end
     end
 
     end

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

@@ -4,17 +4,21 @@ class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :lockable, :timeoutable, :confirmable and :activatable
   devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+         :recoverable, :rememberable, :trackable, :validatable,
+         :authentication_keys => [:login]
 
   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)
+  def self.find_first_by_auth_conditions(warden_conditions)
     conditions = warden_conditions.dup
-    login = conditions.delete(:login)
-    where(conditions).where(["lower(username) = :value OR lower(email) = :value", {:value => login.downcase}]).first
+    if login = conditions.delete(:login)
+      where(conditions).where(["lower(username) = :value OR lower(email) = :value", { :value => login.downcase }]).first
+    else
+      where(conditions).first
+    end
   end
 
   def update_with_password(params={})

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

@@ -3,7 +3,7 @@
 <%%= render 'shared/open_auth' %>
 
 <%% unless user_signed_in? %>
-    <div class="left span-12 last">
+    <div class="left span-9 last">
       <h2 class="alt">... or a Normal Account:</h2>
       <%%= render 'shared/login_form' %>
       <%%= link_to "Forgot your password?", new_password_path('user') %>

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

@@ -1,11 +1,11 @@
 <h2>Sign In Using...</h2>
 
-<%= render 'shared/open_auth' %>
+<%%= render 'shared/open_auth' %>
 
-<% unless user_signed_in? %>
+<%% 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" %>
+      <%%= render 'shared/login_form' %>
+      <%%= render "devise/shared/links" %>
     </div>
-<% end %>
+<%% end %>

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

@@ -10,7 +10,7 @@
 
       <p><%%= f.label :email %></p>
 
-      <p><%%= f.text_field :email, :class => "text" %></p>
+      <p><%%= f.email_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>
 

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

@@ -1,25 +1,29 @@
 <%% title "Sign up" %>
 
-<h2>Sign up</h2>
+<div class="left span-9">
+    <h2>Sign up</h2>
 
-<%%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-  <%%= render 'shared/error_messages', :object => f.object %>
+    <%%= 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>
+      <p><%%= f.label :username %></p>
+      <p><%%= f.text_field :username, :class => "text"  %></p>
 
-<%% if @user.password_required? %>
-  <p><%%= f.label :password %></p>
-  <p><%%= f.password_field :password %></p>
+      <p><%%= f.label :email %></p>
+      <p><%%= f.email_field :email, :class => "text"  %></p>
 
-  <p><%%= f.label :password_confirmation %></p>
-  <p><%%= f.password_field :password_confirmation %></p>
-<%% end %>
+    <%% if @user.password_required? %>
+      <p><%%= f.label :password %></p>
+      <p><%%= f.password_field :password, :class => "text"  %></p>
 
-  <p><%%= f.submit "Sign up" %></p>
-<%% end %>
+      <p><%%= f.label :password_confirmation %></p>
+      <p><%%= f.password_field :password_confirmation, :class => "text"  %></p>
+    <%% end %>
 
-<%%= render :partial => "devise/shared/links" %>
+      <p><%%= f.submit "Sign up" %></p>
+    <%% end %>
+
+    <%%= render :partial => "devise/shared/links" %>
+</div>
+
+<%%= render 'shared/open_auth' %>

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

@@ -1,13 +1,16 @@
 #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' }
+  provider :google_oauth2, 'APP_ID', 'APP_SECRET', { :scope => 'https://www.googleapis.com/auth/userinfo.email', :redirect_uri => 'http://econtriver.com/auth/google_oauth2/callback', :approval_prompt => 'auto' }
 
   #require 'omniauth-twitter'
-  config.omniauth :twitter, 'APP_ID', 'APP_SECRET'
+  provider :twitter, 'APP_ID', 'APP_SECRET'
 
   #require 'omniauth-github'
-  config.omniauth :github, 'APP_ID', 'APP_SECRET'
+  provider :github, 'APP_ID', 'APP_SECRET'
+
+  #require 'omniauth-facebook'
+  provider :facebook, 'APP_ID', 'APP_SECRET'
 
   #provider :open_id, OpenID::Store::Filesystem.new('/tmp')
 end

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

@@ -9,7 +9,7 @@ module Frame
 
       desc "Setup Pages."
 
-      class_option :force, :type => :boolean, :default => false, :desc => "Force file regeneration"
+      class_option :force, :type => :boolean, :default => true, :desc => "Force file overwriting"
 
       #def add_gems
       #  #add_gem "mysql2"
@@ -26,9 +26,9 @@ module Frame
 
       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
       end
 
       def generate_scaffold
@@ -40,7 +40,7 @@ module Frame
       end
 
       def add_root_route
-        insert_into_file 'config/routes.rb', "  root :to => 'pages#show', :id => 0\n", :after => "#{Rails.application.class.parent_name}::Application.routes.draw do\n"
+        insert_into_file 'config/routes.rb', "  root :to => 'pages#show', :id => 0\n  get 'sessions/new'\n", :after => "#{Rails.application.class.parent_name}::Application.routes.draw do\n"
       end
 
       def update_page_controller
@@ -67,17 +67,17 @@ module Frame
       end
 
       def create_pages_partials
-        template '_links.html.erb', 'app/views/pages/_links.html.erb'
-        template '_form.html.erb', 'app/views/pages/_form.html.erb'
-        template '_error_messages.html.erb', 'app/views/shared/_error_messages.html.erb'
-        template '_sidebar.html.erb', 'app/views/shared/_sidebar.html.erb'
-        template '_page.html.erb', 'app/views/pages/_page.html.erb'
+        template('app/views/pages/_form.html.erb')
+        template('app/views/pages/_links.html.erb')
+        template('app/views/pages/_page.html.erb')
+        template('app/views/shared/_error_messages.html.erb')
+        template('app/views/shared/_sidebar.html.erb')
       end
 
       def create_pages_views
-        template 'pages.html.erb', 'app/views/layouts/pages.html.erb'
-        template 'index.html.erb', 'app/views/pages/index.html.erb'
-        template 'show.html.erb', 'app/views/pages/show.html.erb'
+        template('app/views/layouts/pages.html.erb')
+        template('app/views/pages/index.html.erb')
+        template('app/views/pages/show.html.erb')
       end
 
       def add_scopes
@@ -120,10 +120,10 @@ module Frame
     end
 
     def update_db
-      if yes?("Would you like to migrate the database?")
+      #if yes?("Would you like to migrate the database?")
         rake("db:migrate")
         rake("db:seed")
-      end
+      #end
     end
 
     private

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

@@ -33,6 +33,7 @@ module Frame
     def create_rake_file
       #@title = Rails.application.class.parent_name.downcase
       template('Rakefile')
+      gsub_file 'Rakefile', /Rails\.application\.class\.parent_name\:\:Application\.load_tasks/, "#{Rails.application.class.parent_name}::Application.load_tasks"
     end
 
     end

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

@@ -5,7 +5,7 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-Tester::Application.load_tasks
+Rails.application.class.parent_name::Application.load_tasks
 
 files = ['config/initializers/omniauth.rb','config/database.yml','config/initializers/secret_token.rb']
 
@@ -29,11 +29,9 @@ task :get_secret do
   end
 end
 
-task :backup, :roles => :db, :only => { :primary => true } do
+task :backup 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
+  system("mysqldump -u #{config['production']['username']} -p'#{config['production']['password']}' #{config['production']['database']} | bzip2 -c > #{filepath}\n")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frame
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -330,11 +330,11 @@ files:
 - lib/generators/frame/layout/templates/app/assets/images/favicon.ico
 - 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/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/helpers/application_helper.rb
-- lib/generators/frame/layout/templates/app/stylesheets/frame.css
 - lib/generators/frame/layout/USAGE
 - lib/generators/frame/mysql/USAGE
 - lib/generators/frame/mysql/mysql_generator.rb
@@ -344,20 +344,29 @@ files:
 - lib/generators/frame/admin/templates/app/admin/pages.rb
 - lib/generators/frame/admin/USAGE
 - lib/generators/frame/pages/pages_generator.rb
-- lib/generators/frame/pages/templates/_form.html.erb
-- lib/generators/frame/pages/templates/_links.html.erb
-- lib/generators/frame/pages/templates/pages.html.erb
-- lib/generators/frame/pages/templates/_sidebar.html.erb
-- lib/generators/frame/pages/templates/_error_messages.html.erb
-- lib/generators/frame/pages/templates/index.html.erb
-- lib/generators/frame/pages/templates/show.html.erb
-- lib/generators/frame/pages/templates/_page.html.erb
+- lib/generators/frame/pages/templates/app/views/pages/_form.html.erb
+- lib/generators/frame/pages/templates/app/views/pages/_links.html.erb
+- lib/generators/frame/pages/templates/app/views/pages/index.html.erb
+- lib/generators/frame/pages/templates/app/views/pages/show.html.erb
+- lib/generators/frame/pages/templates/app/views/pages/_page.html.erb
+- lib/generators/frame/pages/templates/app/views/shared/_sidebar.html.erb
+- lib/generators/frame/pages/templates/app/views/shared/_error_messages.html.erb
+- lib/generators/frame/pages/templates/app/views/layouts/pages.html.erb
 - lib/generators/frame/pages/USAGE
 - lib/generators/frame/gitignore/gitignore_generator.rb
 - lib/generators/frame/gitignore/USAGE
 - lib/generators/frame/devise/templates/app/views/layouts/defaults.html.erb
 - lib/generators/frame/devise/devise_generator.rb
 - lib/generators/frame/devise/USAGE
+- lib/generators/frame/devise_omniauth/templates/app/models/user.rb
+- lib/generators/frame/devise_omniauth/templates/app/views/devise/sessions/new.html.erb
+- lib/generators/frame/devise_omniauth/templates/app/views/devise/registrations/edit.html.erb
+- lib/generators/frame/devise_omniauth/templates/app/views/devise/registrations/new.html.erb
+- lib/generators/frame/devise_omniauth/templates/app/views/layouts/defaults.html.erb
+- lib/generators/frame/devise_omniauth/templates/app/controllers/omniauth_callbacks_controller.rb
+- lib/generators/frame/devise_omniauth/templates/config/routes.rb
+- lib/generators/frame/devise_omniauth/devise_omniauth_generator.rb
+- lib/generators/frame/devise_omniauth/USAGE
 - lib/generators/frame/secret/templates/database.yml
 - lib/generators/frame/secret/templates/Rakefile
 - lib/generators/frame/secret/secret_generator.rb