tkh_mailing_list 0.10 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2caf6bc1d6e75f3b4453e161d2e457e1e2f5f650
-  data.tar.gz: ed54427b977379f9841f9998c1c7590eb98fcf5b
+  metadata.gz: 104c30052016f291682421644430d9fee2494c6e
+  data.tar.gz: f6274f06be8db3e74ecbeda8c9a895bafb4821f9
 SHA512:
-  metadata.gz: 5cc9b34dd1067c20b7a520d6abbbc4c3889b8cb739876904bcc6c762c888008ccfaed9b1c61449229cb10ab9b7d83df3255486767b16bd40cfa773c693e4d9d6
-  data.tar.gz: 2b7e4afc6d5cdfe4dc0f3af22538d1815e97367b701022ba894196dad01f2ae91fe42ebde145e736548f858eafccd59c85fa0cc74d46b0bb988cc1b0aaa3b5c9
+  metadata.gz: 36c0f9beca6534bd765b8aeff82b82ceffb26a1b00bb4800cd3e64287fd82d5f87082ea46fba91561d068f265bfb29ee69b7766911999b2a08ed6a1d812c264a
+  data.tar.gz: 31b1ccf7b3cefb0c4545f2e6a13f45a7e5f15c6596f8fffb501a51c60fc2f5dca687d55412ebc1e4b08813e8f33ed812447618cbe15d3e0285018d06fc314c77

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 
 
+## 0.10.1
+
+* Private profile viewing and editing
+* Public profile view
+* User can add portrait photo to their profile and crop it on the fly
+
+
 ## 0.10
 
 * Added a member resource for admins to update user records. Users are scoped as members.

data/app/assets/javascripts/profiles.js.coffee

@@ -0,0 +1,24 @@
+jQuery ->
+  new PortraitCropper()
+
+class PortraitCropper
+  constructor: ->
+    $('#cropbox').Jcrop
+      aspectRatio: 1
+      setSelect: [50, 50, 300, 300]
+      onSelect: @update
+      onChange: @update
+
+  update: (coords) =>
+    $('#profile_crop_x').val(coords.x)
+    $('#profile_crop_y').val(coords.y)
+    $('#profile_crop_w').val(coords.w)
+    $('#profile_crop_h').val(coords.h)
+    @updatePreview(coords)
+
+  updatePreview: (coords) =>
+    $('#preview').css
+      width: Math.round(100/coords.w * $('#cropbox').width()) + 'px'
+      height: Math.round(100/coords.h * $('#cropbox').height()) + 'px'
+      marginLeft: '-' + Math.round(100/coords.w * coords.x) + 'px'
+      marginTop: '-' + Math.round(100/coords.h * coords.y) + 'px'

data/app/controllers/members_controller.rb

@@ -56,7 +56,7 @@ class MembersController < ApplicationController
 
   # 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 )
+    params.require(:member).permit :email, :first_name, :last_name, :other_name, :teacher_status, :portrait, :website_url, :facebook_url, :twitter_handle, :google_plus_url, :allow_newsletter, :allow_daily_digests
   end
 
 end

data/app/controllers/profiles_controller.rb

@@ -12,7 +12,11 @@ class ProfilesController < ApplicationController
 
   def update
     if @profile.update_attributes(profile_params)
-      redirect_to profile_path, notice: "<strong>Success!</strong> Your profile was updated.".html_safe
+      if params[:profile][:portrait].present?
+        render :crop  ## Render the view for cropping
+      else
+        redirect_to profile_path, notice: "<strong><span class=\"glyphicon glyphicon-ok-sign\"></span>&nbsp;&nbsp;Success!</strong> Your profile was updated.".html_safe
+      end
     else
       render action: "edit", warning: "<strong>Attention!</strong> A problem occurred while trying to update your profile. Plese try again".html_safe
     end
@@ -31,7 +35,7 @@ class ProfilesController < ApplicationController
 
   # 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 )
+    params.require(:profile).permit :email, :first_name, :last_name, :other_name, :teacher_status, :portrait, :website_url, :facebook_url, :twitter_handle, :google_plus_url, :allow_newsletter, :allow_daily_digests, :crop_x, :crop_y, :crop_w, :crop_h
   end
 
 end

data/app/models/profile.rb

@@ -1,3 +1,14 @@
 class Profile < User
 
+  mount_uploader :portrait, PortraitUploader
+  # crop_uploaded :portrait
+
+  attr_accessor :crop_x, :crop_y, :crop_w, :crop_h
+
+  after_update :crop_portrait
+
+  def crop_portrait
+    portrait.recreate_versions! if crop_x.present?
+  end
+
 end

data/app/uploaders/portrait_uploader.rb

@@ -0,0 +1,60 @@
+class PortraitUploader < CarrierWave::Uploader::Base
+
+  include CarrierWave::RMagick
+  storage :file
+  def store_dir
+    # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"  --- that was the suggested one
+    "system/portraits/#{model.class.to_s.underscore}/#{model.id}"
+  end
+
+  # this is used by jcrop as a source photo
+  # better not modify this code.
+  version :xl do
+    process resize_to_limit: [550, 550]
+  end
+  # these 4 vorsions are cropped square by the user
+  version :thumbnail do
+    process :crop
+    resize_to_fill(125,125)
+  end
+  version :small do
+    process :crop
+    resize_to_fill(225, 225)
+  end
+  version :medium do
+    process :crop
+    resize_to_fill(350, 350)
+  end
+  version :large do
+    process :crop
+    resize_to_fill(450, 450)
+  end
+  # version(:xxl) { process :resize_to_limit => [900, 900] }
+
+  def crop
+    if model.crop_x.present?
+      resize_to_limit(550, 550)
+      manipulate! do |img|
+        x = model.crop_x.to_i
+        y = model.crop_y.to_i
+        w = model.crop_w.to_i
+        h = model.crop_h.to_i
+        img.crop!(x, y, w, h)
+      end
+    end
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    %w(jpg jpeg png)
+  end
+
+  # got this from http://stackoverflow.com/questions/9561641/carrierwave-temp-directory-set-to-uploads-tmp-folder
+  # without this all tmp files would go to /public/uploads/tmp which is not cool at all.
+  def cache_dir
+    # should return path to cache dir
+    Rails.root.join 'tmp/uploads'
+  end
+
+end

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

@@ -1,10 +1,19 @@
-<%= simple_form_for @member do |f| %>
+<%= simple_form_for @member, :html => { multipart: true } do |f| %>
   <%= f.error_notification %>
 
+    <h2>Private Fields</h2>
+    <%= f.input :email, label: t('activerecord.attributes.users.email'), hint: 'change with caution!!!! the email is used to login.' %>
+    <%= f.input :allow_newsletter %>
+    <%= f.input :allow_daily_digests %>
+
+    <h2>Public Fields</h2>
     <%= 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.input :website_url %>
+    <%= f.input :facebook_url %>
+    <%= f.input :twitter_handle %>
+    <%= f.input :google_plus_url, label: "Google+ url" %>
 
     <%= f.button :submit, :class => 'btn btn-primary' %>
 <% end %>

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

@@ -10,10 +10,17 @@
   <% else %>
     <h1><%= student.name %></h1>
   <% end %>
+  <% if Profile.find(@member.id).portrait.present? %>
+    <p id="profile-portrait"><%= image_tag Profile.find(@member.id).portrait_url(:small), title: student.name, alt: student.name, id: 'profile-portrait' %></p>
+  <% end %>
 </div>
 
 <table id="profile-attributes">
   <tbody>
+    <tr><td class="key">website</td><td class="value"><%= link_to student.website_url, student.website_url %></td></tr>
+    <tr><td class="key">facebook</td><td class="value"><%= link_to student.facebook_url, student.facebook_url %></td></tr>
+    <tr><td class="key">twitter</td><td class="value"><%= link_to student.twitter_handle, "https://twitter.com/#{student.twitter_handle}" %></td></tr>
+    <tr><td class="key">google+</td><td class="value"><%= link_to student.google_plus_url, student.google_plus_url %></td></tr>
     <%= render 'profiles/custom_public_profile_attributes' %>
   </tbody>
 </table>

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

@@ -0,0 +1,21 @@
+<% content_for :meta_title, "Crop your profile portrait" %>
+<% content_for :meta_description, "Exact cropping of the profile portrait picture." %>
+
+<h1>Crop Portrait Photo</h1>
+
+<%= form_for @profile, url: profile_path, method: :patch do |f| %>
+  <% %w[x y w h].each do |attribute| %>
+    <%= f.hidden_field "crop_#{attribute}" %>
+  <% end %>
+  <%= f.submit "Crop" %>
+<% end %>
+&nbsp;&nbsp;&nbsp;
+<div style="width:100px; height:100px; overflow:hidden; display: inline-block; margin-bottom: -8px;">
+  <%= image_tag @profile.portrait.url(:xl), id: "preview" %>
+</div>
+
+<br /><br />
+
+<%= image_tag @profile.portrait_url(:xl), id: "cropbox" %>
+
+

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

@@ -6,11 +6,20 @@
 <%= simple_form_for @profile, url: profile_path do |f| %>
   <%= f.error_notification %>
 
+    <h1>Private Information</h1>
     <p>Email: <strong><%= @profile.email %></strong>. Unfortunately, you cannot yet change your email address. This feature is coming soon.</p>
+    <%= f.input :allow_newsletter, label: "Allow rare newsletter?&nbsp;&nbsp;".html_safe, hint: 'never more than once a month' %>
+    <%= f.input :allow_daily_digests, label: "Allow daily activity digests?&nbsp;&nbsp;".html_safe, hint: "replies to your comments, etc." %>
 
+    <h1>Public Information</h1>
     <%= 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.input :portrait %>
+    <%= f.input :website_url %>
+    <%= f.input :facebook_url %>
+    <%= f.input :twitter_handle %>
+    <%= f.input :google_plus_url, label: "Google+ url" %>
 
     <%= f.button :submit, :class => 'btn btn-primary' %>
 <% end %>

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

@@ -12,18 +12,35 @@
   <% else %>
     <h1><%= @profile.name %></h1>
   <% end %>
+  <% if @profile.portrait.present? %>
+    <p id="profile-portrait"><%= image_tag @profile.portrait_url(:small), title: @profile.name, alt: @profile.name, id: 'profile-portrait' %></p>
+  <% 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>
+    <tr><td class="key">get rare newsletter</td>
+      <td class="value"><%= @profile.allow_newsletter == true ? "<span class=\"glyphicon glyphicon-ok\"".html_safe : "<span class=\"glyphicon glyphicon-remove\"".html_safe %></td>
+    </tr>
+    <tr>
+      <td class="key">get your daily activity digests</td>
+      <td class="value"><%= @profile.allow_daily_digests == true ?  "<span class=\"glyphicon glyphicon-ok\"".html_safe : "<span class=\"glyphicon glyphicon-remove\"".html_safe %></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>
+    <tr><td class="key">website</td><td class="value"><%= link_to student.website_url, student.website_url %></td></tr>
+    <tr><td class="key">facebook</td><td class="value"><%= link_to student.facebook_url, student.facebook_url %></td></tr>
+    <tr><td class="key">twitter</td><td class="value"><%= link_to student.twitter_handle, "https://twitter.com/#{student.twitter_handle}" %></td></tr>
+    <tr><td class="key">google+</td><td class="value"><%= link_to student.google_plus_url, student.google_plus_url %></td></tr>
     <%= render 'custom_public_profile_attributes' %>
+
   </tbody>
 </table>
 

data/lib/generators/tkh_mailing_list/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -18,6 +18,7 @@ module TkhMailingList
       def copy_migrations
         puts 'creating user migration'
         migration_template "add_teacher_status_to_users.rb", "db/migrate/add_teacher_status_to_users.rb"
+        migration_template "add_profile_fields_to_users.rb", "db/migrate/add_profile_fields_to_users.rb"
       end
 
     end

data/lib/generators/tkh_mailing_list/create_or_update_migrations/templates/add_profile_fields_to_users.rb

@@ -0,0 +1,12 @@
+class AddProfileFieldsToUsers < ActiveRecord::Migration
+  # profile attributes
+  def change
+    add_column :users,  :portrait,             :string
+    add_column :users,  :allow_newsletter,     :boolean, default: true
+    add_column :users,  :allow_daily_digests,  :boolean, default: true
+    add_column :users,  :website_url,          :string
+    add_column :users,  :facebook_url,         :string
+    add_column :users,  :twitter_handle,       :string
+    add_column :users,  :google_plus_url,      :string
+  end
+end

data/lib/tkh_mailing_list/version.rb

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

data/lib/tkh_mailing_list.rb

@@ -1,5 +1,6 @@
 require "tkh_mailing_list/version"
 
+
 module TkhMailingList
   class Engine < ::Rails::Engine
   end

data/tkh_mailing_list.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  # spec.add_dependency   'jcrop-rails-v2'
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_mailing_list
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: 0.10.1
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,12 +52,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/javascripts/profiles.js.coffee
 - 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/uploaders/portrait_uploader.rb
 - app/views/details/_form.html.erb
 - app/views/details/_tab_admin_menu.html.erb
 - app/views/details/edit.html.erb
@@ -74,6 +76,7 @@ files:
 - 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/crop.html.erb
 - app/views/profiles/edit.html.erb
 - app/views/profiles/history.html.erb
 - app/views/profiles/show.html.erb
@@ -85,6 +88,7 @@ files:
 - lib/generators/tkh_mailing_list/create_or_update_locales/templates/fr.yml
 - lib/generators/tkh_mailing_list/create_or_update_locales/templates/it.yml
 - lib/generators/tkh_mailing_list/create_or_update_migrations/create_or_update_migrations_generator.rb
+- lib/generators/tkh_mailing_list/create_or_update_migrations/templates/add_profile_fields_to_users.rb
 - lib/generators/tkh_mailing_list/create_or_update_migrations/templates/add_teacher_status_to_users.rb
 - lib/tasks/tkh_mailing_list_tasks.rake
 - lib/tkh_mailing_list.rb