ae_users_legacy 0.6.3 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.5

data/ae_users_legacy.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ae_users_legacy}
-  s.version = "0.6.3"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin"]
-  s.date = %q{2011-01-13}
+  s.date = %q{2011-03-29}
   s.description = %q{Don't use this gem.  Use something written in the last couple years instead.}
   s.email = %q{natbudin@gmail.com}
   s.extra_rdoc_files = [
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
      "install.rb",
      "lib/ae_users.rb",
      "rails/init.rb",
+     "schema.sql",
      "tasks/ae_users_tasks.rake",
      "test/ae_users_test.rb",
      "uninstall.rb"
@@ -102,16 +103,17 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nbudin/ae_users}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Legacy authentication/authorization framework}
   s.test_files = [
     "test/ae_users_test.rb"
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-openid>, [">= 2.0.4"])
     else
@@ -123,4 +125,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby-openid>, [">= 2.0.4"])
   end
 end
-

data/app/controllers/permission_controller.rb

@@ -29,8 +29,9 @@ class PermissionController < ApplicationController
   end
   
   def auto_complete_for_permission_grantee
-    if params[:q]
-      query = params[:q].strip.downcase
+    raw_query = params[:q] || params[:term]
+    if raw_query
+      query = raw_query.strip.downcase
       liketerm = "%#{query}%"
       terms = query.split
       
@@ -58,6 +59,7 @@ class PermissionController < ApplicationController
       end
       
       @grantees.uniq!
+      @grantees.compact!
     else
       @grantees = []
     end

data/app/helpers/permission_helper.rb

@@ -1,2 +1,44 @@
 module PermissionHelper
+  def grant_url(item, perm)
+    url_for(:controller => 'permission', :action => 'grant', :perm => full_permission_name(item, perm), 
+            :item_klass => item.class.name, :item_id => item.id, :escape => false)
+  end
+
+  def prototype_grant_callback(item, perm)
+    return <<-EOF
+    nobody = $('#{perm}_nobody');
+    if (nobody) {
+      nobody.remove();
+    }
+    new Ajax.Updater('#{perm}_insert_grants_here', '#{grant_url(item, perm)}',
+          {
+            parameters: { 'klass': klass, 'id': id },
+            insertion: Insertion.Bottom,
+          }
+        );
+    EOF
+  end
+  
+  def jquery_grant_callback(item, perm)
+    return <<-EOF
+    $('##{perm}_nobody').remove();
+    $.get('#{grant_url(item, perm)}',
+      { 'klass': klass, 'id': id },
+      function(data) {
+        $('##{perm}_insert_grants_here').append(data);
+      }
+    );
+    EOF
+  end
+  
+  def grant_permission_user_picker(item, perm)
+    callback = case AeUsers.js_framework
+    when "prototype"
+      prototype_grant_callback(item, perm)
+    when "jquery"
+      jquery_grant_callback(item, perm)
+    end
+    
+    user_picker "#{perm}_grantee", :roles => true, :callback => callback
+  end
 end

data/app/views/permission/_add_grantee.rhtml

@@ -39,9 +39,12 @@
 </ul>
 
 <% elsif AeUsers.js_framework == "jquery" -%>
+<%= @grantees.collect do |grantee|
+  lbl = grantee.name
+  lbl << " (#{pluralize grantee.people.count, "person"})" if grantee.kind_of? Role
 
-<% for grantee in @grantees do -%>
-<%=grantee.name %><% if grantee.kind_of? Role %> (<%= pluralize(grantee.people.count, "person") %>)<% end %>|<%=grantee.class.name %>:<%= grantee.id %>
-<% end -%>
-
+  value = "#{grantee.class.name}:#{grantee.id}"
+  
+  { 'label' => lbl, 'value' => value }
+end.to_json %>
 <% end -%>

data/app/views/permission/_show.rhtml

@@ -41,7 +41,7 @@ div.auto_complete {
           <% if logged_in? and logged_in_person.permitted?(item, "change_permissions") and not (grant.grantee == logged_in_person) -%>
             <%= link_to_remote "Remove",
                 { :url => { :controller => "permission", :action => "revoke", :id => grant.id, :format => "js" },
-                :success => "$('grant_#{grant.id}').remove();",
+                :success => update_page { |page| page["grant_#{grant.id}"].remove },
                 :confirm => "Are you sure you want to revoke that permission?",
 				:failure => "alert(request.responseText)" },
                 { :class => "permission_action" } %>
@@ -54,24 +54,18 @@ div.auto_complete {
     <% if logged_in? and logged_in_person.permitted?(item, "change_permissions") -%>
       <div id="<%= perm %>_insert_grants_here" style="display: inline;"></div>
       | <span id="grant_open_<%=perm%>">
-          <%= link_to_function "Add", "$('grant_open_#{perm}').toggle(); $('grant_#{perm}').toggle(); $('#{perm}_grantee_shim').focus();",
-            :class => "permission_action" %>
+          <%= link_to_function "Add", :class => "permission_action" do |page|
+            page["grant_open_#{perm}"].toggle
+            page["grant_#{perm}"].toggle
+            page["#{perm}_grantee_shim"].focus
+          end %>
         </span>
         <span id="grant_<%=perm %>" style="display: none;">
-        <%= link_to_function "&laquo;", "$('grant_open_#{perm}').toggle(); $('grant_#{perm}').toggle();",
-            :class => "permission_action" %>
-          <%= user_picker "#{perm}_grantee", :roles => true,
-            :callback => "nobody = $('#{perm}_nobody');
-                if (nobody) {
-                  nobody.remove();
-                }
-                new Ajax.Updater('#{perm}_insert_grants_here', '#{url_for :controller => 'permission', :action => 'grant', :perm => full_permission_name(item, perm), 
-                  :item_klass => item.class.name, :item_id => item.id, :escape => false}',
-                  {
-                    parameters: { 'klass': klass, 'id': id },
-                    insertion: Insertion.Bottom,
-                  }
-                );" %>
+          <%= link_to_function "&laquo;", :class => "permission_action" do |page|
+            page["grant_open_#{perm}"].toggle
+            page["grant_#{perm}"].toggle
+          end %>
+          <%= grant_permission_user_picker(item, perm) %>
         </span>
       <% end -%>
     </li>

data/lib/ae_users.rb

@@ -662,18 +662,24 @@ module AeUsers
     :url => "#{auto_complete_url}") %>
 ENDRHTML
       elsif AeUsers.js_framework == "jquery"
+        jq_domid = "##{domid}"
         rhtml << <<-ENDRHTML
 <script type="text/javascript">
-$(function() {
-  jq_domid = "\##{domid.gsub(/(\W)/, '\\\\\\\\\1')}";
-  $(jq_domid + "_shim").autocomplete('#{auto_complete_url}',
+jQuery(function() {
+  jQuery("#{jq_domid}_shim").autocomplete(
       {
-        formatItem: function(data, i, n, value) {
-          return value;
-        },
-      }).bind('result', function(e, data) {
-        $(jq_domid).val(data[1]);
-        #{options[:callback]}
+        source: '#{auto_complete_url}',
+        select: function(e, ui) {
+          if (ui.item != null) {          
+            jQuery('#{jq_domid}_shim').val(ui.item.label);
+          
+            kid = ui.item.value.split(':');
+            klass = kid[0];
+            id = kid[1];
+ 
+            #{options[:callback]}
+          }
+        }
       }
    );
 });

data/rails/init.rb

@@ -5,6 +5,7 @@ require 'ae_users'
 ActiveRecord::Base.send(:include, AeUsers::Acts::Permissioned)
 ActionController::Base.send(:include, AeUsers::ControllerExtensions::RequirePermission)
 ActionView::Base.send(:include, AeUsers::HelperFunctions)
+ActionView::Base.send(:include, PermissionHelper)
 
 infl = begin
   Inflector

data/schema.sql

@@ -0,0 +1,52 @@
+CREATE TABLE `accounts` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `password` varchar(255) NOT NULL,
+  `active` tinyint(1) DEFAULT NULL,
+  `activation_key` varchar(255) DEFAULT NULL,
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL,
+  `person_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=759 DEFAULT CHARSET=latin1;
+
+CREATE TABLE `email_addresses` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `address` varchar(255) NOT NULL,
+  `primary` tinyint(1) DEFAULT NULL,
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL,
+  `person_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=791 DEFAULT CHARSET=latin1;
+
+CREATE TABLE `open_id_identities` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `person_id` int(11) DEFAULT NULL,
+  `identity_url` varchar(4000) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1;
+
+CREATE TABLE `people` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `firstname` varchar(255) DEFAULT NULL,
+  `lastname` varchar(255) DEFAULT NULL,
+  `gender` varchar(255) DEFAULT NULL,
+  `nickname` varchar(255) DEFAULT NULL,
+  `phone` varchar(255) DEFAULT NULL,
+  `best_call_time` varchar(255) DEFAULT NULL,
+  `birthdate` datetime DEFAULT NULL,
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=760 DEFAULT CHARSET=latin1;
+
+CREATE TABLE `people_roles` (
+  `person_id` int(11) NOT NULL,
+  `role_id` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `roles` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ae_users_legacy
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Nat Budin
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -05:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,11 +33,9 @@ dependencies:
   name: ruby-openid
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -136,6 +131,7 @@ files:
 - install.rb
 - lib/ae_users.rb
 - rails/init.rb
+- schema.sql
 - tasks/ae_users_tasks.rake
 - test/ae_users_test.rb
 - uninstall.rb
@@ -149,27 +145,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Legacy authentication/authorization framework