conceptql 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18f492f915df9764cef2f0e323377b3f332775e2
-  data.tar.gz: c1d56957e335c2ce0cf3b210e87fc7076ea3dd5c
+  metadata.gz: 5d18bbb657fb80b014eb554e98b1329f98ecb64f
+  data.tar.gz: 80564c67d29d44af5c91cae68a0096eac546116b
 SHA512:
-  metadata.gz: c24acf0374cc97a6fac1c09dbbf2e9b5a58904c12221e26f24c39a554c34aba425f0751519e40ba89de2e909e7f04fece936f612cc6556e2884dab87a5493c2e
-  data.tar.gz: e0e7b23651b543f13720fe89bff326a37c0d33f429ca7164d64d587532037c140763d7bc1fc9de7ce454cd3ceff15b50a9cadc3592d7d2a71aa48172ae26b6fb
+  metadata.gz: 2bfa1b9efeae75d2d96c3565cc9ffe38398667e5d15afbf8c9c4d5d835c48da685eb74561262db103f86d8f880e4957ac3bd53ffc26816c5ceec73b065a09457
+  data.tar.gz: 11a3813fdd1450c70b4f6aa866dffba16f2e22376ec6a625a77ef6840aeb777dbc8099ab3f40b78feae2080706ebdf40b0609d2cea017f89af5e67faee1823e0

data/CHANGELOG.md

@@ -1,6 +1,25 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.0.6 - 2014-08-23
+
+### Added
+- Tree#defined to pass type information between Define and Recall.
+- Node#sql to produce SQL for each node.
+- Graph includes row count on each edge in the diagram.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Bug in CastingNode that generate SQL returning multiple columns in a subquery.
+- Made ruby-graphviz a dependency so calling programs don't bomb out.
+- Define now passes rows on through like any other node!
+
+
 ## 0.0.5 - 2014-08-19
 
 ### Added
@@ -16,7 +35,6 @@ All notable changes to this project will be documented in this file.
 - Bug in GraphNodifier not displaying types for `recall` nodes.
 
 
-
 ## 0.0.4 - 2014-08-19
 
 ### Added

data/conceptql.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sequelizer', '~> 0.0'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'pg', '~> 0.17'
+  spec.add_dependency 'ruby-graphviz', '~> 1.2'
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'ruby-graphviz', '~> 1.2'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'minitest', '~> 5.4'
   spec.add_development_dependency 'guard-minitest', '~> 2.3'

data/lib/conceptql/behaviors/dottable.rb

@@ -49,9 +49,18 @@ module ConceptQL
         end
       end
 
-      def link_to(g, dest_node)
+      def link_to(g, dest_node, db = nil)
+        edge_options = {}
+
         types.each do |type|
-          e = g.add_edges(graph_node(g), dest_node)
+          if db
+            my_n = my_n(db, type)
+            label = [' rows=' + my_count(db, type).to_s + ' ']
+            label << ' n=' + my_n.to_s + ' '
+            edge_options[:label] = label.join("\n")
+            edge_options[:style] = 'dashed' if my_n.zero?
+          end
+          e = g.add_edges(graph_node(g), dest_node, edge_options)
           e[:color] = type_color(type)
         end
       end
@@ -63,9 +72,17 @@ module ConceptQL
         end
         graph_node(g)
         children.each do |child|
-          child.link_to(g, graph_node(g))
+          child.link_to(g, graph_node(g), db)
         end
       end
+
+      def my_count(db, type)
+        evaluate(db).from_self.where(criterion_type: type.to_s).count
+      end
+
+      def my_n(db, type)
+        evaluate(db).from_self.where(criterion_type: type.to_s).select_group(:person_id).count
+      end
     end
   end
 end

data/lib/conceptql/cli.rb

@@ -37,7 +37,7 @@ module ConceptQL
     desc 'run_statement statement_file', 'Reads the ConceptQL statement from the statement file and executes it against the DB'
     def run_statement(statement_file)
       q = ConceptQL::Query.new(db(options), criteria_from_file(statement_file))
-      puts q.query.sql
+      puts q.sql
       puts q.statement.to_yaml
       pp q.execute
     end
@@ -102,13 +102,13 @@ module ConceptQL
       puts results.length
     end
 
