linkage-viewer 0.0.2 → 0.0.3

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gem "highline"
 gem "terminal-table"
-gem "linkage", "> 0.0.3"
+gem "linkage", "> 0.0.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     ffi (1.0.11)
     git (1.2.5)
-    guard (1.0.1)
+    guard (1.0.2)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-test (0.4.3)
@@ -14,14 +14,14 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    linkage (0.0.4)
+    linkage (0.0.6)
       sequel
     metaclass (0.0.1)
-    mocha (0.10.5)
+    mocha (0.11.3)
       metaclass (~> 0.0.1)
     rake (0.9.2.2)
-    sequel (3.33.0)
-    sqlite3 (1.3.5)
+    sequel (3.35.0)
+    sqlite3 (1.3.6)
     terminal-table (1.4.5)
     test-unit (2.4.8)
     thor (0.14.6)
@@ -34,7 +34,7 @@ DEPENDENCIES
   guard-test
   highline
   jeweler (~> 1.6.4)
-  linkage (> 0.0.3)
+  linkage (> 0.0.5)
   mocha
   sqlite3
   terminal-table

data/Rakefile

@@ -51,3 +51,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :build => :gemspec

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

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

@@ -7,8 +7,7 @@ module Linkage
           @result_set = @config.result_set
           @groups_dataset = @result_set.groups_dataset
           @group_count = @groups_dataset.count
-          @groups_records_dataset = @result_set.groups_records_dataset
-          @datasets = [@config.dataset_1, @config.dataset_2]
+          @datasets = @config.datasets_with_applied_expectations
 
           common_fields = [[], []]
           @config.expectations.each do |exp|
@@ -68,27 +67,24 @@ module Linkage
 
         def set_group_index(index)
           @group_index = index
-          @group = @groups_dataset.order(:id).limit(1, index).first
+          @group = @result_set.get_group(index)
           @records = []
           @records_index = [0, 0]
 
           if @config.linkage_type == :self
             expressions = @field_expressions[0] | @field_expressions[1]
-            @records << get_records(@group[:id], 1, expressions)
+            @records << get_records(@group, 1, expressions)
             @records << @records[0]
             @records_index[1] = 1
           else
-            @records << get_records(@group[:id], 1, @field_expressions[0])
-            @records << get_records(@group[:id], 2, @field_expressions[1])
+            @records << get_records(@group, 1, @field_expressions[0])
+            @records << get_records(@group, 2, @field_expressions[1])
           end
         end
 
-        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)
+        def get_records(group, dataset_id, record_expressions)
           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
+          dataset.dataset_for_group(group).select(*record_expressions).all
         end
       end
     end

data/linkage-viewer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linkage-viewer"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = "2012-03-30"
+  s.date = "2012-05-08"
   s.description = "Visualization tool for viewing results from the Linkage library"
   s.email = "jeremy.f.stephens@vanderbilt.edu"
   s.extra_rdoc_files = [
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/coupler/linkage-viewer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.18"
+  s.rubygems_version = "1.8.23"
   s.summary = "Addon for viewing results from the Linkage library"
 
   if s.respond_to? :specification_version then
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<highline>, [">= 0"])
       s.add_runtime_dependency(%q<terminal-table>, [">= 0"])
-      s.add_runtime_dependency(%q<linkage>, ["> 0.0.3"])
+      s.add_runtime_dependency(%q<linkage>, ["> 0.0.5"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<guard-test>, [">= 0"])
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<terminal-table>, [">= 0"])
-      s.add_dependency(%q<linkage>, ["> 0.0.3"])
+      s.add_dependency(%q<linkage>, ["> 0.0.5"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<guard-test>, [">= 0"])
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<terminal-table>, [">= 0"])
-    s.add_dependency(%q<linkage>, ["> 0.0.3"])
+    s.add_dependency(%q<linkage>, ["> 0.0.5"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<guard-test>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkage-viewer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1156770905248646491
+      hash: 1067688954718411258
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Addon for viewing results from the Linkage library