rdl 2.1.0 → 2.2.0

data/test/test_types.rb

@@ -9,6 +9,10 @@ class TestTypes < Minitest::Test
   class B; end
   class C; end
 
+  def setup
+    RDL.reset
+  end
+
   def test_nil_top
     tnil = NominalType.new :NilClass
     assert_equal RDL::Globals.types[:nil], tnil
@@ -20,6 +24,14 @@ class TestTypes < Minitest::Test
     assert (RDL::Globals.types[:nil] != ttop)
   end
 
+  def test_dyn
+    tdyn = DynamicType.new
+    tdyn2 = DynamicType.new
+    assert_equal tdyn, tdyn2
+    assert_equal RDL::Globals.types[:dyn], tdyn
+    assert (RDL::Globals.types[:nil] != tdyn)
+  end
+
   def test_nominal
     ta = NominalType.new :A
     ta2 = NominalType.new :A
@@ -220,4 +232,9 @@ class TestTypes < Minitest::Test
     assert_equal tmethbssfn, tmethbaabn.instantiate(inst)
     assert_equal tstructinst, tstructorig.instantiate(inst)
   end
+
+  def test_canonical
+    t = RDL::Globals.parser.scan_str '#T Array<Integer or Integer>'
+    assert_equal 'Array<Integer>', t.canonical.to_s
+  end
 end

data/test/test_wrap.rb

@@ -4,6 +4,11 @@ require 'rdl'
 
 class TestWrap < Minitest::Test
   extend RDL::Annotate
+
+  def setup
+    RDL.reset
+  end
+
   class C
     def foo_public(x)
       foo(x)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdl
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jeffrey S. Foster
@@ -9,10 +9,11 @@ authors:
 - T. Stephen Strickland
 - Alexander T. Yu
 - Milod Kazerounian
+- Sankha Narayan Guria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -34,6 +35,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.1.4
+- !ruby/object:Gem::Dependency
+  name: sql-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: |
   RDL is a gem that adds types and contracts to Ruby. RDL includes extensive
   support for specifying method types, which can either be enforced as
@@ -68,9 +83,13 @@ files:
 - lib/rdl/switch.rb
 - lib/rdl/typecheck.rb
 - lib/rdl/types/annotated_arg.rb
+- lib/rdl/types/ast_node.rb
 - lib/rdl/types/bot.rb
+- lib/rdl/types/bound_arg.rb
+- lib/rdl/types/computed.rb
 - lib/rdl/types/dependent_arg.rb
 - lib/rdl/types/dots_query.rb
+- lib/rdl/types/dynamic.rb
 - lib/rdl/types/finite_hash.rb
 - lib/rdl/types/generic.rb
 - lib/rdl/types/intersection.rb
@@ -82,7 +101,9 @@ files:
 - lib/rdl/types/optional.rb
 - lib/rdl/types/parser.racc
 - lib/rdl/types/parser.tab.rb
+- lib/rdl/types/rdl_types.rb
 - lib/rdl/types/singleton.rb
+- lib/rdl/types/string.rb
 - lib/rdl/types/structural.rb
 - lib/rdl/types/top.rb
 - lib/rdl/types/tuple.rb
@@ -96,6 +117,7 @@ files:
 - lib/rdl/util.rb
 - lib/rdl/wrap.rb
 - lib/rdl_disable.rb
+- lib/types/active_record.rb
 - lib/types/core.rb
 - lib/types/core/_aliases.rb
 - lib/types/core/abbrev.rb
@@ -168,11 +190,12 @@ files:
 - lib/types/rails/active_model/validations.rb
 - lib/types/rails/active_record/associations.rb
 - lib/types/rails/active_record/base.rb
+- lib/types/rails/active_record/comp_types.rb
 - lib/types/rails/active_record/core.rb
 - lib/types/rails/active_record/finder_methods.rb
 - lib/types/rails/active_record/model_schema.rb
 - lib/types/rails/active_record/relation.rb
-- lib/types/rails/active_record/schema_types.rb
+- lib/types/rails/active_record/sql-strings.rb
 - lib/types/rails/active_record/validations.rb
 - lib/types/rails/active_support/base.rb
 - lib/types/rails/active_support/logger.rb
@@ -184,13 +207,19 @@ files:
 - lib/types/rails/rack/request.rb
 - lib/types/rails/string.rb
 - lib/types/rails/time.rb
+- lib/types/sequel.rb
+- lib/types/sequel/comp_types.rb
 - rdl.gemspec
 - test/disabled_test_coverage.rb
 - test/disabled_test_rdoc.rb
 - test/test_alias.rb
+- test/test_array_types.rb
+- test/test_bound_types.rb
 - test/test_contract.rb
 - test/test_dsl.rb
+- test/test_dyn_comptype_checks.rb
 - test/test_generic.rb
+- test/test_hash_types.rb
 - test/test_intersection.rb
 - test/test_le.rb
 - test/test_lib_types.rb
@@ -199,11 +228,12 @@ files:
 - test/test_query.rb
 - test/test_rdl.rb
 - test/test_rdl_type.rb
+- test/test_string_types.rb
 - test/test_type_contract.rb
 - test/test_typecheck.rb
 - test/test_types.rb
 - test/test_wrap.rb
-homepage: https://github.com/plum-umd/rdl
+homepage: https://github.com/tupl-tufts/rdl
 licenses:
 - BSD-3-Clause
 metadata: {}
@@ -223,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Ruby type and contract system

data/lib/types/rails/active_record/schema_types.rb

@@ -1,51 +0,0 @@
-class ActiveRecord::Base
-  extend RDL::RDLAnnotate
-
-  def self.add_schema_types
-  end
-
-  rdl_post('self.add_schema_types') { |ret| # load_schema! doesn't return anything interesting
-    type 'self.where', "(*%any) -> ActiveRecord::Relation<#{self}>"
-
-    columns_hash.each { |name, col|
-      t = RDL::Rails.column_to_rdl(col.type)
-      if col.null
-        # may be null; show nullability in return type
-        rdl_type name,       "() -> #{t} or nil"     # getter
-        rdl_type "#{name}_id",       "() -> #{t} or nil"     # getter
-        rdl_type "#{name}=", "(#{t}) -> #{t} or nil" # setter
-        rdl_type "write_attribute", "(:#{name}, #{t}) -> %bool"
-        rdl_type "update_attribute", "(:#{name}, #{t}) -> %bool"
-        rdl_type "update_column", "(:#{name}, #{t}) -> %bool"
-      else
-        # not null; can't truly check in type system but hint via the name
-        rdl_type name,       "() -> !#{t}"                 # getter
-        rdl_type "#{name}_id",       "() -> !#{t}"                 # getter
-        rdl_type "#{name}=", "(!#{t}) -> !#{t}" # setter
-        rdl_type "write_attribute", "(:#{name}, !#{t}) -> %bool"
-        rdl_type "update_attribute", "(:#{name}, #{t}) -> %bool"
-        rdl_type "update_column", "(:#{name}, #{t}) -> %bool"
-      end
-    }
-
-    attribute_types = RDL::Rails.attribute_types(self)
-
-    rdl_type 'self.find', "(Fixnum) -> #{self}"
-    rdl_type 'self.find', "(String) -> #{self}"
-    rdl_type 'self.find', '({' + attribute_types + "}) -> #{self}"
-
-=begin
-    type 'self.find_by', '(' + attribute_types + ") -> #{self} or nil"
-    type 'self.find_by!', '(' + attribute_types + ") -> #{self}"
-    type 'update', '(' + attribute_types + ') -> %bool'
-    type 'update_columns', '(' + attribute_types + ') -> %bool'
-    type 'attributes=', '(' + attribute_types + ') -> %bool'
-
-    # If called with String arguments, can't check types as precisely
-    type 'write_attribute', '(String, %any) -> %bool'
-    type 'update_attribute', '(String, %any) -> %bool'
-    type 'update_column', '(String, %any) -> %bool'
-=end
-    true
-  }
-end