legion-json 0.1.6 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 236669914165ef4e3fa7edc658a131d8f14631918bedc253fba65a67e19ed461
-  data.tar.gz: 48c3deff9ec21b3d84b50469b5301f40c0a4d17229455207c0f7c559573010ed
+  metadata.gz: '0618ae5248d63f45f70ef35a7b1d2825fcfb88e4a0f8951ed5cd3f8c56c2e48a'
+  data.tar.gz: 28788a943771782f54a0d01ebd59f54b8e9a9abb9645d03f49db8dcdfa6a8362
 SHA512:
-  metadata.gz: 318bdc474652693e9a86bf85c76bbe2581b1bee680f3ccf65683f7639c756979fc4c909b536fb5bcc625d013fd247416a822cdb05eb1b19dd88d24bd4db933a6
-  data.tar.gz: e8a8ff464ac97be89a585402d4dd16f5e377b3767958554394d44d7cd44564636b13e4f9492cb53949a06c4bd1dc831154cb69ef50e1a67cc40d9d8ef5db381f
+  metadata.gz: da75e65198e0647f210b440351bca2aae57bffac00b19cde1feeb2b710d6066d81bbcf8acbae6047dffab02ef0c143138cd34f8e10587e0c57a187360bb213fc
+  data.tar.gz: e7c9c1753cc0534dc2a874bfd02065ad9f6ead1919a25abd467eb12673864f46e01860ba55f5c7c8a72f7fdeb88e55778590daf635eb9d7cd8cdce7bfa5d2e6f

data/.circleci/config.yml

@@ -1,49 +1,90 @@
 version: 2.1
 orbs:
-  ruby: circleci/ruby@0.2.1
+  ruby: circleci/ruby@1.1.2
+  sonarcloud: sonarsource/sonarcloud@1.0.2
 
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: cimg/ruby:2.7
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - run:
-          name: Run Rubocop
-          command: bundle exec rubocop
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - run: bundle exec rubocop --format=json --out=rubocop-result.json
+      - store_test_results:
+          path: rubocop-result.json
+      - sonarcloud/scan
+      - run: bundle exec rubocop
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
   "ruby-two-five":
     docker:
-      - image: circleci/ruby:2.5
-      - image: memcached:1.5-alpine
+      - image: cimg/ruby:2.5
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
   "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.6
-      - image: memcached:1.5-alpine
+      - image: cimg/ruby:2.6
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
   "ruby-two-seven":
     docker:
       - image: circleci/ruby:2.7
-      - image: memcached:1.5-alpine
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
+  "ruby-three":
+    docker:
+      - image: circleci/ruby:3
+    steps:
+      - checkout
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
 
 workflows:
   version: 2
@@ -57,5 +98,8 @@ workflows:
           requires:
             - ruby-two-five
       - ruby-two-seven:
+          requires:
+            - ruby-two-five
+      - ruby-three:
           requires:
             - ruby-two-five

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -9,6 +8,8 @@
 /tmp/
 /rspec/
 /test-results/
+/.scannerwork
+rubocop-result.json
 *.gem
 *.pem
 

data/.rubocop.yml

@@ -1,4 +1,3 @@
-require: rubocop-performance
 Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
@@ -9,6 +8,8 @@ Metrics/BlockLength:
   Max: 50
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
+Style/OptionalBooleanParameter:
+  Enabled: false
 Style/SymbolArray:
   Enabled: true
 Layout/HashAlignment:
@@ -18,6 +19,7 @@ Style/Documentation:
   Enabled: false
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in legion-json.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,77 @@
+PATH
+  remote: .
+  specs:
+    legion-json (1.1.4)
+      json_pure
+      legion-exceptions (>= 1.1.5)
+      multi_json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.1)
+    diff-lcs (1.4.4)
+    docile (1.3.4)
+    json (2.5.1)
+    json_pure (2.5.1)
+    legion-exceptions (1.1.5)
+    multi_json (1.15.0)
+    oj (3.10.18)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (1.8.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    simplecov_json_formatter (0.1.2)
+    unicode-display_width (2.0.0)
+
+PLATFORMS
+  x86_64-darwin-18
+
+DEPENDENCIES
+  bundler (>= 2)
+  legion-json!
+  oj
+  rake
+  rspec
+  rspec_junit_formatter
+  rubocop
+  simplecov (< 0.18.0)
+  simplecov_json_formatter
+
+BUNDLED WITH
+   2.2.4

data/README.md

@@ -1,42 +1,13 @@
 # Legion::Json
 
-Legion::Json is part of the Legion Framework
-
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'legion-json'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install legion-json
+Legion::Json is part of the Legion Framework  
+[Issue Tracker - Jira](https://legionio.atlassian.net/projects/JSON/issues)  
+[Docs - Confluence](https://legionio.atlassian.net/wiki/spaces/LEGION/pages/24674324)  
+[RubyGems](https://rubygems.org/gems/legion-json)
 
 ## Usage
-
 This library provides the Legion JSON parser abstraction, enabling the use of platform specific JSON parsers.
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec install`. 
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://bitbucket.org/legion-io/legion-json/issues This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Based on the old sensu-json gem
 
 ## License
-
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
-## Credit
-
-This gem was based on the Sensu JSON gem. You can find the original gem [here](https://github.com/sensu/sensu-json)

data/bitbucket-pipelines.yml

@@ -1,26 +1,17 @@
-image: ruby:2.4.0
+image: ruby:2.7
 
 pipelines:
   tags:
-    '*':
+    "v*":
       - step:
-          name: Deploy to Rubygems JRuby
-          image: jruby:9.2
-          deployment: staging
+          name: Push to RubyGems
+          deployment: RubyGems
           script:
-            - bash .circleci/setup-rubygems.sh
-            - jruby -S gem install bundler bundle git
-            - jruby -S bundle update
-            - jruby -S gem build legion-json.gemspec
-            - jruby -S gem push "legion-json-java-$(git describe --tags).gem"
-      - step:
-          name: Deploy to Rubygems MRI
-          image: ruby:2.4.0
-          deployment: production
-          script:
-            - bash .circleci/setup-rubygems.sh
-            - gem build legion-json.gemspec
-            - gem push "legion-json-$(git describe --tags).gem"
+            - gem install gem-release
+            - (umask  077 ; echo $gem_creds | base64 --decode > ~/.gem/credentials)
+            - gem release
+          artifacts:
+            - pkg/**
 definitions:
   caches:
-    bundler: vendor/bundle
+    bundler: /usr/local/bundle

data/legion-json.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'legion/json/version'
 
 Gem::Specification.new do |spec|
-  spec.name = (RUBY_ENGINE == 'jruby' ? 'legion-json-java' : 'legion-json')
+  spec.name = 'legion-json'
   spec.version       = Legion::Json::VERSION
   spec.authors       = ['Esity']
   spec.email         = ['matthewdiverson@gmail.com']
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'A gem used to load and use JSON objects inside the Legion framework'
   spec.homepage      = 'https://bitbucket.org/legion-io/legion-json'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '~> 2.5'
+  spec.required_ruby_version = '>= 2.5'
   spec.metadata = {
     'bug_tracker_uri'   => 'https://legionio.atlassian.net/projects/JSON/issues',
     'changelog_uri'     => 'https://legionio.atlassian.net/wiki/spaces/LEGION/pages/24674324/JSON',
@@ -25,21 +25,18 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'codecov', '~> 0'
+  spec.add_development_dependency 'bundler', '>= 2'
+  spec.add_development_dependency 'oj' unless RUBY_ENGINE == 'jruby'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_dependency 'json', '~> 2.1'
-  if RUBY_ENGINE == 'jruby'
-    spec.add_dependency('jrjackson', '~> 0.4')
-  else
-    spec.add_dependency('oj', '~> 3')
-  end
+  spec.add_development_dependency 'simplecov', '< 0.18.0'
+  spec.add_development_dependency 'simplecov_json_formatter'
+
+  spec.add_dependency 'json_pure'
+  spec.add_dependency 'legion-exceptions', '>= 1.1.5'
+  spec.add_dependency 'multi_json'
 end

data/lib/legion/json.rb

@@ -1,48 +1,23 @@
 require 'legion/json/version'
 require 'legion/json/parse_error'
+require 'multi_json'
 
 module Legion
-  # Used to create JSON objects
   module JSON
     class << self
-      # Set up the JSON parser. This method must be called before any
-      # attempt to use the parser. This method is currently called at
-      # the bottom of this file. The appropriate JSON parser will be
-      # loaded for the current platform.
-      #
-      # @return [Object] parser.
-      def setup!
-        if RUBY_ENGINE == 'jruby'
-          require 'jrjackson'
-          require 'legion/json/jrjackson'
-          @parser = Legion::JSON::JrJackson.new
-        else
-          require 'oj'
-          Oj.default_options = { mode: :compat }
-          require 'legion/json/oj'
-          @parser = Legion::JSON::Oj.new
-        end
+      def parser
+        @parser ||= MultiJson
       end
 
-      # Load (and parse) a JSON string.
-      #
-      # @param string [String]
-      # @return [Object]
-      def load(string)
-        @parser.load(string)
+      def load(string, symbolize_keys = true)
+        parser.load(string, symbolize_keys: symbolize_keys)
       rescue StandardError => e
         raise Legion::JSON::ParseError.build(e, string)
       end
 
-      # Dump (generate) a JSON string from a Ruby object.
-      #
-      # @param object [Object]
-      # @param options [Hash]
-      def dump(object, options = {})
-        @parser.dump(object, options)
+      def dump(object, pretty = false)
+        parser.dump(object, pretty: pretty)
       end
     end
   end
 end
-
-Legion::JSON.setup!

data/lib/legion/json/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Json
-    VERSION = '0.1.6'.freeze
+    VERSION = '1.1.4'.freeze
   end
 end

data/sonar-project.properties

@@ -0,0 +1,11 @@
+sonar.projectKey=legion-io_legion-json
+sonar.organization=legion-io
+sonar.sources=.
+sonar.exclusions=vendor/**
+sonar.coverage.exclusions=spec/**
+sonar.ruby.coverage.reportPath=coverage/.resultset.json
+sonar.ruby.file.suffixes=rb,ruby
+sonar.ruby.coverage.framework=RSpec
+sonar.ruby.rubocopConfig=.rubocop.yml
+sonar.ruby.rubocop.reportPath=rubocop-result.json
+sonar.ruby.rubocop.filePath=.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-json
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.1.4
 platform: ruby
 authors:
 - Esity
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+- !ruby/object:Gem::Dependency
+  name: simplecov_json_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,33 +123,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: legion-exceptions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 1.1.5
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem used to load and use JSON objects inside the Legion framework
 email:
 - matthewdiverson@gmail.com
@@ -144,23 +172,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
-- ".circleci/setup-rubygems.sh"
 - ".gitignore"
 - ".rubocop.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bitbucket-pipelines.yml
 - codecov.yml
 - legion-json.gemspec
 - lib/legion/json.rb
-- lib/legion/json/jrjackson.rb
-- lib/legion/json/oj.rb
 - lib/legion/json/parse_error.rb
 - lib/legion/json/version.rb
+- sonar-project.properties
 homepage: https://bitbucket.org/legion-io/legion-json
 licenses:
 - MIT
@@ -177,7 +202,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -186,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Legion JSON

data/.circleci/setup-rubygems.sh

@@ -1,2 +0,0 @@
-echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
-chmod 0600 ~/.gem/credentials

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'legion/json'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/legion/json/jrjackson.rb

@@ -1,14 +0,0 @@
-module Legion
-  module JSON
-    # The Legion JSON parser when running on JRuby.
-    class JrJackson
-      def load(string)
-        ::JrJackson::Json.load(string, symbolize_keys: true, raw: true)
-      end
-
-      def dump(object, options = {})
-        ::JrJackson::Json.dump(object, options)
-      end
-    end
-  end
-end

data/lib/legion/json/oj.rb

@@ -1,15 +0,0 @@
-module Legion
-  module JSON
-    # The Legion JSON parser when running on MRI.
-    class Oj
-      def load(string)
-        ::Oj.load(string, symbol_keys: true)
-      end
-
-      def dump(object, options = {})
-        options[:indent] = 2 if options[:pretty]
-        ::Oj.dump(object, options)
-      end
-    end
-  end
-end