-    def graph_it(statement, db = nil, title = nil)
+    def graph_it(statement, title = nil)
       require_relative 'graph'
       require_relative 'tree'
       ConceptQL::Graph.new(statement,
                            dangler: true,
                            title: title,
-                           db: db
+                           db: db(options)
                           ).graph_it('/tmp/graph')
       system('open /tmp/graph.pdf')
     end

data/lib/conceptql/graph.rb

@@ -42,7 +42,7 @@ module ConceptQL
           blank_node[:height] = 0
           blank_node[:label] = ''
           blank_node[:fixedsize] = true
-          last_node.link_to(g, blank_node)
+          last_node.link_to(g, blank_node, db)
         end
       end
     end

data/lib/conceptql/graph_nodifier.rb

@@ -59,7 +59,7 @@ module ConceptQL
       attr :values, :name
       def initialize(name, values)
         @name = name.to_s
-        super(values)
+        super(nil, values)
       end
 
       def display_name
@@ -171,7 +171,8 @@ module ConceptQL
     def types
       @types ||= {}
     end
-    def create(type, values)
+
+    def create(type, values, tree)
       if BINARY_OPERATOR_TYPES.include?(type)
         return BinaryOperatorNode.new(type, values)
       elsif type == :define

data/lib/conceptql/nodes/binary_operator_node.rb

@@ -17,8 +17,8 @@ module ConceptQL
           sub.send("#{cluster_name}_left").send('[]', shape: 'point', color: type_color(types))
           sub.send("#{cluster_name}_right").send('[]', shape: 'point')
         end
-        left.link_to(g, me.send("#{cluster_name}_left"))
-        right.link_to(g, me.send("#{cluster_name}_right"))
+        left.link_to(g, me.send("#{cluster_name}_left"), db)
+        right.link_to(g, me.send("#{cluster_name}_right"), db)
         @__graph_node = me.send("#{cluster_name}_left")
       end
 

data/lib/conceptql/nodes/casting_node.rb

@@ -67,7 +67,7 @@ module ConceptQL
           # For each castable type in the stream, setup a query that
           # casts each type to a set of IDs, union those IDs and fetch
           # them from the source table
-          castable_type_queries = to_me_types.map do |source_type|
+          castable_type_query = to_me_types.map do |source_type|
             source_ids = db.from(stream_query)
               .where(criterion_type: source_type.to_s)
               .select_group(:criterion_id)
@@ -77,8 +77,10 @@ module ConceptQL
             db.from(source_table)
               .where(source_type_id => source_ids)
               .select(destination_type_id)
+          end.inject do |union_query, q|
+            union_query.union(q)
           end
-          wheres << Sequel.expr(destination_type_id => castable_type_queries)
+          wheres << Sequel.expr(destination_type_id => castable_type_query)
         end
 
         unless from_me_types.empty?

data/lib/conceptql/nodes/define.rb

@@ -13,6 +13,10 @@ module ConceptQL
     # and then insert that variable into the concept as needed.
     # run the query once and subsequent calls
     class Define < Node
+      def initialize(*args)
+        super
+        tree.defined[table_name] = self
+      end
       # Create a temporary table and store the stream of  results in that table.
       # This "caches" the results so we only have to execute stream's query
       # once.
@@ -39,35 +43,22 @@ module ConceptQL
       # Also, things will blow up if you try to use a variable that hasn't been
       # defined yet.
       def query(db)
-        table_name = namify(arguments.first)
-        stash_types(db, table_name, types)
         db.create_table!(table_name, temp: true, as: stream.evaluate(db))
-        db[db.send(:create_table_as_sql, table_name, stream.evaluate(db).sql, temp: true)]
+        db.from(table_name)
       end
 
       def types
         stream.types
       end
 
+      def sql(db)
+        db[db.send(:create_table_as_sql, table_name, stream.evaluate(db).sql, temp: true)].sql
+      end
+
       private
 
-      # TODO: Fix this.  This is shameful.
-      # In order to remember which types a table is storing, we need to preserve
-      # the type information outside of the "define" statement because the "recall"
-      # statement most likely doesn't have a reference to this node (that's the
-      # whole point).
-      #
-      # There is only one object shared between all the nodes: the database
-      # connection.  We'll do something terrible and piggyback the type
-      # information about this variable on the database connection so that
-      # the "recall" node can pull that information back out.
-      #
-      # Ugh.
-      def stash_types(db, name, types)
-        def db.types
-          @types ||= {}
-        end
-        db.types[name] = types
+      def table_name
+        @table_name ||= namify(arguments.first)
       end
     end
   end

data/lib/conceptql/nodes/node.rb

@@ -3,7 +3,8 @@ module ConceptQL
   module Nodes
     class Node
       attr :values, :options
-      def initialize(*args)
+      def initialize(tree, *args)
+        @tree = tree
         args.flatten!
         if args.last.is_a?(Hash)
           @options = args.pop.symbolize_keys
@@ -16,6 +17,10 @@ module ConceptQL
         select_it(query(db))
       end
 
+      def sql(db)
+        evaluate(db).sql
+      end
+
       def select_it(query, specific_type = nil)
         specific_type = type if specific_type.nil? && respond_to?(:type)
         query.select(*columns(specific_type))
@@ -48,6 +53,22 @@ module ConceptQL
       end
 
       private
+      # There have been a few times now that I've wanted a node to be able
+      # to pass information to another node that is not directly a child
+      #
+      # Since tree is only object that touches each node in a statement,
+      # I'm going to employ tree as a way to communicate between nodes
+      #
+      # This is an ugly hack, but the use case for this hack is I'm changing
+      # the way `define` and `recall` nodes pass type information between
+      # each other.  They used to take the type information onto the
+      # database connection, but there were issues where sometimes the
+      # type information was needed before we passed around the database
+      # connection.
+      #
+      # At least this way we don't have timing issues when reading types
+      attr :tree
+
       def criterion_id
         :criterion_id
       end

data/lib/conceptql/nodes/recall.rb

@@ -20,13 +20,16 @@ module ConceptQL
       # before we call #query.  Probably time to reevaluate how we're caching
       # the type information.
       def query(db)
-        table_name = namify(arguments.first)
-        @types = db.types[table_name]
         db.from(table_name)
       end
 
       def types
-        @types
+        tree.defined[table_name].types
+      end
+
+      private
+      def table_name
+        @table_name ||= namify(arguments.first)
       end
     end
   end

data/lib/conceptql/nodifier.rb

@@ -1,9 +1,9 @@
 require 'active_support/inflector'
 module ConceptQL
   class Nodifier
-    def create(type, values)
+    def create(type, values, tree)
       require_relative "nodes/#{type}"
-      "conceptQL/nodes/#{type}".camelize.constantize.new(values)
+      "conceptQL/nodes/#{type}".camelize.constantize.new(tree, values)
     end
   end
 end

data/lib/conceptql/query.rb

@@ -19,7 +19,7 @@ module ConceptQL
     end
 
     def sql
-      queries.map(&:sql).join(";\n") + ';'
+      nodes.map { |node| node.sql(db) }.join(";\n") + ';'
     end
 
     # To avoid a performance penalty, only execute the last
@@ -37,7 +37,11 @@ module ConceptQL
     attr :yaml, :tree, :db
 
     def build_query(db)
-      tree.root(self).map { |n| n.evaluate(db) }
+      nodes.map { |n| n.evaluate(db) }
+    end
+
+    def nodes
+      @nodes ||= tree.root(self)
     end
   end
 end

data/lib/conceptql/tree.rb

@@ -3,10 +3,11 @@ require 'active_support/core_ext/hash'
 
 module ConceptQL
   class Tree
-    attr :nodifier, :behavior
+    attr :nodifier, :behavior, :defined
     def initialize(opts = {})
       @nodifier = opts.fetch(:nodifier, Nodifier.new)
       @behavior = opts.fetch(:behavior, nil)
+      @defined = {}
     end
 
     def root(*queries)
@@ -23,7 +24,7 @@ module ConceptQL
         end
         type = obj.keys.first
         values = traverse(obj[type])
-        obj = nodifier.create(type, values)
+        obj = nodifier.create(type, values, self)
         obj.extend(behavior) if behavior
         obj
       when Array

data/lib/conceptql/version.rb

@@ -1,3 +1,3 @@
 module ConceptQL
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conceptql
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: ruby-graphviz
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement