dpickett-clinical 0.1.2 → 0.1.3

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-begin require "metric_fu" rescue Exception; end
+begin require "metric_fu" rescue LoadError; end
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/clinical.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clinical}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
-  s.date = %q{2009-06-28}
+  s.date = %q{2009-06-29}
   s.email = %q{dpickett@enlightsolutions.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/features/finding_clinical_trials.feature

@@ -37,6 +37,14 @@ Feature: As a potential participant for a clinical study
     Then I should get a trial
     And the trial should have an "id" of "NCT00001372"
 
+  Scenario: Find a specific trial with extended attributes
+    When I attempt to retrieve trial "NCT00454363"
+    Then I should get a trial
+    And the trial should have a "phase" of "2"
+    And the trial should have "conditions" like "Lung Cancer"
+    And the trial should have a "minimum_age" of "21 Years"
+    And the trial should have "sponsors" like "M.D. Anderson"
+
   Scenario: Find a non-existant trial
     When I attempt to retrieve trial "4325785"
     Then I should not get a trial

data/features/step_definitions/clinical_steps.rb

@@ -43,7 +43,6 @@ Then /^I should get trials where the "([^\"]*)" contains "([^\"]*)"$/ do |field,
       result.each do |i|
         found = true if i.to_s =~ /#{value}/i
       end
-      debugger if !found
       found.should be_true
     else
       result.to_s.should =~ /#{value}/i
@@ -55,10 +54,15 @@ Then /^I should get a trial$/ do
   @trial.should_not be_nil
 end
 
-Then /^the trial should have an "([^\"]*)" of "([^\"]*)"$/ do |field, value|
-  @trial.send(field).should eql(value)
+Then /^the trial should have an? "([^\"]*)" of "([^\"]*)"$/ do |field, value|
+  @trial.send(field).to_s.should eql(value)
 end
 
+Then /^the trial should have "([^\"]*)" like "([^\"]*)"$/ do |field, value|
+  @trial.send(field).to_s.should =~ /#{Regexp.escape(value)}/
+end
+
+
 Then /^I should not get a trial$/ do
   @trial.should be_nil
 end

data/lib/clinical/trial.rb

@@ -1,5 +1,3 @@
-require "ruby-debug"
-
 module Clinical
   class Trial
     include HappyMapper
@@ -16,9 +14,9 @@ module Clinical
     element :short_title, String, :tag => "title"
     element :official_title, String
     element :condition_summary, String
-    has_many :condition_items, String, :tag => "condition"
+    has_many :condition_items, Clinical::Condition, :tag => "condition", :raw => true
 
-    element :phase, Integer
+    element :text_phase, String, :tag => "phase"
     element :study_type, String
     element :study_design, String
 
@@ -36,10 +34,10 @@ module Clinical
 
     element :last_changed_at, Date, :tag => "lastchanged_date"
 
-    element :minimum_age, String
-    element :maximum_age, String
-    element :gender, String
-    element :healthy_volunteers, String
+    element :minimum_age, String, :tag => "eligibility/minimum_age"
+    element :maximum_age, String, :tag => "eligibility/maximum_age"
+    element :gender, String, :tag => "eligibility/gender"
+    element :healthy_volunteers, String, :tag => "eligibility/healthy_volunteers"
 
     element :participant_quantity, Integer, :tag => "enrollment"
 
@@ -77,6 +75,10 @@ module Clinical
       end
     end
 
+    def phase
+      self.text_phase.gsub(/phase /i, "").to_i
+    end
+
     class << self
       def find_by_id(id)
         response = get("/show/#{id}")

data/lib/clinical.rb

@@ -11,6 +11,7 @@ require "clinical/intervention"
 require "clinical/outcome"
 require "clinical/primary_outcome"
 require "clinical/secondary_outcome"
+require "clinical/condition"
 
 require "clinical/address"
 require "clinical/contact"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dpickett-clinical
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Dan Pickett
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -07:00
+date: 2009-06-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency