clinical 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/clinical.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clinical}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "features/step_definitions/clinical_steps.rb",
      "features/support/env.rb",
      "lib/clinical.rb",
+     "lib/clinical/abstract_element.rb",
      "lib/clinical/address.rb",
      "lib/clinical/agency.rb",
      "lib/clinical/collaborator.rb",
@@ -38,10 +39,7 @@ 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_contact.rb",
-     "lib/clinical/overall_official.rb",
      "lib/clinical/primary_outcome.rb",
      "lib/clinical/secondary_outcome.rb",
      "lib/clinical/sponsor.rb",

data/features/finding_clinical_trials.feature

@@ -36,6 +36,7 @@ Feature: As a potential participant for a clinical study
     When I attempt to retrieve trial "NCT00001372"
     Then I should get a trial
     And the trial should have an "id" of "NCT00001372"
+    And the trial should have an "overall_contact"
 
   Scenario: Find a specific trial with extended attributes
     When I attempt to retrieve trial "NCT00454363"
@@ -47,7 +48,6 @@ 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/lib/clinical/abstract_element.rb

@@ -0,0 +1,19 @@
+module Clinical
+  module AbstractElement
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def abstract_element(name, type, options = {})
+        element(name, type, options.merge(:parser => :abstract_parse, :raw => true))
+      end
+
+      def abstract_parse(xml, options = {})
+        tag XML::Parser.string(xml).parse.root.name
+        parse(xml)
+      end
+    end
+  end
+end
+

data/lib/clinical/contact.rb

@@ -1,25 +1,19 @@
 module Clinical
-  module Contact
-    def self.included(base)
-      base.class_eval do
-        include HappyMapper
-        include Clinical::Contact::InstanceMethods
+  class Contact
+    include HappyMapper
+    include Clinical::AbstractElement
 
-        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
+    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
 
-    module InstanceMethods
-      def to_s
-        [first_name, last_name, "(#{phone})"].join(" ")
-      end
+    def to_s
+      [first_name, last_name, "(#{phone})"].join(" ")
     end
   end
 end

data/lib/clinical/location.rb

@@ -1,10 +1,11 @@
 module Clinical
   class Location
     include HappyMapper
+    include Clinical::AbstractElement
 
     element :facility, String
     has_one :status, Clinical::Status, :parser => :parse
-    has_one :contact, Clinical::LocationContact
+    abstract_element :contact, Clinical::Contact
     has_one :address, Clinical::Address
   end
 end

data/lib/clinical/trial.rb

@@ -2,6 +2,7 @@ module Clinical
   class Trial
     include HappyMapper
     include HTTParty
+    include Clinical::AbstractElement
 
     base_uri "http://clinicaltrials.gov"
     default_params :displayxml => true 
@@ -24,8 +25,8 @@ module Clinical
     has_many :collaborators, Clinical::Collaborator
     has_many :agencies, Clinical::Agency
 
-    has_one :overall_official, Clinical::OverallOfficial, :tag => "overall_official"
-    has_one :overall_contact, Clinical::OverallContact, :tag => "overall_contact"
+    abstract_element :overall_official, Clinical::Contact, :tag => "overall_official"
+    abstract_element :overall_contact, Clinical::Contact, :tag => "overall_contact"
 
     has_many :interventions, Intervention, :tag => "intervention"
     has_many :primary_outcomes, PrimaryOutcome
@@ -98,7 +99,7 @@ module Clinical
     #this metadata is not accessible in the feed so crawl the html page
     #to get keywords, categories, and terms
     def get_metadata
-      response = self.class.get("/show/#{id}", :query => {:displayxml => false})
+      response = self.class.get("/ct2/show/#{id}", :query => {:displayxml => false})
       html = Nokogiri::HTML(response.body)
 
       metadata = {}
@@ -124,7 +125,7 @@ module Clinical
 
     class << self
       def find_by_id(id)
-        response = get("/show/#{id}")
+        response = get("/ct2/show/#{id}")
         if response.code == 400
           nil
         else

data/lib/clinical.rb

@@ -6,6 +6,7 @@ require "happymapper"
 require "nokogiri"
 
 require "clinical/extensions"
+require "clinical/abstract_element"
 
 require "clinical/status"
 require "clinical/intervention"
@@ -21,9 +22,6 @@ require "clinical/agency"
 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.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Dan Pickett
@@ -74,6 +74,7 @@ files:
 - features/step_definitions/clinical_steps.rb
 - features/support/env.rb
 - lib/clinical.rb
+- lib/clinical/abstract_element.rb
 - lib/clinical/address.rb
 - lib/clinical/agency.rb
 - lib/clinical/collaborator.rb
@@ -84,10 +85,7 @@ 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_contact.rb
-- lib/clinical/overall_official.rb
 - lib/clinical/primary_outcome.rb
 - lib/clinical/secondary_outcome.rb
 - lib/clinical/sponsor.rb

data/lib/clinical/location_contact.rb

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

data/lib/clinical/overall_contact.rb

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

data/lib/clinical/overall_official.rb

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