fine_print 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5872d7ae6a8abfb926c3eb5c3203e086937ee70c
-  data.tar.gz: c685f59d91186586a78bd74eafaf16e2c02c2b65
+  metadata.gz: 737d9043df423544d60771c30e22ef71811bcb4b
+  data.tar.gz: 6e54249ed44c5178b6fe8ea17d6518680cf5436b
 SHA512:
-  metadata.gz: 96ee62c1e276077980ff95575e896ada2e679d9663a4bd84c55208434e86c37452b84ed1b83142b6051b07a217d520cc5ab336810c9e0dcbe1b93bdc20699e23
-  data.tar.gz: b4da61298157efa7fb336d8b88b8a4c2011b6373995b27e67d7cbff1bcaeaa5dfc6571095d7020d65ea95226d47ef0f4aa4be4b15609f685ef6d4c75728d87e9
+  metadata.gz: 268d93027f2008ebadafed4b5dd735235b3506fa0bb7813af8be63dc727e3178ae25c09c885d92d03b7290bc9298bbb4e62116998db17c0d4df76c0cc1f716ef
+  data.tar.gz: 3f1c3ccdf8fcdb31522c61cf524c5b979f566ad80d75a0c4d703c4ae3a6889bafc79084613533e256388ad110739a2902f0de34236527ce25b079d22ba5b3d25

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/version.rb~

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

data/lib/fine_print.rb

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

data/lib/fine_print.rb~

@@ -39,7 +39,7 @@ module FinePrint
     when Integer
       Contract.find(ref)
     when String
-      Contract.where(:name => ref).published.first
+      Contract.where(:name => ref.to_s).published.first
     end
   end
 
@@ -82,6 +82,26 @@ module FinePrint
                      :user_id => user.id).first.nil?
   end
 
+  # Returns an array of names for the contracts whose latest published
+  # version the given user has not signed.
+  #   - user -- the user in question
+  #   - names -- contract names to check
+  #
+  def self.get_unsigned_contract_names(user, *names)
+    raise_unless_signed_in(user)
+    names = names.flatten.collect{|name| name.to_s}
+    return [] if names.blank?
+
+    signed_contracts = Contract
+      .joins(:signatures)
+      .where({:name => names,
+              :fine_print_signatures => {:user_id => user.id,
+                                         :user_type => user.class.name}}).latest
+    signed_contract_names = signed_contracts.collect{|c| c.name}
+
+    return names - signed_contract_names
+  end
+
   def self.is_signed_in?(user)
     user_signed_in_proc.call(user)
   end

data/spec/dummy/log/development.log

@@ -1745,3 +1745,29 @@ Connecting to database specified by database.yml
    (4.4ms)  CREATE INDEX "index_fine_print_signatures_on_contract_id" ON "fine_print_signatures" ("contract_id")
    (4.5ms)  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
+   (0.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  select sqlite_version(*)
+   (59.6ms)  DROP TABLE "dummy_users"
+   (5.0ms)  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) 
+   (5.1ms)  DROP TABLE "fine_print_contracts"
+   (4.5ms)  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) 
+   (6.2ms)  CREATE UNIQUE INDEX "index_fine_print_contracts_on_name_and_version" ON "fine_print_contracts" ("name", "version")
+   (4.9ms)  DROP TABLE "fine_print_signatures"
+   (4.8ms)  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.3ms)  CREATE INDEX "index_fine_print_signatures_on_contract_id" ON "fine_print_signatures" ("contract_id")
+   (4.6ms)  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
+   (0.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (20.7ms)  DROP TABLE "dummy_users"
+   (4.3ms)  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.4ms)  DROP TABLE "fine_print_contracts"
+   (4.3ms)  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.6ms)  CREATE UNIQUE INDEX "index_fine_print_contracts_on_name_and_version" ON "fine_print_contracts" ("name", "version")
+   (4.6ms)  DROP TABLE "fine_print_signatures"
+   (4.4ms)  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.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"