strong_json 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdd0f07ab15fb780a80f1f1aa00ca73cf253d3fd1dc606548c17c3044d53aba8
-  data.tar.gz: 9b6928be45c28fd0f25cefdeccbcdcadd60d9f5cf4dd08641ec1d913928f61a8
+  metadata.gz: 0035c9edc36454dc79ce83f91e948c91c7a10935cc4c7dc1ab3c50113c209100
+  data.tar.gz: b77289a1d16f20e2f29875e5156917f984587ad70f6d9bddd4aa4d7a62f40cb9
 SHA512:
-  metadata.gz: 0e0d57e0a35ade9741f5f2b4b53d86dc56f8175a06da3c12c2d09751c23c0f2696e97f1e9439949ecdf924208eb1d779bc6fc0f8d83b71e19e4799d3fd8b8124
-  data.tar.gz: eecb31e269885a382c90be9ec8988b5b2cfef7c39f5669e1f0d1be90507742259359a4f74cbcadebc4db5817ef2901a375efe2792e58fac00a9d332638690832
+  metadata.gz: d230d14df235f9831ea73287abd9aa6018053ead823a7816bb73516adfc3599e29d727295055ab2439c6342592ebe1331e91a74df775adff8f550524b5be2d41
+  data.tar.gz: ac439273a3b6ef148f2f135b3f3c9820caf25831f8bfaae554971830b1c009d42242a6a614b7786eb2669c551e356eb66823375f2bbecf9f2a372bb9b3154228

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 1.0.1 (2019-05-29)
+
+* Improve enum error reporting
+
 ## 1.0.0 (2019-05-26)
 
 * [#14](https://github.com/soutaro/strong_json/pull/14): Revise error reporting

data/lib/strong_json/error_reporter.rb

@@ -17,6 +17,16 @@ class StrongJSON
 
       format_trace(path: path)
       where = format_aliases(path: path, where: [])
+
+      # @type var ty: Type::Enum<any>
+      if (ty = _ = path.type).is_a?(Type::Enum)
+        ty.types.each do |t|
+          if (a = t.alias)
+            where.push format_single_alias(a, t)
+          end
+        end
+      end
+
       unless where.empty?
         @string << "\nWhere:\n"
         @string << where.map {|x| x.gsub(/^/, "  ") }.join("\n")
@@ -45,15 +55,8 @@ class StrongJSON
     def format_aliases(path:, where:)
       ty = path.type
 
-      if ty.alias
-        # @type const PrettyPrint: any
-        where << PrettyPrint.format do |pp|
-          pp.text(ty.alias.to_s)
-          pp.text(" = ")
-          pp.group do
-            pretty(ty, pp, expand_alias: true)
-          end
-        end
+      if (a = ty.alias)
+        where << format_single_alias(a, ty)
       end
 
       if parent = path.parent
@@ -63,6 +66,17 @@ class StrongJSON
       where
     end
 
+    def format_single_alias(name, type)
+      # @type const PrettyPrint: any
+      PrettyPrint.format do |pp|
+        pp.text(name.to_s)
+        pp.text(" = ")
+        pp.group do
+          pretty(type, pp, expand_alias: true)
+        end
+      end
+    end
+
     def pretty_str(type, expand_alias: false)
       # @type const PrettyPrint: any
       PrettyPrint.singleline_format do |pp|
@@ -121,6 +135,8 @@ class StrongJSON
             end
             pp.breakable ""
           end
+        when Type::Base
+          pp.text type.type.to_s
         else
           pp.text type.to_s
         end

data/lib/strong_json/version.rb

@@ -1,5 +1,5 @@
 class StrongJSON
   # @dynamic initialize, let
   
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/sig/strong_json.rbi

@@ -58,6 +58,7 @@ class StrongJSON::ErrorReporter
   def format: -> void
   def (private) format_trace: (path: Type::ErrorPath, ?index: Integer) -> void
   def (private) format_aliases: (path: Type::ErrorPath, where: ::Array<String>) -> ::Array<String>
+  def (private) format_single_alias: (Symbol, ty) -> String
   def (private) pretty: (ty, any, ?expand_alias: bool) -> void
   def pretty_str: (ty, ?expand_alias: bool) -> ::String
 end

data/spec/json_spec.rb

@@ -145,6 +145,14 @@ Where:
     optional(string)
   )
   rule = { "pattern": pattern, "glob": optional(enum(string, array(string))) }
+  regexp_pattern = {
+    "pattern": string,
+    "multiline": optional(boolean),
+    "case_sensitive": optional(boolean)
+  }
+  token_pattern = { "token": string, "case_sensitive": optional(boolean) }
+  literal_pattern = { "literal": string }
+  string_pattern = string
 MSG
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_json
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler