RubyGems - cartoonist - Versions diffs - 0.0.4 → 0.0.5 - Mend

cartoonist 0.0.4 → 0.0.5

Files changed (16) hide show

data/app/controllers/admin_controller.rb +2 -27
data/app/controllers/application_controller.rb +14 -2
data/app/controllers/settings_controller.rb +7 -5
data/app/models/user.rb +6 -0
data/app/views/layouts/admin.html.erb +9 -6
data/app/views/layouts/{sign_in.html.erb → initial_setup.html.erb} +1 -1
data/app/views/layouts/users.html.erb +24 -0
data/app/views/settings/initial_setup.html.erb +1 -1
data/cartoonist.gemspec +5 -0
data/config/locales/devise.en.yml +57 -0
data/config/locales/en.yml +4 -2
data/db/migrate/20120417075756_devise_create_users.rb +50 -0
data/lib/cartoonist.rb +33 -0
data/lib/cartoonist/engine.rb +256 -14
metadata +63 -5
data/app/views/admin/sign_in.html.erb +0 -19

data/app/controllers/admin_controller.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 class AdminController < ApplicationController
   before_filter :ensure_ssl!, :except => [:cache_cron, :tweet_cron]
-  before_filter :check_admin!, :except => [:cache_cron, :index, :sign_in, :tweet_cron]
+  before_filter :check_admin!, :except => [:cache_cron, :tweet_cron]
   def index
-    redirect_to "/admin/sign_in"
+    redirect_to "/admin/main"
   end
   def backup
@@ -65,29 +65,4 @@ class AdminController < ApplicationController
   rescue
     render :text => "Failure.", :layout => false
   end
-  def sign_in
-    return redirect_to "/admin/main" if session[:admin]
-    return redirect_to "/settings/initial_setup" if initial_setup_required?
-    if request.post?
-      user = Setting[:admin_users][params[:username]]
-      if user && params[:password] == user[:password]
-        session[:admin] = true
-        session[:user] = user[:name]
-        return redirect_to "/admin/main"
-      else
-        flash[:error] = "Wrong username or password!"
-        return redirect_to "/admin/sign_in"
-      end
-    end
-    render :layout => "sign_in"
-  end
-  def logout
-    reset_session
-    redirect_to "/admin/sign_in"
-  end
 end

data/app/controllers/application_controller.rb CHANGED Viewed

@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   private
   def initial_setup_required?
-    Setting[:admin_users].empty?
+    User.count == 0
   end
   def ensure_ssl!
@@ -13,7 +13,19 @@ class ApplicationController < ActionController::Base
   end
   def check_admin!
-    raise ActionController::RoutingError.new("Not Found") unless session[:admin]
+    if initial_setup_required?
+      redirect_to "/settings/initial_setup"
+    else
+      authenticate_user!
+    end
+  end
+  def after_sign_out_path_for(resource_or_scope)
+    "/admin"
+  end
+  def after_sign_in_path_for(resource_or_scope)
+    "/admin"
   end
   def check_mobile

data/app/controllers/settings_controller.rb CHANGED Viewed

@@ -20,16 +20,18 @@ class SettingsController < ApplicationController
   end
   def initial_setup
-    return redirect_to "/admin/sign_in" unless initial_setup_required?
-    render :layout => "sign_in"
+    return redirect_to "/admin" unless initial_setup_required?
+    render :layout => "initial_setup"
   end
   def save_initial_setup
-    return redirect_to "/admin/sign_in" unless initial_setup_required?
-    Setting[:admin_users] = { params[:admin_username] => { :name => params[:admin_name], :password => params[:admin_password] } }
+    return redirect_to "/admin" unless initial_setup_required?
     Setting[:domain] = params[:domain]
     Setting[:site_name] = params[:site_name]
     Setting[:secret_token] = SecureRandom.hex 30
-    redirect_to "/admin/sign_in"
+    Setting[:devise_pepper] = SecureRandom.hex 64
+    # This MUST go AFTER we set the pepper
+    User.create! :email => params[:admin_email], :password => params[:admin_password], :name => params[:admin_name]
+    redirect_to "/admin"
   end
 end

data/app/models/user.rb ADDED Viewed

@@ -0,0 +1,6 @@
+class User < ActiveRecord::Base
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :name
+end

data/app/views/layouts/admin.html.erb CHANGED Viewed

@@ -8,12 +8,15 @@
     <link rel="shortcut icon" href="http://<%= Setting[:domain] %><%= asset_path Cartoonist::Theme.favicon %>" type="image/x-icon" />
   </head>
   <body>
