ncore 3.14.0 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82327b8c22a9db2b69dfca2505b658b9a01d5a880cd21a7db9d11c1031d001e7
-  data.tar.gz: abf4f4eef8f9e3bdebbce6e987507ca3adc31d4bb31ffae63d46b5466c417505
+  metadata.gz: ac9447e7da05e0e5822bc1f853d60054fdcbf4ed383c7faa5e3454a791ea7b9a
+  data.tar.gz: 253422e826a1009929f1d8fe565aaeb9e9f36d142125b258dbe7523cb1aea6bb
 SHA512:
-  metadata.gz: de4443f42157acf82e2ea6ca3741ecb6c09ce61a6585cb36f4c84d7898346a9cbf4acdd35303923b8f69cc7cf110931d5e2cf4f26cb4f01f6fd0218ed76bc331
-  data.tar.gz: bbaa72e2993e5f56367f6aeff83825f7f7b0c852d8bac70fc275a4ed86dd02c52a07ea09395e28db44bdc82efee02185d66e56de879b203f1884f9934edcf9e9
+  metadata.gz: 0416aa8b47c956fa4f982aee4071c5ef3ecf64d08fb0916b234d051bacf2d6c13f882a396b2bd75c0b502debc0ea36248fa8bacb80580ab95366112a132a8751
+  data.tar.gz: 8a43de4843cd2363a1b250b1b89486de0b422aa0aa12cbc3746a775d8145d0cf25f504628fa761fedae76de451eef6a902f70747ceb7a79e0bae531a14381c0d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 3.15.0
+
+- Make JSON parsing and generation more consistent by using JSON::Coder
+- Remove MultiJson
+- Make attr_decimal use BigDecimal and attr_money use BigMoney
+
 #### 3.14.0
 
 - Resources: add #to_s

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014-2025 Notioneer, Inc.
+Copyright 2014-2026 Notioneer, Inc.
 
 MIT License
 

data/README.md

@@ -5,9 +5,6 @@ client by itself, but provides several useful building blocks to build one.
 
 It relies on `excon` for HTTP handling and `activemodel`.
 
-If present, uses `multi_json`. Otherwise, the stdlib 'json' is used.
-'multi_json' with an accelerated json gem is recommended.
-
 See `example/` for the beginning of an actual api client.
 
 

data/lib/ncore/attributes.rb

@@ -48,9 +48,29 @@ module NCore
       end
 
       # attr_decimal(:amount, ...)
-      #   adds: obj.amount  => BigMoney if String, else raw json type
+      #   adds: obj.amount  => BigDecimal if String, else raw json type
       #         obj.amount? => bool
       def attr_decimal(*attrs, predicate: true)
+        attrs.each do |attr|
+          check_existing_method(attr)
+          class_eval <<-AD, __FILE__, __LINE__+1
+            def #{attr}
+              case self[:#{attr}]
+              when String
+                BigDecimal(self[:#{attr}])
+              else
+                self[:#{attr}]
+              end
+            end
+          AD
+          attr_boolean :"#{attr}?" if predicate
+        end
+      end
+
+      # attr_money(:amount, ...)
+      #   adds: obj.amount  => BigMoney if String or BigDecimal, else raw json type
+      #         obj.amount? => bool
+      def attr_money(*attrs, predicate: true)
         attrs.each do |attr|
           check_existing_method(attr)
           class_eval <<-AD, __FILE__, __LINE__+1
@@ -58,6 +78,8 @@ module NCore
               case self[:#{attr}]
               when String
                 BigMoney.new(self[:#{attr}])
+              when BigDecimal
+                BigMoney.new(self[:#{attr}].to_s)
               else
                 self[:#{attr}]
               end

data/lib/ncore/client.rb

@@ -31,11 +31,7 @@ module NCore
           path += qs
           payload = nil
         else
-          if defined? MultiJson
-            payload = MultiJson.encode params.as_json
-          else
-            payload = params.to_json
-          end
+          payload = json_coder.generate params
         end
 
         rest_opts = {
@@ -252,22 +248,40 @@ module NCore
         response
       end
 
+
+      def json_opts
+        { allow_duplicate_key: false,
+          create_additions:    false,
+          decimal_class:       BigDecimal,
+          symbolize_names:     false,
+        }
+      end
+
+      def json_coder
+        @json_coder ||= ::JSON::Coder.new(json_opts) do |value, is_key|
+          case value
+          when BigDecimal
+            ::JSON::Fragment.new value.to_s
+          when DateTime, Time
+            value.iso8601(3)
+          else
+            if is_key
+              value.as_json.to_s
+            else
+              value.as_json
+            end
+          end
+        end
+      end
+
       def parse_response(response)
         if response.body.blank?
           json = {}
         else
-          if defined? MultiJson
-            begin
-              json = MultiJson.load(response.body, symbolize_keys: false) || {}
-            rescue MultiJson::ParseError
-              raise module_parent::Error, "Unable to parse API response; HTTP status: #{response.status}; body: #{response.body.inspect}"
-            end
-          else
-            begin
-              json = JSON.parse(response.body, symbolize_names: false) || {}
-            rescue JSON::ParserError
-              raise module_parent::Error, "Unable to parse API response; HTTP status: #{response.status}; body: #{response.body.inspect}"
-            end
+          begin
+            json = json_coder.parse response.body
+          rescue JSON::ParserError
+            raise module_parent::Error, "Unable to parse API response; HTTP status: #{response.status}; body: #{response.body.inspect}"
           end
         end
         json = json.with_indifferent_access
@@ -339,11 +353,7 @@ module NCore
       def debug_response(response)
         return unless logger.debug?
         headers = response.headers.transform_keys(&:downcase)
-        if defined? MultiJson
-          json = MultiJson.load(response.body||'', symbolize_keys: false) rescue response.body
-        else
-          json = JSON.parse(response.body||'', symbolize_names: false) rescue response.body
-        end
+        json = json_coder.parse(response.body) rescue response.body
         logger << <<~DBG
           RESPONSE:
             #{response.status} | #{headers['content-type']} | #{response.body.size} bytes

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '3.14.0'
+  VERSION = '3.15.0'
 end

data/ncore.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activemodel', '>= 5.2', '< 8.2'
   spec.add_dependency 'excon', '< 2'
+  spec.add_dependency 'json', '>= 2.17'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Notioneer Team
@@ -43,6 +43,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement