coactive 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15dae4695420734d0486669dd7f88d7eeceb8815932dc5f47d37cedf0dd4c61
-  data.tar.gz: cd7f7aae30957f69c76230b8cb97ca846ad4d4c99f6c02045f54b9c866d2ec68
+  metadata.gz: 81adac1b8a25c283b42061c7cea9d08bc4ee06987fe2de6aba8ccee17a40e12d
+  data.tar.gz: ae0509c320a8e32f10dff9820d8c92adc60dee58797c6ba1d6befd206d923781
 SHA512:
-  metadata.gz: eebff4ac3fdb067eb44a59ffc634e4fdda567663e6be2c30923828a311f29a52679ea2aaf3295e17412ee492ef3705c1ff200a0065f5bfee03bbf36a045dd007
-  data.tar.gz: e94206eda575c397edc5686fe012cf7ebd66074fa74b1a4215c733d7462b01099a9e2d537041749a039bcfe079bbf4ade6c71d4c2a249e65fa2849175ed94532
+  metadata.gz: c501671b40e84f6bf4951318db3e77e67eaa5ac7fc2120f03b6038402a9f61d4dd9ae95c4859307902f9dc5bfb0d83f193d04b1bbc8c3a9c7544b56f46c567d4
+  data.tar.gz: 91a4346db771c3b0ddb21c07fcf9892e8580243e80916988159b2b5a11813ea39f50b225dc21bdd74faa2430e38fbf4a1fe6ffb91a2a50d264f6744b261fb50b

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 0.5.1
+
+* Fix max length of inspected string.
+* Fix inspect of nil.
+* Fix inspect of objects with id or attributes.
+
+## 0.5.0
+
+* Simplify inspect of context.
+* Add default priority config.
+
 ## 0.4.1
 
 * Clear registry of coactions when reloaded.

data/gemfiles/rails50.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 5.0.0"
 gem "sqlite3", "~> 1.3.6"
+gem "loofah", "~> 2.19.1"
 
 gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 5.1.0"
 gem "sqlite3", "~> 1.3.6"
+gem "loofah", "~> 2.19.1"
 
 gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 5.2.0"
 gem "sqlite3", "~> 1.3.6"
+gem "loofah", "~> 2.19.1"
 
 gemspec path: "../"

data/lib/coactive/coaction.rb

@@ -3,7 +3,11 @@
 module Coactive
   class Coaction < Struct.new(:coactor, :name, :options)
     def priority
-      options[:priority] || 1 << 63
+      options[:priority]
+    end
+
+    def priority=(val)
+      options[:priority] = val
     end
   end
 end

data/lib/coactive/coactions.rb

@@ -24,7 +24,9 @@ module Coactive
       def coaction(*names, **options)
         base = coactive_config.base_class
         names.each do |name|
-          coactions = Coactions[base, name].to_a + [Coaction.new(self, name, options)]
+          coaction = Coaction.new(self, name, options)
+          coaction.priority ||= coactive_config.default_priority
+          coactions = (Coactions[base, name].to_a + [coaction])
           Coactions[base, name] = coactions.sort_by.with_index { |coaction, i| [coaction.priority, i] }
         end
       end

data/lib/coactive/config.rb

@@ -9,6 +9,7 @@ module Coactive
       use_cache: true,
       lookup_superclass_for_object: true,
       lookup_superclass_until: ['ActiveRecord::Base', 'ActiveModel::Base'],
+      default_priority: 1 << 63
     }
 
     attr_accessor :data

data/lib/coactive/contexts/inspect.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'inspector'
+
 module Coactive
   module Contexts
     module Inspect
@@ -11,27 +13,7 @@ module Coactive
 
       class_methods do
         def inspect(data)
-          data.map { |k, v| "#{k}=#{Coactive::Contexts::Inspect.call(v)}" }.join(', ')
-        end
-      end
-
-      class << self
-        class_attribute :max_num, :max_length
-        self.max_num = 5
-        self.max_length = 300
-
-        def call(data)
-          if data.is_a?(Array)
-            str = data.take(max_num).map { |v| call(v) }.join(', ')
-            str += '...' if data.size > max_num
-            "[#{str}]"
-          elsif data.is_a?(Hash)
-            str = data.take(max_num).map { |k, v| "#{k}: #{call(v)}" }.join(', ')
-            str += '...' if data.size > max_num
-            "{#{str}}"
-          else
-            data.to_s.truncate(max_length)
-          end
+          data.map { |k, v| "#{k}=#{Coactive::Contexts::Inspector.call(v)}" }.join(', ')
         end
       end
     end

data/lib/coactive/contexts/inspector.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Coactive
+  module Contexts
+    module Inspector
+      class << self
+        class_attribute :max_num, :max_length, :basic_classes
+        self.max_num = 3
+        self.max_length = 100
+        self.basic_classes = [Module, Symbol, String, Numeric, TrueClass, FalseClass, NilClass, Regexp]
+
+        def call(data)
+          if data.is_a?(Array)
+            inspect_array(data)
+          elsif data.is_a?(Hash)
+            inspect_hash(data)
+          elsif basic_classes.any? { |klass| data.is_a?(klass) }
+            inspect_basic(data)
+          else
+            inspect_object(data)
+          end
+        end
+
+        private
+
+        def inspect_array(data)
+          str = data.take(max_num).map { |v| call(v) }.join(', ')
+          str += "..." if data.size > max_num
+          "[#{str}]"
+        end
+
+        def inspect_hash(data)
+          str = data.take(max_num).map { |k, v| "#{k}: #{call(v)}" }.join(', ')
+          str += "..." if data.size > max_num
+          "{#{str}}"
+        end
+
+        def inspect_basic(data)
+          inspected = data.inspect
+          if inspected.length > max_length
+            inspected[0..max_length] + '...'
+          else
+            inspected
+          end
+        end
+
+        def inspect_object(data)
+          if data.respond_to?(:id)
+            "#<#{data.class}/#{data.id}>"
+          elsif data.respond_to?(:attributes) && (attributes = data.attributes).is_a?(Hash)
+            "#<#{data.class} #{inspect_hash(attributes)}>"
+          else
+            "#<#{data.class}:#{data.object_id}>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/coactive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coactive
-  VERSION = '0.4.1'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coactive
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,6 +128,7 @@ files:
 - lib/coactive/configure.rb
 - lib/coactive/context.rb
 - lib/coactive/contexts/inspect.rb
+- lib/coactive/contexts/inspector.rb
 - lib/coactive/contextualizer.rb
 - lib/coactive/errors.rb
 - lib/coactive/initializer.rb