rusty_json_schema 0.2.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd6b9fde168fe809a7285e76360ae1a87c55c3e0603d4e4901b76f1b4c101674
-  data.tar.gz: '08b4831a5dff32132d473d17470fc992c4b6a453472366eca4f7b511b84fea2a'
+  metadata.gz: 3bf92f5d1ed9c0186380f1ada17deae759ecfaf396f9f997094b6672df710d33
+  data.tar.gz: 0a7dc445d6b9765794ac4a19c030c862a503e90e679191b6abddfba595fbb092
 SHA512:
-  metadata.gz: 7b45b35d8d14862cf402215993c2075885ad014a2c80a41394bf9959495a4ecb5993d17bb31d479260f83746325e6c1b3527dfaa630af8967a884f4413ef9f5f
-  data.tar.gz: a70e61c95d6f55d66da0848fa4edc0a78dad1fa08da140eca8c2f0af8d0365f51eff7f8ee7dfdb855ffe6de1488b0c1499b0bddf3a357a9e34e89a0c4b414404
+  metadata.gz: f620866be4dc3ec9ba8c0cf544a888034e6352587f212c5bbb7e9589a7bd93055f0073337d9f465e0ba79abe1686745f1abe48cd0a39b4830683014406ddf898
+  data.tar.gz: bf084b4eefbc2f3988894ccf1ef8224c500ebce40373d2737b3fe86715fc4964599634edb7c3d12bd8997ae3b4a31c3a56dba0d2c1c1ef6e1def7227bfda01d7

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "json_schema"
-version = "0.1.0"
+version = "0.6.1"
 authors = ["Leszek Zalewski <leszekzalewski@fastmail.fm>"]
 edition = "2018"
 
@@ -10,5 +10,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 libc = "0.2.81"
-jsonschema = "0.4.3"
+jsonschema = "0.9.0"
 serde_json = "1.0"

data/README.md

@@ -8,6 +8,8 @@ Currently during heavy development.
 
 ## Installation
 
+> **NOTE**: Compilation requires openssl-dev / openssl-devel package
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -45,7 +47,7 @@ To get validation errors
 
 ```ruby
 validator.validate(event_json)
-# => ["invalid...", ...]
+# => ["path \"...\": invalid...", ...]
 ```
 
 ## Development

data/ext/Rakefile

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "thermite/tasks"
+require_relative "../lib/tasks/thermite_dir_patch"
+
+project_dir = File.dirname(File.dirname(__FILE__))
+thermite    = Thermite::Tasks.new(cargo_project_path: project_dir,
+                                  ruby_project_path: project_dir,
+                                  optional_rust_extension: true)
+
+namespace :thermite do # rubocop:disable Metrics/BlockLength
+  desc "Clean up default binaries"
+  task :clean_binnaries do
+    puts "Cleaning up"
+    Dir["#{thermite.config.ruby_extension_path}.*.default"].each do |file|
+      FileUtils.rm(file)
+    end
+  end
+
+  desc "Try to build extension if cargo is available or setup default lib"
+  task :build_or_default do
+    platform = "#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}"
+    default_ext_path = "#{thermite.config.ruby_extension_path}.#{platform}.default"
+
+    if thermite.cargo
+      profile = ENV.fetch("CARGO_PROFILE", "release")
+      thermite.run_cargo_rustc(profile)
+
+      FileUtils.cp(thermite.config.cargo_target_path(profile, thermite.config.cargo_shared_library),
+                   thermite.config.ruby_extension_path)
+    elsif File.exist?(default_ext_path)
+      puts "NOTE: Defaults to pre-build binary #{default_ext_path.inspect} => your mileage may vary."
+
+      FileUtils.mv(default_ext_path,
+                   thermite.config.ruby_extension_path)
+
+      thermite.inform_user_about_cargo
+    else
+      # Prebuild binary is not available for a given platform, install cargo to
+      # compile the gem
+      raise thermite.cargo_required_msg
+    end
+  end
+
+  desc "Cleanup cargo artifacts"
+  task :cargo_clean do
+    thermite.run_cargo_if_exists "clean", *thermite.cargo_manifest_path_args
+  end
+end
+
+task default: %w[thermite:build_or_default thermite:cargo_clean thermite:clean_binnaries]

data/lib/rusty_json_schema/binding.rb

@@ -9,13 +9,7 @@ module RustyJSONSchema
 
     extend FFI::Library
 
-    lib_name =
-      case ::FFI::Platform::LIBSUFFIX
-      when "so", "dylib" then "libjson_schema"
-      when "dll" then "json_schema"
-      end
-
-    ffi_lib File.expand_path("../ext/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}", __dir__)
+    ffi_lib File.expand_path("../../ext/json_schema.so", __dir__)
 
     attach_function :new, :validator_new, [:string], Validator
     attach_function :free, :validator_free, [Validator], :void

data/lib/rusty_json_schema/validator.rb

@@ -17,10 +17,27 @@ module RustyJSONSchema
 
     # Simple validation without actual error messages
     #
+    # ## Examples
+    #
+    #     validator = RustyJSONSchema.build(json_schema)
+    #     validator.valid?(event)
+    #     # => false|true
+    #
     def valid?(event)
       Binding.is_valid(self, RustyJSONSchema.dump(event))
     end
 
