Feature/ruby 2.7 updates (#4)

* Remove Ruby 2.7 deprecation warnings related to keyword arguments
* drop support for Ruby 2.2

Author: nigelramsay

.travis.yml

@@ -1,6 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
-before_install: gem install bundler -v 1.13.1
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+before_install: gem install bundler -v 2.1.4

CHANGELOG.md

@@ -1,3 +1,9 @@
+# AddressFinder 1.0.3 (May 27, 2020)
+
+* Add support for Ruby 2.7
+* Drop support for Ruby 2.2
+* Ruby 2.7 deprecated the use of hashes in the last argument of a method call. We added a check to handle that deprecation. Read more here: https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+
 # AddressFinder 1.0.2 (November 22, 2016) #
 
 * Raise a ValidationError when #perform! fails rather that call the Rails 5 

lib/use_case_pattern/base.rb

@@ -9,7 +9,7 @@ module Base
     module ClassMethods
       # The perform method of a UseCase should always return itself
       def perform(*args)
-        new(*args).tap do |use_case|
+        use_case(*args).tap do |use_case|
           if use_case.valid?
             use_case.perform
           end
@@ -18,7 +18,20 @@ def perform(*args)
 
       # Raise a validation error if perform has created any errors
       def perform!(*args)
-        new(*args).tap { |use_case| use_case.perform! }
+        use_case(*args).tap { |use_case| use_case.perform! }
+      end
+
+      private 
+
+      # initialises the use_case, making sure that any keyword arguments are
+      # dealt with appropriately: https://piechowski.io/post/last-arg-keyword-deprecated-ruby-2-7/
+      def use_case(*args)
+        if args.last.is_a?(Hash)
+          keyword_arguments = args.pop
+          new(*args, **keyword_arguments)
+        else
+          new(*args)
+        end
       end
     end
 

lib/use_case_pattern/version.rb

@@ -1,3 +1,3 @@
 module UseCasePattern
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

spec/use_case_pattern/base_spec.rb

@@ -31,6 +31,59 @@
         expect { UseCaseWithMissingPerformMethod.perform }.to raise_error(NotImplementedError)
       end
     end
+
+    context "with a class containing a constructor with hash arguments" do 
+      subject(:result){ UseCaseWithConstructorContainingHash.perform(name: "Bert", age: 5) }
+
+      it "should have no errors" do
+        expect(result.errors.full_messages).to eq([])
+      end
+
+      it "should return the use case object" do
+        expect(result.class).to eq(UseCaseWithConstructorContainingHash)
+      end
+
+      it "should have set the name and age" do 
+        expect(result.age).to eq(5)
+        expect(result.name).to eq("Bert")
+      end
+    end
+
+    context "with a class containing a constructor with multiple arguments" do 
+      subject(:result){ UseCaseWithConstructorContainingStringAndHash.perform("Rocket", height: 50, width: 5) }
+
+      it "should have no errors" do
+        expect(result.errors.full_messages).to eq([])
+      end
+
+      it "should return the use case object" do
+        expect(result.class).to eq(UseCaseWithConstructorContainingStringAndHash)
+      end
+
+      it "should have set the name and age" do 
+        expect(result.label).to eq("Rocket")
+        expect(result.height).to eq(50)
+        expect(result.width).to eq(5)
+      end
+    end
+
+    context "with a class containing a constructor with multiple hashes" do 
+      subject(:result){ UseCaseWithConstructorContainingTwoHashes.perform({label: "Rocket"}, height: 50, width: 5) }
+
+      it "should have no errors" do
+        expect(result.errors.full_messages).to eq([])
+      end
+
+      it "should return the use case object" do
+        expect(result.class).to eq(UseCaseWithConstructorContainingTwoHashes)
+      end
+
+      it "should have set the name and age" do 
+        expect(result.label).to eq("Rocket")
+        expect(result.height).to eq(50)
+        expect(result.width).to eq(5)
+      end
+    end
   end
 
   context "with a use case that generates errors" do
@@ -77,6 +130,50 @@ def perform
   end
 end
 
+class UseCaseWithConstructorContainingHash
+  include UseCasePattern
+
+  attr_reader :name, :age
+
+  def initialize(name:, age:)
+    @name = name
+    @age = age
+  end
+
+  def perform
+  end
+end
+
+class UseCaseWithConstructorContainingTwoHashes
+  include UseCasePattern
+
+  attr_reader :label, :height, :width
+
+  def initialize(my_hash, height:, width:)
+    @label = my_hash[:label]
+    @height = height
+    @width = width
+  end
+
+  def perform
+  end
+end
+
+class UseCaseWithConstructorContainingStringAndHash
+  include UseCasePattern
+
+  attr_reader :label, :height, :width
+
+  def initialize(label, height:, width:)
+    @label = label
+    @height = height
+    @width = width
+  end
+
+  def perform
+  end
+end
+
 class UseCaseThatGeneratesErrors
   include UseCasePattern
 

use_case_pattern.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '~> 2.2'
+  spec.required_ruby_version = '~> 2.3'
 
   spec.add_runtime_dependency "activemodel", [">= 4.0.0"]
   spec.add_runtime_dependency "activesupport", [">= 4.0.0"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end