clinical 0.2.4 → 0.2.5

data/Rakefile

@@ -45,18 +45,6 @@ namespace :rcov do
     t.rcov_opts = %w{--aggregate coverage.data --exclude osx\/objc,gems\/,features\/,spec\/ -o "features_rcov"}
   end
 end
-begin
-  desc "Run both specs and features to generate aggregated coverage"
-  task :rcov do |t|
-    rm "coverage.data" if File.exist?("coverage.data")
-    Rake::Task["rcov:cucumber"].invoke
-    Rake::Task["rcov:tests"].invoke
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
 
 begin
   require 'cucumber/rake/task'

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/clinical.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clinical}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
-  s.date = %q{2009-07-29}
+  s.date = %q{2009-08-07}
   s.email = %q{dpickett@enlightsolutions.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -48,11 +48,10 @@ Gem::Specification.new do |s|
      "test/fixtures/open_set.xml",
      "test/test_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/dpickett/clinical}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{a library for accessing data from ClinicalTrials.gov}
   s.test_files = [
     "test/clinical/trial_test.rb",

data/features/finding_clinical_trials.feature

@@ -46,6 +46,17 @@ Feature: As a potential participant for a clinical study
     And the trial should have "sponsors" like "M.D. Anderson"
     And the trial should have an "overall_official" like "Alexandra Phan, MD"
 
+  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"
+    When I perform the extended search
+    Then I should get trials where "updated_at" is greater than or equal to "07/06/2009" 
+    And I should get trials where "updated_at" is less than or equal to "07/07/2009"
+
+  Scenario: Find trials that were updated beyond a single date
+    Given I am searching for trials that have been updated after "07/06/2009"
+    When I perform the extended search
+    Then I should get trials where "updated_at" is greater than or equal to "07/06/2009"
+
   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

@@ -10,6 +10,21 @@ Given /^I am searching for trials where "([^\"]*)" is "([^\"]*)"$/ do |field, va
   @params[field.to_sym] = value
 end
 
+Given /^I am searching for trials that have been updated between "([^\"]*)" and "([^\"]*)"$/ do |start_date, end_date|
+  dates = [Date.parse(start_date)]
+  dates << Date.parse(end_date)
+
+  @params ||= {}
+  @params[:updated_at] = dates
+end
+
+Given /^I am searching for trials that have been updated after "([^\"]*)"$/ do |date|
+  dates = [Date.parse(date)]
+
+  @params ||= {}
+  @params[:updated_at] = dates
+end
+
 When /^I perform the search$/ do
   @trials = Clinical::Trial.find(:conditions => @params)
 end
@@ -67,8 +82,30 @@ Then /^the trial should have (an\s)?"([^\"]*)" like "([^\"]*)"$/ do |an, field,
   @trial.send(field).to_s.should =~ /#{Regexp.escape(value)}/
 end
 
+Then /^I should get trials where "([^\"]*)" is greater than "([^\"]*)"$/ do |arg1, arg2|
+  pending
+end
+
+Then /^I should get trials where "([^\"]*)" is greater than or equal to "([^\"]*)"$/ do |attr, date|
+  @trials.each do |t|
+    assert t.send(attr) >= Date.parse(date), 
+      "#{t.send(attr)} is not >= #{Date.parse(date)}"
+  end 
+end
+
+Then /^I should get trials where "([^\"]*)" is less than or equal to "([^\"]*)"$/ do |attr, date|
+  @trials.each do |t|
+    assert t.send(attr) <= Date.parse(date), 
+      "#{t.send(attr)} is not <= #{Date.parse(date)}"
+  end 
+end
+
 
 Then /^I should not get a trial$/ do
   @trial.should be_nil
 end
 
+
+Then /^I should get trials where "([^\"]*)" is between "([^\"]*)" and "([^\"]*)"$/ do |attr, start_date, end_date|
+  end
+

data/lib/clinical/trial.rb

@@ -34,7 +34,8 @@ module Clinical
     element :start_date, Date
     element :end_date, Date
 
-    element :last_changed_at, Date, :tag => "lastchanged_date"
+    element :first_received_at, Date, :tag => "firstreceived_date"
+    element :updated_at, Date, :tag => "lastchanged_date"
 
     element :minimum_age, String, :tag => "eligibility/minimum_age"
     element :maximum_age, String, :tag => "eligibility/maximum_age"
@@ -164,6 +165,17 @@ module Clinical
           query[value] = conditions[key] unless conditions[key].nil?
         end
 
+        unless conditions[:updated_at].nil?
+          unless conditions[:updated_at].is_a?(Array)
+            conditions[:updated_at] = [conditions[:updated_at]] 
+          end
+
+          query["lup_s"] = conditions[:updated_at][0].strftime("%m/%d/%Y")
+          if conditions[:updated_at].size == 2
+            query["lup_e"] = conditions[:updated_at][1].strftime("%m/%d/%Y") 
+          end
+        end
+
         query
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clinical
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Dan Pickett
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -04:00
+date: 2009-08-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: a library for accessing data from ClinicalTrials.gov