rdl 1.0.1.rc1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8ba5d3f1fe3944a7eadae9366c10428470a623
-  data.tar.gz: d87c55ae1f8877a6cb14fafff20a38b3cc7f3137
+  metadata.gz: d70ef3cc3d6edbb1cf16a849e412dc465510a606
+  data.tar.gz: b544a1f441d5d2d5beaa023a435940b2ad332ddf
 SHA512:
-  metadata.gz: f31d49ff2763c501dff6093de526d6770624bae0f0e9d6c147903ade326fc8e8fecde916c7a7156f71ab218948a55334426779dfd9dc570126a2ad24a7fd7d1c
-  data.tar.gz: f81fbff3ac6b8348233c9a49471d99fcbd2885dbbf415a0454580109a2f24dd972944dc4f0a235ebee08b435334c25436b6932040baf3b86bd371256932aeb19
+  metadata.gz: c3004c7b0b1b13e4d507497bde17980ec35d80fece303666f07ceee739efeec81bc33a35e09283c222782f419ac2cfbc7d19e163d6988c485a764901e41a262d
+  data.tar.gz: 57246478d603a49ef56bc1dd5266ecdda6f8f8331149beb96651a4d4c30c81764feae526522e7c4c73d37e48003520b54946eef732099256df26120aad084bc6

data/bin/rdl_query

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/rdl.rb' # Fix for release!
-require_relative '../lib/rdl_types.rb' # Fix for release!
+require_relative '../lib/rdl.rb'
+require_relative '../lib/rdl_types.rb'
 
 if ARGV.length != 1 then
 print <<EOF

data/lib/rdl/query.rb

@@ -6,33 +6,25 @@ class RDL::Query
   # method - method of self's class
   def self.method_query(q)
     klass = nil
-    klass_pref = nil
     meth = nil
-    if q =~ /(.+)#(.+)/
+    if q =~ /(.+)#(.+)/ then
       klass = $1
-      klass_pref = "#{klass}#"
       meth = $2.to_sym
-    elsif q =~ /(.+)\.(.+)/
-      klass_pref = "#{$1}."
+    elsif q =~ /(.+)\.(.+)/ then
       klass = RDL::Util.add_singleton_marker($1)
       meth = $2.to_sym
-    else
-      klass = self.class.to_s
-      klass_pref = "#{klass}#"
-      meth = q.to_sym
-    end
-    name = "#{klass_pref}#{meth}"
-    if RDL::Wrap.has_contracts?(klass, meth, :type)
-      return [name, RDL::Wrap.get_contracts(klass, meth, :type)]
-    else
-      raise "No type for #{name}"
+#    else
+#      klass = self.class.to_s
+#      meth = q.to_sym
     end
+    return nil unless RDL::Wrap.has_contracts?(klass, meth, :type)
+    return RDL::Wrap.get_contracts(klass, meth, :type)
   end
 
   # Return an ordered list of all method types of a class. The query should be a class name.
   def self.class_query(q)
     klass = q.to_s
-    return [] unless $__rdl_contracts.has_key? klass
+    return nil unless $__rdl_contracts.has_key? klass
     cls_meths = []
     cls_klass = RDL::Util.add_singleton_marker(klass)
     if $__rdl_contracts.has_key? cls_klass then
@@ -50,46 +42,63 @@ class RDL::Query
         end
       }
     end
-    cls_meths.sort! { |p1,p2| p1[0] <=> p2[0] }
+    cls_meths.sort! { |p1, p2| p1[0] <=> p2[0] }
     cls_meths.each { |m, t| m.insert(0, "self.") }
-    inst_meths.sort! { |p1,p2| p1[0] <=> p2[0] }
+    inst_meths.sort! { |p1, p2| p1[0] <=> p2[0] }
     return cls_meths + inst_meths
   end
 
-  # Return . The query should be a string containing a method type query.
+  # Returns sorted list of pairs [method name, type] matching query. The query should be a string containing a method type query.
   def self.method_type_query(q)
     q = $__rdl_parser.scan_str "#Q #{q}"
+    result = []
     $__rdl_contracts.each { |klass, meths|
       meths.each { |meth, kinds|
         if kinds.has_key? :type then
           kinds[:type].each { |t|
             if q.match(t)
-              puts "#{RDL::Util.pretty_name(klass, meth)}: #{t}"
+              result << [RDL::Util.pretty_name(klass, meth), t]
             end
           }
         end
       }
     }
+    result.sort! { |p1, p2| p1[0] <=> p2[0] }
+    return result
   end
-
 end
 
 class Object
 
   def rdl_query(q)
     $__rdl_contract_switch.off {
-      if q =~ /^([A-Z]\w*(#|\.))?([a-z_]\w*(!|\?|=)?|!|~|\+|\*\*|-|\*|\/|%|<<|>>|&|\||\^|<|<=|=>|>|==|===|!=|=~|!~|<=>|\[\]|\[\]=)$/
-        name, typs = RDL::Query.method_query(q)
-        typs.each { |t|
-          puts "#{name}: #{t}"
-        }
+      if q =~ /^[A-Z]\w*(#|\.)([a-z_]\w*(!|\?|=)?|!|~|\+|\*\*|-|\*|\/|%|<<|>>|&|\||\^|<|<=|=>|>|==|===|!=|=~|!~|<=>|\[\]|\[\]=)$/
+        typs = RDL::Query.method_query(q)
+        if typs.nil? then
+          puts "No types for #{q}"
+        else
+          typs.each { |t|
+            puts "#{q}: #{t}"
+          }
+        end
       elsif q =~ /^[A-Z]\w*$/
-        RDL::Query.class_query(q).each { |m, t| puts "#{m}: #{t}"}
-      elsif q =~ /(.*)/
-        RDL::Query.method_type_query(q)
+        typs = RDL::Query.class_query(q)
+        if typs.nil? then
+          puts "No method types for #{q}"
+        else
+          typs.each { |m, t| puts "#{m}: #{t}"}
+        end
+      elsif q =~ /\(.*\)/
+        typs = RDL::Query.method_type_query(q)
+        if typs.empty? then
+          puts "No matching methods"
+        else
+          typs.each { |m, t| puts "#{m}: #{t}" }
+        end
       else
         raise "Don't know how to handle query"
       end
+      nil
     }
   end
 

data/rdl.gemspec

@@ -4,8 +4,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'rdl'
-  s.version     = '1.0.1.rc1'
-  s.date        = '2016-01-01'
+  s.version     = '1.1.0'
+  s.date        = '2016-01-03'
   s.summary     = 'Ruby type and contract system'
   s.description = <<-EOF
 RDL is a gem that allows contracts (pre- and postconditions) to be added to methods.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdl
 version: !ruby/object:Gem::Version
-  version: 1.0.1.rc1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeffrey S. Foster
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -173,9 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1