rubype 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d752aa79376b7981146f2f8b9f6ef94f8fc74b20
-  data.tar.gz: de61c2ff8105a604256f0d89c1e6c65285a94ddf
+  metadata.gz: e7c7fb90c7b7bb6d84aed99e298cfd92344c334b
+  data.tar.gz: 66a55c98516f1d8b2f4b1a1454516532406c3e24
 SHA512:
-  metadata.gz: 08e2f22b13c8138246daf7c94417b73be722c55310aee0e21d0a6799d8c36673ef5b598f3b73dd8b32cb9aa1f4a1d81afcb8e5065e44e6bda52d7af47cc7cec8
-  data.tar.gz: 5792a3bc311e89a8ca0b5b5333819ce335969bda6f2c35d4ce64054d818070a03693af4340ee9d2597c840da97c0c0699ccfb86960afdd383fc47574df22d00a
+  metadata.gz: 56da79236105ebf887d96f031d596efdff6272ee1e1a548f3d87c23b63fde00bc49eb77c18de1146177e6157f0acf92bb46669f1b89026a147ab65f1b5b41c81
+  data.tar.gz: b2d3b9172ec56df5b2b5f1488c2b8022048d699202e0eadb26399aad46078d4b7da70d699ea6e3694e709819cd7ce5de9ed61a0ede214858c92fe60039e3ade4

data/README.md

@@ -125,6 +125,19 @@ MyClass.new.sum(1, 2)
 MyClass.new.sum('1', 2)
 ```
 
+### Check type info everywhere!
+```ruby
+class MyClass
+  def sum(x, y)
+    x.to_i + y
+  end
+  typesig :sum, [:to_i, Numeric] => Numeric
+end
+
+MyClass.new.method(:foo).type_info
+# => [:to_i, Numeric] => Numeric
+
+```
 
 ## Installation
 

data/lib/rubype.rb

@@ -27,6 +27,14 @@ class Method
       methods_hash[name]
     end
   end
+
+  def arg_types
+    type_info.first.first if type_info
+  end
+
+  def return_type
+    type_info.first.last if type_info
+  end
 end
 
 module Rubype
@@ -43,15 +51,15 @@ module Rubype
        # @param caller [Object]
        # @param type_info_hash [Hash] { [ArgInfo_1, ArgInfo_2, ... ArgInfo_n] => RtnInfo }
        # @param module [Module]
-      def define_typed_method(meth_caller, meth, type_info_hash, __rubype__)
+      def define_typed_method(owner, meth, type_info_hash, __rubype__)
         arg_types, rtn_type = *strip_type_info(type_info_hash)
-        @@typed_method_info[meth_caller][meth] = {
+        @@typed_method_info[owner][meth] = {
           arg_types => rtn_type
         }
         __rubype__.send(:define_method, meth) do |*args, &block|
-          ::Rubype.send(:assert_arg_type, meth_caller, meth, args, arg_types)
+          ::Rubype.send(:assert_arg_type, self, meth, args, arg_types)
           rtn = super(*args, &block)
-          ::Rubype.send(:assert_trn_type, meth_caller, meth, rtn, rtn_type)
+          ::Rubype.send(:assert_trn_type, self, meth, rtn, rtn_type)
           rtn
         end
       end
@@ -67,15 +75,15 @@ module Rubype
       # @param meth [Symbol]
       # @param args [Array<Object>]
       # @param type_infos [Array<Class, Symbol>]
-      def assert_arg_type(caller, meth, args, type_infos)
+      def assert_arg_type(meth_caller, meth, args, type_infos)
         args.zip(type_infos).each.with_index(1) do |(arg, type_info), i|
           case type_check(arg, type_info)
           when :need_correct_class
             raise ArgumentTypeError,
-              "Expected #{caller.class}##{meth}'s #{i}th argument to be #{type_info} but got #{arg.inspect} instead"
+              "Expected #{meth_caller.class}##{meth}'s #{i}th argument to be #{type_info} but got #{arg.inspect} instead"
           when :need_correct_method
             raise ArgumentTypeError,
-              "Expected #{caller.class}##{meth}'s #{i}th argument to have method ##{type_info} but got #{arg.inspect} instead"
+              "Expected #{meth_caller.class}##{meth}'s #{i}th argument to have method ##{type_info} but got #{arg.inspect} instead"
           end
         end
       end
@@ -83,14 +91,14 @@ module Rubype
       # @param caller [Module]
       # @param rtn [Object]
       # @param type_info [Class, Symbol]
-      def assert_trn_type(caller, meth, rtn, type_info)
+      def assert_trn_type(meth_caller, meth, rtn, type_info)
         case type_check(rtn, type_info)
         when :need_correct_class
           raise ReturnTypeError,
-            "Expected #{caller.class}##{meth} to return #{type_info} but got #{rtn.inspect} instead"
+            "Expected #{meth_caller.class}##{meth} to return #{type_info} but got #{rtn.inspect} instead"
         when :need_correct_method
           raise ReturnTypeError,
-            "Expected #{caller.class}##{meth} to return object which has method ##{type_info} but got #{rtn.inspect} instead"
+            "Expected #{meth_caller.class}##{meth} to return object which has method ##{type_info} but got #{rtn.inspect} instead"
         end
       end
 

data/lib/rubype/version.rb

@@ -1,3 +1,3 @@
 module Rubype
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/minitest_helper.rb

@@ -1,4 +1,4 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rubype'
-
+require 'pry'
 require 'minitest/autorun'

data/test/test_rubype.rb

@@ -91,12 +91,22 @@ class TestRubype < MiniTest::Unit::TestCase
 
   def test_type_info
     klass = Class.new.class_eval <<-RUBY_CODE
-      def test_mth
+      def test_mth(n1, n2)
       end
       typesig :test_mth, [Numeric, Numeric] => String
     RUBY_CODE
+    Object.const_set('MyClass', klass)
 
-    assert_equal klass.new.method(:test_mth).type_info, { [Numeric, Numeric] => String }
+    meth = klass.new.method(:test_mth)
+    assert_equal meth.type_info, { [Numeric, Numeric] => String }
+    assert_equal meth.arg_types, [Numeric, Numeric]
+    assert_equal meth.return_type, String
+
+    err = assert_raises(Rubype::ReturnTypeError) { meth.(1,2) }
+    assert_equal err.message, "Expected MyClass#test_mth to return String but got nil instead"
+
+    err = assert_raises(Rubype::ArgumentTypeError) { meth.(1,'2') }
+    assert_equal err.message, "Expected MyClass#test_mth's 2th argument to be Numeric but got \"2\" instead"
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubype
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - gogotanaka