rubype 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11e9ed5d164e542b00c10907afbe3267e85782d4
-  data.tar.gz: 9fd19b2b530147fb64d00e1f35a10d654c830f9a
+  metadata.gz: bbafcbd7c094043d0baef1fd0c51255d7cfcf5be
+  data.tar.gz: a8b1a0e69ad72db349e56527441b7ec021dddeea
 SHA512:
-  metadata.gz: 727672e8759985e9d1a5dabbfe6082c9637bf43897028783d513ce24ca5ce697da54fde51e47c334de55e0b1a7b87390e3c0bdebf3fbc51224bfd9f515d405d8
-  data.tar.gz: f0c745f01fc40523eab21e642c0d50368920304564bf14443f09c55ec693e604a5baf26ff553c6bafa32d551e608d38dc2f5925ad5e6a7433a423accff537b45
+  metadata.gz: f32e1eaeff1cbe50458f9a8fb6f0c8b40000b1f0bbec2c81180c5b07c99e13e3292efcfe8539a0b90f7ddcfdc23e79dcf76dee3ef58c8c60248c4a32b7a43b30
+  data.tar.gz: dcf8604ab00e4f535296c896494f6a02996381c2a387ff232a774d3e3a74388475cb990a37d4efe93946f4308cf4fe28a32e1f108937fe9cd246610c40fe271b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGELOG
 
+### 0.3.1
+
+* Fix bugs.
+
 ### 0.3.0
 
 * First release with C ext.

data/README.md

@@ -180,58 +180,23 @@ MyClass.new.method(:sum).return_type
 
 ## Benchmarks
 
-```ruby
-require 'rubype'
-require 'benchmark'
-
-class RubypeCommonClass
-  def sum(x, y)
-    x + y
-  end
-  typesig :sum, [Numeric, Numeric] => Numeric
-end
-
-class CommonClass
-  def sum(x, y)
-    x + y
-  end
-end
-
-class RubypeDucktypeClass
-  def sum(x, y)
-    x.to_i + y
-  end
-  typesig :sum, [:to_i, Numeric] => Numeric
-end
-
-class DucktypeClass
-  def sum(x, y)
-    x.to_i + y
-  end
-end
-
-N = 100_000
-Benchmark.bm("RubypeDucktypeClass".length + 3) do |x|
-  x.report("RubypeCommonClass") { N.times { RubypeCommonClass.new.sum(1, 5) } }
-  x.report("CommonClass")       { N.times { CommonClass.new.sum(1, 5) } }
-end
-
-Benchmark.bm("RubypeDucktypeClass".length + 3) do |x|
-  x.report("RubypeDucktypeClass")  { N.times { RubypeDucktypeClass.new.sum(1, 5) } }
-  x.report("DucktypeClass")        { N.times { DucktypeClass.new.sum(1, 5) } }
-end
-```
+#### result of `bundle exec rake benchmark`
 
-### Results
-Ruby 2.2.0, Macbook Pro 2.9Ghz Intel Core i7, 8GB RAM
+Ruby 2.2.1, Macbook Pro 2.7Ghz Intel Core i5, 8GB RAM
 
 ```
-                             user     system      total        real
-RubypeCommonClass        0.530000   0.010000   0.540000 (  0.566493)
-CommonClass              0.030000   0.000000   0.030000 (  0.035718)
-                             user     system      total        real
-RubypeDucktypeClass      0.590000   0.010000   0.600000 (  0.682504)
-DucktypeClass            0.030000   0.000000   0.030000 (  0.029856)
+ruby version: 2.2.1
+rubype version: 0.3.0
+Calculating -------------------------------------
+           Pure Ruby   101.070k i/100ms
+              Rubype    63.973k i/100ms
+-------------------------------------------------
+           Pure Ruby      7.115M (± 6.1%) i/s -     35.476M
+              Rubype      1.537M (± 2.5%) i/s -      7.677M
+
+Comparison:
+           Pure Ruby:  7114786.0 i/s
+              Rubype:  1536611.5 i/s - 4.63x slower
 ```
 
 

data/ext/rubype/rubype.c

@@ -40,17 +40,20 @@ VALUE expected_mes(VALUE expected)
   }
 }
 
+#define assing_ivars VALUE meth_caller, meth, arg_types, rtn_type;\
+                     meth_caller = rb_ivar_get(self, id_owner);\
+                     meth        = rb_ivar_get(self, id_meth);\
+                     arg_types   = rb_ivar_get(self, id_arg_types);\
+                     rtn_type    = rb_ivar_get(self, id_rtn_type);
+
 static VALUE
-rb_rubype_assert_type(VALUE self, VALUE args, VALUE rtn)
+rb_rubype_assert_args_type(VALUE self, VALUE args)
 {
   int i;
   VALUE target;
-  VALUE meth_caller, meth, arg_types, arg_type, rtn_type, arg;
+  VALUE arg, arg_type;
 
-  meth_caller = rb_ivar_get(self, id_owner);
-  meth        = rb_ivar_get(self, id_meth);
-  arg_types   = rb_ivar_get(self, id_arg_types);
-  rtn_type    = rb_ivar_get(self, id_rtn_type);
+  assing_ivars
 
   for (i=0; i<RARRAY_LEN(args); i++) {
     arg      = rb_ary_entry(args, i);
@@ -61,6 +64,14 @@ rb_rubype_assert_type(VALUE self, VALUE args, VALUE rtn)
       rb_raise(rb_eRubypeArgumentTypeError, error_fmt, target, expected_mes(arg_type), arg);
     }
   }
+  return Qnil;
+}
+
+static VALUE
+rb_rubype_assert_rtn_type(VALUE self, VALUE rtn)
+{
+  VALUE target;
+  assing_ivars
 
   if (unmatch_type_p(rtn, rtn_type)){
     target = rb_sprintf("%"PRIsVALUE"#%"PRIsVALUE"'s return", meth_caller, meth);
@@ -89,7 +100,8 @@ Init_rubype(void)
 
   rb_cContract = rb_define_class_under(rb_mRubype, "Contract", rb_cObject);
   rb_define_method(rb_cContract, "initialize", rb_rubype_initialize, 4);
-  rb_define_method(rb_cContract, "assert_type", rb_rubype_assert_type, 2);
+  rb_define_method(rb_cContract, "assert_args_type", rb_rubype_assert_args_type, 1);
+  rb_define_method(rb_cContract, "assert_rtn_type", rb_rubype_assert_rtn_type, 1);
 
   id_meth      = rb_intern("@meth");
   id_owner     = rb_intern("@owner");

data/lib/rubype.rb

@@ -16,7 +16,8 @@ module Rubype
       @@typed_methods[owner][meth] = contract
       method_visibility = get_method_visibility(owner, meth)
       __rubype__.send(:define_method, meth) do |*args, &block|
-        contract.assert_type(args, super(*args, &block))
+        contract.assert_args_type(args)
+        super(*args, &block).tap { |rtn| contract.assert_rtn_type(rtn) }
       end
 
       __rubype__.send(method_visibility, meth)

data/lib/rubype/version.rb

@@ -1,3 +1,3 @@
 module Rubype
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test_rubype.rb

@@ -132,6 +132,21 @@ class TestRubype < Minitest::Test
     end
   end
 
+  def test_for_readme
+    assert_raises(Rubype::ArgumentTypeError) do
+       eval <<-RUBY_CODE
+        class MyClass
+          def sum(x, y)
+            x.to_i + y
+          end
+          typesig :sum, [Numeric, Numeric] => Numeric
+        end
+
+        MyClass.new.sum(:has_no_to_i, 2)
+      RUBY_CODE
+    end
+  end
+
   private
     def assert_equal_to_s(str, val)
       assert_equal str, val.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubype
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler