instructor 0.9.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc57cfeb2326c5cf09fab05b02a3c91f6f5749c76bf64ec6b4eafc080d0c83b
-  data.tar.gz: c7a5f435ddd101bc361d8210373972ed8a7e90c804103666f293ab37ec638d5c
+  metadata.gz: 00d64c0d81969735c570992e5467c0f0d39657ac237c324f64c8b5139fc914d1
+  data.tar.gz: 47a9c9cc96860ad4e9fcda15c3c57c0e5e0ba6ed5915590e9e1fcfd996aa50b4
 SHA512:
-  metadata.gz: db7c1efaa9230b6cc5c15f8a5a8a8279a35bba3966606750a1d9854567c5f05200753b36f1cbcceb50f0cf58064a209df881c8f62efc31cdde0ff2e3618c0c98
-  data.tar.gz: 395d726c54ae39b9bd55e887ed84af8b63e59f105924916ce5eb3eacd8a26797fba69f6397cb4e4ca15675e8cee7e99868461bc63f755c8cb6e45aba017c8088
+  metadata.gz: 04640c4f8f7390e0d773b8ba00b9953d83441ed7f53e4517851c3f4db24a421874b4d9ca531a897fffcdd7e595de67c9893c5d1039820bd2b468f5b6a6c6996f
+  data.tar.gz: 90743c22d61f87807a5ee4d799a65bcd6ef1fdce1c417304ebd8060bd006ecfd87056b77e27e54c91f97f308409aeb2ea580c5ca4770571700245dbdaceb1228

data/lib/instructor/base.rb

@@ -6,7 +6,6 @@ require_relative "concerns/attributes"
 require_relative "concerns/arguments"
 require_relative "concerns/options"
 require_relative "concerns/core"
-require_relative "concerns/string"
 
 module Instructor
   class Base
@@ -14,12 +13,12 @@ module Instructor
     include Technologic
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
+    include Tablesalt::StringableObject
     include Instructor::Callbacks
     include Instructor::Defaults
     include Instructor::Attributes
     include Instructor::Arguments
     include Instructor::Options
     include Instructor::Core
-    include Instructor::String
   end
 end

data/lib/instructor/concerns/attributes.rb

@@ -27,5 +27,11 @@ module Instructor
       end
       alias_method :attribute, :define_attribute
     end
+
+    private
+
+    def stringable_attributes
+      self.class._attributes
+    end
   end
 end

data/lib/instructor/version.rb

@@ -2,5 +2,5 @@
 
 module Instructor
   # This constant is managed by spicerack
-  VERSION = "0.9.5"
+  VERSION = "0.10.0"
 end

data/lib/instructor.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require "active_support"
+require "active_support/inflector"
 require "active_model"
 
 require "short_circu_it"
+require "tablesalt"
 require "technologic"
 
 require "instructor/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instructor
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Eric Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,7 +56,6 @@ files:
 - lib/instructor/concerns/core.rb
 - lib/instructor/concerns/defaults.rb
 - lib/instructor/concerns/options.rb
-- lib/instructor/concerns/string.rb
 - lib/instructor/custom_matchers.rb
 - lib/instructor/custom_matchers/define_argument.rb
 - lib/instructor/custom_matchers/define_attribute.rb

data/lib/instructor/concerns/string.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# Formats the Instructor as a string.
-module Instructor
-  module String
-    extend ActiveSupport::Concern
-
-    def to_s
-      string_for(__method__)
-    end
-
-    def inspect
-      string_for(__method__)
-    end
-
-    private
-
-    def stringable_attributes
-      self.class._attributes
-    end
-
-    def string_for(method)
-      "#<#{self.class.name} #{attribute_string(method)}>"
-    end
-
-    def attribute_string(method)
-      stringable_attribute_values.map { |attribute, value| "#{attribute}=#{value.public_send(method)}" }.join(" ")
-    end
-
-    def stringable_attribute_values
-      stringable_attributes.each_with_object({}) { |attribute, result| result[attribute] = safe_send(attribute) }
-    end
-
-    def safe_send(method)
-      public_send(method)
-    rescue StandardError
-      nil
-    end
-  end
-end