haskell 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85cd42c60a8fd8905a866a3ef595379fc061422
-  data.tar.gz: 95a13b1c977a43d4bcfaa1c3c34ba4f35b83994f
+  metadata.gz: e555bd13822ba64ac40eefd7874334266b76527b
+  data.tar.gz: 1203cdd7568b53f6931a59a0d5fecf0b754dbc3f
 SHA512:
-  metadata.gz: 0bb0e886c7bce3e0ad68e20c1269df8e5874ec6104d16ff570598a40d03cabe098a60deec053f4ba6bb0e6081e20b64cf8ab7622fc1a4c41e34989fb0f3446ad
-  data.tar.gz: 3626c9b3b1daa0e0a57b211308d3a21275729c4702c0978e14063015f3720a31ab825e1fe38fcb555fec47ce24d39ad988fc11f7d73186f4723c4a24cc79f22b
+  metadata.gz: aca2299d010c4264f693a13dce7ce27c213363824838ba80312fd21ee5fdee7fafff60779ddb6fb0349a8ca6a71c146b08b8fe5c898843588009e00bea0178e7
+  data.tar.gz: edcaa3d3fb1be593d1ce45b5baebe1329419232b114fada299b20c4dbe047039d0c25c956e0cb942fd203bbc2433d530e7661c1b269b6780bf6e0703c15845b7

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
   - 2.1.2
+  - 2.0.0
+  - 1.9.3
+notifications:
+  email: false

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in haskell.gemspec
-
 gem 'pry'
 gemspec

data/README.md

@@ -1,17 +1,20 @@
 # Ruby with Type.
 
-```rb
+Matz has mentioned Ruby3.0 with static type at some confluences. But almost all rubyists(include me) are not sure how typed Ruby is.
+
+But it's worth thinking more. This gem is kind of trial without so much side-effect.
 
+```rb
 require 'haskell'
 
-# Ruby 2.1.0+
+# ex1: (Ruby 2.1.0+)
 class MyClass
-    type Numeric >= Numeric >= Numeric, def sum(x, y)
+  type Numeric >= Numeric >= Numeric, def sum(x, y)
     x + y
   end
 
   type Numeric >= Numeric >= Numeric, def wrong_sum(x, y)
-  'string'
+    'string'
   end
 end
 
@@ -24,7 +27,22 @@ MyClass.new.sum(1, 'string')
 MyClass.new.wrong_sum(1, 2)
 #=> TypeError: Expected wrong_sum to return Numeric but got "str" instead
 
-# Ruby 1.8.0+
+
+# ex2: (Ruby 2.1.0+)
+class People
+  type People >= Any, def marry(people)
+    # Your Ruby code as usual
+  end
+end
+
+People.new.marry(People.new)
+#=> no error
+
+People.new.marry('non people')
+#=> ArgumentError: Wrong type of argument, type of "non people" should be People
+
+
+# ex3: (Ruby 1.8.0+)
 class MyClass
   def sum(x, y)
     x + y
@@ -33,6 +51,38 @@ class MyClass
 end
 ```
 
+## Feature
+### Typed method can coexist with non-typed method
+
+```ruby
+# It's totally OK!!
+class MyClass
+  type Numeric >= Numeric >= Numeric, def sum(x, y)
+    x + y
+  end
+
+  def wrong_sum(x, y)
+    'string'
+  end
+end
+```
+
+### Duck typing
+
+```ruby
+
+class MyClass
+  type Any >= Numeric, def foo(any_obj)
+    1
+  end
+end
+
+# It's totally OK!!
+MyClass.new.foo(1)
+# It's totally OK!!
+MyClass.new.foo('str')
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -49,22 +99,6 @@ Or install it yourself as:
 
     $ gem install haskell
 
-## More example
-```ruby
-class People
-  type People >= Any, def marry(people)
-    # Your Ruby code as usual
-  end
-end
-
-People.new.marry(People.new)
-#=> no error
-
-People.new.marry('non people')
-#=> ArgumentError: Wrong type of argument, type of "non people" should be People
-
-```
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/haskell/fork )
@@ -75,4 +109,4 @@ People.new.marry('non people')
 
 
 ## Credits
-[@chancancode](https://github.com/chancancode) first brought this to my attention.
+[@chancancode](https://github.com/chancancode) first brought this to my attention. I've stolen some idea from him.

data/haskell.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "minitest"
 end

data/lib/haskell.rb

@@ -1,27 +1,15 @@
 require 'haskell/type_list'
+require 'haskell/base'
+require 'haskell/assert_arg_type'
+require 'haskell/assert_rtn_type'
 
-module Haskell
-  class << self
-    def assert_arg_type(meth, args, klasses)
+module Haskell; end
 
-      args.each_with_index do |arg, i|
-        if wrong_type?(arg, klasses[i])
-          raise ArgumentError, "Wrong type of argument, type of #{arg.inspect} should be #{klasses[i]}"
-        end
-      end
-    end
-
-    def assert_rtn_type(meth, rtn, klass)
-      if wrong_type?(rtn, klass)
-        raise TypeError, "Expected #{meth} to return #{klass} but got #{rtn.inspect} instead"
-      end
-    end
-
-    def wrong_type?(obj, klass)
-      !(obj.is_a?(klass) || klass == Any)
-    end
-  end
-end
+# New Class(Type)
+class  Any;     end
+module Boolean; end
+TrueClass.send(:include, Boolean)
+FalseClass.send(:include, Boolean)
 
 class Module
   private
@@ -32,13 +20,11 @@ class Module
 
     def type(type_list, meth)
       __haskell__.send(:define_method, meth) do |*args, &block|
-        ::Haskell.assert_arg_type(meth, args, type_list.args)
+        ::Haskell::AssertArgType.execute(meth, args, type_list.args)
         rtn = super(*args, &block)
-        ::Haskell.assert_rtn_type(meth, rtn, type_list.rtn)
+        ::Haskell::AssertRtnType.execute(meth, rtn, type_list.rtn)
         rtn
       end
       self
     end
 end
-
-class Any; end

data/lib/haskell/assert_arg_type.rb

@@ -0,0 +1,14 @@
+module Haskell
+  module AssertArgType
+    extend Base
+
+    def self.execute(meth, args, klasses)
+      args.each_with_index do |arg, i|
+        if wrong_type?(arg, klasses[i])
+          raise ArgumentError, "Wrong type of argument, type of #{arg.inspect} should be #{klasses[i]}"
+        end
+      end
+    end
+
+  end
+end

data/lib/haskell/assert_rtn_type.rb

@@ -0,0 +1,16 @@
+module Haskell
+  module AssertRtnType
+    extend Base
+
+    def self.execute(meth, rtn, klass)
+      if wrong_type?(rtn, klass)
+        raise TypeError, "Expected #{meth} to return #{klass} but got #{rtn.inspect} instead"
+      end
+    end
+
+    def self.wrong_type?(obj, klass)
+      !(obj.is_a?(klass) || klass == Any)
+    end
+
+  end
+end

data/lib/haskell/base.rb

@@ -0,0 +1,7 @@
+module Haskell
+  module Base
+    def wrong_type?(obj, klass)
+      !(obj.is_a?(klass) || klass == Any)
+    end
+  end
+end

data/lib/haskell/version.rb

@@ -1,3 +1,3 @@
 module Haskell
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_haskell.rb

@@ -21,12 +21,14 @@ class TestHaskell < MiniTest::Unit::TestCase
     assert_correct_type Numeric >= String,  [@numeric], @string
     assert_correct_type Numeric >= Hash,    [@numeric], @hash
     assert_correct_type Numeric >= Symbol,  [@numeric], @symbol
-
-    assert_correct_type Numeric >= Numeric >= Numeric, [@numeric, @numeric], @numeric
-    assert_correct_type Numeric >= Array   >= Array,   [@numeric, @array  ], @array
-    assert_correct_type Numeric >= String  >= String,  [@numeric, @string ], @string
-    assert_correct_type Numeric >= Hash    >= Hash,    [@numeric, @hash   ], @hash
-    assert_correct_type Numeric >= Symbol  >= Symbol,  [@numeric, @symbol ], @symbol
+    assert_correct_type Numeric >= Boolean, [@numeric], true
+    assert_correct_type Numeric >= Boolean, [@numeric], false
+
+    assert_correct_type Boolean >= Numeric >= Numeric, [true, @numeric], @numeric
+    assert_correct_type Boolean >= Array   >= Array,   [true, @array  ], @array
+    assert_correct_type Boolean >= String  >= String,  [true, @string ], @string
+    assert_correct_type Boolean >= Hash    >= Hash,    [true, @hash   ], @hash
+    assert_correct_type Boolean >= Symbol  >= Symbol,  [true, @symbol ], @symbol
   end
 
   def test_wrong_return_type
@@ -84,9 +86,10 @@ class TestHaskell < MiniTest::Unit::TestCase
 
     def define_test_method(type_list, args, val)
       klass = Class.new.class_eval <<-RUBY_CODE
-        type #{obj_literal(type_list)}, def call(#{arg_literal(args.count)})
+        def call(#{arg_literal(args.count)})
           #{obj_literal(val)}
         end
+        type #{obj_literal(type_list)}, :call
       RUBY_CODE
 
       klass.new

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: haskell
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -81,13 +81,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- a
 - bin/haskell
 - ext/haskell/extconf.rb
 - ext/haskell/haskell.c
 - ext/haskell/haskell.h
 - haskell.gemspec
 - lib/haskell.rb
+- lib/haskell/assert_arg_type.rb
+- lib/haskell/assert_rtn_type.rb
+- lib/haskell/base.rb
 - lib/haskell/type_list.rb
 - lib/haskell/version.rb
 - test/minitest_helper.rb

data/a

@@ -1,11 +0,0 @@
-  def test_any
-    assert_wrong_arg @symbo >= @symbo, [@array ], @numeric
-    assert_wrong_arg @symbo >= @symbo, [@string], @numeric
-    assert_wrong_arg @symbo >= @symbo, [@hash  ], @numeric
-    assert_wrong_arg @symbo >= @symbo, [@symbol], @numeric
-
-    assert_wrong_arg @symbo >= @symbo >= @symbo, [@numeric, @array ], @numeric
-    assert_wrong_arg @symbo >= @symbo >= @symbo, [@numeric, @string], @numeric
-    assert_wrong_arg @symbo >= @symbo >= @symbo, [@numeric, @hash  ], @numeric
-    assert_wrong_arg @symbo >= @symbo >= @symbo, [@numeric, @symbol], @numeric
-  en