fine_print 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 737d9043df423544d60771c30e22ef71811bcb4b
-  data.tar.gz: 6e54249ed44c5178b6fe8ea17d6518680cf5436b
+  metadata.gz: 0ad3cdb6cc83d91c8ad70a79abd35a43159d3f99
+  data.tar.gz: 1aa4cc47c9501d5fd816b6d5eddee4d71a4dbd52
 SHA512:
-  metadata.gz: 268d93027f2008ebadafed4b5dd735235b3506fa0bb7813af8be63dc727e3178ae25c09c885d92d03b7290bc9298bbb4e62116998db17c0d4df76c0cc1f716ef
-  data.tar.gz: 3f1c3ccdf8fcdb31522c61cf524c5b979f566ad80d75a0c4d703c4ae3a6889bafc79084613533e256388ad110739a2902f0de34236527ce25b079d22ba5b3d25
+  metadata.gz: 52bc3cdc2a6f0250b716f2401171ad06afc52dc6c34b8e0873037b71d60deb757b976d60310cdd95d9bf8c3be462a7fde7edfea24be698c8dc4372304950a2fe
+  data.tar.gz: 54bbdde67d20c2795eac3679f43a00af2d3aad288add521ea908da2924a1c7a147b34674fb344171a75d1e761ce9dc7fd292b0efdefe201de805da8f06f62762

data/app/controllers/fine_print/application_controller.rb

@@ -8,7 +8,7 @@ module FinePrint
     protected
 
     def verify_admin
-      user = send FinePrint.current_user_method
+      user = FinePrint.current_user_proc.call(self)
       FinePrint.raise_unless_admin(user)
     end
   end

data/app/controllers/fine_print/application_controller.rb~

@@ -1,15 +1,15 @@
 module FinePrint
   class ApplicationController < ActionController::Base
-    before_filter :verify_admin!
+    before_filter :verify_admin
 
     rescue_from FinePrint::SecurityTransgression, 
                 :with => lambda { redirect_to FinePrint.redirect_path }
 
     protected
 
-    def verify_admin!
-      user = send FinePrint.current_user_method
-      FinePrint.raise_unless_admin!(user)
+    def verify_admin
+      user = send FinePrint.current_user_proc.call(self)
+      FinePrint.raise_unless_admin(user)
     end
   end
 end

data/config/initializers/fine_print.rb

@@ -3,22 +3,22 @@
 FinePrint.configure do |config|
   # Engine Configuration
 
-  # Name of the ApplicationController helper method that returns the current user.
-  # Default: 'current_user'
-  config.current_user_method = 'current_user'
+  # Proc called with controller as argument that returns the current user.
+  # Default: lambda { |controller| controller.current_user }
+  config.current_user_proc = lambda { |controller| controller.current_user }
 
-  # Proc called with user as argument that should return true if and only if the user is an admin.
+  # Proc called with user as argument that returns true iif the user is an admin.
   # Admins can create and edit agreements and terminate accepted agreements.
   # Default: lambda { |user| false } (no admins)
   config.user_admin_proc = lambda { |user| false }
 
-  # Proc that returns true if and only if the provided user is logged in.
+  # Proc called with user as argument that returns true iif the user is logged in.
   # In many systems, a non-logged-in user is represented by nil.
   # However, some systems use something like an AnonymousUser class to represent this state.
   # This proc is mostly used to help the developer realize that they should only be asking
   # signed in users to sign contracts; without this, developers would get a cryptic SQL error.
-  # Default: lambda { |user| !user.nil? }
-  config.user_signed_in_proc = lambda { |user| !user.nil? }
+  # Default: lambda { |user| user }
+  config.user_signed_in_proc = lambda { |user| user }
 
   # Path to redirect users to when an error occurs (e.g. permission denied on admin pages).
   # Default: '/'

data/config/initializers/fine_print.rb~

@@ -3,34 +3,34 @@
 FinePrint.configure do |config|
   # Engine Configuration
 
