clinical 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/clinical.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{clinical}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
-  s.date = %q{2009-08-10}
+  s.date = %q{2009-09-19}
   s.email = %q{dpickett@enlightsolutions.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -37,6 +40,7 @@ Gem::Specification.new do |s|
      "lib/clinical/location.rb",
      "lib/clinical/location_contact.rb",
      "lib/clinical/outcome.rb",
+     "lib/clinical/overall_contact.rb",
      "lib/clinical/overall_official.rb",
      "lib/clinical/primary_outcome.rb",
      "lib/clinical/secondary_outcome.rb",

data/features/finding_clinical_trials.feature

@@ -47,6 +47,7 @@ Feature: As a potential participant for a clinical study
     And the trial should have an "overall_official" like "Alexandra Phan, MD"
     And the trial should have "eligibility_criteria" like "DISEASE CHARACTERISTICS"
     And the trial should have "brief_summary" like "Pazopanib"
+    And the trial should have an "overall_contact"
 
   Scenario: Find trials that were updated between a range of dates
     Given I am searching for trials that have been updated between "07/06/2009" and "07/07/2009"

data/features/getting_keywords_and_categories.feature

@@ -5,5 +5,4 @@ Feature: As a user of the clinical library
   Scenario: Get keywords, categories, and terms
     When I attempt to retrieve keywords for trial "NCT00001372"
     Then the trial should have "keywords" like "Autoimmunity"
-    And the trial should have "categories" like "Urologic Diseases"
     And the trial should have "terms" like "Connective Tissue Diseases"

data/features/step_definitions/clinical_steps.rb

@@ -74,6 +74,10 @@ Then /^I should get a trial$/ do
   @trial.should_not be_nil
 end
 
+Then /^the trial should have an? "([^\"]*)"$/ do |field|
+  @trial.send(field).should_not be_nil
+end
+
 Then /^the trial should have an? "([^\"]*)" of "([^\"]*)"$/ do |field, value|
   @trial.send(field).to_s.should eql(value)
 end
@@ -109,3 +113,10 @@ end
 Then /^I should get trials where "([^\"]*)" is between "([^\"]*)" and "([^\"]*)"$/ do |attr, start_date, end_date|
   end
 
+Then /^the trial should have "([^\"]*)" with a "([^\"]*)"$/ do |col, attribute|
+  @trial.send(col).should_not be_empty
+  @trial.send(col).each do |i|
+    i.send(attribute).should_not be_nil
+  end
+end
+

data/lib/clinical/overall_contact.rb

@@ -0,0 +1,7 @@
+module Clinical
+  class OverallContact 
+    include Clinical::Contact
+
+    tag "overall_official"
+  end
+end

data/lib/clinical/trial.rb

@@ -25,6 +25,7 @@ module Clinical
     has_many :agencies, Clinical::Agency
 
     has_one :overall_official, Clinical::OverallOfficial, :tag => "overall_official"
+    has_one :overall_contact, Clinical::OverallContact, :tag => "overall_contact"
 
     has_many :interventions, Intervention, :tag => "intervention"
     has_many :primary_outcomes, PrimaryOutcome
@@ -104,20 +105,19 @@ module Clinical
 
       {
         :terms => 0, 
-        :categories => 1,
-        :keywords => 2
+        :keywords => 1
       }.each do |key, value|
-
         metadata[key] = []
         html.search("div.indent3:nth-last-child(#{value}) td").each do |td|
-          word = td.inner_html.split(/\<br\>/).collect{|i| i.gsub(/\<div.*/, "").strip.chomp}
-          if word != ""
-            metadata[key] += word
+          words = td.inner_html.split(/\<br\/?\>/).collect{|i| i.gsub(/\<div.*/, "").strip.chomp}
+          if !words.empty?
+            metadata[key] += words
           end
+          metadata[key]
         end
 
       end
-
+ 
       @terms, @categories, @keywords = metadata[:terms], metadata[:categories], metadata[:keywords]
       metadata
     end

data/lib/clinical.rb

@@ -23,6 +23,7 @@ require "clinical/collaborator"
 require "clinical/contact"
 require "clinical/overall_official"
 require "clinical/location_contact"
+require "clinical/overall_contact"
 
 require "clinical/address"
 require "clinical/location"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clinical
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Dan Pickett
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -04:00
+date: 2009-09-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - lib/clinical/location.rb
 - lib/clinical/location_contact.rb
 - lib/clinical/outcome.rb
+- lib/clinical/overall_contact.rb
 - lib/clinical/overall_official.rb
 - lib/clinical/primary_outcome.rb
 - lib/clinical/secondary_outcome.rb