cartoonist 0.0.7 → 0.0.8

data/app/assets/stylesheets/admin.css.scss

@@ -1,5 +1,17 @@
 form.inline { display: inline-block; }
 
+table {
+  tbody {
+    tr:nth-of-type(odd) {
+      background-color: #ddd;
+    }
+
+    tr:nth-of-type(even) {
+      background-color: #fff;
+    }
+  }
+}
+
 table.cache {
   tbody {
     tr:nth-of-type(odd) {

data/app/controllers/accounts_controller.rb

@@ -0,0 +1,32 @@
+class AccountsController < CartoonistController
+  before_filter :ensure_ssl!
+  before_filter :check_admin!
+
+  def index
+    @users = User.order(:name).all
+  end
+
+  def create
+    user = User.create_user params
+    redirect_to "/accounts"
+  end
+
+  def show
+    @user = User.find params[:id].to_i
+  end
+
+  def edit
+    @user = User.find params[:id].to_i
+  end
+
+  def update
+    user = User.update_user params
+    redirect_to "/accounts/#{user.id}"
+  end
+
+  def destroy
+    raise "Cannot destroy yourself!" if current_user.id == params[:id].to_i
+    User.delete_user params
+    redirect_to "/accounts"
+  end
+end

data/app/controllers/settings_controller.rb

@@ -26,12 +26,19 @@ class SettingsController < CartoonistController
 
   def save_initial_setup
     return redirect_to "/admin" unless initial_setup_required?
+
+    if params[:admin_password] != params[:admin_confirm_password]
+      flash[:error] = t "settings.initial_setup.passwords_dont_match"
+      return redirect_to "/settings/initial_setup"
+    end
+
+    Setting[:copyright_starting_year] = Date.today.strftime("%Y").to_i
     Setting[:domain] = params[:domain]
     Setting[:site_name] = params[:site_name]
     Setting[:secret_token] = SecureRandom.hex 30
     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]
+    User.create! :email => params[:admin_email], :password => params[:admin_password], :password_confirmation => params[:admin_confirm_password], :name => params[:admin_name]
     redirect_to "/admin"
   end
 end

data/app/models/user.rb

@@ -3,4 +3,28 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me, :name
+
+  class << self
+    def create_user(params)
+      create :email => params[:email], :name => params[:name], :password => params[:password], :password_confirmation => params[:confirm_password]
+    end
+
+    def delete_user(params)
+      User.find(params[:id].to_i).destroy
+    end
+
+    def update_user(params)
+      user = find params[:id].to_i
+      user.email = params[:email]
+      user.name = params[:name]
+
+      if params[:password].present? || params[:confirm_password].present?
+        user.password = params[:password]
+        user.password_confirmation = params[:confirm_password]
+      end
+
+      user.save!
+      user
+    end
+  end
 end

data/app/views/accounts/edit.html.erb

@@ -0,0 +1,21 @@
+<h2><%= t "accounts.edit.subtitle" %></h2>
+
+<%= form_tag "/accounts/#{@user.id}", :method => :put do %>
+  <p>
+    <%= t "accounts.edit.email" %> <input type="text" name="email" value="<%= @user.email %>" />
+  </p>
+
+  <p>
+    <%= t "accounts.edit.name" %> <input type="text" name="name" value="<%= @user.name %>" />
+  </p>
+
+  <p>
+    <%= t "accounts.edit.password" %> <input type="password" name="password" value="" />
+  </p>
+
+  <p>
+    <%= t "accounts.edit.confirm" %> <input type="password" name="confirm_password" value="" />
+  </p>
+
+  <input type="submit" value="<%= t "accounts.edit.save" %>" />
+<% end %>

data/app/views/accounts/index.html.erb

@@ -0,0 +1,29 @@
+<a href="/accounts/new"><%= t "accounts.index.new_user" %></a>
+
+<table>
+  <thead>
+    <tr>
+      <th><%= t "accounts.index.name" %></th>
+      <th><%= t "accounts.index.email" %></th>
+      <th><%= t "accounts.index.edit" %></th>
+      <th><%= t "accounts.index.delete" %></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.name %></td>
+        <td><%= user.email %></td>
+        <td><a href="/accounts/<%= user.id %>/edit"><%= t "accounts.index.edit_button" %></a></td>
+        <td>
+          <% if current_user.id != user.id %>
+            <%= form_tag "/accounts/#{user.id}", :method => :delete do %>
+              <input type="submit" value="<%= t "accounts.index.delete_button" %>" />
+            <% end %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/accounts/new.html.erb

@@ -0,0 +1,21 @@
+<h2><%= t "accounts.new.subtitle" %></h2>
+
+<%= form_tag "/accounts", :method => :post do %>
+  <p>
+    <%= t "accounts.new.email" %> <input type="text" name="email" value="" />
+  </p>
+
+  <p>
+    <%= t "accounts.new.name" %> <input type="text" name="name" value="" />
+  </p>
+
+  <p>
+    <%= t "accounts.new.password" %> <input type="password" name="password" value="" />
+  </p>
+
+  <p>
+    <%= t "accounts.new.confirm" %> <input type="password" name="confirm_password" value="" />
+  </p>
+
+  <input type="submit" value="<%= t "accounts.new.save" %>" />
+<% end %>

data/app/views/accounts/show.html.erb

@@ -0,0 +1,11 @@
+<p>
+  <a href="/accounts/<%= @user.id %>/edit"><%= t "accounts.show.edit" %></a>
+</p>
+
+<p>
+  <%= t "accounts.show.email" %> <%= @user.email %>
+</p>
+
+<p>
+  <%= t "accounts.show.name" %> <%= @user.name %>
+</p>

data/app/views/layouts/accounts.html.erb

@@ -0,0 +1,8 @@
+<% content_for :subtabs do %>
+  <a class="subtab" href="/accounts/<%= current_user.id %>"><%= t "admin.accounts.layout.my_account" %></a>
+  <a class="subtab" href="/accounts"><%= t "admin.accounts.layout.users" %></a>
+<% end %>
+
+<% content_for :page_title, t("admin.accounts.layout.section") %>
+<% content_for(:content) { yield } %>
+<%= render :template => "layouts/admin" %>

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

@@ -14,6 +14,7 @@
           <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 %>
+        <a href="/accounts/<%= current_user.id %>"><%= t "admin.layout.account" %></a>
         <input type="submit" value="<%= t "admin.layout.logout" %>" />
       </p>
     <% end %>

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

@@ -1,3 +1,9 @@
+<% if flash[:error] %>
+  <div class="error">
+    <%= flash[:error] %>
+  </div>
+<% end %>
+
 <%= form_tag "/settings/save_initial_setup", :method => :post do %>
   <p>
     <%= t "settings.initial_setup.email" %><input type="text" name="admin_email" value="<%= t "settings.initial_setup.default_email" %>" autofocus="autofocus" />
@@ -11,6 +17,10 @@
     <%= t "settings.initial_setup.password" %><input type="password" name="admin_password" />
   </p>
 
+  <p>
+    <%= t "settings.initial_setup.confirm_password" %><input type="password" name="admin_confirm_password" />
+  </p>
+
   <p>
     <%= t "settings.initial_setup.domain" %><input type="text" name="domain" />
   </p>

data/config/locales/en.yml

@@ -1,5 +1,37 @@
 en:
+  accounts:
+    edit:
+      confirm: "Confirm:"
+      email: "Email:"
+      name: "Name:"
+      password: "Password:"
+      save: Save
+      subtitle: Edit Account
+    index:
+      delete: Delete
+      delete_button: delete
+      edit: Edit
+      edit_button: edit
+      email: Email
+      name: Name
+      new_user: New User
+    new:
+      confirm: "Confirm:"
+      email: "Email:"
+      name: "Name:"
+      password: "Password:"
+      save: Save
+      subtitle: New Account
+    show:
+      edit: edit
+      email: "Email:"
+      name: "Name:"
   admin:
+    accounts:
+      layout:
+        my_account: My Account
+        section: Account
+        users: Users
     general:
       actions:
         backup: Download Backup
@@ -11,6 +43,7 @@ en:
         settings: Settings
         static_cache: Static Cache
     layout:
+      account: Account
       tab:
         general: General
       logout: Logout
@@ -43,12 +76,14 @@ en:
       www_tmp: www tmp
   settings:
     initial_setup:
+      confirm_password: "Confirmation: "
       default_email: you@youremail.com
       default_name: Anonymous
       domain: "Domain: "
       email: "Email: "
       name: "Name: "
       password: "Password: "
+      passwords_dont_match: Your passwords must match.
       save: Save
       site_name: "Site Name: "
       username: "Username: "

data/lib/cartoonist/engine.rb

@@ -3,6 +3,8 @@ module Cartoonist
     # 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|
+      devise_config.parent_controller = "CartoonistController"
+
       # ==> 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.
@@ -358,6 +360,8 @@ module Cartoonist
         end
       end
 
+      resources :accounts
+
       resources :admin do
         collection do
           get "cache_cron"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13208780 !ruby/object:Gem::Requirement
+  requirement: &6819100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *13208780
+  version_requirements: *6819100
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &13206920 !ruby/object:Gem::Requirement
+  requirement: &6817240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *13206920
+  version_requirements: *6817240
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &13205660 !ruby/object:Gem::Requirement
+  requirement: &6816220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *13205660
+  version_requirements: *6816220
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &13205080 !ruby/object:Gem::Requirement
+  requirement: &6815620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *13205080
+  version_requirements: *6815620
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &13204340 !ruby/object:Gem::Requirement
+  requirement: &6814720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *13204340
+  version_requirements: *6814720
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []
@@ -75,6 +75,7 @@ files:
 - .gitignore
 - app/assets/javascripts/cartoonist.js.erb
 - app/assets/stylesheets/admin.css.scss
+- app/controllers/accounts_controller.rb
 - app/controllers/admin_controller.rb
 - app/controllers/cache_controller.rb
 - app/controllers/cartoonist_controller.rb
@@ -93,8 +94,13 @@ files:
 - app/models/static_cache.rb
 - app/models/tweetable.rb
 - app/models/user.rb
+- app/views/accounts/edit.html.erb
+- app/views/accounts/index.html.erb
+- app/views/accounts/new.html.erb
+- app/views/accounts/show.html.erb
 - app/views/admin/main.html.erb
 - app/views/cache/index.html.erb
+- app/views/layouts/accounts.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/cartoonist.html.erb
 - app/views/layouts/cartoonist.rss.erb