From 0a9af8c54b6cdfca1c0de45c75f5b0803f00d3c5 Mon Sep 17 00:00:00 2001
From: Andreas Haller <andreas.haller@invision.de>
Date: Tue, 9 Apr 2019 21:47:24 +0200
Subject: [PATCH 1/6] Remove depending on Inflector in changeset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…except #inspect
---
 lib/lurch/changeset.rb | 2 +-
 lib/lurch/query.rb     | 6 ++++--
 lib/lurch/store.rb     | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/lurch/changeset.rb b/lib/lurch/changeset.rb
index 338b0e4..0579091 100644
--- a/lib/lurch/changeset.rb
+++ b/lib/lurch/changeset.rb
@@ -5,7 +5,7 @@ class Changeset
 
     def initialize(type, attributes = {})
       is_resource = type.is_a?(Resource)
-      @type = is_resource ? type.type : Inflector.decode_type(type)
+      @type = is_resource ? type.type : type
       @id = is_resource ? type.id : nil
       @attributes = attributes
       @relationships = {}
diff --git a/lib/lurch/query.rb b/lib/lurch/query.rb
index 288be93..79ea459 100644
--- a/lib/lurch/query.rb
+++ b/lib/lurch/query.rb
@@ -60,13 +60,15 @@ def find(id)
 
     def save(changeset)
       raise ArgumentError, "No type specified for query" if @type.nil?
-      raise ArgumentError, "Type mismatch" if @type != changeset.type
+      raise ArgumentError, "Type mismatch" if @type != Inflector.decode_type(changeset.type)
+
       @store.save(changeset, to_query)
     end
 
     def insert(changeset)
       raise ArgumentError, "No type specified for query" if @type.nil?
-      raise ArgumentError, "Type mismatch" if @type != changeset.type
+      raise ArgumentError, "Type mismatch" if @type != Inflector.decode_type(changeset.type)
+
       @store.insert(changeset, to_query)
     end
 
diff --git a/lib/lurch/store.rb b/lib/lurch/store.rb
index f58bd0a..229ec08 100644
--- a/lib/lurch/store.rb
+++ b/lib/lurch/store.rb
@@ -19,7 +19,9 @@ def peek(type, id)
 
     def save(changeset, query = {})
       return insert(changeset) if changeset.id.nil?
-      url = uri_builder.resource_uri(changeset.type, changeset.id, query)
+
+      type = Inflector.decode_type(changeset.type)
+      url = uri_builder.resource_uri(type, changeset.id, query)
 
       document = @client.patch(url, payload_builder.build(changeset))
       process_document(document)
@@ -30,7 +32,9 @@ def save(changeset, query = {})
 
     def insert(changeset, query = {})
       return save(changeset) unless changeset.id.nil?
-      url = uri_builder.resources_uri(changeset.type, query)
+
+      type = Inflector.decode_type(changeset.type)
+      url = uri_builder.resources_uri(type, query)
 
       document = @client.post(url, payload_builder.build(changeset))
       process_document(document)

From 61e28a2409b31cf566a7cb1a2b67cc990f4c5cf2 Mon Sep 17 00:00:00 2001
From: Andreas Haller <andreas.haller@invision.de>
Date: Tue, 9 Apr 2019 21:54:49 +0200
Subject: [PATCH 2/6] Don't call Inflector in #inspect methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Trying to remove using Inflector class methods…
---
 lib/lurch/changeset.rb             | 2 +-
 lib/lurch/collection.rb            | 2 +-
 lib/lurch/query.rb                 | 2 +-
 lib/lurch/relationship/has_many.rb | 2 +-
 lib/lurch/relationship/has_one.rb  | 2 +-
 lib/lurch/resource.rb              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/lurch/changeset.rb b/lib/lurch/changeset.rb
