ncore 3.8.1 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b92860b930948dd670a333583cd9e20ce4608929eb0c5f968234fe0cace69d3
-  data.tar.gz: 00e9f32713a037614ff36b322600b95338e23957ed165388c69269a4f9c129df
+  metadata.gz: b9823810517052d731b6290cf93b9bd942f25164aed98940860be7c37b7514b5
+  data.tar.gz: 851945716245d8308d5b14a7fc17afb4207ea25f4dff049779ab8e9f2d1a5a3e
 SHA512:
-  metadata.gz: fdaddd93c446f6c57d76d490f742d64683e1218f1c9628b2fb6de984d1fc586911746f9f7ffb126e057ffc5b3d57d896bbea3545d1e99276499743b1b884d95b
-  data.tar.gz: d5af6a87561366c3fc1e92823dd64e281016b8c3b0128edd17998b7ae48879eb590f0b9ca56a6b342baa98784cac7b3aeea8a4418631ae12b0b0f0607ae24eee
+  metadata.gz: 02103dd4eb28433b6311192c37f727e31708a2d5b4ccd2c46888d13a661f6916c906dbd90ad42e03f00592ab6c267fd46d560c69636070a6ee7ddf50c4f4c037
+  data.tar.gz: ee2d1391f5042222d448aebb3ef96f521eb535d3d0e1d23f6bb715bd2cf836f64d6d8a72527d95efd0af05a2881556111000acb5e65082fa8289f605a90ed51d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+#### 3.9.0
+
+- Add inspection filter for attributes
+- Fix generation of query params when values are Hashes
+
 #### 3.8.1
 
 - Add option to disable some_attr?() definition

data/lib/ncore/base.rb

@@ -1,17 +1,20 @@
 module NCore
   module Base
     extend ActiveSupport::Concern
-    
+
     included do
       extend Associations
       include ActiveModel
       include Attributes
       include Client
       include Client::Cache
+      include FilterAttributes
       include Identity
       include Lifecycle
       include Util
       include Wait
+
+      self.filter_attributes = []
     end
 
     module ClassMethods

data/lib/ncore/client.rb

@@ -88,17 +88,26 @@ module NCore
 
       def build_query_string(params)
         if params.any?
-          query_string = params.sort.map do |k,v|
-            if v.is_a?(Array)
+          query_string = params.sort.filter_map do |k,v|
+            case v
+            when Array
               if v.empty?
-                "#{k.to_s}[]="
+                "#{CGI::escape(k.to_s)}[]"
               else
                 v.sort.map do |v2|
-                  "#{k.to_s}[]=#{CGI::escape(v2.to_s)}"
+                  "#{CGI::escape(k.to_s)}[]=#{CGI::escape(v2.to_s)}"
+                end.join('&')
+              end
+            when Hash
+              if v.empty?
+                nil
+              else
+                v.sort.map do |k2, v2|
+                  "#{CGI::escape(k.to_s)}[#{k2}]=#{CGI::escape(v2.to_s)}"
                 end.join('&')
               end
             else
-              "#{k.to_s}=#{CGI::escape(v.to_s)}"
+              "#{CGI::escape(k.to_s)}=#{CGI::escape(v.to_s)}"
             end
           end.join('&')
           "?#{query_string}"

data/lib/ncore/filter_attributes.rb

@@ -0,0 +1,43 @@
+module NCore
+  module FilterAttributes
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def filter_attributes
+        @filter_attributes || superclass.filter_attributes
+      end
+
+      def filter_attributes=(filter_attributes)
+        @inspection_filter = nil
+        @filter_attributes = filter_attributes
+      end
+
+      def inspection_filter
+        if @filter_attributes
+          @inspection_filter ||= ActiveSupport::ParameterFilter.new @filter_attributes
+        else
+          superclass.inspection_filter
+        end
+      end
+
+    end
+
+
+    def inspect
+      base = "#{self.class}:0x#{'%016x'%self.object_id} id: #{id.inspect}"
+      inspect_chain = Thread.current[:inspect_chain] ||= []
+      return "#<#{base}, ...>" if inspect_chain.include? self
+      begin
+        inspect_chain.push self
+        attribs = @attribs.except(:id).each.with_object({}) do |(k,v),h|
+          h[k] = v.nil? ? nil : self.class.inspection_filter.filter_param(k,v)
+        end
+        "#<#{base}, attribs: #{attribs.inspect}, metadata: #{metadata.inspect}>"
+      ensure
+        inspect_chain.pop
+      end
+    end
+
+  end
+end

data/lib/ncore/singleton_base.rb

@@ -7,10 +7,13 @@ module NCore
       include ActiveModel
       include Attributes
       include Client
+      include FilterAttributes
       include Identity
       include Lifecycle
       include Util
       include Wait
+
+      self.filter_attributes = []
     end
 
     module ClassMethods

data/lib/ncore/util.rb

@@ -63,18 +63,5 @@ module NCore
 
     delegate :factory, to: :class
 
-
-    def inspect
-      base = "#{self.class}:0x#{'%016x'%self.object_id} id: #{id.inspect}"
-      @@inspect_chain ||= []
-      return "#<#{base}, ...>" if @@inspect_chain.include? self
-      begin
-        @@inspect_chain.push self
-        "#<#{base}, attribs: #{@attribs.except(:id).inspect}, metadata: #{metadata.inspect}>"
-      ensure
-        @@inspect_chain.pop
-      end
-    end
-
   end
 end

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '3.8.1'
+  VERSION = '3.9.0'
 end

data/lib/ncore.rb

@@ -15,6 +15,7 @@ require 'pp'
   exceptions
   identity
   lifecycle
+  filter_attributes
   util
   wait
   base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.9.0
 platform: ruby
 authors:
 - Notioneer Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -101,6 +101,7 @@ files:
 - lib/ncore/collection.rb
 - lib/ncore/configuration.rb
 - lib/ncore/exceptions.rb
+- lib/ncore/filter_attributes.rb
 - lib/ncore/identity.rb
 - lib/ncore/lifecycle.rb
 - lib/ncore/methods/all.rb