rubycube 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a67b0c4bfcd1f828f6f2c976dfacb893fd3447d
-  data.tar.gz: 2185c04360ba16d024ba0e3c4369cb27fd6ea75a
+  metadata.gz: 2bcabba8c4d9c0e4e97fbe87c677b5a4f6cb12de
+  data.tar.gz: b41bb0dde4bf03c019bbe008242b9a56ed51043a
 SHA512:
-  metadata.gz: 54329a70c088a60cefb0dbb060274fa4a3ef0619d2c0363bd08032d3927d0735238e319789049850f45f174f8194d312db0aea409bd02fb8b29de0a9479c655f
-  data.tar.gz: 7dad8733970a4a3734a55e37d3a34762112643a6f54ab7094098884d90cc5346fa1e41d00217e5990768b90df0326842ec699f9c548bae113ab4972ba33da723
+  metadata.gz: c24794642ae6e1ee65a52184b3e60efdfb243571307afaa2dc442c4d413171a13e0bce27bd16e130846b1718d794f668a6c184db0896aaadabbaa1bbe6f9adbb
+  data.tar.gz: '0283893f2805db378c55358ceaa15e370ab13519f7d40aa3e788b33ae430b42e4285e5acf0dfb4665054fc7e1940d1776580de3a5ac6e6b8f8c0372e7ef8d62e'

data/cube.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'rubycube'
-  spec.version    = '0.3.1'
+  spec.version    = '0.4.0'
   spec.author     = 'Aditya Godbole'
   spec.license    = 'Artistic 2.0'
   spec.email      = 'code.aa@gdbl.me'
@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
 
   spec.extra_rdoc_files = ['README.md', 'CHANGES', 'MANIFEST', 'examples/demo.rb']
 
+  spec.add_dependency('dry-types')
+  spec.add_development_dependency('dry-types')
   spec.add_development_dependency('test-unit')
   spec.add_development_dependency('rake')
 

data/examples/demo.rb

@@ -1,19 +1,24 @@
 # run as `RUBY_CUBE_TYPECHECK= 1 ruby examples/demo.rb`
 #require_relative '../lib/cube'
 require 'cube'
+require 'dry-types'
+
+module Types
+  include Dry::Types.module
+end
 
 Adder = Cube.interface {
-  # sum is a method that takes an array of Integer and returns an Integer
-  proto(:sum, [Integer]) { Integer }
+  # sum is a method that takes an array of Types::Strict::Int and returns an Types::Strict::Int
+  proto(:sum, [Types::Strict::Int]) { Types::Strict::Int }
 }
 
 Calculator = Cube.interface {
   # interfaces can be composed
   extends Adder
-  # method fact takes an Integer and returns an Integer
-  proto(:fact, Integer) { Integer }
-  # method pos takes an array of Integers, an Integer, and returns either Integer or nil
-  proto(:pos, [Integer], Integer) { [Integer, NilClass].to_set }
+  # method fact takes an Types::Strict::Int and returns an Types::Strict::Int
+  proto(:fact, Types::Strict::Int) { Types::Strict::Int }
+  # method pos takes an array of Types::Strict::Ints, an Types::Strict::Int, and returns either Types::Strict::Int or nil
+  proto(:pos, [Types::Strict::Array], Types::Strict::Int) { Types::Strict::Int|Types::Strict::Nil }
 }
 
 class SimpleCalcImpl
@@ -39,8 +44,8 @@ p c.pos([1, 2, 3], 4)
 
 AdvancedCalculator = Cube.interface {
   extend Calculator
-  proto(:product, Integer, Integer) { Integer }
-  proto(:avg, [Integer]) { Float }
+  proto(:product, Types::Strict::Int, Types::Strict::Int) { Types::Strict::Int }
+  proto(:avg, [Types::Strict::Int]) { Types::Strict::Float }
 }
 
 ProductCalcT = Cube.trait do

data/examples/traits.rb

@@ -1,12 +1,18 @@
 ENV['RUBY_CUBE_TYPECHECK'] = "1"
 #require_relative '../lib/cube'
 require 'cube'
+require 'dry-initializer'
+
+module Types
+  include Dry::Types.module
+end
+
 EmailNotifierT = Cube.trait do
   def notify
     puts "email sent to #{email}"
   end
   requires_interface Cube.interface {
-    proto(:email) { String }
+    proto(:email) { Types::Strict::String }
   }
 end
 
@@ -16,7 +22,7 @@ AndroidNotifierT = Cube.trait do
   end
 
   requires_interface Cube.interface {
-    proto(:mobile_number) { String }
+    proto(:mobile_number) { Types::Strict::String }
   }
 end
 
@@ -26,7 +32,7 @@ IOSNotifierT = Cube.trait do
   end
 
   requires_interface Cube.interface {
-    proto(:mobile_number) { String }
+    proto(:mobile_number) { Types::Strict::String }
   }
 end
 
@@ -50,21 +56,31 @@ IOSCombinedNotifier = Cube.trait.with_trait(IOSNotifierT, rename: { notify: :mob
                           .with_trait(CombinedNotifierT)
 
 MobileEmailUser = Cube.interface {
-  proto(:email) { String }
-  proto(:mobile_number) { String }
+  proto(:email) { Types::Strict::String }
+  proto(:mobile_number) { Types::Strict::String }
 }
 
+class Service
+  extend Dry::Initializer
+  option :email
+  option :mobile_number
+  option :type
+end
+
+AndroidService = Cube[Service].with_trait(AndroidCombinedNotifier)
+                              .as_interface(MobileEmailUser)
+IOSService = Cube[Service].with_trait(IOSCombinedNotifier)
+                              .as_interface(MobileEmailUser)
+
 Services = {
-  android: AndroidCombinedNotifier.wrap(MobileEmailUser),
-  ios: IOSCombinedNotifier.wrap(MobileEmailUser)
+  android: AndroidService,
+  ios: IOSService
 }
 User = Struct.new(:email, :mobile_number, :type)
-Cube.mark_interface!(User, MobileEmailUser)
-CubeUser = Cube[User].as_interface(MobileEmailUser)
 
 u1 = User.new('u1@foo.com', '1234567890', :android)
 u2 = User.new('u2@foo.com', '1234567899', :ios)
 
 [u1, u2].each do |u|
-  Services[u.type].new(u).notify
+  Services[u.type].new(u.to_h).notify
 end

data/lib/cube/interfaces.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'set'
+require 'dry-types'
 # A module for implementing Java style interfaces in Ruby. For more information
 # about Java interfaces, please see:
 #
@@ -9,28 +10,6 @@ require 'set'
 # Top level module for RubyCube
 module Cube
   module Interface
-
-    def self.match_specs(i1specs, i2specs)
-      i1specs.each do |meth, i1spec|
-        i2spec = i2specs[meth]
-        raise InterfaceMatchError, "Method `#{meth}` not found" unless i2spec
-        i2_in = i2spec[:in]
-        i1_in = i1spec[:in]
-        if i1_in && (!i2_in || i1_in.size != i2_in.size)
-          raise InterfaceMatchError, "Method `#{meth}` prototype does not match"
-        end
-        (i1_in || []).each_index do |i|
-          Cube.check_type_spec(i1_in[i], i2_in[i]) { |t1, t2| t2 == t1 }
-        end
-        i1_out = i1spec[:out]
-        if i1_out
-          i2_out = i2spec[:out]
-          raise InterfaceMatchError, "Method `#{meth}` prototype does not match" unless i2_out
-          Cube.check_type_spec(i1_out, i2_out) { |t1, t2| t2 == t1 }
-        end
-      end
-    end
-
     # Exceptions thrown while checking interfaces
     class MethodMissing < RuntimeError; end
     class PrivateVisibleMethodMissing < MethodMissing; end
@@ -131,28 +110,26 @@ module Cube
       # replace method with a type checking wrapper
       mod.class_exec do
         # random alias name to avoid conflicts
-        ns_meth_name = "#{id}_#{SecureRandom.hex(3)}".to_sym 
+        ns_meth_name = "#{id}_#{SecureRandom.hex(3)}".to_sym
         alias_method ns_meth_name, id
         # The type checking wrapper
         define_method(id) do |*args|
-          args.each_index do |i|
-            # the value and expected type of the arg
-            v, t = args[i], inchecks[i]
+          new_args = args.zip(inchecks).map do |v, t|
             begin
-              Cube.check_type(t, v)
-            rescue Interface::TypeMismatchError => e
+              Cube.check_type(t,v)
+            rescue Dry::Types::ConstraintError => e
               raise Interface::TypeMismatchError,
-                    "#{mod}: #{iface}##{id} (arg: #{i}): #{e.message}"
+                    "#{mod}: #{iface}##{id} : #{e.message}"
             end
           end
           # types look good, call the original method
-          ret = send(ns_meth_name, *args)
+          ret = send(ns_meth_name, *new_args)
           # check return type if it exists
           begin
             Cube.check_type(outcheck, ret) if outcheck
-          rescue Interface::TypeMismatchError => e
+          rescue Dry::Types::ConstraintError => e
             raise Interface::TypeMismatchError,
-              "#{mod}: #{iface}##{id} (return): #{e.message}"
+                  "#{mod}: #{iface}##{id} (return): #{e.message}"
           end
           # looks good, return
           ret
@@ -174,12 +151,8 @@ module Cube
     # validate the interface spec is valid
     def validate_spec(spec)
       [*spec].each do |t|
-        if t.is_a?(Array)
-          unless t.first.is_a?(Module)
-            raise ArgumentError, "#{t} does not contain a Module or Interface"
-          end
-        elsif !t.is_a?(Module)
-          raise ArgumentError, "#{t} is not a Module or Interface"
+        unless t.is_a?(Dry::Types::Type) || t.is_a?(Module)
+          raise ArgumentError, "#{t} is not a Dry::Types::Type nor a Module"
         end
       end
     end
@@ -203,13 +176,6 @@ module Cube
       @ids.merge(inherited_specs)
     end
 
-    def assert_match(intf)
-      raise ArgumentError, "#{intf} is not a Cube::Interface" unless intf.is_a?(Interface)
-      intf_specs = intf.to_spec
-      self_specs = to_spec
-      Interface.match_specs(self_specs, intf_specs)
-    end
-
     def proto(meth, *args)
       out_spec = yield if block_given?
       validate_spec(args)

data/lib/cube/toplevel.rb

@@ -1,3 +1,5 @@
+require 'dry-types'
+
 module Cube
   def self.mark_interface!(cls, iface)
     Cube[cls].as_interface(iface, runtime_checks: false)
@@ -36,49 +38,36 @@ module Cube
     m
   end
 
-  def self.check_type_spec(t, v, &blk)
-    if t.is_a?(Set)
-      if v.is_a?(Set)
-        if v != t
-          raise Cube::Interface::TypeMismatchError, "#{t.to_a} is not eql to #{v.to_a}"
-        end
-        return true
-      end
-      unless t.any? { |tp| check_type(tp, v, &blk) rescue false }
-        raise Cube::Interface::TypeMismatchError,
-          "#{v.inspect} is not any of #{t.to_a}"
-      end
-      return
-    end
-    if t.is_a? Array
-      raise Cube::Interface::TypeMismatchError,
-        "#{v} is not an Array" unless v.is_a? Array
-      check_type(t.first, v.first, &blk)
-      check_type(t.first, v.last, &blk)
-      return
-    end
-    raise Cube::Interface::TypeMismatchError, "#{v.inspect} is not type #{t}" unless blk.call(t, v) 
-    true
-  end
+#  def self.check_type_spec(t, v, &blk)
+#    if t.is_a?(Set)
+#      if v.is_a?(Set)
+#        if v != t
+#          raise Cube::Interface::TypeMismatchError, "#{t.to_a} is not eql to #{v.to_a}"
+#        end
+#        return true
+#      end
+#      unless t.any? { |tp| check_type(tp, v, &blk) rescue false }
+#        raise Cube::Interface::TypeMismatchError,
+#          "#{v.inspect} is not any of #{t.to_a}"
+#      end
+#      return
+#    end
+#    if t.is_a? Array
+#      raise Cube::Interface::TypeMismatchError,
+#        "#{v} is not an Array" unless v.is_a? Array
+#      check_type(t.first, v.first, &blk)
+#      check_type(t.first, v.last, &blk)
+#      return
+#    end
+#    raise Cube::Interface::TypeMismatchError, "#{v.inspect} is not type #{t}" unless blk.call(t, v) 
+#    true
+#  end
 
   if ENV['RUBY_CUBE_TYPECHECK'].to_i > 0
     def self.check_type(t, v)
-      if t.is_a?(Set)
-        unless t.any? { |tp| check_type(tp, v) rescue false }
-          raise Cube::Interface::TypeMismatchError,
-                "#{v.inspect} is not any of #{t.to_a}"
-        end
-        return
-      end
-      if t.is_a? Array
-        raise Cube::Interface::TypeMismatchError,
-              "#{v} is not an Array" unless v.is_a? Array
-        check_type(t.first, v.first)
-        check_type(t.first, v.last)
-        return
-      end
+      return t[v] if t.is_a? Dry::Types::Type
       raise Cube::Interface::TypeMismatchError, "#{v.inspect} is not type #{t}" unless v.is_a? t
-      true
+      v
     end
   else
     def self.check_type(*_); end

data/lib/cube/traits.rb

@@ -43,38 +43,6 @@ module Cube
       end
       super
     end
-
-    def wrap(intf)
-      assert_match(intf)
-      cls = Class.new(SimpleDelegator) do
-        define_method(:initialize) do |obj|
-          $stderr.puts "Checking with #{intf}"
-          Cube.check_type(intf, obj)
-          super(obj)
-        end
-      end
-      inc_trait = clone
-      inc_trait.instance_variable_set(:@__interface_trait_required_interface, nil)
-      inc_trait.instance_variable_set(:@__trait_cloned_from, self)
-      Cube[cls].with_trait(inc_trait)
-    end
-
-    def assert_match(intf)
-      self_methods = instance_methods
-      inherited = self.ancestors.select{ |x| Trait === x }
-      required_interface_spec = inherited.inject({}) { |acc, x|
-        req = x.instance_variable_get('@__interface_trait_required_interface')
-        if req
-          acc.merge(req.to_spec)
-        else
-          acc
-        end
-      }
-      self_methods.each do |sm|
-        required_interface_spec.delete(sm)
-      end
-      Interface.match_specs(required_interface_spec, intf.to_spec)
-    end
   end
 end
 

data/test/test_interface.rb

@@ -5,15 +5,19 @@
 #####################################################
 ENV['RUBY_CUBE_TYPECHECK'] = "1"
 require 'test-unit'
-require 'cube'
+require_relative '../lib/cube'
+require 'dry-types'
 
+module Types
+  include Dry::Types.module
+end
 
 class TC_Interface < Test::Unit::TestCase
   def self.startup
     alpha_interface = Cube.interface{
       public_visible(:alpha, :beta)
-      proto(:beta) { [Integer, NilClass].to_set }
-      proto(:delta, Integer, String, Integer) { Integer }
+      proto(:beta) { Types::Strict::Int|Types::Strict::Nil }
+      proto(:delta, Types::Strict::Int, Types::Strict::String, Types::Strict::Int) { Types::Strict::Int }
     }
 
     gamma_interface = Cube.interface{
@@ -84,9 +88,9 @@ class TC_Interface < Test::Unit::TestCase
     assert_nothing_raised {
       Cube[B].as_interface(@@alpha_interface).as_interface(@@alpha_interface)
     }
-    assert_nothing_raised {
+#    assert_nothing_raised {
       Cube[B].as_interface(@@alpha_interface, runtime_checks: true).new.beta
-    }
+#    }
     assert_raise(ArgumentError) {
       Cube[B].as_interface(@@alpha_interface).new.delta
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycube
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Aditya Godbole
@@ -9,8 +9,36 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/djberg96_pub.pem
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -39,8 +67,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      CUBE (Composable Units of Behaviour) implements Interfaces, Traits and typechecks for Ruby.
+description: "    CUBE (Composable Units of Behaviour) implements Interfaces, Traits
+  and typechecks for Ruby.\n"
 email: code.aa@gdbl.me
 executables: []
 extensions: []
@@ -56,75 +84,13 @@ files:
 - Rakefile
 - certs/djberg96_pub.pem
 - cube.gemspec
-- doc/Bar.html
-- doc/CHANGES.html
-- doc/Foo.html
-- doc/Interface.html
-- doc/Interface/MethodMissing.html
-- doc/Interface/PrivateVisibleMethodMissing.html
-- doc/Interface/PublicVisibleMethodMissing.html
-- doc/MANIFEST.html
-- doc/Module.html
-- doc/MyClass.html
-- doc/MyInterface.html
-- doc/MySubInterface.html
-- doc/Object.html
-- doc/README.html
-- doc/Rakefile.html
-- doc/TC_Interface.html
-- doc/certs/djberg96_pub_pem.html
-- doc/created.rid
-- doc/css/fonts.css
-- doc/css/rdoc.css
-- doc/fonts/Lato-Light.ttf
-- doc/fonts/Lato-LightItalic.ttf
-- doc/fonts/Lato-Regular.ttf
-- doc/fonts/Lato-RegularItalic.ttf
-- doc/fonts/SourceCodePro-Bold.ttf
-- doc/fonts/SourceCodePro-Regular.ttf
-- doc/images/add.png
-- doc/images/arrow_up.png
-- doc/images/brick.png
-- doc/images/brick_link.png
-- doc/images/bug.png
-- doc/images/bullet_black.png
-- doc/images/bullet_toggle_minus.png
-- doc/images/bullet_toggle_plus.png
-- doc/images/date.png
-- doc/images/delete.png
-- doc/images/find.png
-- doc/images/loadingAnimation.gif
-- doc/images/macFFBgHack.png
-- doc/images/package.png
-- doc/images/page_green.png
-- doc/images/page_white_text.png
-- doc/images/page_white_width.png
-- doc/images/plugin.png
-- doc/images/ruby.png
-- doc/images/tag_blue.png
-- doc/images/tag_green.png
-- doc/images/transparent.png
-- doc/images/wrench.png
-- doc/images/wrench_orange.png
-- doc/images/zoom.png
-- doc/index.html
-- doc/interface_gemspec.html
-- doc/js/darkfish.js
-- doc/js/jquery.js
-- doc/js/navigation.js
-- doc/js/navigation.js.gz
-- doc/js/search.js
-- doc/js/search_index.js
-- doc/js/search_index.js.gz
-- doc/js/searcher.js
-- doc/js/searcher.js.gz
-- doc/table_of_contents.html
 - examples/demo.rb
 - examples/traits.rb
 - lib/cube.rb
 - lib/cube/interfaces.rb
 - lib/cube/toplevel.rb
 - lib/cube/traits.rb
+- rubycube-0.3.0.gem
 - test/test_interface.rb
 homepage: http://github.com/adityagodbole/rubycube
 licenses:
@@ -146,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Interfaces for Ruby