-  # Name of the ApplicationController helper method that returns the current user
+  # Proc called with controller as argument that returns the current user.
   # Default: 'current_user'
-  config.current_user_method = 'current_user'
+  config.current_user_proc = lambda { |controller| controller.current_user }
 
-  # Proc called with user as argument that should return true if and only if the user is an admin
-  # Admins can create and edit agreements and terminate accepted agreements
+  # Proc called with user as argument that returns true iif the user is an admin.
+  # Admins can create and edit agreements and terminate accepted agreements.
   # Default: lambda { |user| false } (no admins)
   config.user_admin_proc = lambda { |user| false }
 
-  # Proc that returns true if and only if the provided user is logged in
-  # In many systems, a non-logged-in user is represented by nil
-  # However, some systems use something like an AnonymousUser class to represent this state
+  # Proc called with user as argument that returns true iif the user is logged in.
+  # In many systems, a non-logged-in user is represented by nil.
+  # However, some systems use something like an AnonymousUser class to represent this state.
   # This proc is mostly used to help the developer realize that they should only be asking
-  # signed in users to sign contracts; without this, developers would get a cryptic SQL error
-  # Default: lambda { |user| !user.nil? }
-  config.user_signed_in_proc = lambda { |user| !user.nil? }
+  # signed in users to sign contracts; without this, developers would get a cryptic SQL error.
+  # Default: lambda { |user| user }
+  config.user_signed_in_proc = lambda { |user| user }
 
-  # Path to redirect users to when an error occurs (e.g. permission denied on admin pages)
+  # Path to redirect users to when an error occurs (e.g. permission denied on admin pages).
   # Default: '/'
   config.redirect_path = '/'
 
   # Signature (fine_print_get_signatures) Configuration
 
-  # Path to redirect users to when they need to agree to contract(s)
-  # A list of contract names that must be agreed to will be available in the 'contracts' parameter
+  # Path to redirect users to when they need to agree to contract(s).
+  # A list of contract names that must be agreed to will be available in the 'contracts' parameter.
   # Your code doesn't have to deal with all of them at once, e.g. you can get
   # the user to agree to the first one and then they'll just eventually be
-  # redirected back to this page with the remaining contract names
+  # redirected back to this page with the remaining contract names.
   # Default: '/'
   config.pose_contracts_path = '/'
 end

data/lib/fine_print/controller_additions.rb

@@ -35,7 +35,7 @@ module FinePrint
             # Bail if nothing to do
             return true if contract_names.blank?
 
-            user = send FinePrint.current_user_method
+            user = FinePrint.current_user_proc.call(self)
             FinePrint.raise_unless_signed_in(user)
 
             unsigned_contract_names = 

data/lib/fine_print/controller_additions.rb~

@@ -35,7 +35,7 @@ module FinePrint
             # Bail if nothing to do
             return true if contract_names.blank?
 
-            user = send FinePrint.current_user_method
+            user = send FinePrint.current_user_proc.call(self)
             FinePrint.raise_unless_signed_in(user)
 
             unsigned_contract_names = 
@@ -54,6 +54,8 @@ module FinePrint
       # See the README
       def fine_print_skip_signatures(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
+
+        # Convert all names to string
         names = args.flatten.collect{|n| n.to_s}
 
         class_eval do

data/lib/fine_print/version.rb

@@ -1,3 +1,3 @@
 module FinePrint
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/fine_print/version.rb~

@@ -1,3 +1,3 @@
 module FinePrint
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/fine_print.rb

@@ -7,7 +7,7 @@ module FinePrint
 
   # Can be set in initializer only
   ENGINE_OPTIONS = [
-    :current_user_method,
+    :current_user_proc,
     :user_admin_proc,
     :user_signed_in_proc,
     :pose_contracts_path,

data/lib/fine_print.rb~

@@ -38,7 +38,7 @@ module FinePrint
       ref
     when Integer
       Contract.find(ref)
-    when String
+    when String, Symbol
       Contract.where(:name => ref.to_s).published.first
     end
   end

data/spec/dummy/config/initializers/fine_print.rb

@@ -3,22 +3,22 @@
 FinePrint.configure do |config|
   # Engine Configuration
 
-  # Name of the ApplicationController helper method that returns the current user.
-  # Default: 'current_user'
-  config.current_user_method = 'current_user'
+  # Proc called with controller as argument that returns the current user.
+  # Default: lambda { |controller| controller.current_user }
+  config.current_user_proc = lambda { |controller| controller.current_user }
 
-  # Proc called with user as argument that should return true if and only if the user is an admin.
+  # Proc called with user as argument that returns true iif the user is an admin.
   # Admins can create and edit agreements and terminate accepted agreements.
   # Default: lambda { |user| false } (no admins)
   config.user_admin_proc = lambda { |user| user.is_admin }
 
-  # Proc that returns true if and only if the provided user is logged in.
+  # Proc called with user as argument that returns true iif the user is logged in.
   # In many systems, a non-logged-in user is represented by nil.
   # However, some systems use something like an AnonymousUser class to represent this state.
   # This proc is mostly used to help the developer realize that they should only be asking
   # signed in users to sign contracts; without this, developers would get a cryptic SQL error.
-  # Default: lambda { |user| !user.nil? }
-  config.user_signed_in_proc = lambda { |user| !user.nil? }
+  # Default: lambda { |user| user }
+  config.user_signed_in_proc = lambda { |user| user }
 
   # Path to redirect users to when an error occurs (e.g. permission denied on admin pages).
   # Default: '/'

data/spec/dummy/config/initializers/fine_print.rb~

@@ -10,7 +10,7 @@ FinePrint.configure do |config|
   # Proc called with user as argument that should return true if and only if the user is an admin.
   # Admins can create and edit agreements and terminate accepted agreements.
   # Default: lambda { |user| false } (no admins)
-  config.user_admin_proc = lambda { |user| false }
+  config.user_admin_proc = lambda { |user| user.is_admin }
 
   # Proc that returns true if and only if the provided user is logged in.
   # In many systems, a non-logged-in user is represented by nil.

data/spec/dummy/log/development.log

@@ -1771,3 +1771,17 @@ Connecting to database specified by database.yml
    (4.2ms)  CREATE INDEX "index_fine_print_signatures_on_contract_id" ON "fine_print_signatures" ("contract_id")
    (4.2ms)  CREATE UNIQUE INDEX "index_fine_print_s_on_u_id_and_u_type_and_c_id" ON "fine_print_signatures" ("user_id", "user_type", "contract_id")
    (0.1ms)  SELECT version FROM "schema_migrations"
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (0.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  select sqlite_version(*)
+   (13.4ms)  DROP TABLE "dummy_users"
+   (5.7ms)  CREATE TABLE "dummy_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "is_admin" boolean DEFAULT 'f' NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (4.6ms)  DROP TABLE "fine_print_contracts"
+   (4.4ms)  CREATE TABLE "fine_print_contracts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "version" integer, "title" varchar(255) NOT NULL, "content" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (4.3ms)  CREATE UNIQUE INDEX "index_fine_print_contracts_on_name_and_version" ON "fine_print_contracts" ("name", "version")
+   (4.5ms)  DROP TABLE "fine_print_signatures"
+   (4.5ms)  CREATE TABLE "fine_print_signatures" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "contract_id" integer NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255) NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (4.4ms)  CREATE INDEX "index_fine_print_signatures_on_contract_id" ON "fine_print_signatures" ("contract_id")
+   (3.8ms)  CREATE UNIQUE INDEX "index_fine_print_s_on_u_id_and_u_type_and_c_id" ON "fine_print_signatures" ("user_id", "user_type", "contract_id")
+   (0.1ms)  SELECT version FROM "schema_migrations"