ruby_codex 0.0.3 → 0.0.4a

data/lib/ruby_codex.rb

@@ -2,10 +2,10 @@ load 'data_node.rb'
 
 class Codex
   
-  attr_accessor :block, :func, :func_chain, :cond, :ident
-  
-  def initialize(db,agg_db)
+  attr_reader :nodes
     
+  def initialize(db,agg_db)
+    @nodes = {}
     # helper procs
     info = Proc.new do |node|
       normal_node(node) do |n, norm|
@@ -52,7 +52,7 @@ class Codex
       :func_info => Proc.new { |v| v.first[:func_info] }
     }
 
-    @block = DataNode.new(
+    @nodes[:block] = DataNode.new(
       db, agg_db,
       Proc.new { |x| x.type == :block}, 
       key.merge({ 
@@ -83,18 +83,17 @@ class Codex
         query_count = query.nil? ? 0 : query.count
         blocks = db.where(:type => keys[:type], :func => keys[:func]).sum(:count)
         rets = db.where(:type => keys[:type], :ret_val => keys[:ret_val]).sum(:count)
-        if query_count <= 0
-          { :keys => keys,
-            :message => 
-              "We've seen #{keys[:func]} blocks returning #{keys[:ret_val]} only #{query_count.to_s} " +
-              "times, though we've seen #{keys[:func]} blocks #{blocks.to_s} times and #{keys[:ret_val]} " +
-              "returned #{rets.to_s} times."
-          } if blocks > 0 && rets > 0
-        end
+        { :keys => keys,
+          :message => 
+            "We've seen #{keys[:func]} blocks returning the #{keys[:ret_val]} type #{query_count.to_s} " +
+            "times, and we've seen #{keys[:func]} blocks #{blocks.to_s} times and #{keys[:ret_val]} " +
+            "returned #{rets.to_s} times.",
+          :unlikely => Proc.new { |gt=1,bt = 0,rt = 0| query_count < gt && blocks > bt && rets > rt}
+        }
       }
     )
 
-    @func = DataNode.new(
+    @nodes[:func] = DataNode.new(
       db, agg_db,
       Proc.new { |x| x.type == :send}, 
       key.merge({ 
@@ -111,13 +110,14 @@ class Codex
         alt_count = func.nil? ? 0 : func.count
         { :keys => keys,
           :message =>
-            "Function call #{keys[:norm_code]} has appeared #{query_count.to_s} times, but " +
-            "#{func.norm_code} has appeared #{alt_count.to_s} times."
-        } if alt_count > 10 * (query_count + 1)
+            "Function call #{keys[:norm_code]} has appeared #{query_count.to_s} times, and the most " +
+            "common alternative #{func.norm_code} has appeared #{alt_count.to_s} times.",
+          :unlikely => Proc.new { |t=10| alt_count > t * (query_count + 1)}
+        }
       }
     )
 
-    @func_chain = func = DataNode.new(
+    @nodes[:func_chain] = DataNode.new(
       db, agg_db,
       Proc.new { |x| x.type == :send && type.call(x.children.first) == "send" }, 
       key.merge({ 
@@ -132,19 +132,19 @@ class Codex
       combine,
       Proc.new do |db,keys,data|
         query = db.where(keys).first
-        if query.nil? || query.count <= 0
-          fs = [:f1,:f2].map { |f| db.where(:type => "send", :func => keys[f]).size }
-          { :keys => keys, 
-            :message => 
-              "Function #{keys[:f1]} has appeared #{fs[0].to_s} times " +
-              "and #{keys[:f2]} has appeared #{fs[1].to_s} times, but " +
-              "they haven't appeared together."
-          } unless fs[0] <= 0 || fs[1] <= 0
-        end
+        query_count = query.nil? ? 0 : query.count
+        fs = [:f1,:f2].map { |f| db.where(:type => "send", :func => keys[f]).size }
+        { :keys => keys, 
+          :message => 
+            "Function #{keys[:f1]} has appeared #{fs[0].to_s} times " +
+            "and #{keys[:f2]} has appeared #{fs[1].to_s} times, and " +
+            "they've appeared #{query_count} times together.",
+          :unlikely => Proc.new { |gt=1, t=10| query_count < gt && fs[0] > t && fs[1] > t }
+        }
       end
     )
 
-    @cond = DataNode.new(
+    @nodes[:cond] = DataNode.new(
       db, agg_db,
       Proc.new { |x| x.type == :if },
       key.merge({
@@ -157,7 +157,7 @@ class Codex
       combine
     )
 
-    @ident = DataNode.new(
+    @nodes[:ident] = DataNode.new(
       db, agg_db,
       Proc.new { |x| [:lvasgn, :ivasgn, :cvasgn, :gvasgn].include?(x.type) },
       key.merge({
@@ -177,21 +177,48 @@ class Codex
         if query
           types = query.ident_types.select { |k,v| ["str","int","float","array","hash"].include? k }
           types.default = 0
-          pp types
-          first, second = types.sort_by{ |k,v| v*-1 }.take(2)
-          if (first && second.nil?) || (first[1] > 10 * (second[1] + 1))
-            { :keys => keys,
-              :message => 
-                "The identifier #{keys[:ident]} has appeared #{first[1].to_s} " +
-                "times as #{first[0].to_s}, but only #{types[data[:ident_type]].to_s} " +
-                "times as #{data[:ident_type].to_s}" 
-            } unless first[0].to_s == data[:ident_type]
-          end
+          best = types.select { |k,v| k != data[:ident_type] }.sort_by{ |k,v| v*-1 }.first
+          { :keys => keys,
+            :message => 
+              "The identifier #{keys[:ident]} has appeared #{types[data[:ident_type]].to_s} " +
+              "times as #{data[:ident_type].to_s} and #{best[1].to_s} times as #{best[0].to_s}", 
+            :unlikely => Proc.new { |t=5| best[1] > t * (types[keys[:ident_type]] + 1) }
+          }
+        else
+          { :message => "Never Seen", :unlikely => Proc.new { false } }
         end
       }
     )
   end
   
+  def add_ast(ast, file, project, &block)
+    @nodes.each do |k,v|
+      v.add_ast(ast, file, project, &block) 
+    end
+  end
+  
+  def save_all!
+    @nodes.each do |k,v|
+      v.save!
+    end
+  end
+  
+  def query(ast)
+    @nodes.each do |k,v|
+      yield k, v.query(ast)
+    end
+  end
+  
+  def is_unlikely(ast, options = Hash.new([]))
+    unlikely = []
+    query(ast) do |k, message|
+      if message && message[:unlikely].call(*options[k])
+        unlikely.push(message)
+      end
+    end
+    unlikely
+  end   
+  
   def without_caller(node) 
     node.updated(nil, node.children.map.with_index do |x,i|
       i == 0 ? nil : x

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ruby_codex
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4a
+  prerelease: 5
 platform: ruby
 authors:
 - Ethan Fast
@@ -22,26 +23,26 @@ files:
 homepage: http://rubygems.org/gems/ruby-codex
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Analyze ruby ASTs with Codex
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmQ3MDg3YzBkZjZmMmM5ZmI2ODEyMTMxYWI0MWU4MGI3N2VmMDBjMQ==
-  data.tar.gz: !binary |-
-    ZjEzZThiNmI4M2RjYjM5MGUwZmQzYzAzOWI0MjNmODRmN2Y0YzZiYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWJjZTliOTQzMzU3NDM3OTRlYjI0OGRiMzMyZjA5YWM5MjBmYWMyMDcxNDI3
-    ZWM3OWE5ODhjZTU2YTBiNjlmMzI1YzQzMTMwODZlMTk3ZjljYzAyYzA2ZDQx
-    ZjUzMzNhZjk0ZjI0YjFiOGFmMWYzYTNkZTE4NmYzMzI0Y2E1MzE=
-  data.tar.gz: !binary |-
-    NWQwMTBjNmY3NjAwZTNiOWYyNDliYmE3YjM4MWE4MDk2YmI2N2IxYTk1ZTE0
-    NzA1YzZhNjQwYjBiMzI4MmE1NTViODg0YWJkMTA3NTBlODFiMzAzZjc2ZDA4
-    Y2VlYzFiNDdhYmFkN2E3YzdmNDMzZmQxZThlMjFiNTA1ZDk4ODk=