tkh_mailing_list 0.9.2 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fae94da3929b8e0ffbfaac55589d653bb764151
-  data.tar.gz: 94b9bfc0c731970fcb0d5cfdcf2312f35e523883
+  metadata.gz: 2caf6bc1d6e75f3b4453e161d2e457e1e2f5f650
+  data.tar.gz: ed54427b977379f9841f9998c1c7590eb98fcf5b
 SHA512:
-  metadata.gz: 37bc21297277d51d7d228b560bd9d4ce9e309f03ad6ea9ad70f077e1d2e4e0ac150b8a2f671cf717ce049d12c3750699a22e2c7d28b56b63d126bf1117c423bd
-  data.tar.gz: 41f412275b7f4515a7f542b28fd16cd550254f7d617bec2bcef1e5d5979894907fe734276ba90ec8ca89b2a3eed6c440f90a993432972a5755b68586f170cb79
+  metadata.gz: 5cc9b34dd1067c20b7a520d6abbbc4c3889b8cb739876904bcc6c762c888008ccfaed9b1c61449229cb10ab9b7d83df3255486767b16bd40cfa773c693e4d9d6
+  data.tar.gz: 2b7e4afc6d5cdfe4dc0f3af22538d1815e97367b701022ba894196dad01f2ae91fe42ebde145e736548f858eafccd59c85fa0cc74d46b0bb988cc1b0aaa3b5c9

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.10
+
+* Added a member resource for admins to update user records. Users are scoped as members.
+* Added a profile resource for users to view and edit their own info.
+
+
 ## 0.9.2
 
 * Fixed up details user form

data/app/controllers/members_controller.rb

@@ -0,0 +1,62 @@
+class MembersController < ApplicationController
+
+  before_filter :authenticate,            except: :show
+  before_filter :authenticate_with_admin, except: :show
+
+  before_action :set_member, only: [ :show, :edit, :update, :destroy ]
+
+  def index
+    @members = Member.by_recent.paginate(:page => params[:page], :per_page => 50)
+    switch_to_admin_layout
+  end
+
+  def show
+  end
+
+  def new
+    @member = Member.new
+    switch_to_admin_layout
+  end
+
+  def edit
+    switch_to_admin_layout
+  end
+
+  def create
+    @member = Member.new(member_params)
+    if @member.save
+      redirect_to @member, notice: t('members.create.notice')
+    else
+      render action: "new", warning: t('members.create.warning'), layout: 'admin'
+    end
+  end
+
+  def update
+    if @member.update_attributes(member_params)
+      redirect_to @member, notice: t('members.update.notice')
+    else
+      render action: "edit", warning: t('members.update.warning'), layout: 'admin'
+    end
+  end
+
+  def destroy
+    if @member.destroy
+      redirect_to members_path, notice: t('members.destroy.notice')
+    else
+      redirect_to members_path, warning: t('members.destroy.warning')
+    end
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_member
+    @member = Member.find(params[:id])
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def member_params
+    params.require(:member).permit( :email, :first_name, :last_name, :other_name, :teacher_status )
+  end
+
+end

data/app/controllers/profiles_controller.rb

@@ -0,0 +1,37 @@
+class ProfilesController < ApplicationController
+
+  before_filter :authenticate
+
+  before_action :set_profile
+
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    if @profile.update_attributes(profile_params)
+      redirect_to profile_path, notice: "<strong>Success!</strong> Your profile was updated.".html_safe
+    else
+      render action: "edit", warning: "<strong>Attention!</strong> A problem occurred while trying to update your profile. Plese try again".html_safe
+    end
+  end
+
+  def history
+    @activities = doer.activities.by_recent
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_profile
+    @profile = Profile.find(current_user)
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def profile_params
+    params.require(:profile).permit( :first_name, :last_name, :other_name )
+  end
+
+end

data/app/models/member.rb

@@ -0,0 +1,2 @@
+class Member < User
+end

data/app/models/profile.rb

@@ -0,0 +1,3 @@
+class Profile < User
+
+end

data/app/views/members/_admin_context_menu.html.erb

@@ -0,0 +1,16 @@
+<% if administrator? %>
+
+  <% content_for :admin_context_menu do %>
+
+    <h2><%= t('admin_section') %></h2>
+    <ul class="list-group">
+      <li class="list-group-item"><%= link_to t('admin_panel'), members_path %></li>
+      <%= content_tag :li, link_to( "#{t('activerecord.models.comments').capitalize} <span class='badge'>#{Comment.pending.count}</span>".html_safe, pending_comments_path ), class: 'list-group-item' if Comment.pending.count > 0 %>
+      <% if controller.action_name == 'show' %>
+        <li class="list-group-item"><%= link_to 'Modify this member record', edit_member_path(member) %></li>
+      <% end %>
+    </ul>
+
+  <% end -%>
+
+<% end -%>

