cmap 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ee02def6c2ba51722af4bd490b39bcd310ce1e
-  data.tar.gz: c65a0293ee805f17bbcf662f907f22538d064461
+  metadata.gz: 2c1aa04d3a2f907856c9b8ee5585bfad160f5537
+  data.tar.gz: 73a72a40cc5dded9d995413e09c76024968b7482
 SHA512:
-  metadata.gz: 6949e80f0d48124ebe8d570b26e3a53f8924d7a573442f6f1dcd1a50185bef93ab91ae396fa49ff9d8886d5a4cc71aac1a1fa66951ad9080857e259377304ffb
-  data.tar.gz: e15dfa04a3323273bf83296c85b24d24b3fe5d0af05136c38b4aa7ac9a2837278d09cf41ebfa9ded52c8c0dc19f26669c856306dc164b91df6199dfed4b34e5c
+  metadata.gz: 562e1751d18d1f84671c6b4d6137cfcb4c12ef4739157f6b51cecdb563cbf08b6d64b32d42c4e580d0e994680d6455b9de511051de89637617eba8958560adb5
+  data.tar.gz: 42f17d5ef2eeff14a77f461c9d1f61c894296873174b9b85d396d02f5b436822aa5c644c94f79626060840b6da53b84313966c8e955459bf954f02f341b1efd0

data/lib/cmap/edges_to_queries.rb

@@ -1,10 +1,11 @@
 module Cmap; class EdgesToQueries
 
-  attr_reader :edges, :table_name, :subquery_expander
+  attr_reader :edges, :table_name, :schema_name, :subquery_expander
 
-  def initialize(edges, table_name, subquery_expander)
+  def initialize(edges, table_name, schema_name, subquery_expander)
     @edges = edges
     @table_name = table_name
+    @schema_name = schema_name
     @subquery_expander = subquery_expander
   end
 
@@ -22,7 +23,7 @@ module Cmap; class EdgesToQueries
   end
 
   def add_columns_queries
-    unique_edges.map {|e| "alter table #{table_name} add column #{e.destination_vertex} int2;"}
+    unique_edges.map {|e| "alter table #{schema_name}.#{table_name} add column #{e.destination_vertex} int2;"}
   end
 
   def grouped_edges
@@ -36,7 +37,7 @@ module Cmap; class EdgesToQueries
   def updates
     u = (grouped_edges[false] || []).map {|e| "#{e.destination_vertex}=(#{e.value})::int"}.join(", ")
     return [] if u.empty?
-    ["update #{table_name} set #{u};"]
+    ["update #{schema_name}.#{table_name} set #{u};"]
   end
 
 end; end

data/lib/cmap/graph_to_sql.rb

@@ -1,16 +1,17 @@
 module Cmap; class GraphToSql
 
-  attr_reader :table_name, :graph, :subquery_gsubs
+  attr_reader :table_name, :schema_name, :graph, :subquery_gsubs
 
-  def initialize(table_name, graph, subquery_gsubs = [])
+  def initialize(table_name, schema_name, graph, subquery_gsubs = [])
     @table_name = table_name
+    @schema_name = schema_name
     @graph = graph
     @subquery_gsubs = subquery_gsubs
   end
 
   def queries
     sorted_grouped_edges.inject([]) do |memo, (_, edges)|
-      memo += (EdgesToQueries.new(edges, table_name, subquery_expander).queries)
+      memo += (EdgesToQueries.new(edges, table_name, schema_name, subquery_expander).queries)
       memo
     end
   end
@@ -18,7 +19,7 @@ module Cmap; class GraphToSql
   private
 
   def subquery_expander
-    SubqueryExpander.new(table_name: table_name, subquery_gsubs: subquery_gsubs)
+    SubqueryExpander.new(table_name: table_name, schema_name: schema_name, subquery_gsubs: subquery_gsubs)
   end
 
   def sorted_grouped_edges

data/lib/cmap/propositions_to_sql.rb

@@ -1,10 +1,11 @@
 module Cmap; class PropositionsToSql
 
-  attr_reader :propositions_path, :table_name, :subquery_gsubs
+  attr_reader :propositions_path, :table_name, :schema_name, :subquery_gsubs
 
   def initialize(args)
     @propositions_path = args.fetch(:propositions_path)
     @table_name = args.fetch(:table_name)
+    @schema_name = args.fetch(:schema_name)
     @subquery_gsubs = args.fetch(:subquery_gsubs, [])
   end
 
@@ -25,7 +26,7 @@ module Cmap; class PropositionsToSql
   end
 
   def graph_to_sql
-    GraphToSql.new(table_name, sanitized_graph, subquery_gsubs)
+    GraphToSql.new(table_name, schema_name, sanitized_graph, subquery_gsubs)
   end
 
 end; end

data/lib/cmap/subquery_expander.rb

@@ -1,9 +1,10 @@
 module Cmap; class SubqueryExpander
 
-  attr_reader :table_name, :subquery_gsubs
+  attr_reader :table_name, :schema_name, :subquery_gsubs
 
   def initialize(args)
     @table_name = args.fetch(:table_name)
+    @schema_name = args.fetch(:schema_name)
     @subquery_gsubs = args.fetch(:subquery_gsubs, [])
   end
 
@@ -13,7 +14,7 @@ module Cmap; class SubqueryExpander
 
   def query(edge)
     r = edge.value
-    replacements = [["+table_name+", table_name], ["+destination_vertex+", edge.destination_vertex], ["+origin_vertex+", edge.origin_vertex]]
+    replacements = [["+table_name+", table_name], ["+schema_name+", schema_name], ["+destination_vertex+", edge.destination_vertex], ["+origin_vertex+", edge.origin_vertex]]
     (subquery_gsubs + replacements).each {|gsub| r = r.gsub(*gsub)}
     r
   end

data/lib/cmap/version.rb

@@ -1,3 +1,3 @@
 module Cmap
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - MrPowers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler