dpickett-clinical 0.2.1 → 0.2.3

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.add_dependency("jnunemaker-httparty", ">= 0.4.3")
     gem.add_dependency("jnunemaker-happymapper", ">= 0.2.5")
     gem.add_dependency("mislav-will_paginate", ">= 2.3.11")
-    gem.add_dependency("nokogiri", "> 1.3.3")
+    gem.add_dependency("nokogiri", ">= 1.3.3")
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.4

data/clinical.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clinical}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
@@ -35,7 +35,9 @@ Gem::Specification.new do |s|
      "lib/clinical/intervention.rb",
      "lib/clinical/lead_sponsor.rb",
      "lib/clinical/location.rb",
+     "lib/clinical/location_contact.rb",
      "lib/clinical/outcome.rb",
+     "lib/clinical/overall_official.rb",
      "lib/clinical/primary_outcome.rb",
      "lib/clinical/secondary_outcome.rb",
      "lib/clinical/sponsor.rb",
@@ -65,17 +67,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<jnunemaker-httparty>, [">= 0.4.3"])
       s.add_runtime_dependency(%q<jnunemaker-happymapper>, [">= 0.2.5"])
       s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 2.3.11"])
-      s.add_runtime_dependency(%q<nokogiri>, ["> 1.3.3"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
     else
       s.add_dependency(%q<jnunemaker-httparty>, [">= 0.4.3"])
       s.add_dependency(%q<jnunemaker-happymapper>, [">= 0.2.5"])
       s.add_dependency(%q<mislav-will_paginate>, [">= 2.3.11"])
-      s.add_dependency(%q<nokogiri>, ["> 1.3.3"])
+      s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
     end
   else
     s.add_dependency(%q<jnunemaker-httparty>, [">= 0.4.3"])
     s.add_dependency(%q<jnunemaker-happymapper>, [">= 0.2.5"])
     s.add_dependency(%q<mislav-will_paginate>, [">= 2.3.11"])
-    s.add_dependency(%q<nokogiri>, ["> 1.3.3"])
+    s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
   end
 end

data/features/finding_clinical_trials.feature

@@ -44,6 +44,7 @@ Feature: As a potential participant for a clinical study
     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"
+    And the trial should have an "overall_official" like "Alexandra Phan, MD"
 
   Scenario: Find a non-existant trial
     When I attempt to retrieve trial "4325785"

data/features/step_definitions/clinical_steps.rb

@@ -63,7 +63,7 @@ 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|
+Then /^the trial should have (an\s)?"([^\"]*)" like "([^\"]*)"$/ do |an, field, value|
   @trial.send(field).to_s.should =~ /#{Regexp.escape(value)}/
 end
 

data/lib/clinical/contact.rb

@@ -1,13 +1,25 @@
 module Clinical
-  class Contact
-    include HappyMapper
+  module Contact
+    def self.included(base)
+      base.class_eval do
+        include HappyMapper
+        include Clinical::Contact::InstanceMethods
 
-    element :first_name, String
-    element :middle_name, String
-    element :last_name, String
-    element :degrees, String
-    element :phone, String
-    element :phone_ext, String
-    element :email, String
+        element :first_name, String
+        element :middle_name, String
+        element :last_name, String
+        element :degrees, String
+        element :phone, String
+        element :phone_extension, String, :tag => "phone_ext"
+        element :email, String
+      end
+
+    end
+
+    module InstanceMethods
+      def to_s
+        [first_name, last_name, "(#{phone})"].join(" ")
+      end
+    end
   end
 end

data/lib/clinical/location.rb

@@ -4,7 +4,7 @@ module Clinical
 
     element :facility, String
     has_one :status, Clinical::Status, :parser => :parse
-    has_one :contact, Clinical::Contact
+    has_one :contact, Clinical::LocationContact
     has_one :address, Clinical::Address
   end
 end

data/lib/clinical/location_contact.rb

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

data/lib/clinical/overall_official.rb

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

data/lib/clinical/sponsor.rb

@@ -1,13 +1,13 @@
 module Clinical
   module Sponsor
-     def self.included(base)
-        base.class_eval do
-          attr_accessor :name
-          include HappyMapper
-        end
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
+    def self.included(base)
+      base.class_eval do
+        attr_accessor :name
+        include HappyMapper
       end
+      base.extend(ClassMethods)
+      base.send(:include, InstanceMethods)
+    end
 
     module InstanceMethods
       def to_s
@@ -24,4 +24,4 @@ module Clinical
       end
     end
   end
-end
+end

data/lib/clinical/trial.rb

@@ -24,6 +24,8 @@ module Clinical
     has_many :collaborators, Clinical::Collaborator
     has_many :agencies, Clinical::Agency
 
+    has_one :overall_official, Clinical::OverallOfficial, :tag => "overall_official"
+
     has_many :interventions, Intervention, :tag => "intervention"
     has_many :primary_outcomes, PrimaryOutcome
     has_many :secondary_outcomes, SecondaryOutcome

data/lib/clinical.rb

@@ -20,8 +20,11 @@ require "clinical/lead_sponsor"
 require "clinical/agency"
 require "clinical/collaborator"
 
-require "clinical/address"
 require "clinical/contact"
+require "clinical/overall_official"
+require "clinical/location_contact"
+
+require "clinical/address"
 require "clinical/location"
 
 require "clinical/trial"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dpickett-clinical
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Dan Pickett
@@ -48,7 +48,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.3.3
     version: 
@@ -84,7 +84,9 @@ files:
 - lib/clinical/intervention.rb
 - lib/clinical/lead_sponsor.rb
 - lib/clinical/location.rb
+- lib/clinical/location_contact.rb
 - lib/clinical/outcome.rb
+- lib/clinical/overall_official.rb
 - lib/clinical/primary_outcome.rb
 - lib/clinical/secondary_outcome.rb
 - lib/clinical/sponsor.rb