-    <p class="tabs">
-      <% Cartoonist::Admin::Tab.all.each do |tab| %>
-        <a class="tab" href="<%= Cartoonist::Admin::Tab[tab] %>"><%= t tab, :scope => "admin.layout.tab" %></a>
-      <% end %>
-      | <%= t "admin.layout.user_heading", :user => session[:user] %> <a href="/admin/logout"><%= t "admin.layout.logout" %></a>
-    </p>
+    <%= form_tag "/users/sign_out", :method => :delete do %>
+      <p class="tabs">
+        <% Cartoonist::Admin::Tab.all.each do |tab| %>
+          <a class="tab" href="<%= Cartoonist::Admin::Tab[tab] %>"><%= t tab, :scope => "admin.layout.tab" %></a>
+        <% end %>
+        | <%= t "admin.layout.user_heading", :user => current_user.name %>
+        <input type="submit" value="<%= t "admin.layout.logout" %>" />
+      </p>
+    <% end %>
     <% if content_for? :subtabs %>
       <p class="subtabs">

data/app/views/layouts/{sign_in.html.erb → initial_setup.html.erb} RENAMED Viewed

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Sign In</title>
+    <title>Initial Setup</title>
     <%= csrf_meta_tags %>
     <link rel="icon" href="http://<%= Setting[:domain] %><%= asset_path Cartoonist::Theme.favicon %>" type="image/x-icon" />
     <link rel="shortcut icon" href="http://<%= Setting[:domain] %><%= asset_path Cartoonist::Theme.favicon %>" type="image/x-icon" />

data/app/views/layouts/users.html.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Sign In</title>
+    <%= csrf_meta_tags %>
+    <link rel="icon" href="http://<%= Setting[:domain] %><%= asset_path Cartoonist::Theme.favicon %>" type="image/x-icon" />
+    <link rel="shortcut icon" href="http://<%= Setting[:domain] %><%= asset_path Cartoonist::Theme.favicon %>" type="image/x-icon" />
+  </head>
+  <body>
+    <% if flash[:notice] %>
+      <div class="notice">
+        <%= flash[:notice] %>
+      </div>
+    <% end %>
+    <% if flash[:alert] %>
+      <div class="alert">
+        <%= flash[:alert] %>
+      </div>
+    <% end %>
+    <%= yield %>
+  </body>
+</html>

data/app/views/settings/initial_setup.html.erb CHANGED Viewed

@@ -1,6 +1,6 @@
 <%= form_tag "/settings/save_initial_setup", :method => :post do %>
   <p>
-    <%= t "settings.initial_setup.username" %><input type="text" name="admin_username" value="<%= t "settings.initial_setup.default_username" %>" autofocus="autofocus" />
+    <%= t "settings.initial_setup.email" %><input type="text" name="admin_email" value="<%= t "settings.initial_setup.default_email" %>" autofocus="autofocus" />
   </p>
   <p>

data/cartoonist.gemspec CHANGED Viewed

@@ -10,4 +10,9 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
   s.homepage      = "http://reasonnumber.com/cartoonist"
+  s.add_dependency "devise", "~> 2.0.0"
+  s.add_dependency "jquery-rails", "~> 2.0.0"
+  s.add_dependency "railties", "~> 3.2.0"
+  s.add_dependency "redcarpet", "~> 2.1.0"
+  s.add_dependency "twitter", "~> 2.2.0"
 end

data/config/locales/devise.en.yml ADDED Viewed

@@ -0,0 +1,57 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+en:
+  errors:
+    messages:
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      already_confirmed: "was already confirmed, please try signing in"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
+  devise:
+    failure:
+      already_authenticated: 'You are already signed in.'
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    sessions:
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+      updated_not_active: 'Your password was changed successfully.'
+      send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      signed_up: 'Welcome! You have signed up successfully.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+      updated: 'You updated your account successfully.'
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
+      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
+    omniauth_callbacks:
+      success: 'Successfully authorized from %{kind} account.'
+      failure: 'Could not authorize you from %{kind} because "%{reason}".'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'

data/config/locales/en.yml CHANGED Viewed

@@ -43,9 +43,10 @@ en:
       www_tmp: www tmp
   settings:
     initial_setup:
+      default_email: you@youremail.com
       default_name: Anonymous
-      default_username: admin
       domain: "Domain: "
+      email: "Email: "
       name: "Name: "
       password: "Password: "
       save: Save
@@ -67,6 +68,7 @@ en:
         site_name: "Site Name: "
         site_heading: "Site Heading: "
         site_update_description: "Site Update Description: "
+        root_path: "Root Path: "
         theme: "Theme: "
         schedule: "Schedule: "
         copyright_starting_year: "Copyright Starting Year: "
@@ -86,8 +88,8 @@ en:
         disqus_comic_category: "Disqus Comic Category: "
         disqus_blog_post_category: "Disqus Blog Post Category: "
         disqus_page_category: "Disqus Page Category: "
-        admin_users: "Admin Users: "
         secret_token: "Secret Token: "
+        devise_pepper: "Devise Pepper: "
       tabs:
         advanced: Advanced
         general: General

data/db/migrate/20120417075756_devise_create_users.rb ADDED Viewed

@@ -0,0 +1,50 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+      ## Rememberable
+      t.datetime :remember_created_at
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+      ## Encryptable
+      # t.string :password_salt
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+      ## Lockable
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+      ## Token authenticatable
+      # t.string :authentication_token
+      t.string :name
+      t.timestamps
+    end
+    add_index :users, :email,                :unique => true
+    add_index :users, :reset_password_token, :unique => true
+    # add_index :users, :confirmation_token,   :unique => true
+    # add_index :users, :unlock_token,         :unique => true
+    # add_index :users, :authentication_token, :unique => true
+  end
+end

data/lib/cartoonist.rb CHANGED Viewed

@@ -1,3 +1,8 @@
+require "devise"
+require "jquery-rails"
+require "redcarpet"
+require "twitter"
 module Cartoonist
   module Admin
     class Tab
@@ -147,6 +152,34 @@ module Cartoonist
     end
   end
+  class RootPath
+    @@all = []
+    @@paths = {}
+    class << self
+      def all
+        @@all
+      end
+      def add(path_name, path)
+        (@@all << path_name.to_sym).sort! unless @@all.include? path_name.to_sym
+        @@paths[path_name.to_sym] = path unless @@paths.include? path_name.to_sym
+      end
+      def [](key)
+        @@paths[key.to_sym]
+      end
+      def current_key
+        Setting[:root_path]
+      end
+      def current
+        self[current_key]
+      end
+    end
+  end
   class Routes
     @@begin = []
     @@middle = []

data/lib/cartoonist/engine.rb CHANGED Viewed

@@ -1,5 +1,229 @@
 module Cartoonist
   class Engine < ::Rails::Engine
+    # Use this hook to configure devise mailer, warden hooks and so forth.
+    # Many of these configuration options can be set straight in your model.
+    Devise.setup do |devise_config|
+      # ==> Mailer Configuration
+      # Configure the e-mail address which will be shown in Devise::Mailer,
+      # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+      devise_config.mailer_sender = "no-reply@willbesetlater.com"
+      # Configure the class responsible to send e-mails.
+      # devise_config.mailer = "Devise::Mailer"
+      # Automatically apply schema changes in tableless databases
+      devise_config.apply_schema = false
+      # ==> ORM configuration
+      # Load and configure the ORM. Supports :active_record (default) and
+      # :mongoid (bson_ext recommended) by default. Other ORMs may be
+      # available as additional gems.
+      require "devise/orm/active_record"
+      # ==> Configuration for any authentication mechanism
+      # Configure which keys are used when authenticating a user. The default is
+      # just :email. You can configure it to use [:username, :subdomain], so for
+      # authenticating a user, both parameters are required. Remember that those
+      # parameters are used only when authenticating and not when retrieving from
+      # session. If you need permissions, you should implement that in a before filter.
+      # You can also supply a hash where the value is a boolean determining whether
+      # or not authentication should be aborted when the value is not present.
+      # devise_config.authentication_keys = [ :email ]
+      # Configure parameters from the request object used for authentication. Each entry
+      # given should be a request method and it will automatically be passed to the
+      # find_for_authentication method and considered in your model lookup. For instance,
+      # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+      # The same considerations mentioned for authentication_keys also apply to request_keys.
+      # devise_config.request_keys = []
+      # Configure which authentication keys should be case-insensitive.
+      # These keys will be downcased upon creating or modifying a user and when used
+      # to authenticate or find a user. Default is :email.
+      devise_config.case_insensitive_keys = [ :email ]
+      # Configure which authentication keys should have whitespace stripped.
+      # These keys will have whitespace before and after removed upon creating or
+      # modifying a user and when used to authenticate or find a user. Default is :email.
+      devise_config.strip_whitespace_keys = [ :email ]
+      # Tell if authentication through request.params is enabled. True by default.
+      # It can be set to an array that will enable params authentication only for the
+      # given strategies, for example, `devise_config.params_authenticatable = [:database]` will
+      # enable it only for database (email + password) authentication.
+      # devise_config.params_authenticatable = true
+      # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+      # It can be set to an array that will enable http authentication only for the
+      # given strategies, for example, `devise_config.http_authenticatable = [:token]` will
+      # enable it only for token authentication.
+      # devise_config.http_authenticatable = false
+      # If http headers should be returned for AJAX requests. True by default.
+      # devise_config.http_authenticatable_on_xhr = true
+      # The realm used in Http Basic Authentication. "Application" by default.
+      # devise_config.http_authentication_realm = "Application"
+      # It will change confirmation, password recovery and other workflows
+      # to behave the same regardless if the e-mail provided was right or wrong.
+      # Does not affect registerable.
+      # devise_config.paranoid = true
+      # By default Devise will store the user in session. You can skip storage for
+      # :http_auth and :token_auth by adding those symbols to the array below.
+      # Notice that if you are skipping storage for all authentication paths, you
+      # may want to disable generating routes to Devise's sessions controller by
+      # passing :skip => :sessions to `devise_for` in your config/routes.rb
+      devise_config.skip_session_storage = [:http_auth]
+      # ==> Configuration for :database_authenticatable
+      # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+      # using other encryptors, it sets how many times you want the password re-encrypted.
+      #
+      # Limiting the stretches to just one in testing will increase the performance of
+      # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+      # a value less than 10 in other environments.
+      devise_config.stretches = Rails.env.test? ? 1 : 10
+      # Setup a pepper to generate the encrypted password.
+      devise_config.pepper = "temporary... this is initialized later, in the to_prepare block"
+      # ==> Configuration for :confirmable
+      # A period that the user is allowed to access the website even without
+      # confirming his account. For instance, if set to 2.days, the user will be
+      # able to access the website for two days without confirming his account,
+      # access will be blocked just in the third day. Default is 0.days, meaning
+      # the user cannot access the website without confirming his account.
+      # devise_config.allow_unconfirmed_access_for = 2.days
+      # If true, requires any email changes to be confirmed (exctly the same way as
+      # initial account confirmation) to be applied. Requires additional unconfirmed_email
+      # db field (see migrations). Until confirmed new email is stored in
+      # unconfirmed email column, and copied to email column on successful confirmation.
+      devise_config.reconfirmable = true
+      # Defines which key will be used when confirming an account
+      # devise_config.confirmation_keys = [ :email ]
+      # ==> Configuration for :rememberable
+      # The time the user will be remembered without asking for credentials again.
+      # devise_config.remember_for = 2.weeks
+      # If true, extends the user's remember period when remembered via cookie.
+      # devise_config.extend_remember_period = false
+      # If true, uses the password salt as remember token. This should be turned
+      # to false if you are not using database authenticatable.
+      devise_config.use_salt_as_remember_token = true
+      # Options to be passed to the created cookie. For instance, you can set
+      # :secure => true in order to force SSL only cookies.
+      # devise_config.cookie_options = {}
+      # ==> Configuration for :validatable
+      # Range for password length. Default is 6..128.
+      # devise_config.password_length = 6..128
+      # Email regex used to validate email formats. It simply asserts that
+      # an one (and only one) @ exists in the given string. This is mainly
+      # to give user feedback and not to assert the e-mail validity.
+      # devise_config.email_regexp = /\A[^@]+@[^@]+\z/
+      # ==> Configuration for :timeoutable
+      # The time you want to timeout the user session without activity. After this
+      # time the user will be asked for credentials again. Default is 30 minutes.
+      # devise_config.timeout_in = 30.minutes
+      # ==> Configuration for :lockable
+      # Defines which strategy will be used to lock an account.
+      # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+      # :none            = No lock strategy. You should handle locking by yourself.
+      # devise_config.lock_strategy = :failed_attempts
+      # Defines which key will be used when locking and unlocking an account
+      # devise_config.unlock_keys = [ :email ]
+      # Defines which strategy will be used to unlock an account.
+      # :email = Sends an unlock link to the user email
+      # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+      # :both  = Enables both strategies
+      # :none  = No unlock strategy. You should handle unlocking by yourself.
+      # devise_config.unlock_strategy = :both
+      # Number of authentication tries before locking an account if lock_strategy
+      # is failed attempts.
+      # devise_config.maximum_attempts = 20
+      # Time interval to unlock the account if :time is enabled as unlock_strategy.
+      # devise_config.unlock_in = 1.hour
+      # ==> Configuration for :recoverable
+      #
+      # Defines which key will be used when recovering the password for an account
+      # devise_config.reset_password_keys = [ :email ]
+      # Time interval you can reset your password with a reset password key.
+      # Don't put a too small interval or your users won't have the time to
+      # change their passwords.
+      devise_config.reset_password_within = 6.hours
+      # ==> Configuration for :encryptable
+      # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+      # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+      # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+      # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+      # REST_AUTH_SITE_KEY to pepper)
+      # devise_config.encryptor = :sha512
+      # ==> Configuration for :token_authenticatable
+      # Defines name of the authentication token params key
+      # devise_config.token_authentication_key = :auth_token
+      # ==> Scopes configuration
+      # Turn scoped views on. Before rendering "sessions/new", it will first check for
+      # "users/sessions/new". It's turned off by default because it's slower if you
+      # are using only default views.
+      # devise_config.scoped_views = false
+      # Configure the default scope given to Warden. By default it's the first
+      # devise role declared in your routes (usually :user).
+      # devise_config.default_scope = :user
+      # Configure sign_out behavior.
+      # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
+      # The default is true, which means any logout action will sign out all active scopes.
+      # devise_config.sign_out_all_scopes = true
+      # ==> Navigation configuration
+      # Lists the formats that should be treated as navigational. Formats like
+      # :html, should redirect to the sign in page when the user does not have
+      # access, but formats like :xml or :json, should return 401.
+      #
+      # If you have any extra navigational formats, like :iphone or :mobile, you
+      # should add them to the navigational formats lists.
+      #
+      # The "*/*" below is required to match Internet Explorer requests.
+      # devise_config.navigational_formats = ["*/*", :html]
+      # The default HTTP method used to sign out a resource. Default is :delete.
+      devise_config.sign_out_via = :delete
+      # ==> OmniAuth
+      # Add a new OmniAuth provider. Check the wiki for more information on setting
+      # up on your models and hooks.
+      # devise_config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+      # ==> Warden configuration
+      # If you want to use other strategies, that are not supported by Devise, or
+      # change the failure app, you can configure them inside the devise_config.warden block.
+      #
+      # devise_config.warden do |manager|
+      #   manager.intercept_401 = false
+      #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+      # end
+    end
     config.before_initialize do
       # Add in various configuration from plugins
       Rails.application.config.assets.precompile += ["admin.css"]
@@ -14,6 +238,8 @@ module Cartoonist
     end
     config.to_prepare do
+      Devise::SessionsController.layout "users"
       if Setting.table_exists?
         secret_token_changed = lambda do
           # Your secret key for verifying the integrity of signed cookies.
@@ -24,11 +250,18 @@ module Cartoonist
         end
         twitter_auth_changed = lambda do
-          Twitter.configure do |config|
-            config.consumer_key = Setting[:twitter_consumer_key]
-            config.consumer_secret = Setting[:twitter_consumer_secret]
-            config.oauth_token = Setting[:twitter_oauth_token]
-            config.oauth_token_secret = Setting[:twitter_oauth_token_secret]
+          Twitter.configure do |twitter_config|
+            twitter_config.consumer_key = Setting[:twitter_consumer_key]
+            twitter_config.consumer_secret = Setting[:twitter_consumer_secret]
+            twitter_config.oauth_token = Setting[:twitter_oauth_token]
+            twitter_config.oauth_token_secret = Setting[:twitter_oauth_token_secret]
+          end
+        end
+        devise_pepper_changed = lambda do
+          Devise.setup do |devise_config|
+            devise_config.mailer_sender = "no-reply@#{Setting[:domain]}"
+            devise_config.pepper = Setting[:devise_pepper]
           end
         end
@@ -36,12 +269,12 @@ module Cartoonist
         Setting.define :site_name, :order => 2
         Setting.define :site_heading, :order => 3
         Setting.define :site_update_description, :order => 4
-        Setting.define :theme, :type => :symbol, :default => :cartoonist_default_theme, :order => 5, :select_from => lambda { Cartoonist::Theme.all }
-        Setting.define :schedule, :type => :array, :default => [:monday, :wednesday, :friday], :order => 6
-        Setting.define :copyright_starting_year, :type => :int, :order => 7
-        Setting.define :copyright_owners, :order => 8
-        Setting.define :default_title, :order => 9
-        Setting.define :admin_users, :type => :hash, :order => 10
+        Setting.define :root_path, :type => :symbol, :default => Cartoonist::RootPath.all.first, :order => 5, :select_from => lambda { Cartoonist::RootPath.all }, :onchange => lambda { Rails.application.reload_routes! }
+        Setting.define :theme, :type => :symbol, :default => :cartoonist_default_theme, :order => 6, :select_from => lambda { Cartoonist::Theme.all }
+        Setting.define :schedule, :type => :array, :default => [:monday, :wednesday, :friday], :order => 7
+        Setting.define :copyright_starting_year, :type => :int, :order => 8
+        Setting.define :copyright_owners, :order => 9
+        Setting.define :default_title, :order => 10
         Setting::Tab.define :social_and_analytics, :order => 1 do
           Setting::Section.define :google_analytics, :order => 1 do
@@ -70,10 +303,12 @@ module Cartoonist
         Setting::Tab.define :advanced, :order => 2 do
           Setting.define :secret_token, :default => "ThisTokenMustBeRegenerated....", :onchange => secret_token_changed
+          Setting.define :devise_pepper, :default => "ThisTokenMustBeRegenerated....", :onchange => devise_pepper_changed
         end
         secret_token_changed.call
         twitter_auth_changed.call
+        devise_pepper_changed.call
       end
     end
@@ -89,11 +324,21 @@ module Cartoonist
       Setting.order(:id).all
     end
+    Cartoonist::Backup.for :users do
+      User.order(:id).all
+    end
+    Cartoonist::Routes.add_begin do
+      root :to => Cartoonist::RootPath.current
+    end
     Cartoonist::Routes.add do
       match "favicon" => "site#favicon", :defaults => { :format => "ico" }
       match "sitemap" => "site#sitemap", :defaults => { :format => "xml" }
       match "robots" => "site#robots", :defaults => { :format => "text" }
+      devise_for :users
       resources :cache do
         collection do
           post "expire_www"
@@ -113,11 +358,8 @@ module Cartoonist
         collection do
           get "cache_cron"
           get "backup"
-          get "logout"
           get "main"
           get "reload"
-          get "sign_in"
-          post "sign_in"
           get "tweet_cron"
         end
       end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease:
 platform: ruby
 authors:
@@ -9,8 +9,63 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
-dependencies: []
+date: 2012-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &16995580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *16995580
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &16993360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *16993360
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &16988280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *16988280
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &16987660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *16987660
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: &16986940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *16986940
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []
@@ -37,24 +92,27 @@ files:
 - app/models/sitemap_entry.rb
 - app/models/static_cache.rb
 - app/models/tweetable.rb
+- app/models/user.rb
 - app/views/admin/main.html.erb
-- app/views/admin/sign_in.html.erb
 - app/views/cache/index.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/application.rss.erb
 - app/views/layouts/application.xml.erb
 - app/views/layouts/general_admin.html.erb
-- app/views/layouts/sign_in.html.erb
+- app/views/layouts/initial_setup.html.erb
+- app/views/layouts/users.html.erb
 - app/views/settings/initial_setup.html.erb
 - app/views/settings/show.html.erb
 - app/views/site/robots.text.erb
 - app/views/site/sitemap.xml.erb
 - app/views/static_cache/index.html.erb
 - cartoonist.gemspec
+- config/locales/devise.en.yml
 - config/locales/en.yml
 - db/migrate/20120320043253_create_database_files.rb
 - db/migrate/20120401014029_create_settings.rb
+- db/migrate/20120417075756_devise_create_users.rb
 - lib/cartoonist.rb
 - lib/cartoonist/engine.rb
 - public/errors/404.html

data/app/views/admin/sign_in.html.erb DELETED Viewed

@@ -1,19 +0,0 @@
-<% if flash[:error] %>
-  <p style="color: red;">
-    <%= flash[:error] %>
-  </p>
-<% end %>
-<%= form_tag "/admin/sign_in", :method => :post do %>
-  <p>
-    Username: <input type="text" name="username" autofocus="autofocus" />
-  </p>
-  <p>
-    Password: <input type="password" name="password" />
-  </p>
-  <p>
-    <input type="submit" value="Sign in" />
-  </p>
-<% end %>