idcf-json_hyper_schema 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd49fb93bcdb6b81071e58dd5ebebb6587941db
-  data.tar.gz: b118944ec52abfc512b2485cd09cc0dc6e555d92
+  metadata.gz: cf6fd0e7a80ec0ef552e19bccec568431e293887
+  data.tar.gz: 0881a485385f89b213f7491e6485f6f1a7bae38a
 SHA512:
-  metadata.gz: 65a81b483dd7ba5850af10409de7e642b41b0c46218fe30caffe171cb9fb7b645c0ea3d04e723250bcfa0b87ef2027be6d2b53407ccc1cec636dd3d70730e937
-  data.tar.gz: 509d639623c599763209b9690b5dd8436f8aa935841e286c05d050d3ba9f522142ad118d71f5056eed4465477c54a0fe70d9fd137142ee13cf11c0972981a824
+  metadata.gz: a82bc9a88edb0460e2bb77b3a017dea8628db49497caf0fe6e5a96cb40b585951f440eca62b76d5e8e82bf191aef97ceb2563739c9ff58a10e75aad2437c69fd
+  data.tar.gz: 0374d508d3728696cb5464b3ed7a49135b43f328c04dc92e4de51111518215e47a05b36b695598549b81b8e57533678adbcdc5688f1c7c4dd9fb0005f3a4bf8d

data/.codeclimate.yml

@@ -14,6 +14,10 @@ engines:
 ratings:
   paths:
     - "**.rb"
+checks:
+  method-complexity:
+    config:
+      threshold: 10
 exclude_paths:
   - vendor/bundle
   - .idea

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.rubocop.yml

@@ -26,3 +26,5 @@ Style/ClassLength:
   Max: 150
 Style/MethodLength:
   Max: 15
+Style/FormatStringToken:
+  Enabled: false

data/README.md

@@ -63,7 +63,7 @@ require 'idcf/json_hyper_schema'
 
 path    = File.expand_path('./sample.json')
 analyst = Idcf::JsonHyperSchema::Analyst.new.load(path)
-p analyst.links(j)
+p analyst.links
 ```
 
 or

data/idcf-json_hyper_schema.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'idcf/json_hyper_schema/version'

data/lib/idcf/json_hyper_schema/analyst.rb

@@ -1,9 +1,19 @@
+require 'json_schema'
+require 'idcf/json_hyper_schema/validation'
 module Idcf
   module JsonHyperSchema
     # json-hyper-schema analyst
     class Analyst
       attr_reader :process_version, :schema, :load_schema
 
+      def json_schema_init
+        configuration = JsonSchema.configuration
+        Idcf::JsonHyperSchema::Validation.validations.each do |key, val|
+          configuration.register_format(key, val)
+        end
+        self
+      end
+
       # json file laod
       #
       # @param path [String]
@@ -40,6 +50,7 @@ module Idcf
       #
       # @return Expands::LinkInfoBase
       def links
+        json_schema_init
         p_schema         = JsonSchema.parse!(@load_schema)
         @process_version = schema_version(p_schema)
         p_schema.expand_references!
@@ -53,8 +64,9 @@ module Idcf
       # @return Expands::LinkInfoBase
       def schema_links(schema, options = {})
         ex_schema = expand(schema, options)
-        p_schema  = JsonSchema.parse!(ex_schema.schema)
-        t_v       = @process_version
+        json_schema_init
+        p_schema = JsonSchema.parse!(ex_schema.schema)
+        t_v      = @process_version
         p_schema.expand_references!
         result           = find_links(p_schema)
         @process_version = t_v
@@ -95,7 +107,7 @@ module Idcf
             result << link_obj
           end
 
-          schema.properties.each do |_, sub|
+          schema.properties.each_value do |sub|
             result.concat(find_links(sub))
           end
         end

data/lib/idcf/json_hyper_schema/expands/base.rb

@@ -55,7 +55,7 @@ module Idcf
         def make_ids(schema)
           {}.tap do |result|
             next if schema['definitions'].nil?
-            schema['definitions'].each do |_k, v|
+            schema['definitions'].each_value do |v|
               result[v['id']] = v.deep_dup unless v['id'].nil?
               result.merge!(search_child_ids(v))
             end
@@ -63,14 +63,15 @@ module Idcf
         end
 
         def search_child_ids(child)
-          {}.tap do |result|
-            next unless child.class == Hash
-            child.each do |_k, v|
-              next unless v.class == Hash
-              result[v['id']] = v.deep_dup unless v['id'].nil?
-              result.merge!(search_child_ids(v))
-            end
+          result = {}
+          return result unless child.class == Hash
+          child.each_value do |v|
+            next unless v.class == Hash
+            id = v['id']
+            result[id] = v.deep_dup unless id.nil?
+            result.merge!(search_child_ids(v))
           end
+          result
         end
 
         def delete_id(data)
@@ -95,7 +96,8 @@ module Idcf
         end
 
         def exp_hash(schema)
-          schema.keys.each do |k|
+          list = schema.keys
+          list.each do |k|
             exp = expansion(k, schema[k])
             if k == '$ref' && exp.class == Hash
               schema.delete(k)

data/lib/idcf/json_hyper_schema/expands/link_info_base.rb

@@ -132,10 +132,10 @@ module Idcf
             param = args.deep_dup
             next unless param.class == Hash
             param = param.stringify_keys
-            make_query_params(args).each do |qk, _qv|
+            make_query_params(args).each_key do |qk|
               param.delete(qk)
             end
-            properties.each do |pk, _pv|
+            properties.each_key do |pk|
               result[pk] = param[pk] if param.key?(pk)
             end
           end

data/lib/idcf/json_hyper_schema/validation.rb

@@ -0,0 +1,50 @@
+require 'json_schema'
+module Idcf
+  module JsonHyperSchema
+    # json-hyper-schema validation
+    class Validation
+      class << self
+        attr_reader :add_validation
+
+        def reset_format
+          @add_validation = {}
+          self
+        end
+
+        def register_format(name, validator_proc)
+          @add_validation ||= {}
+          @add_validation[name] = validator_proc
+          self
+        end
+
+        def validations
+          @add_validation ||= {}
+          custom_validations.merge(@add_validation)
+        end
+
+        protected
+
+        def custom_validations
+          {
+            'ipv4_cidr' => lambda do |data|
+              ip_check(data, JsonSchema::Validator::IPV4_PATTERN)
+            end,
+            'ipv6_cidr' => lambda do |data|
+              ip_check(data, JsonSchema::Validator::IPV6_PATTERN)
+            end,
+            'integer' => lambda do |data|
+              data =~ /^[0-9]+$/
+            end
+          }
+        end
+
+        def ip_check(data, pattern)
+          list = data.split('/')
+          return false unless list.size == 2
+          return false unless list[0] =~ pattern
+          list[1] =~ /^[0-9]*$/
+        end
+      end
+    end
+  end
+end

data/lib/idcf/json_hyper_schema/version.rb

@@ -1,5 +1,5 @@
 module Idcf
   module JsonHyperSchema
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idcf-json_hyper_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - IDC Frontier Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,7 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -128,6 +129,7 @@ files:
 - lib/idcf/json_hyper_schema/expands/link_info_base.rb
 - lib/idcf/json_hyper_schema/expands/link_info_v4.rb
 - lib/idcf/json_hyper_schema/expands/v4.rb
+- lib/idcf/json_hyper_schema/validation.rb
 - lib/idcf/json_hyper_schema/version.rb
 homepage: https://www.idcfcloud.jp
 licenses:
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: IDCF Json-Hyper-Schema Expand tools