ka-ching-client 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '096acd110efe41626adbb730494ba86247e0c20614b294ba1bfa4d4dd7d420d9'
-  data.tar.gz: ea47b6fcb5d16b2a42a0a198c4c397eb0ebabc05f6d9755bc3a2fa31793aa982
+  metadata.gz: b266d888ac648db0b7ba10d543b48b7e5a8873195a6982f838c6c0df698b3f10
+  data.tar.gz: '091be55267371bb203f35badd476240281758ab3a165edafefe97d9acbfd9c71'
 SHA512:
-  metadata.gz: 19d9b84a3e2a5c4872fe9fe0ed2746140d9da84afa925f1ef7554d2d048bd087d1032c272030269c01e8d742dfa953597561f503d0d7e50ed0e99ecede67e311
-  data.tar.gz: cb4701e66c2a1e922379a4fec71ec935982d0021dcdb7601b61bec19bbd1ad3217b55f024a01cf4bdd5028d64e9d341b6a705b57dc9a1be9c700d8155fc96489
+  metadata.gz: 8a575168a652675ec36b46793b079f661957cc5b3906260c54bc0d6e3628f8f1c6a0e117c5df0c6bd3132c88e878ddd0aad0b72afe02a29387709311a4fce9a5
+  data.tar.gz: 6ed57b703f09d68b3ddf529cc0db13f3fb672ee6296aafdea99eb180f3906abbc4cf243565bec8eb330c938372c4bbdfdf12688dd182b2dfee0b0d1d0d058820

data/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - 2023-07-11
+
+- [#18](https://github.com/simonneutert/ka-ching-client/pull/18) implements a much simpler json interaction all the way for every endpoint - [@simonneutert](https://github.com/simonneutert).
+
 ## [0.3.0] - 2023-06-27
 
 Matches ka-ching-backend version bump to v0.3.0.

data/Gemfile

@@ -9,11 +9,11 @@ group :development, :test do
   gem 'minitest-vcr', '~> 1.4'
   gem 'pry', '~> 0.14.2'
   gem 'rake', '~> 13.0'
-  gem 'rubocop', '~> 1.53'
+  gem 'rubocop', '~> 1.54'
   gem 'rubocop-minitest', '~> 0.31.0'
   gem 'rubocop-performance', '~> 1.18'
   gem 'solargraph', '~> 0.49.0'
-  gem 'vcr', '~> 6.1'
+  gem 'vcr', '~> 6.2'
   gem 'webmock', '~> 3.18'
   gem 'yard', '~> 0.9.34'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ka-ching-client (0.3.0)
+    ka-ching-client (0.4.0)
       faraday (~> 2.7.4)
       httpx (>= 0.22.4, < 0.25.0)
 
@@ -18,13 +18,13 @@ GEM
       rexml
     diff-lcs (1.5.0)
     e2mmap (0.1.0)
-    faraday (2.7.7)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     http-2-next (0.5.1)
-    httpx (0.24.0)
+    httpx (0.24.1)
       http-2-next (>= 0.4.1)
     jaro_winkler (1.5.6)
     json (2.6.3)
@@ -65,7 +65,7 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rubocop (1.53.1)
+    rubocop (1.54.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -104,7 +104,7 @@ GEM
     thor (1.2.2)
     tilt (2.2.0)
     unicode-display_width (2.4.2)
-    vcr (6.1.0)
+    vcr (6.2.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -122,11 +122,11 @@ DEPENDENCIES
   minitest-vcr (~> 1.4)
   pry (~> 0.14.2)
   rake (~> 13.0)
-  rubocop (~> 1.53)
+  rubocop (~> 1.54)
   rubocop-minitest (~> 0.31.0)
   rubocop-performance (~> 1.18)
   solargraph (~> 0.49.0)
-  vcr (~> 6.1)
+  vcr (~> 6.2)
   webmock (~> 3.18)
   yard (~> 0.9.34)
 

data/README.md

@@ -4,6 +4,10 @@ KaChing::Client is a Ruby API client for the [KaChing Backend project / simonneu
 
 [![Ruby](https://github.com/simonneutert/ka-ching-client/actions/workflows/main.yml/badge.svg)](https://github.com/simonneutert/ka-ching-client/actions/workflows/main.yml)
 
+The client is supposed to work with the corresponding backend version. As long as it is `0.x.y` the minor (x in this case) must match. 
+
+---
+
 - [Installation](#installation)
 - [Usage (API V1)](#usage-api-v1)
   - [Setup the client](#setup-the-client)

data/lib/ka_ching/api_v1/audit_logs.rb

@@ -29,7 +29,7 @@ module KaChing
                   { year: year })
 
         yield res if block_given?
-        parse_bookings(JSON.parse(res.body))['audit_logs']
+        JSON.parse(res.body)['audit_logs']
       end
 
       #
@@ -46,7 +46,7 @@ module KaChing
         res = get(build_url(tenant_account_id: tenant_account_id),
                   { year: year, month: month })
         yield res if block_given?
-        parse_bookings(JSON.parse(res.body))['audit_logs']
+        JSON.parse(res.body)['audit_logs']
       end
 
       #
@@ -64,31 +64,11 @@ module KaChing
         res = get(build_url(tenant_account_id: tenant_account_id),
                   { year: year, month: month, day: day })
         yield res if block_given?
-        parse_bookings(JSON.parse(res.body))['audit_logs']
+        JSON.parse(res.body)['audit_logs']
       end
 
       private
 
-      def parse_bookings(audit_log_json)
-        audit_log_json['audit_logs'].map! do |audit_log|
-          parse_booking(audit_log, 'environment_snapshot')
-          parse_booking(audit_log, 'log_entry')
-          audit_log
-        end
-        audit_log_json
-      end
-
-      def parse_booking(audit_log, bookings_key)
-        audit_log[bookings_key] = JSON.parse(audit_log[bookings_key])
-        audit_log[bookings_key]['context'] = JSON.parse(JSON.parse(audit_log[bookings_key]['context']))
-        audit_log[bookings_key]['bookings'] = JSON.parse(audit_log[bookings_key]['bookings_json'])
-        audit_log[bookings_key]['bookings'].map! do |b|
-          b['context'] = JSON.parse(b['context'])
-          b
-        end
-        audit_log
-      end
-
       #
       # build the url for the bookings endpoint
       #

data/lib/ka_ching/api_v1/lockings.rb

@@ -47,10 +47,7 @@ module KaChing
           req.body = locking.to_json
         end
         yield res if block_given?
-        res = JSON.parse(res.body)
-        res['record']['bookings_json'] = JSON.parse(res['record']['bookings_json'])
-        res['context'] = JSON.parse(JSON.parse(res['context']))
-        res
+        JSON.parse(res.body)
       end
 
       #
@@ -64,10 +61,7 @@ module KaChing
           req.headers['Content-Type'] = 'application/json'
         end
         yield res if block_given?
-        res = JSON.parse(res.body)
-        res['bookings_json'] = JSON.parse(res['bookings_json'])
-        res['context'] = JSON.parse(JSON.parse(res['context']))
-        res
+        JSON.parse(res.body)
       end
 
       def all(tenant_account_id:, page: 1, per_page: 10)

data/lib/ka_ching/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KaChing
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ka-ching-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Simon Neutert
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: This gem is a client for the ka-ching API.