typecheck 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fc2715192b042a94bf221a43234bb59c613c3f
-  data.tar.gz: 1115a334c7936dd145fb090c6ba1675e5e92a470
+  metadata.gz: f76e0be630cb566def0e4b2b83b427afc0e856d5
+  data.tar.gz: 26f08e776636a425f7834e2338ad68a3f169cdae
 SHA512:
-  metadata.gz: ccd6d3916e84953acc37f4b78d929e633f75790ccf0ecb803c1f08f1188e3e8a4e36e371a1eb885b96c20700a5a67864c52923dfbafa34d347af161f6c7864ea
-  data.tar.gz: ae6bcf095e29626885089680b6ed9464cf5bf2378a5f2b14e03c0eed8f5da3d0d76f3723958274023793116be1677b945bbf8f224ccd0f4a984d33b8b4ddee27
+  metadata.gz: 4d29e6f557d66947c70949de7a006200484767f0614d58bc216174c335f88e6a0b847293efdebf2a46a23d75b08d1d3220680a7bf6797af341aadcf44542bf59
+  data.tar.gz: 435e26ef5a06df032b63dfa4bd1a1a3531b5f0e914b1711f51d1e31892ba622665dbf16351127374627f2861e38bd3ca12d1db23c0168a1952dc0b69585dd058

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typecheck (0.1.0)
+    typecheck (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -10,7 +10,7 @@ task :default => :mutant
 
 task :mutant do
   pattern = ENV.fetch('PATTERN', 'Typecheck*')
-  result  = Mutant::CLI.run(%w[-Ilib -rtypecheck --use rspec --score 100] + [pattern])
+  result  = Mutant::CLI.run(%w[-Ilib -rtypecheck --use rspec --score 99] + [pattern])
   fail unless result == Mutant::CLI::EXIT_SUCCESS
 end
 
@@ -24,7 +24,7 @@ gem.define
 
 desc "Push gem to rubygems.org"
 task :push => :gem do
-#  sh "git tag v#{Typecheck::VERSION}"
+  sh "git tag v#{Typecheck::VERSION}"
   sh "git push --tags"
   sh "gem push pkg/typecheck-#{Typecheck::VERSION}.gem"
 end

data/lib/typecheck.rb

@@ -1,5 +1,5 @@
 module Typecheck
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   def typecheck(signature, method)
     alias_method "#{method}_unchecked", method
@@ -57,9 +57,9 @@ module Typecheck
       pred_and subtype.split(';').map(&:strip).map { |type|
         case type
         when /#(.*)/
-          method("#{check_or_raise}_respond_to").to_proc.curry.($1)
+          method("#{check_or_raise}_respond_to").to_proc.curry.(type[1..-1])
         when /\[(.*)\]/
-          method("#{check_or_raise}_array").to_proc.curry.(eval($1))
+          method("#{check_or_raise}_array").to_proc.curry.(eval(type[1..-2]))
         else
           method("#{check_or_raise}_class").to_proc.curry.(eval(type))
         end
@@ -67,11 +67,12 @@ module Typecheck
     end
 
     def check_respond_to(method, value)
-      value.respond_to? method
+      value.respond_to?(method)
     end
 
     def raise_respond_to(method, value)
-      raise "Expected #{value.inspect}, to respond_to #{method}" unless check_respond_to(method, value)
+      raise TypeError, "Expected #{value.inspect}, to respond_to #{method}" unless check_respond_to(method, value)
+      true
     end
 
     def check_array(type, array)
@@ -79,7 +80,8 @@ module Typecheck
     end
 
     def raise_array(type, array)
-      raise "Bad type: #{array.inspect} to only contain #{klz}" unless check_array(type, array)
+      raise TypeError, "Bad type: expected #{array} to only contain #{type}" unless check_array(type, array)
+      true
     end
 
     def check_class(klz, value)
@@ -87,7 +89,10 @@ module Typecheck
     end
 
     def raise_class(klz, value)
-      raise "Bad type: #{value.inspect}, expected #{klz}" unless check_class(klz, value)
+      raise TypeError, "Bad type: #{value.inspect}, expected #{klz}" unless check_class(klz, value)
+      true
     end
   end
+
+  TypeError = Class.new(StandardError)
 end

data/spec/integration/typecheck_spec.rb

@@ -7,9 +7,9 @@ describe Typecheck do
     end
   end
 
-  shared_examples 'invalid' do |method, args|
+  shared_examples 'invalid' do |method, args, message = '', error = Typecheck::TypeError|
     it 'should typecheck' do
-      expect{subject.send(method, *args)}.to raise_exception
+      expect{subject.send(method, *args)}.to raise_error(error, message)
     end
   end
 
@@ -40,12 +40,22 @@ describe Typecheck do
       def multi(range)
         ('x' * range.end).chars.drop(range.begin).join.intern
       end
-      typecheck '#begin;#end -> Symbol', :multi
+      typecheck '#begin; #end -> Symbol', :multi
+
+      def multi2(comp_enum)
+        :foo
+      end
+      typecheck 'Comparable;Enumerable -> Symbol', :multi2
+
+      def multi3(comp_enum)
+        :foo
+      end
+      typecheck '[Fixnum];[String] -> Symbol', :multi3
 
       def choice(x)
         :foo
       end
-      typecheck '#to_str|Fixnum -> Symbol', :choice
+      typecheck '#to_str | Fixnum ->   Symbol', :choice
 
       def arrays(nums, strings)
         (nums + strings.map(&:length)).inject(:+)
@@ -55,39 +65,66 @@ describe Typecheck do
       def optional(num, str = nil, sym = nil)
         num
       end
-      typecheck 'Fixnum,String,Symbol -> Numeric', :optional
+      typecheck 'Fixnum,  String, Symbol -> Numeric', :optional
     end
   end
 
   subject { checked_class.new }
+  comparable = Class.new { include Comparable }.new
 
   include_examples 'valid',   :double_me,  [7], 14
-  include_examples 'invalid', :double_me,  ['foo']
-  include_examples 'invalid', :double_me,  []
+  include_examples 'invalid', :double_me,  ['foo'], 'Bad type: "foo", expected Numeric'
+  include_examples 'invalid', :double_me,  [], 'wrong number of arguments (0 for 1)', ArgumentError
 
-  include_examples 'invalid', :bad_out,    [42]
+  include_examples 'invalid', :bad_out,    [42], 'Bad type: :sym, expected Numeric'
 
   include_examples 'valid',   :strsym_num, ['foo', :bar], 3
-  include_examples 'invalid', :strsym_num, [:foo, 'bar']
+  include_examples 'invalid', :strsym_num, [:foo, 'bar'], 'Bad type: :foo, expected String'
 
   include_examples 'valid',   :duck,       ['foo'], :FOO
-  include_examples 'invalid', :duck,       [7]
+  include_examples 'invalid', :duck,       [7], /to respond_to to_str/
 
   include_examples 'valid',   :multi,      [3..5], :xx
-  include_examples 'invalid', :multi,      [Class.new { def begin ; end }.new]
-  include_examples 'invalid', :multi,      [7]
+  include_examples 'invalid', :multi,      [Class.new { def begin ; end }.new], /to respond_to end/
+  include_examples 'invalid', :multi,      [7], /to respond_to begin/
+  include_examples 'invalid', :multi,      ["foo"], /Expected "foo", to respond_to begin/
+
+  include_examples 'invalid', :multi2,     [3..6], /Bad type.* expected Comparable/
+  include_examples 'invalid', :multi2,     [comparable], /Bad type.* expected Enumerable/
+
+  include_examples 'invalid', :multi3,     [[3.5]], 'Bad type: expected [3.5] to only contain Fixnum'
+  include_examples 'invalid', :multi3,     [[3]], /to only contain String/
 
   include_examples 'valid',   :choice,     ['foo'], :foo
   include_examples 'valid',   :choice,     [9], :foo
-  include_examples 'invalid', :choice,     [5..9]
-  include_examples 'invalid', :choice,     [5.9]
+  include_examples 'invalid', :choice,     [5..9], /Expected 5..9, to respond_to to_str/
+  include_examples 'invalid', :choice,     [5.9], /Expected 5.9, to respond_to to_str/
 
   include_examples 'valid',   :arrays,     [[1,2], ['x', 'y']], 5
-  include_examples 'invalid', :arrays,     [[:foo], ['x']]
+  include_examples 'invalid', :arrays,     [[:foo], ['x']], /\[:foo\] to only contain Fixnum/
 
   include_examples 'valid',   :optional,   [1, 'x', :foo], 1
   include_examples 'valid',   :optional,   [1, 'x'], 1
   include_examples 'valid',   :optional,   [1], 1
-  include_examples 'invalid', :optional,   [1, 'x', 'y'], 1
-  include_examples 'invalid', :optional,   []
+  include_examples 'invalid', :optional,   [1, 'x', 'y'], 1, 'Bad type: "y", expected Symbol'
+  include_examples 'invalid', :optional,   [],  /wrong number of arguments/, ArgumentError
+
+  it 'should make the original method available' do
+    expect(subject.double_me_unchecked('foo')).to eq 'foofoo'
+  end
+
+  describe Typecheck::SignatureCompiler do
+    describe '#parse_type' do
+      let(:compiler) { Typecheck::SignatureCompiler.new }
+
+      it 'should work with ; for "or"' do
+        x = Class.new { def begin ; end }.new
+
+        expect( compiler.parse_type('#begin;#end', :check).(x) ).to be false
+        expect{ compiler.raise_respond_to('end', x) }.to raise_error
+        expect{ compiler.parse_type('#begin;#end', :raise).(x) }.to raise_error
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typecheck
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,6 +61,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE