rtype-native 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5d14f3ae8593646d772106c340e8d41b594c4f
-  data.tar.gz: ec5849c75b6a42d8c30dfe41bf2eb48a0fe54bb5
+  metadata.gz: 7628a99152b791414bf7a6651d3fec5229718c2c
+  data.tar.gz: 1fe92f38dc1995a88342ce8d9a80c7dca9de5a6d
 SHA512:
-  metadata.gz: fddff4c61beacc969280f481972b339231b20dcc617f6c7f941d76b7b4c92d2baa70b2b20d5357ea0ff653abe2c6961e002dac0b2b8321be2a7efc3f31a70cc5
-  data.tar.gz: 23f5bc94ee53094bdeef9ea2f98073086bc9ac08a1f63d4d27b77e152acfdc267fc92b130d97a9da722fc560f1a854008e67ff61e9133311597af922123aa19e
+  metadata.gz: 9ecde7d0cebc9796d8e29845f341fe8f913d1e1cd3a424741c7b8c35ab16083a305a5b7c695e3a70d5da9606f552825e7a6cc110bed4553f6c20746a6d958e74
+  data.tar.gz: c06b26503bd67776e2592d2bc956ae9a83879b04d81bee393312433f7c66d7219f2c469cc9230cb572053e744f086fb06a63dbf43516a12095da734d4829595c

data/README.md

@@ -31,7 +31,10 @@ Test::invert(state: 0)
 
 ## Requirements
 - Ruby >= 2.1
-- MRI or RBX if native extension is used. Rtype itself without it is pure-ruby gem, therefore you can use Rtype in JRuby, etc.
+- MRI or RBX
+  - If C native extension is used, otherwise it is not required
+- JRuby
+  - If Java extension is used, otherwise it is not required
 
 ## Features
 - Provide type checking for argument and return
@@ -49,12 +52,29 @@ require 'rtype'
 ```
 
 ### Native extension
-Rtype itself is pure-ruby gem. but you can make it more faster by native extension.
+Rtype itself is pure-ruby gem. but you can make it more faster by using native extension.
 
-Just run `gem install rtype-native` or add `gem 'rtype-native'` to your `Gemfile`, then Rtype use it.
-(Do not `require 'rtype-native'`)
+#### Native extension for MRI, RBX
+Just run
+```ruby
+gem install rtype-native
+```
+or add to your `Gemfile`:
+```ruby
+gem 'rtype-native'
+```
+then, Rtype use it. (Do not `require 'rtype-native'`)
 
-It is only for MRI or RBX. JRuby extension not supported yet.
+#### Java extension for JRuby
+Just run
+```ruby
+gem install rtype-java
+```
+or add to your `Gemfile`:
+```ruby
+gem 'rtype-java'
+```
+then, Rtype use it. (Do not `require 'rtype-java'`)
 
 ## Usage
 
@@ -370,68 +390,70 @@ Result of `rake benchmark` ([source](https://github.com/sputnikgugja/rtype/tree/
 
 ### MRI
 ```
+Rtype with C native extension
 Ruby version: 2.1.7
 Ruby engine: ruby
 Ruby description: ruby 2.1.7p400 (2015-08-18 revision 51632) [x64-mingw32]
-Rtype version: 0.2.0
+Rtype version: 0.3.0
 Rubype version: 0.3.1
 Sig version: 1.0.1
 Contracts version: 0.13.0
 Typecheck version: 0.1.2
 Warming up --------------------------------------
-                pure    85.600k i/100ms
-               rtype    25.735k i/100ms
-              rubype    20.922k i/100ms
-                 sig     8.960k i/100ms
-           contracts     4.659k i/100ms
-           typecheck     1.102k i/100ms
+                pure    85.328k i/100ms
+               rtype    25.665k i/100ms
+              rubype    21.414k i/100ms
+                 sig     8.921k i/100ms
+           contracts     4.638k i/100ms
+           typecheck     1.110k i/100ms
 Calculating -------------------------------------
-                pure      3.273M (± 2.4%) i/s -     16.435M
-               rtype    340.376k (± 1.9%) i/s -      1.724M
-              rubype    268.253k (± 4.2%) i/s -      1.339M
-                 sig    100.050k (± 1.9%) i/s -    501.760k
-           contracts     50.027k (± 2.0%) i/s -    251.586k
-           typecheck     11.317k (± 1.4%) i/s -     57.304k
+                pure      3.282M (± 2.7%) i/s -     16.468M
+               rtype    339.065k (± 2.6%) i/s -      1.720M
+              rubype    266.893k (± 5.9%) i/s -      1.349M
+                 sig     99.952k (± 2.1%) i/s -    499.576k
+           contracts     49.693k (± 1.5%) i/s -    250.452k
+           typecheck     11.356k (± 1.6%) i/s -     57.720k
 
 Comparison:
-                pure:  3272978.0 i/s
-               rtype:   340375.8 i/s - 9.62x slower
-              rubype:   268252.5 i/s - 12.20x slower
-                 sig:   100050.1 i/s - 32.71x slower
-           contracts:    50026.9 i/s - 65.42x slower
-           typecheck:    11317.1 i/s - 289.21x slower
+                pure:  3282431.9 i/s
+               rtype:   339064.9 i/s - 9.68x slower
+              rubype:   266892.9 i/s - 12.30x slower
+                 sig:    99952.2 i/s - 32.84x slower
+           contracts:    49693.0 i/s - 66.05x slower
+           typecheck:    11355.9 i/s - 289.05x slower
 ```
 
 ### JRuby
 Without Rubype that doesn't support JRuby
 
 ```
+Rtype with Java extension
 Ruby version: 2.2.3
 Ruby engine: jruby
 Ruby description: jruby 9.0.5.0 (2.2.3) 2016-01-26 7bee00d Java HotSpot(TM) 64-Bit Server VM 25.60-b23 on 1.8.0_60-b27 +jit [Windows 10-amd64]
-Rtype version: 0.2.0
+Rtype version: 0.3.0
 Sig version: 1.0.1
 Contracts version: 0.13.0
 Typecheck version: 0.1.2
 Warming up --------------------------------------
-                pure    29.127k i/100ms
-               rtype     4.566k i/100ms
-                 sig     4.162k i/100ms
-           contracts   776.000  i/100ms
-           typecheck   981.000  i/100ms
+                pure     9.994k i/100ms
+               rtype     6.181k i/100ms
+                 sig     4.041k i/100ms
+           contracts   951.000  i/100ms
+           typecheck   970.000  i/100ms
 Calculating -------------------------------------
-                pure      6.705M (±12.0%) i/s -     32.826M
-               rtype     89.262k (± 3.3%) i/s -    447.468k
-                 sig     74.070k (± 2.0%) i/s -    370.418k
-           contracts     25.399k (± 2.9%) i/s -    127.264k
-           typecheck     12.461k (± 9.0%) i/s -     61.803k
+                pure      7.128M (?±35.6%) i/s -     30.831M
+               rtype    121.556k (?± 6.2%) i/s -    605.738k
+                 sig     72.187k (?± 6.4%) i/s -    359.649k
+           contracts     24.984k (?± 3.9%) i/s -    125.532k
+           typecheck     12.041k (?± 9.5%) i/s -     60.140k
 
 Comparison:
-                pure:  6705166.5 i/s
-               rtype:    89262.5 i/s - 75.12x slower
-                 sig:    74070.1 i/s - 90.52x slower
-           contracts:    25398.9 i/s - 263.99x slower
-           typecheck:    12460.7 i/s - 538.10x slower
+                pure:  7128373.0 i/s
+               rtype:   121555.8 i/s - 58.64x slower
+                 sig:    72186.8 i/s - 98.75x slower
+           contracts:    24984.5 i/s - 285.31x slower
+           typecheck:    12041.0 i/s - 592.01x slower
 ```
 
 ## Rubype, Sig

data/ext/rtype/{rtype.c → c/rtype.c}

@@ -37,10 +37,10 @@ rb_rtype_valid(VALUE self, VALUE expected, VALUE value) {
 		case T_FALSE:
 			return !RTEST(value) ? Qtrue : Qfalse;
 		default:
-			if(CLASS_OF(expected) == rb_cRange) {
+			if(rb_obj_is_kind_of(expected, rb_cRange)) {
 				return rb_funcall(expected, rb_intern("include?"), 1, value);
 			}
-			else if(CLASS_OF(expected) == rb_cProc) {
+			else if(rb_obj_is_kind_of(expected, rb_cProc)) {
 				return RTEST(rb_funcall(expected, rb_intern("call"), 1, value)) ? Qtrue : Qfalse;
 			}
 			else if( RTEST(rb_obj_is_kind_of(expected, rb_cRtypeBehaviorBase)) ) {
@@ -95,13 +95,13 @@ rb_rtype_assert_return_type(VALUE self, VALUE expected, VALUE result) {
 	if(expected == Qnil) {
 		if(result != Qnil) {
 			VALUE msg = rb_funcall(rb_mRtype, rb_intern("type_error_message"), 2, expected, result);
-			rb_raise(rb_eRtypeReturnTypeError, "for return:\n %s", StringValueCStr(msg));
+			rb_raise(rb_eRtypeReturnTypeError, "for return:\n%s", StringValueCStr(msg));
 		}
 	}
 	else {
 		if( !RTEST(rb_rtype_valid(self, expected, result)) ) {
 			VALUE msg = rb_funcall(rb_mRtype, rb_intern("type_error_message"), 2, expected, result);
-			rb_raise(rb_eRtypeReturnTypeError, "for return:\n %s", StringValueCStr(msg));
+			rb_raise(rb_eRtypeReturnTypeError, "for return:\n%s", StringValueCStr(msg));
 		}
 	}
 	return Qnil;
@@ -115,8 +115,8 @@ void Init_rtype_native(void) {
 	rb_eRtypeTypeSignatureError = rb_define_class_under(rb_mRtype, "TypeSignatureError", rb_eArgError);
 	rb_eRtypeReturnTypeError = rb_define_class_under(rb_mRtype, "ReturnTypeError", rb_eStandardError);
 
-	rb_define_singleton_method(rb_mRtype, "valid?", rb_rtype_valid, 2);
-	rb_define_singleton_method(rb_mRtype, "assert_arguments_type", rb_rtype_assert_arguments_type, 2);
-	rb_define_singleton_method(rb_mRtype, "assert_arguments_type_with_keywords", rb_rtype_assert_arguments_type_with_keywords, 4);
-	rb_define_singleton_method(rb_mRtype, "assert_return_type", rb_rtype_assert_return_type, 2);
+	rb_define_method(rb_mRtype, "valid?", rb_rtype_valid, 2);
+	rb_define_method(rb_mRtype, "assert_arguments_type", rb_rtype_assert_arguments_type, 2);
+	rb_define_method(rb_mRtype, "assert_arguments_type_with_keywords", rb_rtype_assert_arguments_type_with_keywords, 4);
+	rb_define_method(rb_mRtype, "assert_return_type", rb_rtype_assert_return_type, 2);
 }

data/spec/rtype_spec.rb

@@ -236,29 +236,35 @@ describe Rtype do
 		describe 'true' do
 			it "is right" do
 				klass.send :rtype, :return_arg, [true] => Any
+				instance.return_arg(true)
 				instance.return_arg(123)
 			end
 			it "is wrong args" do
 				klass.send :rtype, :return_arg, [true] => Any
+				expect {instance.return_arg(false)}.to raise_error Rtype::ArgumentTypeError
 				expect {instance.return_arg(nil)}.to raise_error Rtype::ArgumentTypeError
 			end
 			it "is wrong result" do
-				klass.send :rtype, :return_nil, [Any] => true
-				expect {instance.return_nil(123)}.to raise_error Rtype::ReturnTypeError
+				klass.send :rtype, :return_arg, [Any] => true
+				expect {instance.return_arg(false)}.to raise_error Rtype::ReturnTypeError
+				expect {instance.return_arg(nil)}.to raise_error Rtype::ReturnTypeError
 			end
 		end
 
 		describe 'false' do
 			it "is right" do
 				klass.send :rtype, :return_arg, [false] => Any
+				instance.return_arg(false)
 				instance.return_arg(nil)
 			end
 			it "is wrong args" do
 				klass.send :rtype, :return_arg, [false] => Any
+				expect {instance.return_arg(true)}.to raise_error Rtype::ArgumentTypeError
 				expect {instance.return_arg(123)}.to raise_error Rtype::ArgumentTypeError
 			end
 			it "is wrong result" do
 				klass.send :rtype, :return_arg, [Any] => false
+				expect {instance.return_arg(true)}.to raise_error Rtype::ReturnTypeError
 				expect {instance.return_arg(123)}.to raise_error Rtype::ReturnTypeError
 			end
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtype-native
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sputnik Gugja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtype
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ email:
 - sputnikgugja@gmail.com
 executables: []
 extensions:
-- ext/rtype/extconf.rb
+- ext/rtype/c/extconf.rb
 extra_rdoc_files: []
 files:
 - Gemfile
@@ -79,9 +79,9 @@ files:
 - README.md
 - Rakefile
 - benchmark/benchmark.rb
-- ext/rtype/extconf.rb
-- ext/rtype/rtype.c
-- ext/rtype/rtype.h
+- ext/rtype/c/extconf.rb
+- ext/rtype/c/rtype.c
+- ext/rtype/c/rtype.h
 - spec/rtype_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sputnikgugja/rtype