tspec 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c4d9398a6b867d88b048d7e04490339fcfb83f
-  data.tar.gz: '09f87a6d7814aa3314e4a8420556052ed25e0cfd'
+  metadata.gz: a07e9bb4da483559eef421219cb624def8ede4cd
+  data.tar.gz: 1fe473785a30b27f1160b9108f264817ea259167
 SHA512:
-  metadata.gz: fd0096b8d732ff9c56fa41c1a7abfd02b46eab64063fe9680b9b688e6db9a44f899f16b795008f502f1d79ed370bb3117176a4e30a4883069ea804ab0d03dabc
-  data.tar.gz: e1a10ffc54d218e3025ec18927db331027a0d0cf609bd451235b971e14946dab9cdc32d2384623ef78f07406d95d209a2f7d86702386fd0b18fd3fcc9f991057
+  metadata.gz: 838d9f1c2b18277fcb2a54c41bdb8b9894f8d312775a5a9900307a6e35ab8dee293e805dc7204bb79737c43e58942e8f49347c8f958744a025efd26c2a95b0fb
+  data.tar.gz: cea0a7a54424d0b0401b8bce18b24d071516db57b15185132b4d0ffd5c5bb7ee2dbdc26f3b0766b220603bea9729e7c723b9a724555cf1c5dc064cce40a8e084

data/README.md

@@ -1,6 +1,8 @@
 # TSpec
 
-TSpec add simple type check of method into Ruby.
+[![Build Status](https://travis-ci.org/siman-man/tspec.svg?branch=master)](https://travis-ci.org/siman-man/tspec)
+
+TSpec adds a method of simple type check to Ruby.
 
 :construction: **Recommended for use only in hobby programming. Do not use this in production apps.** :construction:
 
@@ -16,18 +18,18 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Or install it by yourself:
 
     $ gem install tspec
 
 ## Usage
 
-tspec can use `#receive` and `#return` method.
+TSpec can use `#receive` and `#return` method.
 
 
 ### receive
 
-`receive` define the type of method arguments.
+`receive` defines the type of method arguments.
 
 ```ruby
 require 'tspec'
@@ -37,7 +39,7 @@ def echo(str)
 end.receive(str: String)
 ```
 
-specify multiple type.
+You can specify multiple type, too.
 
 ```ruby
 require 'tspec'
@@ -50,7 +52,7 @@ echo('hello')
 echo(3.14)
 ```
 
-if method arguments is single. it can skip keyword.
+If single method argument is given, you can skip keyword.
 
 ```ruby
 require 'tspec'
@@ -62,7 +64,7 @@ end.receive([String])
 puts join_array(%w(hello world))
 ```
 
-if specify Array content type. writing is strange.
+You can specify Array content type, although it may seem strange.
 
 ```ruby
 require 'tspec'
@@ -77,7 +79,7 @@ puts receive_string_array(['hello', 'world'])
 
 ### return
 
-`return` define the type of method return value.
+`return` defines the type of method return value.
 
 ```ruby
 require 'tspec'
@@ -87,7 +89,7 @@ def message
 end.return(String)
 ```
 
-multiple return value.
+You can specify multiple return value, too.
 
 ```ruby
 require 'tspec'
@@ -101,7 +103,7 @@ end.return(Float, String, Symbol)
 end
 ```
 
-specify Array content type.
+Also, you can specify Array content type.
 
 ```ruby
 require 'tspec'
@@ -115,7 +117,7 @@ p message_list
 
 ## Example
 
-combination `receive` and `return` method.
+Combination of `receive` and `return` method.
 
 ```ruby
 require 'tspec'
@@ -135,5 +137,5 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/siman-
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 

data/lib/tspec.rb

@@ -19,11 +19,32 @@ class Symbol
   end
 end
 
+class UnboundMethod
+  def return(*types)
+    self
+  end
+
+  def receive(*type, **types)
+    self
+  end
+end
+
+class Method
+  def return(*types)
+    self
+  end
+
+  def receive(*type, **types)
+    self
+  end
+end
+
 module TSpec
   @method_return_type_table = {}
   @method_arguments_type_table = {}
   @before_trace = {}
   @type_error_flag = false
+  DEFINE_METHOD_SYMBOLS = %i(method_added singleton_method_added define_method instance_method method)
 
   def self.value_type_check(value, *types)
     types.any? do |type|
@@ -44,10 +65,15 @@ module TSpec
   TracePoint.trace do |tp|
     case tp.event
       when :call
-        if %i(return receive).include?(tp.method_id) && %i(method_added singleton_method_added define_method).include?(@before_trace[:method_id])
-          klass = (@before_trace[:method_id] == :singleton_method_added) ? @before_trace[:self].singleton_class : @before_trace[:self]
+        if %i(return receive).include?(tp.method_id) && DEFINE_METHOD_SYMBOLS.include?(@before_trace[:method_id])
           ctx = tp.binding
-          key = "#{klass}::#{ctx.receiver}"
+
+          if %i(instance_method method).include?(@before_trace[:method_id])
+            key = "#{tp.self.owner}::#{tp.self.name}"
+          else
+            klass = (@before_trace[:method_id] == :singleton_method_added) ? @before_trace[:self].singleton_class : @before_trace[:self]
+            key = "#{klass}::#{ctx.receiver}"
+          end
 
           case tp.method_id
             when :return
@@ -66,18 +92,15 @@ module TSpec
             arguments = tp.binding.eval("method(:#{tp.method_id}).parameters.map(&:last)")
 
             types.each do |name, type|
+              name = arguments.first if name == type.__id__
 
-              if name != type.__id__
-                unless arguments.include?(name)
-                  @type_error_flag = true
-                  raise NotFoundArgumentNameError, "undefined arguments `#{name}' for #{key}"
-                end
-
-                value = tp.binding.local_variable_get(name)
-              else
-                value = tp.binding.local_variable_get(arguments.first)
+              unless arguments.include?(name)
+                @type_error_flag = true
+                raise NotFoundArgumentNameError, "undefined arguments `#{name}' for #{key}"
               end
 
+              value = tp.binding.local_variable_get(name)
+
               unless value_type_check(value, *type)
                 @type_error_flag = true
                 raise ArgumentTypeError, "##{tp.method_id} '#{name}' variable should be #{type.inspect}, but actual '#{value.inspect}' - #{value.class}"

data/tspec.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "tspec"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["siman-man"]
   spec.email         = ["k128585@ie.u-ryukyu.ac.jp"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tspec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - siman-man
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler