dpickett-clinical 0.1.4 → 0.1.5

data/.gitignore

@@ -3,3 +3,6 @@
 coverage
 rdoc
 pkg
+tmp
+features_rcov
+coverage.data

data/Rakefile

@@ -29,12 +29,27 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
+namespace :rcov do
   require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
+  Rcov::RcovTask.new(:tests) do |test|
     test.libs << 'test'
     test.pattern = 'test/**/*_test.rb'
+    test.rcov_opts = %w{--aggregate coverage.data --exclude osx\/objc,gems\/,spec\/}
     test.verbose = true
+  end  
+  
+  require 'cucumber/rake/task'  
+  Cucumber::Rake::Task.new(:cucumber) do |t|    
+    t.rcov = true
+    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
@@ -45,6 +60,7 @@ end
 begin
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new(:features)
+  
 rescue LoadError
   task :features do
     abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"

data/clinical.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clinical}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
@@ -25,15 +25,19 @@ Gem::Specification.new do |s|
      "features/support/env.rb",
      "lib/clinical.rb",
      "lib/clinical/address.rb",
+     "lib/clinical/agency.rb",
+     "lib/clinical/collaborator.rb",
      "lib/clinical/collection.rb",
      "lib/clinical/condition.rb",
      "lib/clinical/contact.rb",
      "lib/clinical/extensions.rb",
      "lib/clinical/intervention.rb",
+     "lib/clinical/lead_sponsor.rb",
      "lib/clinical/location.rb",
      "lib/clinical/outcome.rb",
      "lib/clinical/primary_outcome.rb",
      "lib/clinical/secondary_outcome.rb",
+     "lib/clinical/sponsor.rb",
      "lib/clinical/status.rb",
      "lib/clinical/trial.rb",
      "test/clinical/trial_test.rb",

data/lib/clinical/agency.rb

@@ -0,0 +1,6 @@
+module Clinical
+  class Agency
+    include Clinical::Sponsor
+    tag "sponsors/agency"
+  end
+end

data/lib/clinical/collaborator.rb

@@ -0,0 +1,6 @@
+module Clinical
+  class Collaborator
+    include Clinical::Sponsor
+    tag "sponsors/collaborator"
+  end
+end

data/lib/clinical/lead_sponsor.rb

@@ -0,0 +1,6 @@
+module Clinical
+  class LeadSponsor
+    include Clinical::Sponsor
+    tag "sponsors/lead_sponsor"
+  end
+end

data/lib/clinical/sponsor.rb

@@ -0,0 +1,27 @@
+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)
+      end
+
+    module InstanceMethods
+      def to_s
+        name
+      end
+    end
+    module ClassMethods
+      def parse(xml, options = {})
+        xml.find(tag_name).collect do |n|
+          item = new
+          item.name = n.content.chomp.strip
+          item
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dpickett-clinical
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Dan Pickett
@@ -64,15 +64,19 @@ files:
 - features/support/env.rb
 - lib/clinical.rb
 - lib/clinical/address.rb
+- lib/clinical/agency.rb
+- lib/clinical/collaborator.rb
 - lib/clinical/collection.rb
 - lib/clinical/condition.rb
 - lib/clinical/contact.rb
 - lib/clinical/extensions.rb
 - lib/clinical/intervention.rb
+- lib/clinical/lead_sponsor.rb
 - lib/clinical/location.rb
 - lib/clinical/outcome.rb
 - lib/clinical/primary_outcome.rb
 - lib/clinical/secondary_outcome.rb
+- lib/clinical/sponsor.rb
 - lib/clinical/status.rb
 - lib/clinical/trial.rb
 - test/clinical/trial_test.rb