fine_print 1.4.1 → 2.0.0

data/spec/lib/fine_print/controller_includes_spec.rb

@@ -2,14 +2,9 @@ require 'spec_helper'
 
 module FinePrint
   describe ControllerIncludes do
-    it 'must add fine_print_get_unsigned_contract_names to ActionController instances' do
-      expect(ActionController::Base.new.respond_to? :fine_print_get_unsigned_contract_names).to eq true
-      expect(DummyModelsController.new.respond_to? :fine_print_get_unsigned_contract_names).to eq true
-    end
-
-    it 'must add fine_print_redirect to ActionController instances' do
-      expect(ActionController::Base.new.respond_to? :fine_print_redirect).to eq true
-      expect(DummyModelsController.new.respond_to? :fine_print_redirect).to eq true
+    it 'must add fine_print_sign to ActionController instances' do
+      expect(ActionController::Base.new.respond_to? :fine_print_sign).to eq true
+      expect(DummyModelsController.new.respond_to? :fine_print_sign).to eq true
     end
 
     it 'must add fine_print_return to ActionController instances' do
@@ -17,14 +12,14 @@ module FinePrint
       expect(DummyModelsController.new.respond_to?(:fine_print_return, true)).to eq true
     end
 
-    it 'must add fine_print_get_signatures to ActionController and subclasses' do
-      expect(ActionController::Base.respond_to? :fine_print_get_signatures).to eq true
-      expect(DummyModelsController.respond_to? :fine_print_get_signatures).to eq true
+    it 'must add fine_print_require to ActionController and subclasses' do
+      expect(ActionController::Base.respond_to? :fine_print_require).to eq true
+      expect(DummyModelsController.respond_to? :fine_print_require).to eq true
     end
 
-    it 'must add fine_print_skip_signatures to ActionController and subclasses' do
-      expect(ActionController::Base.respond_to? :fine_print_skip_signatures).to eq true
-      expect(DummyModelsController.respond_to? :fine_print_skip_signatures).to eq true
+    it 'must add fine_print_skip to ActionController and subclasses' do
+      expect(ActionController::Base.respond_to? :fine_print_skip).to eq true
+      expect(DummyModelsController.respond_to? :fine_print_skip).to eq true
     end
   end
 end

data/spec/lib/fine_print_spec.rb

@@ -5,11 +5,11 @@ describe FinePrint do
     @alpha_1 = FactoryGirl.create(:published_contract, :name => 'alpha')
     @beta_1 = FactoryGirl.create(:published_contract, :name => 'beta')
 
-    @user = mock_model 'DummyUser', :id => -1
+    @user = DummyUser.create
     @alpha_1_sig = FactoryGirl.create(:signature, :contract => @alpha_1, :user => @user) 
     @beta_1_sig = FactoryGirl.create(:signature, :contract => @beta_1, :user => @user)
 
-    @alpha_2 = @alpha_1.draft_copy
+    @alpha_2 = @alpha_1.new_version
     @alpha_2.update_attribute(:content, 'foo')
     @alpha_2.publish
   end
@@ -23,25 +23,31 @@ describe FinePrint do
     expect(FinePrint.get_contract('alpha')).to eq @alpha_2
   end
 
+  it 'gets signed contracts' do
+    expect(FinePrint.get_signed_contract_ids(@user)).to(
+      eq [@beta_1.id])
+  end
+
   it 'gets unsigned contracts' do
-    expect(FinePrint.get_unsigned_contract_names(@user, 'beta', 'alpha')).to eq ['alpha']
+    expect(FinePrint.get_unsigned_contract_ids(@user, @alpha_2.id, @beta_1.id)).to(
+      eq [@alpha_2.id])
   end
 
   it 'allows users to sign contracts' do
     expect(FinePrint.signed_contract?(@user, @alpha_1)).to eq true
     expect(FinePrint.signed_contract?(@user, @alpha_2)).to eq false
     expect(FinePrint.signed_contract?(@user, @beta_1)).to eq true
-    expect(FinePrint.signed_any_contract_version?(@user, @alpha_1)).to eq true
-    expect(FinePrint.signed_any_contract_version?(@user, @alpha_2)).to eq true
-    expect(FinePrint.signed_any_contract_version?(@user, @beta_1)).to eq true
+    expect(FinePrint.signed_any_version_of_contract?(@user, @alpha_1)).to eq true
+    expect(FinePrint.signed_any_version_of_contract?(@user, @alpha_2)).to eq true
+    expect(FinePrint.signed_any_version_of_contract?(@user, @beta_1)).to eq true
 
     expect(FinePrint.sign_contract(@user, @alpha_2)).to be_a FinePrint::Signature
 
     expect(FinePrint.signed_contract?(@user, @alpha_1)).to eq true
     expect(FinePrint.signed_contract?(@user, @alpha_2)).to eq true
     expect(FinePrint.signed_contract?(@user, @beta_1)).to eq true
-    expect(FinePrint.signed_any_contract_version?(@user, @alpha_1)).to eq true
-    expect(FinePrint.signed_any_contract_version?(@user, @alpha_2)).to eq true
-    expect(FinePrint.signed_any_contract_version?(@user, @beta_1)).to eq true
+    expect(FinePrint.signed_any_version_of_contract?(@user, @alpha_1)).to eq true
+    expect(FinePrint.signed_any_version_of_contract?(@user, @alpha_2)).to eq true
+    expect(FinePrint.signed_any_version_of_contract?(@user, @beta_1)).to eq true
   end
 end

data/spec/models/contract_spec.rb

@@ -4,12 +4,10 @@ module FinePrint
   describe Contract do
     it 'can be published and unpublished' do
       contract = FactoryGirl.create(:contract)
-      expect(contract.is_published?).to be_false
+      expect(contract.is_published?).to eq false
       expect(contract.version).to be_nil
-      expect(contract.is_latest?).to be_false
-      expect(contract.can_be_updated?).to be_true
-      expect(contract.can_be_published?).to be_true
-      expect(contract.can_be_unpublished?).to be_false
+      expect(contract.is_latest?).to eq false
+      expect(contract.signatures).to be_empty
 
       contract.unpublish
       expect(contract.errors).not_to be_empty
@@ -17,12 +15,10 @@ module FinePrint
       expect(contract.errors).to be_empty
       contract.publish
       expect(contract.errors).to be_empty
-      expect(contract.is_published?).to be_true
-      expect(contract.version).to be 1
-      expect(contract.is_latest?).to be_true
-      expect(contract.can_be_updated?).to be_true
-      expect(contract.can_be_published?).to be_false
-      expect(contract.can_be_unpublished?).to be_true
+      expect(contract.is_published?).to eq true
+      expect(contract.version).to eq 1
+      expect(contract.is_latest?).to eq true
+      expect(contract.signatures).to be_empty
 
       contract.publish
       expect(contract.errors).not_to be_empty
@@ -30,23 +26,19 @@ module FinePrint
       expect(contract.errors).to be_empty
       contract.unpublish
       expect(contract.errors).to be_empty
-      expect(contract.is_published?).to be_false
+      expect(contract.is_published?).to eq false
     end
 
-    it "can't be modified after a user signs" do
+    it "can't be modified after a user signs it" do
       contract = FactoryGirl.create(:contract)
 
       contract.publish
-      expect(contract.is_published?).to be_true
-      expect(contract.can_be_updated?).to be_true
-      expect(contract.can_be_published?).to be_false
-      expect(contract.can_be_unpublished?).to be_true
+      expect(contract.is_published?).to eq true
+      expect(contract.signatures).to be_empty
 
       ua = FactoryGirl.create(:signature, :contract => contract)
       contract.reload
-      expect(contract.can_be_updated?).to be_false
-      expect(contract.can_be_published?).to be_false
-      expect(contract.can_be_unpublished?).to be_false
+      expect(contract.signatures).not_to be_empty
 
       contract.save
       expect(contract.errors).not_to be_empty
@@ -54,14 +46,14 @@ module FinePrint
       expect(contract.errors).to be_empty
       contract.unpublish
       expect(contract.errors).not_to be_empty
-      expect(contract.is_published?).to be_true
+      expect(contract.reload.is_published?).to eq true
     end
 
     it 'results in a new version if a copy is published' do
       contract = FactoryGirl.create(:published_contract)
       expect(contract.version).to eq 1
-      new_version = contract.draft_copy
-      expect(new_version.save).to be_true
+      new_version = contract.new_version
+      expect(new_version.save).to eq true
       new_version.publish
       expect(new_version.version).to eq 2
     end
@@ -69,9 +61,9 @@ module FinePrint
     it 'results in a first version if a name is changed after publishing' do
       contract = FactoryGirl.create(:published_contract)
       expect(contract.version).to eq 1
-      new_version = contract.draft_copy
+      new_version = contract.new_version
       new_version.name = 'Joe'
-      expect(new_version.save).to be_true
+      expect(new_version.save).to eq true
       new_version.publish
       expect(new_version.version).to eq 1
     end

data/spec/models/signature_spec.rb

@@ -4,25 +4,15 @@ module FinePrint
   describe Signature do
     it 'can''t be associated with unpublished contracts' do
       contract = FactoryGirl.create(:contract)
-      expect(contract.is_published?).to be_false
-      expect(contract.can_be_updated?).to be_true
+      expect(contract.is_published?).to eq false
+      expect(contract.signatures).to be_empty
 
       sig = FactoryGirl.build(:signature)
       sig.contract = contract
-      expect(sig.save).to be_false
+      expect(sig.save).to eq false
 
       contract.reload
-      expect(contract.can_be_updated?).to be_true
-    end
-
-    it 'prevents contract from being updated' do
-      sig = FactoryGirl.build(:signature)
-      contract = sig.contract
-      expect(contract.can_be_updated?).to be_true
-
-      sig.save!
-      contract.reload
-      expect(contract.can_be_updated?).to be_false
+      expect(contract.signatures).to be_empty
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ ENV['RAILS_ENV'] ||= 'test'
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'factory_girl_rails'
 require 'faker'
 
@@ -13,7 +12,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
   config.infer_base_class_for_anonymous_controllers = false
   config.order = 'random'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fine_print
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - JP Slavinsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,6 +39,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: action_interceptor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: squeel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -132,13 +160,15 @@ files:
 - app/models/fine_print/contract.rb
 - app/models/fine_print/signature.rb
 - app/views/fine_print/contracts/_form.html.erb
+- app/views/fine_print/contracts/_show.html.erb
 - app/views/fine_print/contracts/edit.html.erb
 - app/views/fine_print/contracts/index.html.erb
 - app/views/fine_print/contracts/new.html.erb
 - app/views/fine_print/contracts/new_version.html.erb
 - app/views/fine_print/contracts/show.html.erb
-- app/views/fine_print/home/index.html.erb
+- app/views/fine_print/signatures/_form.html.erb
 - app/views/fine_print/signatures/index.html.erb
+- app/views/fine_print/signatures/new.html.erb
 - app/views/layouts/fine_print/application.html.erb
 - config/initializers/fine_print.rb
 - config/routes.rb
@@ -146,7 +176,6 @@ files:
 - lib/fine_print.rb
 - lib/fine_print/controller_includes.rb
 - lib/fine_print/engine.rb
-- lib/fine_print/security_transgression.rb
 - lib/fine_print/version.rb
 - lib/tasks/fine_print_tasks.rake
 - spec/controllers/contracts_controller_spec.rb

data/app/views/fine_print/home/index.html.erb

@@ -1,16 +0,0 @@
-<h1 class='fine_print heading'>FinePrint</h1>
-
-<div class='fine_print root'>
-  <ul class='fine_print'>
-    <li>
-      <%= link_to 'Manage contracts',
-                  contracts_path,
-                  :class => 'fine_print link' %>
-    </li>
-    <li>
-      <%= link_to 'View signatures',
-                  signatures_path,
-                  :class => 'fine_print link' %>
-    </li>
-  </ul>
-</div>

data/lib/fine_print/security_transgression.rb

@@ -1,3 +0,0 @@
-module FinePrint
-  class SecurityTransgression < StandardError; end
-end