data/app/views/members/_form.html.erb

@@ -0,0 +1,10 @@
+<%= simple_form_for @member do |f| %>
+  <%= f.error_notification %>
+
+    <%= f.input :first_name, label: t('activerecord.attributes.users.first_name') %>
+    <%= f.input :last_name, label: t('activerecord.attributes.users.last_name') %>
+    <%= f.input :other_name, label: t('activerecord.attributes.users.other_name'), hint: 'nickname, spiritual name, etc.' %>
+    <%= f.input :email, label: t('activerecord.attributes.users.email'), hint: 'change with caution!!!! the email is used to login.' %>
+
+    <%= f.button :submit, :class => 'btn btn-primary' %>
+<% end %>

data/app/views/members/_tab_admin_menu.html.erb

@@ -0,0 +1,6 @@
+<h1>Members</h1>
+<ul class="nav nav-tabs" id="admin-menu-tab">
+  <%= content_tag :li, link_to(t('new'), new_member_path), ({ class: 'active' } if controller.action_name.to_s == 'new' ) %>
+  <%= content_tag :li, link_to(t('list'), members_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
+  <%= content_tag :li, link_to(t('edit'), '#'), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>
+</ul>

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

@@ -0,0 +1,5 @@
+<%= render 'tab_admin_menu' %>
+
+<%= render 'form' %>
+
+<%= render 'shared/admin_sidebar' %>

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

@@ -0,0 +1,37 @@
+<%= render 'tab_admin_menu' %>
+
+<%= will_paginate @members, inner_window: 2 %>
+
+<table class='table table-striped'>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Email</th>
+      <th>Admin?</th>
+      <th><%= t('actions') %></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @members.each do |member| %>
+      <tr>
+        <td><%= link_to member.name, member, title: 'view' %></td>
+        <td><%= member.email %></td>
+        <td>
+          <% unless member.admin? %>
+            <span class="glyphicon glyphicon-remove"></span> <%= link_to t('authentication.enable_admin'), make_admin_user_path(member), class: 'btn btn-xs btn-default', method: :post %>
+          <% else %>
+            <span class="glyphicon glyphicon-ok"></span> <%= link_to t('authentication.disable_admin'), remove_admin_user_path(member), class: 'btn btn-xs btn-primary', method: :post %>
+          <% end -%>
+        </td>
+        <td><%= link_to t('edit'), edit_member_path(member), :class => 'btn btn-xs btn-default' %><%= link_to t('delete'), member, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= will_paginate @members, inner_window: 2 %>
+
+<p><%= link_to 'Add a New Member', new_member_path, class: 'btn btn-default' %></p>
+
+<%= render 'shared/admin_sidebar' %>

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

@@ -0,0 +1,5 @@
+<%= render 'tab_admin_menu' %>
+
+<%= render 'form' %>
+
+<%= render 'shared/admin_sidebar' %>

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

@@ -0,0 +1,21 @@
+<% content_for :meta_title, @member.name %>
+<% content_for :meta_description, "Public profile for #{@member.name}" %>
+
+<div id="profile-title">
+  <% if student.other_name.present? %>
+    <h1>
+      <%= student.other_name %><br />
+      <span class="secondary-name"><%= student.name %></span>
+    </h1>
+  <% else %>
+    <h1><%= student.name %></h1>
+  <% end %>
+</div>
+
+<table id="profile-attributes">
+  <tbody>
+    <%= render 'profiles/custom_public_profile_attributes' %>
+  </tbody>
+</table>
+
+<%= render 'admin_context_menu', member: @member %>

data/app/views/profiles/_admin_context_menu.html.erb

@@ -0,0 +1,15 @@
+<% if administrator? %>
+
+  <% content_for :admin_context_menu do %>
+
+    <h2><%= t('admin_section') %></h2>
+    <ul class="list-group">
+      <li class="list-group-item"><%= link_to t('admin_panel'), members_path %></li>
+      <%= content_tag :li, link_to( "#{t('activerecord.models.comments').capitalize} <span class='badge'>#{Comment.pending.count}</span>".html_safe, pending_comments_path ), class: 'list-group-item' if Comment.pending.count > 0 %>
+      <% if controller.action_name == 'show' %>
+      <% end %>
+    </ul>
+
+  <% end -%>
+
+<% end -%>

data/app/views/profiles/_custom_private_profile_attributes.html.erb

@@ -0,0 +1 @@
+<% # place partial of same name in /app/views/profiles to add fields %>

data/app/views/profiles/_custom_public_profile_attributes.html.erb

@@ -0,0 +1 @@
+<% # place partial of same name in /app/views/profiles to add fields %>

data/app/views/profiles/_tab_menu.html.erb

@@ -0,0 +1,5 @@
+<ul class="nav nav-tabs" id="tab-menu">
+  <%= content_tag :li, link_to('<span class="glyphicon glyphicon-user"></span>&nbsp;profile'.html_safe, profile_path), ({ class: 'active' } if controller.action_name.to_s == 'show' ) %>
+  <%= content_tag :li, link_to("<span class=\"glyphicon glyphicon-pencil\"></span>&nbsp;#{t('edit')}".html_safe, edit_profile_path), ({ class: 'active' } if controller.action_name.to_s == 'edit' ) %>
+  <%= content_tag :li, link_to('history', profile_history_path), ({ class: 'active' } if controller.action_name.to_s == 'history' ) %>
+</ul>

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

@@ -0,0 +1,18 @@
+<% content_for :meta_title, 'Editing My Profile' %>
+<% content_for :meta_description, "This is where the site's user can edit his or her profile information" %>
+
+<%= render 'tab_menu' %>
+
+<%= simple_form_for @profile, url: profile_path do |f| %>
+  <%= f.error_notification %>
+
+    <p>Email: <strong><%= @profile.email %></strong>. Unfortunately, you cannot yet change your email address. This feature is coming soon.</p>
+
+    <%= f.input :first_name, label: t('activerecord.attributes.users.first_name') %>
+    <%= f.input :last_name, label: t('activerecord.attributes.users.last_name') %>
+    <%= f.input :other_name, label: render( 'shared/other_name_label') %>
+
+    <%= f.button :submit, :class => 'btn btn-primary' %>
+<% end %>
+
+<%= render'admin_context_menu' %>

data/app/views/profiles/history.html.erb

@@ -0,0 +1,41 @@
+<% content_for :meta_title, 'My Profile History' %>
+<% content_for :meta_description, "List of a user's historical activities on the site." %>
+
+<%= render 'tab_menu' %>
+
+<div id="profile-title">
+  <% if @profile.other_name.present? %>
+    <h1>
+      <%= @profile.other_name %><br />
+      <span class="secondary-name"><%= @profile.name %></span>
+    </h1>
+  <% else %>
+    <h1><%= @profile.name %></h1>
+  <% end %>
+</div>
+
+<br />
+
+<table class='table table-striped'>
+  <thead>
+    <tr>
+      <th>When?</th>
+      <th>What happened?</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% if @activities.any? %>
+      <% @activities.each do |activity| %>
+        <tr>
+          <td><%= human_date_and_time(activity.created_at) %></td>
+            <td><%= "You #{activity.message}".html_safe %></td>
+        </tr>
+      <% end %>
+    <% else # no activities %>
+      <tr><td>You don't have any activities yet.</td></tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= render 'admin_context_menu' %>

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

@@ -0,0 +1,32 @@
+<% content_for :meta_title, 'My Profile' %>
+<% content_for :meta_description, "My profile administration section for the logged in user" %>
+
+<%= render 'tab_menu' %>
+
+<div id="profile-title">
+  <% if @profile.other_name.present? %>
+    <h1>
+      <%= @profile.other_name %><br />
+      <span class="secondary-name"><%= @profile.name %></span>
+    </h1>
+  <% else %>
+    <h1><%= @profile.name %></h1>
+  <% end %>
+</div>
+
+<table id="profile-attributes">
+  <tbody>
+    <tr><td class="section" colspan="2"><span class="label label-danger">private information</span></td></tr>
+    <tr><td class="key"><span class="glyphicon glyphicon-envelope"></span> email address</td><td class="value"><%= @profile.email %></td></tr>
+    <%= render 'custom_private_profile_attributes' %>
+    <tr><td class="section" colspan="2"><span class="label label-success">public information</span></td></tr>
+    <tr><td class="key">first name</td><td class="value"><%= @profile.first_name %></td></tr>
+    <tr><td class="key">last name</td><td class="value"><%= @profile.last_name %></td></tr>
+    <tr><td class="key"><%= render 'shared/other_name_label' %></td><td class="value"><%= @profile.other_name %></td></tr>
+    <%= render 'custom_public_profile_attributes' %>
+  </tbody>
+</table>
+
+<p class="text-center"><%= link_to "<span class=\"glyphicon glyphicon-pencil\"></span> change your info".html_safe, edit_profile_path, class: 'btn btn-sm btn-default' %></p>
+
+<%= render'admin_context_menu' %>

data/config/routes.rb

@@ -1,5 +1,14 @@
 Rails.application.routes.draw do
   scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-    resources :details
+
+    # Mailing list records for admin
+    resources :details # deprecated. Should disappear soon.
+
+    # for public viewing and admin editing
+    resources :members
+    # for user to edit and view privately
+    resource :profile, only: [ :show, :edit, :update ]
+    get 'profile_history' => 'profiles#history'
+
   end
 end

data/lib/generators/tkh_mailing_list/create_or_update_locales/templates/de.yml

@@ -10,3 +10,14 @@ de:
     destroy:
       notice: 'This user has been deleted.'
       warning: 'A problem occurred while deleting this user.'
+
+  members:
+    create:
+      notice: 'This user has been created.'
+      warning: 'A problem occurred while creating this user.'
+    update:
+      notice: 'This user has been updated.'
+      warning: "A problem occurred while updating this user's record."
+    destroy:
+      notice: 'This user has been deleted.'
+      warning: 'A problem occurred while deleting this user.'

data/lib/generators/tkh_mailing_list/create_or_update_locales/templates/en.yml

@@ -10,3 +10,15 @@ en:
     destroy:
       notice: 'This user has been deleted.'
       warning: 'A problem occurred while deleting this user.'
+
+
+  members:
+    create:
+      notice: 'This user has been created.'
+      warning: 'A problem occurred while creating this user.'
+    update:
+      notice: 'This user has been updated.'
+      warning: "A problem occurred while updating this user's record."
+    destroy:
+      notice: 'This user has been deleted.'
+      warning: 'A problem occurred while deleting this user.'

data/lib/generators/tkh_mailing_list/create_or_update_locales/templates/es.yml

@@ -10,3 +10,14 @@ es:
     destroy:
       notice: 'This user has been deleted.'
       warning: 'A problem occurred while deleting this user.'
+
+  members:
+    create:
+      notice: 'This user has been created.'
+      warning: 'A problem occurred while creating this user.'
+    update:
+      notice: 'This user has been updated.'
+      warning: "A problem occurred while updating this user's record."
+    destroy:
+      notice: 'This user has been deleted.'
+      warning: 'A problem occurred while deleting this user.'

data/lib/generators/tkh_mailing_list/create_or_update_locales/templates/fr.yml

@@ -10,3 +10,14 @@ fr:
     destroy:
       notice: "Cet utilisateur n'est plus dans la base de données."
       warning: "Il y a eu un problème qui n'a pas permis d'éléliminer cet utilisateur"
+
+  members:
+    create:
+      notice: 'Un nouvel utilisateur a été ajouté à la base de données.'
+      warning: "Il y a eu un problème qui n'a pas permis d'ajouter cet utilisateur"
+    update:
+      notice: 'Les données de cet utilisateur ont été modifiées'
+      warning: "Il y a eu un problème qui n'a pas permis de modifier les données de cet utilisateur"
+    destroy:
+      notice: "Cet utilisateur n'est plus dans la base de données."
+      warning: "Il y a eu un problème qui n'a pas permis d'éléliminer cet utilisateur"

data/lib/tkh_mailing_list/version.rb

@@ -1,3 +1,3 @@
 module TkhMailingList
-  VERSION = "0.9.2"
+  VERSION = "0.10"
 end

data/tkh_mailing_list.gemspec

@@ -20,6 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-
-  spec.add_dependency "tkh_authentication", '~> 0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_mailing_list
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: '0.10'
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tkh_authentication
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 description: A mailing list module to work with tkh_authentication gem
 email:
 - swami@TenThousandHours.eu
@@ -67,12 +53,30 @@ files:
 - README.md
 - Rakefile
 - app/controllers/details_controller.rb
+- app/controllers/members_controller.rb
+- app/controllers/profiles_controller.rb
 - app/models/detail.rb
+- app/models/member.rb
+- app/models/profile.rb
 - app/views/details/_form.html.erb
 - app/views/details/_tab_admin_menu.html.erb
 - app/views/details/edit.html.erb
 - app/views/details/new.html.erb
 - app/views/details/show.html.erb
+- app/views/members/_admin_context_menu.html.erb
+- app/views/members/_form.html.erb
+- app/views/members/_tab_admin_menu.html.erb
+- app/views/members/edit.html.erb
+- app/views/members/index.html.erb
+- app/views/members/new.html.erb
+- app/views/members/show.html.erb
+- app/views/profiles/_admin_context_menu.html.erb
+- app/views/profiles/_custom_private_profile_attributes.html.erb
+- app/views/profiles/_custom_public_profile_attributes.html.erb
+- app/views/profiles/_tab_menu.html.erb
+- app/views/profiles/edit.html.erb
+- app/views/profiles/history.html.erb
+- app/views/profiles/show.html.erb
 - config/routes.rb
 - lib/generators/tkh_mailing_list/create_or_update_locales/create_or_update_locales_generator.rb
 - lib/generators/tkh_mailing_list/create_or_update_locales/templates/de.yml