strong_json 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ddde917e3030412ba154b0b99ea307e2c50af8ff9ca7b45ba9730e96d6dfff0
-  data.tar.gz: a0fbfc9b8245dae4683236e1c6d5b92c97b5ce30ad4eef628e54bde56539f47c
+  metadata.gz: 34cb280b80e097153297adf6032193ce6479c3facb6aabf8f8bf0794a83030e0
+  data.tar.gz: 12e64c35a8376a275d6cf0e4819c2820d5f5db4fa94b1b294ecba2ccd133fd42
 SHA512:
-  metadata.gz: a2051a77f37d08d171ad355ae97fdd0b46bf42fbaaa771824f3cff3be4e0498e1a3844881036e6877981ae44852eee89347894768e86b28d49a44d73c9c8867c
-  data.tar.gz: 460f595197f2772851bcf4e400ca08bd7410a797cc2161dc39e7f35526211f508b0940ee2733b5ba07d661b43a5ccbd535599debd722e0f5115eaf795c53a5f9
+  metadata.gz: 3258f86f9fe623a016658fc19a8f333a60fb99a9af4a9d55c23087e4bcf3edb137723083921d4f55ed5764dd659e964a0b4afbbf36cf4e9294247bf5a377fdbb
+  data.tar.gz: f52cfe275312e777495d5d5d7d2822aeec61fb5cedcc01573c630ce34c204861072e996bd4ee9c621121cb97a83aed27642ec2bc035df4e4c87d551d35acc449

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.9.0 (2019-3-20)
+
+* [#12](https://github.com/soutaro/strong_json/pull/12): Fix type signature
+
 ## 0.8.0 (2018-10-29)
 
 * Add steep typechecking

data/example/example.rb

@@ -3,7 +3,7 @@ Schema = _ = StrongJSON.new do
 
   let :address, object(address: string, country: symbol?)
   let :email, object(email: string)
-  let :contact, enum(address, email)
+  let :contact, enum?(address, email)
   let :person, object(name: string, contacts: array(contact))
 end
 

data/example/example.rbi

@@ -2,10 +2,10 @@ type address = { address: String, country: Symbol? }
 type email = { email: String }
 
 class AddressSchema < StrongJSON
-  def address: -> StrongJSON::_Schema<address>
-  def email: -> StrongJSON::_Schema<email>
-  def contact: -> StrongJSON::_Schema<email | address>
-  def person: -> StrongJSON::_Schema<{ name: String, contacts: Array<email | address> }>
+  def address: -> StrongJSON::Type::Object<address>
+  def email: -> StrongJSON::Type::Object<email>
+  def contact: -> StrongJSON::Type::Object<email | address>
+  def person: -> StrongJSON::Type::Object<{ name: String, contacts: Array<email | address> }>
 end
 
 Schema: AddressSchema

data/lib/strong_json/types.rb

@@ -1,16 +1,16 @@
 class StrongJSON
   module Types
-    # @type method object: (?Hash<Symbol, ty>) -> _Schema<any>
+    # @type method object: (?Hash<Symbol, ty>) -> Type::Object<any>
     def object(fields = {})
       Type::Object.new(fields)
     end
 
-    # @type method array: (?ty) -> _Schema<any>
+    # @type method array: (?ty) -> Type::Array<any>
     def array(type = any)
       Type::Array.new(type)
     end
 
-    # @type method optional: (?ty) -> _Schema<any>
+    # @type method optional: (?ty) -> Type::Optional<any>
     def optional(type = any)
       Type::Optional.new(type)
     end

data/lib/strong_json/version.rb

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

data/sig/strong_json.rbi

@@ -16,29 +16,29 @@ end
 type StrongJSON::ty = _Schema<any>
 
 module StrongJSON::Types
-  def object: <'x> (Hash<Symbol, ty>) -> _Schema<'x>
-            | () -> _Schema<Hash<Symbol, any>>
-  def object?: <'x> (Hash<Symbol, ty>) -> _Schema<'x | nil>
-  def any: () -> _Schema<any>
-  def optional: <'x> (?_Schema<'x>) -> _Schema<'x | nil>
-              | () -> _Schema<any>
-  def string: () -> _Schema<String>
-  def string?: () -> _Schema<String?>
-  def number: () -> _Schema<Numeric>
-  def number?: () -> _Schema<Numeric?>
-  def numeric: () -> _Schema<Numeric>
-  def numeric?: () -> _Schema<Numeric?>
-  def boolean: () -> _Schema<bool>
-  def boolean?: () -> _Schema<bool?>
-  def symbol: () -> _Schema<Symbol>
-  def symbol?: () -> _Schema<Symbol?>
-  def array: <'x> (_Schema<'x>) -> _Schema<Array<'x>>
-           | () -> _Schema<Array<any>>
-  def array?: <'x> (_Schema<'x>) -> _Schema<Array<'x>?>
-  def literal: <'x> ('x) -> _Schema<'x>
-  def literal?: <'x> ('x) -> _Schema<'x?>
-  def enum: <'x> (*_Schema<any>) -> _Schema<'x>
-  def enum?: <'x> (*_Schema<any>) -> _Schema<'x?>
+  def object: <'x> (Hash<Symbol, ty>) -> Type::Object<'x>
+            | () -> Type::Object<Hash<Symbol, any>>
+  def object?: <'x> (Hash<Symbol, ty>) -> Type::Optional<'x>
+  def any: () -> Type::Base<any>
+  def optional: <'x> (_Schema<'x>) -> Type::Optional<'x>
+              | () -> Type::Optional<any>
+  def string: () -> Type::Base<String>
+  def string?: () -> Type::Optional<String>
+  def number: () -> Type::Base<Numeric>
+  def number?: () -> Type::Optional<Numeric>
+  def numeric: () -> Type::Base<Numeric>
+  def numeric?: () -> Type::Optional<Numeric>
+  def boolean: () -> Type::Base<bool>
+  def boolean?: () -> Type::Optional<bool>
+  def symbol: () -> Type::Base<Symbol>
+  def symbol?: () -> Type::Optional<Symbol>
+  def array: <'x> (_Schema<'x>) -> Type::Array<'x>
+           | () -> Type::Array<any>
+  def array?: <'x> (_Schema<'x>) -> Type::Optional<::Array<'x>>
+  def literal: <'x> ('x) -> Type::Literal<'x>
+  def literal?: <'x> ('x) -> Type::Optional<'x>
+  def enum: <'x> (*_Schema<any>) -> Type::Enum<'x>
+  def enum?: <'x> (*_Schema<any>) -> Type::Optional<'x>
   def ignored: () -> _Schema<nil>
   def prohibited: () -> _Schema<nil>
 end

data/strong_json.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.metadata = { "steep_types" => "sig" }
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", ">= 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "steep", "~> 0.8"
+  spec.add_development_dependency "steep", "~> 0.10"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: strong_json
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 description: Type check JSON objects
 email:
 - matsumoto@soutaro.com