index 0579091..2639d7f 100644
--- a/lib/lurch/changeset.rb
+++ b/lib/lurch/changeset.rb
@@ -26,7 +26,7 @@ def inspect
       attrs = attrs.concat(attributes.map { |name, value| "#{name}: #{value.inspect}" })
       attrs = attrs.concat(relationships.map { |name, value| "#{name}: #{value.inspect}" })
       inspection = attrs.join(", ")
-      "#<#{self.class}[#{Inflector.classify(type)}] #{inspection}>"
+      "#<#{self.class}[#{type}] #{inspection}>"
     end
   end
 end
diff --git a/lib/lurch/collection.rb b/lib/lurch/collection.rb
index 5445ab4..d507335 100644
--- a/lib/lurch/collection.rb
+++ b/lib/lurch/collection.rb
@@ -74,7 +74,7 @@ def last?
     end
 
     def inspect
-      suffix = @resources.first ? "[#{Inflector.classify(@resources.first.type)}]" : ""
+      suffix = @resources.first ? "[#{@resources.first.type}]" : ""
       inspection = size ? ["size: #{size}"] : []
       inspection << ["pages: #{page_count}"] if page_count
       "#<#{self.class}#{suffix} #{inspection.join(', ')}>"
diff --git a/lib/lurch/query.rb b/lib/lurch/query.rb
index 79ea459..549e640 100644
--- a/lib/lurch/query.rb
+++ b/lib/lurch/query.rb
@@ -79,7 +79,7 @@ def delete(resource)
     end
 
     def inspect
-      type = @type.nil? ? "" : "[#{Inflector.classify(@type)}]"
+      type = @type.nil? ? "" : "[#{@type}]"
       query = to_query
       query = query.empty? ? "" : " #{query.inspect}"
       "#<#{self.class}#{type}#{query}>"
diff --git a/lib/lurch/relationship/has_many.rb b/lib/lurch/relationship/has_many.rb
index 636ac2b..fe1b460 100644
--- a/lib/lurch/relationship/has_many.rb
+++ b/lib/lurch/relationship/has_many.rb
@@ -9,7 +9,7 @@ def initialize(store, relationship_key, document)
       end
 
       def inspect
-        suffix = @data.first ? "[#{Inflector.classify(@data.first.type)}]" : ""
+        suffix = @data.first ? "[#{@data.first.type}]" : ""
         "#<#{self.class}#{suffix} size: #{@data.size}>"
       end
     end
diff --git a/lib/lurch/relationship/has_one.rb b/lib/lurch/relationship/has_one.rb
index f700ef2..c69d730 100644
--- a/lib/lurch/relationship/has_one.rb
+++ b/lib/lurch/relationship/has_one.rb
@@ -14,7 +14,7 @@ def initialize(store, relationship_key, document)
       end
 
       def inspect
-        @data.nil? ? "#<#{self.class} nil>" : "#<#{self.class}[#{Inflector.classify(@type)}] id: #{@id.inspect}>"
+        @data.nil? ? "#<#{self.class} nil>" : "#<#{self.class}[#{@type}] id: #{@id.inspect}>"
       end
     end
   end
diff --git a/lib/lurch/resource.rb b/lib/lurch/resource.rb
index def3a38..4347efd 100644
--- a/lib/lurch/resource.rb
+++ b/lib/lurch/resource.rb
@@ -53,7 +53,7 @@ def inspect
                    else
                      "not loaded"
                    end
-      "#<#{self.class}[#{resource_class_name}] id: #{id.inspect}, #{inspection}>"
+      "#<#{self.class}[#{type}] id: #{id.inspect}, #{inspection}>"
     end
 
   private

From 2514684aab08e8f59187c4271fcb6ebef1d4fb29 Mon Sep 17 00:00:00 2001
From: Andreas Haller <andreas.haller@invision.de>
Date: Tue, 9 Apr 2019 22:01:53 +0200
Subject: [PATCH 3/6] Remove Inflector.classify

---
 lib/lurch/inflector.rb             |  4 ----
 lib/lurch/resource.rb              | 12 ++++--------
 test/lurch/test_fetch_resources.rb |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/lurch/inflector.rb b/lib/lurch/inflector.rb
index f4b84f4..12789e7 100644
--- a/lib/lurch/inflector.rb
+++ b/lib/lurch/inflector.rb
@@ -5,10 +5,6 @@ def initialize(inflection_mode, types_mode)
       define_encode_type(types_mode)
     end
 
-    def self.classify(str)
-      Inflecto.classify(str)
-    end
-
     def self.decode_key(key)
       Inflecto.underscore(key.to_s).to_sym
     end
diff --git a/lib/lurch/resource.rb b/lib/lurch/resource.rb
index 4347efd..afff767 100644
--- a/lib/lurch/resource.rb
+++ b/lib/lurch/resource.rb
@@ -18,13 +18,13 @@ def fetch
     end
 
     def attributes
-      raise Errors::ResourceNotLoaded, resource_class_name unless loaded?
+      raise Errors::ResourceNotLoaded, type unless loaded?
 
       resource_from_store.attributes
     end
 
     def relationships
-      raise Errors::ResourceNotLoaded, resource_class_name unless loaded?
+      raise Errors::ResourceNotLoaded, type unless loaded?
 
       resource_from_store.relationships
     end
@@ -38,15 +38,11 @@ def eql?(other)
     end
 
     def [](attribute)
-      raise Errors::ResourceNotLoaded, resource_class_name unless loaded?
+      raise Errors::ResourceNotLoaded, type unless loaded?
 
       resource_from_store.attribute(attribute)
     end
 
-    def resource_class_name
-      Inflector.classify(type)
-    end
-
     def inspect
       inspection = if loaded?
                      attributes.map { |name, value| "#{name}: #{value.inspect}" }.join(", ")
@@ -68,7 +64,7 @@ def respond_to_missing?(method, all)
     end
 
     def method_missing(method, *arguments, &block)
-      raise Errors::ResourceNotLoaded, resource_class_name unless loaded?
+      raise Errors::ResourceNotLoaded, type unless loaded?
 
       return resource_from_store.attribute(method) if resource_from_store.attribute?(method)
       if resource_from_store.relationship?(method)
diff --git a/test/lurch/test_fetch_resources.rb b/test/lurch/test_fetch_resources.rb
index 2bd62fc..8221c19 100644
--- a/test/lurch/test_fetch_resources.rb
+++ b/test/lurch/test_fetch_resources.rb
@@ -65,7 +65,7 @@ def test_fetch_resource_that_includes_resource_identifiers_only
     refute phone_number.loaded?
     assert phone_number.inspect
     err = assert_raises(Lurch::Errors::ResourceNotLoaded) { phone_number.name }
-    assert_equal "Resource (PhoneNumber) not loaded, try calling #fetch first.", err.message
+    assert_equal "Resource (phone_numbers) not loaded, try calling #fetch first.", err.message
 
     stub_get("#{phone_number_type}/1", @response_factory.phone_number_response("1", "Cell", "111-222-3344"))
 

From 5872db730fd9b7d403f03cf23d1ebe475668b12b Mon Sep 17 00:00:00 2001
From: Andreas Haller <andreas.haller@invision.de>
Date: Tue, 9 Apr 2019 22:19:43 +0200
Subject: [PATCH 4/6] Remove class methods from Inflector

---
 lib/lurch/inflector.rb            |  4 ++--
 lib/lurch/query.rb                | 20 +++++++++++---------
 lib/lurch/relationship.rb         |  4 ++++
 lib/lurch/relationship/has_one.rb |  2 +-
 lib/lurch/resource.rb             |  2 +-
 lib/lurch/store.rb                | 19 ++++++++++++-------
 lib/lurch/stored_resource.rb      | 10 +++++++---
 7 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/lib/lurch/inflector.rb b/lib/lurch/inflector.rb
index 12789e7..9091a41 100644
--- a/lib/lurch/inflector.rb
+++ b/lib/lurch/inflector.rb
@@ -5,11 +5,11 @@ def initialize(inflection_mode, types_mode)
       define_encode_type(types_mode)
     end
 
-    def self.decode_key(key)
+    def decode_key(key)
       Inflecto.underscore(key.to_s).to_sym
     end
 
-    def self.decode_type(type)
+    def decode_type(type)
       Inflecto.pluralize(decode_key(type)).to_sym
     end
 
diff --git a/lib/lurch/query.rb b/lib/lurch/query.rb
index 549e640..6698c6e 100644
--- a/lib/lurch/query.rb
+++ b/lib/lurch/query.rb
@@ -37,7 +37,7 @@ def page(params)
     end
 
     def type(type)
-      @type = Inflector.decode_type(type)
+      @type = inflector.decode_type(type)
       self
     end
 
@@ -60,14 +60,14 @@ def find(id)
 
     def save(changeset)
       raise ArgumentError, "No type specified for query" if @type.nil?
-      raise ArgumentError, "Type mismatch" if @type != Inflector.decode_type(changeset.type)
+      raise ArgumentError, "Type mismatch" if @type != inflector.decode_type(changeset.type)
 
       @store.save(changeset, to_query)
     end
 
     def insert(changeset)
       raise ArgumentError, "No type specified for query" if @type.nil?
-      raise ArgumentError, "Type mismatch" if @type != Inflector.decode_type(changeset.type)
+      raise ArgumentError, "Type mismatch" if @type != inflector.decode_type(changeset.type)
 
       @store.insert(changeset, to_query)
     end
@@ -87,8 +87,10 @@ def inspect
 
   private
 
+    attr_reader :inflector
+
     def uri_builder
-      @uri_builder ||= URIBuilder.new(@inflector)
+      @uri_builder ||= URIBuilder.new(inflector)
     end
 
     def to_query
@@ -109,16 +111,16 @@ def other_uri_params
     end
 
     def filter_query
-      @inflector.encode_keys(@filter)
+      inflector.encode_keys(@filter)
     end
 
     def include_query
-      @include.map { |path| @inflector.encode_key(path) }.compact.uniq.join(",")
+      @include.map { |path| inflector.encode_key(path) }.compact.uniq.join(",")
     end
 
     def fields_query
-      @inflector.encode_types(@fields) do |fields|
-        fields.map { |field| @inflector.encode_key(field) }.compact.uniq.join(",")
+      inflector.encode_types(@fields) do |fields|
+        fields.map { |field| inflector.encode_key(field) }.compact.uniq.join(",")
       end
     end
 
@@ -127,7 +129,7 @@ def sort_query
     end
 
     def sort_key(key, direction)
-      encoded_key = @inflector.encode_key(key)
+      encoded_key = inflector.encode_key(key)
       case direction
       when :asc
         encoded_key
diff --git a/lib/lurch/relationship.rb b/lib/lurch/relationship.rb
index 152948d..3326ebd 100644
--- a/lib/lurch/relationship.rb
+++ b/lib/lurch/relationship.rb
@@ -13,6 +13,10 @@ def loaded?
       !!defined?(@data)
     end
 
+    def inflector
+      @store.inflector
+    end
+
     def respond_to_missing?(method, all)
       raise Errors::RelationshipNotLoaded, @relationship_key unless loaded?
       super
diff --git a/lib/lurch/relationship/has_one.rb b/lib/lurch/relationship/has_one.rb
index c69d730..9dcd873 100644
--- a/lib/lurch/relationship/has_one.rb
+++ b/lib/lurch/relationship/has_one.rb
@@ -7,7 +7,7 @@ def initialize(store, relationship_key, document)
         if document["data"].nil?
           @data = nil
         else
-          @type = Inflector.decode_type(document["data"]["type"])
+          @type = inflector.decode_type(document["data"]["type"])
           @id = document["data"]["id"]
           @data = Resource.new(@store, @type, @id)
         end
diff --git a/lib/lurch/resource.rb b/lib/lurch/resource.rb
index afff767..64fc58a 100644
--- a/lib/lurch/resource.rb
+++ b/lib/lurch/resource.rb
@@ -4,7 +4,7 @@ class Resource
 
     def initialize(store, type, id)
       @store = store
-      @type = Inflector.decode_type(type)
+      @type = @store.inflector.decode_type(type)
       @id = id
     end
 
diff --git a/lib/lurch/store.rb b/lib/lurch/store.rb
index 229ec08..0836fbb 100644
--- a/lib/lurch/store.rb
+++ b/lib/lurch/store.rb
@@ -17,11 +17,13 @@ def peek(type, id)
       Resource.new(self, stored_resource.type, stored_resource.id)
     end
 
-    def save(changeset, query = {})
+    def save(changeset, query = {}) # rubocop:disable Metrics/AbcSize
       return insert(changeset) if changeset.id.nil?
 
-      type = Inflector.decode_type(changeset.type)
-      url = uri_builder.resource_uri(type, changeset.id, query)
+      url = uri_builder.resource_uri(
+        inflector.decode_type(changeset.type),
+        changeset.id, query
+      )
 
       document = @client.patch(url, payload_builder.build(changeset))
       process_document(document)
@@ -33,7 +35,7 @@ def save(changeset, query = {})
     def insert(changeset, query = {})
       return save(changeset) unless changeset.id.nil?
 
-      type = Inflector.decode_type(changeset.type)
+      type = inflector.decode_type(changeset.type)
       url = uri_builder.resources_uri(type, query)
 
       document = @client.post(url, payload_builder.build(changeset))
@@ -74,7 +76,7 @@ def load_from_url(url)
 
     # @private
     def resource_from_store(type, id)
-      normalized_type = Inflector.decode_type(type)
+      normalized_type = inflector.decode_type(type)
       @store[normalized_type][id]
     end
 
@@ -83,12 +85,15 @@ def query
       Query.new(self, inflector)
     end
 
-  private
-
+    # @private
     def inflector
       @inflector ||= Inflector.new(@config.inflection_mode, @config.types_mode)
     end
 
+  private
+
+    def changeset_type(changeset); end
+
     def uri_builder
       @uri_builder ||= URIBuilder.new(inflector)
     end
diff --git a/lib/lurch/stored_resource.rb b/lib/lurch/stored_resource.rb
index 80a7b04..3a2fab5 100644
--- a/lib/lurch/stored_resource.rb
+++ b/lib/lurch/stored_resource.rb
@@ -10,7 +10,7 @@ def id
     end
 
     def type
-      @type ||= Inflector.decode_type(@resource_object["type"])
+      @type ||= inflector.decode_type(@resource_object["type"])
     end
 
     def attributes
@@ -39,15 +39,19 @@ def relationship(name)
 
   private
 
+    def inflector
+      @store.inflector
+    end
+
     def fixed_attributes
       @fixed_attributes ||= resource_attributes.each_with_object({}) do |(key, value), hash|
-        hash[Inflector.decode_key(key)] = value
+        hash[inflector.decode_key(key)] = value
       end
     end
 
     def fixed_relationships
       @fixed_relationships ||= resource_relationships.each_with_object({}) do |(key, value), hash|
-        relationship_key = Inflector.decode_key(key)
+        relationship_key = inflector.decode_key(key)
         hash[relationship_key] = Relationship.from_document(@store, relationship_key, value)
       end
     end

From f93b4e20c722bb4038ad435f010e46896b5139db Mon Sep 17 00:00:00 2001
From: Andreas Haller <andreas.haller@invision.de>
Date: Tue, 9 Apr 2019 22:35:36 +0200
Subject: [PATCH 5/6] Use dry-inflector, because inflecto is no longer
 maintained

---
 lib/lurch.rb           |  1 -
 lib/lurch/inflector.rb | 21 +++++++++++++++------
 lurch.gemspec          |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/lurch.rb b/lib/lurch.rb
index 532b4da..df6c980 100644
--- a/lib/lurch.rb
+++ b/lib/lurch.rb
@@ -1,6 +1,5 @@
 require "uri"
 
-require "inflecto"
 require "rack"
 require "faraday"
 require "typhoeus"
diff --git a/lib/lurch/inflector.rb b/lib/lurch/inflector.rb
index 9091a41..b843c8a 100644
--- a/lib/lurch/inflector.rb
+++ b/lib/lurch/inflector.rb
@@ -1,24 +1,29 @@
+# frozen_string_literal: true
+
+require "dry/inflector"
+
 module Lurch
   class Inflector
     def initialize(inflection_mode, types_mode)
+      @inflector = Dry::Inflector.new
       define_encode_key(inflection_mode)
       define_encode_type(types_mode)
     end
 
     def decode_key(key)
-      Inflecto.underscore(key.to_s).to_sym
+      inflector.underscore(key.to_s).to_sym
     end
 
     def decode_type(type)
-      Inflecto.pluralize(decode_key(type)).to_sym
+      inflector.pluralize(decode_key(type)).to_sym
     end
 
     def define_encode_key(inflection_mode)
       case inflection_mode
       when :dasherize
-        define_singleton_method(:encode_key) { |key| Inflecto.dasherize(key.to_s) }
+        define_singleton_method(:encode_key) { |key| inflector.dasherize(key.to_s) }
       when :underscore
-        define_singleton_method(:encode_key) { |key| Inflecto.underscore(key.to_s) }
+        define_singleton_method(:encode_key) { |key| inflector.underscore(key.to_s) }
       else
         raise ArgumentError, "Invalid inflection mode: #{inflection_mode}"
       end
@@ -29,12 +34,12 @@ def define_encode_type(types_mode)
       when :pluralize
         define_singleton_method(:encode_type) do |type|
           key = encode_key(type)
-          Inflecto.pluralize(key)
+          inflector.pluralize(key)
         end
       when :singularize
         define_singleton_method(:encode_type) do |type|
           key = encode_key(type)
-          Inflecto.singularize(key)
+          inflector.singularize(key)
         end
       else
         raise ArgumentError, "Invalid types mode: #{types_mode}"
@@ -52,5 +57,9 @@ def encode_types(hash)
         acc[encode_type(key)] = block_given? ? yield(value) : value
       end
     end
+
+  private
+
+    attr_reader :inflector
   end
 end
diff --git a/lurch.gemspec b/lurch.gemspec
index 6a048ec..1415df2 100644
--- a/lurch.gemspec
+++ b/lurch.gemspec
@@ -13,8 +13,8 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($RS)
   gem.require_paths = ["lib"]
 
+  gem.add_dependency("dry-inflector", "< 1.0")
   gem.add_dependency("faraday", "< 1.0")
-  gem.add_dependency("inflecto", "~> 0.0")
   gem.add_dependency("rack", ">= 1.0")
   gem.add_dependency("typhoeus", "< 2.0")
 

From 7e1143013609b7b045215140966f6cd7d064caec Mon Sep 17 00:00:00 2001
From: Andreas Haller <andreas.haller@invision.de>
Date: Tue, 9 Apr 2019 22:53:20 +0200
Subject: [PATCH 6/6] Add inflection to make test work

Not really sure where to put this
---
 lib/lurch/inflector.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/lurch/inflector.rb b/lib/lurch/inflector.rb
index b843c8a..f5f43d1 100644
--- a/lib/lurch/inflector.rb
+++ b/lib/lurch/inflector.rb
@@ -5,7 +5,9 @@
 module Lurch
   class Inflector
     def initialize(inflection_mode, types_mode)
-      @inflector = Dry::Inflector.new
+      @inflector = Dry::Inflector.new do |inflections|
+        inflections.plural "people", "people"
+      end
       define_encode_key(inflection_mode)
       define_encode_type(types_mode)
     end