linkage-viewer 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/linkage/viewer/ui/base.rb

@@ -8,8 +8,7 @@ module Linkage
           @groups_dataset = @result_set.groups_dataset
           @group_count = @groups_dataset.count
           @groups_records_dataset = @result_set.groups_records_dataset
-          @dataset_1 = @config.dataset_1
-          @dataset_2 = @config.dataset_2
+          @datasets = [@config.dataset_1, @config.dataset_2]
 
           common_fields = [[], []]
           @config.expectations.each do |exp|
@@ -28,8 +27,8 @@ module Linkage
 
           all_fields = if @config.visual_comparisons.empty?
             [
-              common_fields[0] | @dataset_1.field_set.values,
-              common_fields[1] | @dataset_2.field_set.values
+              common_fields[0] | @datasets[0].field_set.values,
+              common_fields[1] | @datasets[1].field_set.values
             ]
           else
             @config.visual_comparisons.inject(common_fields.dup) do |arr, vc|
@@ -48,7 +47,7 @@ module Linkage
           @field_names = [[], []]
           all_fields.each_with_index do |fields, i|
             fields.each do |field|
-              expr = field.to_expr
+              expr = field.to_expr(@datasets[i].adapter_scheme)
               if expr.is_a?(Sequel::SQL::Function)
                 name = field.name
                 expr = expr.as(name)
@@ -86,7 +85,7 @@ module Linkage
 
         def get_records(group_id, dataset_id, record_expressions)
           record_ids = @groups_records_dataset.filter(:group_id => group_id, :dataset => dataset_id).select_map(:record_id)
-          dataset = dataset_id == 1 ? @dataset_1 : @dataset_2
+          dataset = dataset_id == 1 ? @datasets[0] : @datasets[1]
           primary_key = dataset.field_set.primary_key.to_expr
 
           dataset.select(*record_expressions).filter(primary_key => record_ids).all

data/lib/linkage/viewer/ui/console.rb

@@ -77,8 +77,8 @@ module Linkage
 end
 
 Linkage::Viewer::UI::Console::MENU = <<EOF
-Dataset 1: <%= @dataset_1.table_name %> (<%= @dataset_1.adapter_scheme %>)
-Dataset 2: <%= @dataset_2.table_name %> (<%= @dataset_2.adapter_scheme %>)
+Dataset 1: <%= @datasets[0].table_name %> (<%= @datasets[0].adapter_scheme %>)
+Dataset 2: <%= @datasets[1].table_name %> (<%= @datasets[1].adapter_scheme %>)
 Groups:    <%= @groups_dataset.count %>
 
 <%= get_table %>

data/linkage-viewer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linkage-viewer"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-30"
   s.description = "Visualization tool for viewing results from the Linkage library"
   s.email = "jeremy.f.stephens@vanderbilt.edu"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkage-viewer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1289887407956206137
+      hash: 1156770905248646491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: