fine_print 2.3.1 → 3.0.0

data/spec/factories/fine_print/contract.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :fine_print_contract, :class => FinePrint::Contract do
+  factory :fine_print_contract, class: FinePrint::Contract do
     name { Faker::Lorem.words.join('_') }
     title { Faker::Lorem.words.join(' ').capitalize }
     content { Faker::Lorem.paragraphs.join("\n") }

data/spec/factories/fine_print/signature.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
-  factory :fine_print_signature, :class => FinePrint::Signature do
-    association :contract, :factory => [:fine_print_contract, :published]
+  factory :fine_print_signature, class: FinePrint::Signature do
+    association :contract, factory: [:fine_print_contract, :published]
 
     transient do
       user_factory :user

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
 FactoryGirl.define do
-  factory :user, :class => DummyUser do
+  factory :user, class: DummyUser do
   end  
 end

data/spec/lib/fine_print/action_controller/base_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module FinePrint
+  module ActionController
+    describe Base, type: :lib do
+      let!(:controller)            { ::ActionController::Base.new }
+      let!(:dummy_controller)      { DummyModelsController.new }
+
+      it 'must add fine_print_sign to ActionController instances' do
+        expect(controller).to respond_to(:fine_print_require)
+        expect(dummy_controller).to respond_to(:fine_print_require)
+      end
+
+      it 'must add fine_print_return to ActionController instances' do
+        expect(controller.respond_to?(:fine_print_return, true)).to eq true
+        expect(dummy_controller.respond_to?(:fine_print_return, true)).to eq true
+      end
+
+      it 'must add fine_print_require to ActionController and subclasses' do
+        expect(controller.class).to respond_to(:fine_print_require)
+        expect(dummy_controller.class).to respond_to(:fine_print_require)
+      end
+
+      it 'must add fine_print_skip to ActionController and subclasses' do
+        expect(controller.class).to respond_to(:fine_print_skip)
+        expect(dummy_controller.class).to respond_to(:fine_print_skip)
+      end
+    end
+  end
+end

data/spec/lib/fine_print_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper'
 
-describe FinePrint do
+describe FinePrint, type: :lib do
   before :each do
-    @alpha_1 = FactoryGirl.create(:fine_print_contract, :published, :name => 'alpha')
-    @beta_1 = FactoryGirl.create(:fine_print_contract, :published, :name => 'beta')
+    @alpha_1 = FactoryGirl.create(:fine_print_contract, :published,
+                                                        name: 'alpha')
+    @beta_1 = FactoryGirl.create(:fine_print_contract, :published,
+                                                       name: 'beta')
 
     @user = DummyUser.create
-    @alpha_1_sig = FactoryGirl.create(:fine_print_signature, :contract => @alpha_1,
-                                                             :user => @user) 
-    @beta_1_sig = FactoryGirl.create(:fine_print_signature, :contract => @beta_1,
-                                                            :user => @user)
+    @alpha_1_sig = FactoryGirl.create(:fine_print_signature, contract: @alpha_1,
+                                                             user: @user) 
+    @beta_1_sig = FactoryGirl.create(:fine_print_signature, contract: @beta_1,
+                                                            user: @user)
 
     @alpha_2 = @alpha_1.new_version
     @alpha_2.update_attribute(:content, 'foo')
@@ -26,13 +28,14 @@ describe FinePrint do
   end
 
   it 'gets signed contracts' do
-    expect(FinePrint.get_signed_contract_ids(@user)).to(
-      eq [@beta_1.id])
+    expect(FinePrint.signed_contracts_for(@user)).to(
+      eq [@beta_1]
+    )
   end
 
   it 'gets unsigned contracts' do
-    expect(FinePrint.get_unsigned_contract_ids(@user, @alpha_2.id, @beta_1.id)).to(
-      eq [@alpha_2.id])
+    names = [@alpha_2, @beta_1].collect{|c| c.name}
+    expect(FinePrint.unsigned_contracts_for(@user, name: names)).to eq [@alpha_2]
   end
 
   it 'allows users to sign contracts' do

data/spec/models/contract_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module FinePrint
-  describe Contract do
+  describe Contract, type: :model do
     it 'can be published and unpublished' do
       contract = FactoryGirl.create(:fine_print_contract)
       expect(contract.is_published?).to eq false
@@ -36,7 +36,7 @@ module FinePrint
       expect(contract.is_published?).to eq true
       expect(contract.signatures).to be_empty
 
-      ua = FactoryGirl.create(:fine_print_signature, :contract => contract)
+      ua = FactoryGirl.create(:fine_print_signature, contract: contract)
       contract.reload
       expect(contract.signatures).not_to be_empty
 

data/spec/models/signature_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module FinePrint
-  describe Signature do
+  describe Signature, type: :model do
     it "can't be associated with unpublished contracts" do
       contract = FactoryGirl.create(:fine_print_contract)
       expect(contract.is_published?).to eq false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fine_print
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0
 platform: ruby
 authors:
 - JP Slavinsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,7 +171,8 @@ files:
 - config/routes.rb
 - db/migrate/0_install_fine_print.rb
 - lib/fine_print.rb
-- lib/fine_print/controller_includes.rb
+- lib/fine_print/action_controller/base.rb
+- lib/fine_print/configuration.rb
 - lib/fine_print/engine.rb
 - lib/fine_print/version.rb
 - lib/tasks/fine_print_tasks.rake
@@ -219,7 +220,7 @@ files:
 - spec/factories/fine_print/contract.rb
 - spec/factories/fine_print/signature.rb
 - spec/factories/user.rb
-- spec/lib/fine_print/controller_includes_spec.rb
+- spec/lib/fine_print/action_controller/base_spec.rb
 - spec/lib/fine_print_spec.rb
 - spec/models/contract_spec.rb
 - spec/models/signature_spec.rb
@@ -294,7 +295,7 @@ test_files:
 - spec/factories/fine_print/contract.rb
 - spec/factories/fine_print/signature.rb
 - spec/factories/user.rb
-- spec/lib/fine_print/controller_includes_spec.rb
+- spec/lib/fine_print/action_controller/base_spec.rb
 - spec/lib/fine_print_spec.rb
 - spec/models/contract_spec.rb
 - spec/models/signature_spec.rb

data/lib/fine_print/controller_includes.rb

@@ -1,93 +0,0 @@
-module FinePrint
-  module ControllerIncludes
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    # Accepts a user, an array of contract ids to be signed and an options hash
-    # Calls the sign_proc with the given parameters
-    def fine_print_sign(user, *args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      contract_ids = args.flatten.collect{|n| n.to_s}
-
-      blk = options[:must_sign_proc] || FinePrint.must_sign_proc
-
-      # Use action_interceptor to save the current url
-      store_url key: :fine_print_return_to
-
-      instance_exec user, contract_ids, &blk
-    end
-
-    # Accepts no arguments
-    # Redirects the user back to the url they were at before
-    # one of FinePrint's procs redirected them
-    def fine_print_return
-      redirect_back key: :fine_print_return_to
-    end
-
-    protected
-
-    def fine_print_skipped_contract_names
-      @fine_print_skipped_contract_names ||= []
-    end
-
-    module ClassMethods
-      # For the following methods, names passed as Symbols are converted to Strings.
-
-      # Accepts an array of contract names and an options hash
-      # Adds a before_filter to the current controller that will check if the
-      # current user has signed the given contracts and call the sign_proc if appropriate
-      # Options relevant to FinePrint are passed to fine_print_sign, while
-      # other options are passed to the before_filter
-      def fine_print_require(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-
-        filter_options = options.except(*FinePrint::CONTROLLER_OPTIONS)
-        fine_print_options = options.slice(*FinePrint::CONTROLLER_OPTIONS)
-
-        # Convert names to an array of Strings
-        contract_names = args.flatten.collect{|c| c.to_s}
-
-        class_eval do
-          before_filter(filter_options) do |controller|
-            skipped_contract_names = controller.fine_print_skipped_contract_names
-            unskipped_contract_names = contract_names - skipped_contract_names
-
-            # Return quietly if all contracts skipped
-            next if unskipped_contract_names.blank?
-
-            user = instance_exec &FinePrint.current_user_proc
-
-            contract_ids = FinePrint.contract_names_to_ids(unskipped_contract_names).flatten
-
-            unsigned_contract_ids = FinePrint.get_unsigned_contract_ids(user, contract_ids)
-
-            # Return quietly if no contracts left to sign
-            next if unsigned_contract_ids.blank?
-
-            controller.fine_print_sign(user, unsigned_contract_ids, fine_print_options)
-          end
-        end
-      end
-
-      # Accepts an array of contract names and an options hash
-      # Excludes the given contracts from the `fine_print_require`
-      # check for this controller and subclasses
-      # Options are passed to prepend_before_filter
-      def fine_print_skip(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-
-        # Convert names to an array of Strings
-        contract_names = args.flatten.collect{|c| c.to_s}
-
-        class_eval do
-          prepend_before_filter(options) do |controller|
-            controller.fine_print_skipped_contract_names.push(*contract_names)
-          end
-        end
-      end
-    end
-  end
-end
-
-ActionController::Base.send :include, FinePrint::ControllerIncludes

data/spec/lib/fine_print/controller_includes_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-module FinePrint
-  describe ControllerIncludes do
-    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
-      expect(ActionController::Base.new.respond_to?(:fine_print_return, true)).to eq true
-      expect(DummyModelsController.new.respond_to?(:fine_print_return, true)).to eq true
-    end
-
-    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 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