+    # Full validation and error messages
+    #
+    # ## Examples
+    #
+    #     validator = RustyJSONSchema.build(json_schema)
+    #     validator.validate(event)
+    #     # => [
+    #     #   'path "/foo": "rusty" is not a "number"',
+    #     #   ...
+    #     # ]
+    #
     def validate(event)
       Binding.validate(self, RustyJSONSchema.dump(event)).to_a
     end

data/lib/rusty_json_schema/version.rb

@@ -2,6 +2,6 @@
 
 module RustyJSONSchema
 
-  VERSION = "0.2.0"
+  VERSION = "0.9.0"
 
 end

data/lib/tasks/thermite_dir_patch.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Update where this option is configurable
+# is not yet released
+module ThermiteDirPatch
+
+  def ruby_extension_path
+    ruby_path("ext", shared_library)
+  end
+
+end
+
+Thermite::Config.prepend(ThermiteDirPatch)

data/rusty_json_schema.gemspec

@@ -2,7 +2,7 @@
 
 require_relative "lib/rusty_json_schema/version"
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name        = "rusty_json_schema"
   spec.version     = RustyJSONSchema::VERSION
   spec.authors     = ["Leszek Zalewski"]
@@ -16,17 +16,29 @@ Gem::Specification.new do |spec|
     Currently during heavy development.
   STR
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
   spec.metadata["homepage_uri"]      = spec.homepage
   spec.metadata["source_code_uri"]   = spec.homepage
   spec.metadata["changelog_uri"]     = "https://github.com/driv3r/rusty_json_schema/blob/main/CHANGELOG.md"
 
-  spec.files = Dir["lib/**/*", "src/**/*.rs", "rusty_json_schema.gemspec", "Cargo.toml", "LICENSE", "README.md"]
+  spec.files = Dir[
+    "lib/**/*",
+    "src/**/*.rs",
+    "rusty_json_schema.gemspec",
+    "Cargo.toml",
+    "LICENSE",
+    "README.md",
+    "ext/Rakefile",
+    "ext/*.default"
+  ]
 
   spec.require_paths = ["lib"]
 
+  spec.extensions << "ext/Rakefile"
+  spec.add_runtime_dependency "thermite", "~> 0"
+
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "ffi", "~> 1.14"
   spec.add_dependency "json", ">= 1.0"

data/src/lib.rs

@@ -42,7 +42,12 @@ impl Validator {
 
         if let Err(validation_errors) = self.schema.validate(event) {
             for error in validation_errors {
-                errors.push(error.to_string());
+                let path = match format!("{}", error.instance_path).as_str() {
+                    "" => "/".to_string(),
+                    p => p.to_string(),
+                };
+
+                errors.push(format!("path \"{}\": {}", path, error));
             }
         }
 
@@ -209,9 +214,9 @@ mod tests {
         let result = unsafe { helper_validate_result_as_vec(raw_result) };
 
         let expectation: Vec<String> = vec![
-            String::from("\'\"rusty\"\' is not of type \'number\'"),
-            String::from("\'1\' is not of type \'string\'"),
-            String::from("\'baz\' is a required property"),
+            String::from("path \"/bar\": \"rusty\" is not of type \"number\""),
+            String::from("path \"/foo\": 1 is not of type \"string\""),
+            String::from("path \"/\": \"baz\" is a required property"),
         ];
 
         assert_eq!(result, expectation);

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rusty_json_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Leszek Zalewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thermite
+  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'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -45,24 +59,22 @@ description: |2
 email:
 - leszekzalewski@fastmail.fm
 executables: []
-extensions: []
+extensions:
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - Cargo.toml
 - README.md
-- lib/ext/json_schema.d
-- lib/ext/json_schema.dll
-- lib/ext/json_schema.dll.exp
-- lib/ext/json_schema.dll.lib
-- lib/ext/json_schema.pdb
-- lib/ext/libjson_schema.d
-- lib/ext/libjson_schema.dylib
-- lib/ext/libjson_schema.so
+- ext/Rakefile
+- ext/json_schema.so.x64-mingw32.default
+- ext/json_schema.so.x86_64-darwin.default
+- ext/json_schema.so.x86_64-linux.default
 - lib/rusty_json_schema.rb
 - lib/rusty_json_schema/binding.rb
 - lib/rusty_json_schema/nodes_array.rb
 - lib/rusty_json_schema/validator.rb
 - lib/rusty_json_schema/version.rb
+- lib/tasks/thermite_dir_patch.rb
 - rusty_json_schema.gemspec
 - src/lib.rs
 homepage: https://github.com/driv3r/rusty_json_schema
@@ -81,15 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: FFI wrapper around jsonschema-rs Rust library.

data/lib/ext/json_schema.d

@@ -1 +0,0 @@
-D:\a\rusty_json_schema\rusty_json_schema\target\x86_64-pc-windows-msvc\release\json_schema.dll: D:\a\rusty_json_schema\rusty_json_schema\src\lib.rs

data/lib/ext/libjson_schema.d

@@ -1 +0,0 @@
-/home/runner/work/rusty_json_schema/rusty_json_schema/target/x86_64-unknown-linux-gnu/release/libjson_schema.so: /home/runner/work/rusty_json_schema/rusty_json_schema/src/lib.rs