cellect-server 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e99eedbb031e30c30aa5a1115f3620f5e2e4cf3
-  data.tar.gz: 06dbf151721e9abdb0c3c518de248f8809e972a3
+  metadata.gz: 662861e6791c0a2f621c9cbe855f30fa86280282
+  data.tar.gz: f2d6a01fb332db3ba9456e130b50774f55c89159
 SHA512:
-  metadata.gz: e4911bddd166a8258fa63fde6dd767159e848217c736d9c8390496150ba113cd9dbc35b092631a17d300b16670b73cd7e3a7e0bdfdb36052ff6c7c797d462816
-  data.tar.gz: 02043a81baca72f5d2a640a0d0d4909beae0751265e79bab6b4263ffd78661935b465ad16625c61ea6ad1bbadd051dff79c0ff7d0f20a5f7bfa5b54306999099
+  metadata.gz: 6513ff370439e2e634138677a9be174a14de38d28ff979a1483c1174c304612b3261773ebad62275747c5efd064ca8f8b566b213782caf8fbefc35480b756860
+  data.tar.gz: eb028c8c78b3cc46d601bc2b71f51a1e815d680774c2d0c3724acb1b9e790bd8cd2473decff7cb43e86a391ad574e53e75b25b5090b0c15e252436b57c0daad6

data/lib/cellect/server/adapters/postgres.rb

@@ -10,7 +10,7 @@ module Cellect
             PG.connect connection_options
           end
         end
-        
+
         def workflow_list
           with_pg do |pg|
             pg.exec('SELECT * FROM workflows').collect do |row|
@@ -24,16 +24,15 @@ module Cellect
             end
           end
         end
-        
+
         def load_data_for(workflow_name)
           with_pg do |pg|
             statement = <<-SQL
-              SELECT sms.id as id, sms.priority as priority, sms.subject_set_id as group_id 
+              SELECT sms.id as id, sms.priority as priority, sms.subject_set_id as group_id
               FROM workflows w
-              JOIN subject_sets_workflows ssw ON (ssw.workflow_id = w.id) 
-              JOIN subject_sets ss ON (ss.id = ssw.subject_set_id) 
-              JOIN set_member_subjects sms ON (ss.id = sms.subject_set_id)
-              WHERE w.id = #{ workflow_name } 
+              JOIN subject_sets ss ON (ss.workflow_id = w.id)
+              JOIN set_member_subjects sms ON (sms.subject_set_id = ss.id)
+              WHERE w.id = #{ workflow_name }
             SQL
             pg.exec(statement).collect do |row|
               {
@@ -44,11 +43,11 @@ module Cellect
             end
           end
         end
-        
+
         def load_user(workflow_name, id)
           with_pg do |pg|
             statement = <<-SQL
-              SELECT subject_ids FROM user_seen_subjects
+              SELECT set_member_subject_ids FROM user_seen_subjects
               WHERE user_id = #{ id } AND workflow_id = #{ workflow_name }
             SQL
             pg.exec(statement).collect do |row|
@@ -56,11 +55,11 @@ module Cellect
             end
           end
         end
-        
+
         def with_pg
           @pg.with{ |pg| yield pg }
         end
-        
+
         def connection_options
           {
             host: ENV.fetch('PG_HOST', '127.0.0.1'),

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler