Merge branch 'master' into legislation-module-stable

app/models/signature.rb

@@ -10,6 +10,8 @@ class Signature < ActiveRecord::Base
 
   delegate :signable, to: :signature_sheet
 
+  before_validation :clean_document_number
+
   def verified?
     user_exists? || in_census?
   end
@@ -58,6 +60,11 @@ class Signature < ActiveRecord::Base
     User.create!(user_params)
   end
 
+  def clean_document_number
+    return if self.document_number.blank?
+    self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase
+  end
+
   def random_password
     (0...20).map { ('a'..'z').to_a[rand(26)] }.join
   end

config/deploy.rb

@@ -30,6 +30,7 @@ set :keep_releases, 5
 set :local_user, ENV['USER']
 
 set :delayed_job_workers, 2
+set :delayed_job_roles, :background
 
 set(:config_files, %w(
   log_rotation

config/deploy/preproduction.rb

@@ -6,5 +6,5 @@ set :ssh_options, port: deploysecret(:ssh_port)
 set :stage, :preproduction
 set :rails_env, :preproduction
 
-server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron)
+server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron background)
 server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer)

config/deploy/production.rb

@@ -7,6 +7,6 @@ set :stage, :production
 set :rails_env, :production
 
 #server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer)
-server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron)
+server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background)
 server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer)
 server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer)

spec/models/signature_spec.rb

@@ -13,6 +13,12 @@ describe Signature do
     it "should not be valid without a document number" do
       signature.document_number = nil
       expect(signature).to_not be_valid
+
+      signature.document_number = ""
+      expect(signature).to_not be_valid
+
+      signature.document_number = " "
+      expect(signature).to_not be_valid
     end
 
     it "should not be valid without an associated signature sheet" do
@@ -22,6 +28,24 @@ describe Signature do
 
   end
 
+  describe "#clean_document_number" do
+    it "removes non alphanumeric characters" do
+      signature = create(:signature, document_number: "123-[;,9]")
+      expect(signature.document_number).to eq("1239")
+    end
+
+    it "upcases letter in document number" do
+      signature = create(:signature, document_number: "123a")
+      expect(signature.document_number).to eq("123A")
+    end
+
+    it "deals gracefully with empty document numbers" do
+      signature = build(:signature, document_number: "")
+      signature.clean_document_number
+      expect(signature.document_number).to eq("")
+    end
+  end
+
   describe "#verified?" do
 
     it "returns true if user exists" do