om 1.2.4 → 1.2.5

data/Rakefile

@@ -1,30 +1,9 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "om"
-    gem.summary = %Q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.}
-    gem.description = %Q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper methods for doing things like retrieve generated xpath queries or look up properties based on a simplified DSL}
-    gem.email = "matt.zumwalt@yourmediashelf.com"
-    gem.homepage = "http://github.com/mediashelf/om"
-    gem.authors = ["Matt Zumwalt"]
-    
-    gem.add_dependency('nokogiri', ">= 1.4.2")
-    
-    gem.add_development_dependency "rspec", "<2.0.0"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    gem.add_development_dependency "ruby-debug"
-    gem.add_development_dependency "jeweler"
-    gem.add_development_dependency "equivalent-xml", ">= 0.2.4"
-    
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+# adding tasks defined in lib/tasks
+Dir.glob('lib/tasks/*.rake').each { |r| import r }
+
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -44,7 +23,7 @@ task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = Om::VERSION 
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "om #{version}"

data/UPDATING_DOCUMENTS.textile

@@ -0,0 +1,3 @@
+h3. Updating, Inserting & Deleting Elements ("TermValueOperators":OM/XML/TermValueOperators.html)
+
+h3. Inserting entire hierarchies of Elements

data/lib/om/samples/mods_article.rb

@@ -5,44 +5,52 @@ class OM::Samples::ModsArticle
     set_terminology do |t|
       t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
 
+
       t.title_info(:path=>"titleInfo") {
-        t.main_title(:path=>"title", :label=>"title")
-        t.language(:path=>{:attribute=>"lang"})
+        t.main_title(:index_as=>[:facetable],:path=>"title", :label=>"title")
+        t.language(:index_as=>[:facetable],:path=>{:attribute=>"lang"})
       } 
-      t.abstract     
-      t.subject{
-        t.topic
+      t.language{
+        t.lang_code(:index_as=>[:facetable], :path=>"languageTerm", :attributes=>{:type=>"code"})
       }
-      t.topic_tag(:ref=>[:subject, :topic])           
+      t.abstract   
+      t.subject {
+        t.topic(:index_as=>[:facetable])
+      }      
+      t.topic_tag(:proxy=>[:subject, :topic])    
+      # t.topic_tag(:index_as=>[:facetable],:path=>"subject", :default_content_path=>"topic")
       # This is a mods:name.  The underscore is purely to avoid namespace conflicts.
       t.name_ {
         # this is a namepart
-        t.namePart(:index_as=>[:searchable, :displayable, :facetable, :sortable], :required=>:true, :type=>:string, :label=>"generic name")
+        t.namePart(:type=>:string, :label=>"generic name")
         # affiliations are great
         t.affiliation
+        t.institution(:path=>"affiliation", :index_as=>[:facetable], :label=>"organization")
         t.displayForm
         t.role(:ref=>[:role])
-        t.description
+        t.description(:index_as=>[:facetable])
         t.date(:path=>"namePart", :attributes=>{:type=>"date"})
         t.last_name(:path=>"namePart", :attributes=>{:type=>"family"})
         t.first_name(:path=>"namePart", :attributes=>{:type=>"given"}, :label=>"first name")
         t.terms_of_address(:path=>"namePart", :attributes=>{:type=>"termsOfAddress"})
+        t.computing_id
         t.name_content(:path=>"text()")
       }
       # lookup :person, :first_name        
-      t.person(:ref=>:name, :attributes=>{:type=>"personal"})
-      t.organizaton(:ref=>:name, :attributes=>{:type=>"institutional"})
-      t.conference(:ref=>:name, :attributes=>{:type=>"conference"})
-
+      t.person(:ref=>:name, :attributes=>{:type=>"personal"}, :index_as=>[:facetable])
+      t.department(:proxy=>[:person,:description],:index_as=>[:facetable])
+      t.organization(:ref=>:name, :attributes=>{:type=>"corporate"}, :index_as=>[:facetable])
+      t.conference(:ref=>:name, :attributes=>{:type=>"conference"}, :index_as=>[:facetable])
       t.role {
         t.text(:path=>"roleTerm",:attributes=>{:type=>"text"})
         t.code(:path=>"roleTerm",:attributes=>{:type=>"code"})
       }
       t.journal(:path=>'relatedItem', :attributes=>{:type=>"host"}) {
-        t.title_info
+        t.title_info(:index_as=>[:facetable],:ref=>[:title_info])
         t.origin_info(:path=>"originInfo") {
           t.publisher
           t.date_issued(:path=>"dateIssued")
+          t.issuance(:index_as=>[:facetable])
         }
         t.issn(:path=>"identifier", :attributes=>{:type=>"issn"})
         t.issue(:path=>"part") {
@@ -53,12 +61,19 @@ class OM::Samples::ModsArticle
             t.start
             t.end
           }
-          t.publication_date(:path=>"date")
           t.start_page(:proxy=>[:pages, :start])
           t.end_page(:proxy=>[:pages, :end])
+          t.publication_date(:path=>"date")
         }
       }
-      
+      t.note
+      t.location(:path=>"location") {
+        t.url(:path=>"url")
+      }
+      t.publication_url(:proxy=>[:location,:url])
+      t.peer_reviewed(:proxy=>[:journal,:origin_info,:issuance], :index_as=>[:facetable])
+      t.title(:proxy=>[:mods,:title_info, :main_title])
+      t.journal_title(:proxy=>[:journal, :title_info, :main_title])
     end
     
     # Changes from OM::Properties implementation

data/lib/om/version.rb

@@ -0,0 +1,3 @@
+module Om
+  VERSION = "1.2.5"
+end

data/lib/om/xml/document.rb

@@ -42,6 +42,7 @@ module OM::XML::Document
   
     klass.send(:include, OM::XML::Container)
     klass.send(:include, OM::XML::TermValueOperators)
+    klass.send(:include, OM::XML::Validation)
   end
   
   # Applies the property's corresponding xpath query, returning the result Nokogiri::XML::NodeSet

data/lib/om/xml/term.rb

@@ -1,7 +1,15 @@
+# Special options: data_type, attributes, index_as
+# is_root_term
+#
 class OM::XML::Term
   
   # Term::Builder Class Definition
   #
+  # @example
+  #   tb2 = OM::XML::Term::Builder.new("my_term_name").path("fooPath").attributes({:lang=>"foo"}).index_as([:searchable, :facetable]).required(true).data_type(:text) 
+  #
+  #   
+  #
   # When coding against Builders, remember that they rely on MethodMissing, 
   # so any time you call a method on the Builder that it doesn't explicitly recognize, 
   # the Builder will add your method & arguments to the it's settings and return itself.

data/lib/om/xml/terminology.rb

@@ -1,3 +1,13 @@
+# When you're defining a Terminology, you will usually use a "Terminology Builder":OM/XML/Terminology/Builder.html to create it
+# Each line you put into a "Terminology Builder":OM/XML/Terminology/Builder.html is passed to the constructor for a "Term Builder":OM/XML/Term/Builder.html. 
+# See the "OM::XML::Term::Builder":OM/XML/Term/Builder.html API docs for complete description of your options for defining each Term.
+#
+# The most important thing to define in a Terminology is the root term.  This is the place where you set namespaces and schemas for the Terminology
+# @example Define a Terminology with a root term "mods", a default namespace of "http://www.loc.gov/mods/v3" and a schema of "http://www.loc.gov/standards/mods/v3/mods-3-2.xsd" (schema is optional)
+#   terminology_builder = OM::XML::Terminology::Builder.new do |t|
+#     t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
+#   end
+#   terminology = terminology_builder.build
 class OM::XML::Terminology
   
   class BadPointerError < StandardError; end

data/lib/om.rb

@@ -54,6 +54,10 @@ module OM
     end
     return flat_array
   end
+
+  def self.version
+    Om::VERSION
+  end
 end
 
 module OM::XML; end
@@ -61,5 +65,5 @@ module OM::XML; end
 require "om/tree_node"
 require "om/xml"
 require "om/samples"
-
+require "om/version"
 

data/lib/tasks/om.rake

@@ -0,0 +1,56 @@
+desc "Task to execute builds on a Hudson Continuous Integration Server."
+task :hudson do
+  Rake::Task["om:doc"].invoke
+  Rake::Task["om:rcov"].invoke
+  Rake::Task["om:rspec"].invoke
+end
+
+namespace :om do    
+
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:rspec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
+
+  require 'rcov/rcovtask'
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov_opts << "--exclude \"gems/*\" --rails" 
+    spec.rcov = true
+  end
+
+  # Use yard to build docs
+  begin
+    require 'yard'
+    require 'yard/rake/yardoc_task'
+    project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
+    doc_destination = File.join(project_root, 'doc')
+
+    YARD::Rake::YardocTask.new(:doc) do |yt|
+      readme_filename = 'README.textile'
+      textile_docs = []
+      Dir[File.join(project_root, "*.textile")].each_with_index do |f, index| 
+        unless f.include?("/#{readme_filename}") # Skip readme, which is already built by the --readme option
+          textile_docs << '-'
+          textile_docs << f
+        end
+      end
+      yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + textile_docs
+                   # [ File.join(project_root, 'README.textile') ]
+                   # [ File.join(project_root, 'README.textile'),'-', File.join(project_root,'GETTING_STARTED.textile') ]
+      yt.options = ['--output-dir', doc_destination, '--readme', readme_filename]
+    end
+  rescue LoadError
+    desc "Generate YARD Documentation"
+    task :doc do
+      abort "Please install the YARD gem to generate rdoc."
+    end
+  end
+
+
+
+
+end
+

data/om.gemspec

@@ -1,218 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "om/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{om}
-  s.version = "1.2.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Matt Zumwalt"]
-  s.date = %q{2011-05-02}
+  s.name        = "om"
+  s.version     = Om::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Matt Zumwalt"]
+  s.email       = %q{matt.zumwalt@yourmediashelf.com}
+  s.homepage    = %q{http://github.com/mediashelf/om}
+  s.summary     = %q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.}
   s.description = %q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.  Wraps Nokogiri documents in objects with miscellaneous helper methods for doing things like retrieve generated xpath queries or look up properties based on a simplified DSL}
-  s.email = %q{matt.zumwalt@yourmediashelf.com}
+
+  s.add_dependency('nokogiri', ">= 1.4.2")
+  s.add_development_dependency "rspec", "<2.0.0"
+  s.add_development_dependency "mocha", ">= 0.9.8"
+  s.add_development_dependency "ruby-debug"
+  s.add_development_dependency "equivalent-xml", ">= 0.2.4"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc",
     "README.textile"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "History.textile",
-    "LICENSE",
-    "README.rdoc",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "container_spec.rb",
-    "lib/om.rb",
-    "lib/om/samples.rb",
-    "lib/om/samples/mods_article.rb",
-    "lib/om/tree_node.rb",
-    "lib/om/xml.rb",
-    "lib/om/xml/container.rb",
-    "lib/om/xml/document.rb",
-    "lib/om/xml/named_term_proxy.rb",
-    "lib/om/xml/node_generator.rb",
-    "lib/om/xml/template_registry.rb",
-    "lib/om/xml/term.rb",
-    "lib/om/xml/term_value_operators.rb",
-    "lib/om/xml/term_xpath_generator.rb",
-    "lib/om/xml/terminology.rb",
-    "lib/om/xml/validation.rb",
-    "lib/om/xml/vocabulary.rb",
-    "om.gemspec",
-    "spec/fixtures/CBF_MODS/ARS0025_016.xml",
-    "spec/fixtures/RUBRIC_mods_article_template.xml",
-    "spec/fixtures/mods-3-2.xsd",
-    "spec/fixtures/mods_articles/hydrangea_article1.xml",
-    "spec/fixtures/test_dummy_mods.xml",
-    "spec/integration/rights_metadata_integration_example_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "spec/unit/container_spec.rb",
-    "spec/unit/document_spec.rb",
-    "spec/unit/named_term_proxy_spec.rb",
-    "spec/unit/node_generator_spec.rb",
-    "spec/unit/om_spec.rb",
-    "spec/unit/template_registry_spec.rb",
-    "spec/unit/term_builder_spec.rb",
-    "spec/unit/term_spec.rb",
-    "spec/unit/term_value_operators_spec.rb",
-    "spec/unit/term_xpath_generator_spec.rb",
-    "spec/unit/terminology_builder_spec.rb",
-    "spec/unit/terminology_spec.rb",
-    "spec/unit/validation_spec.rb",
-    "spec/unit/xml_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/mediashelf/om}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS.}
-  s.test_files = [
-    "spec/integration/rights_metadata_integration_example_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/container_spec.rb",
-    "spec/unit/document_spec.rb",
-    "spec/unit/named_term_proxy_spec.rb",
-    "spec/unit/node_generator_spec.rb",
-    "spec/unit/om_spec.rb",
-    "spec/unit/template_registry_spec.rb",
-    "spec/unit/term_builder_spec.rb",
-    "spec/unit/term_spec.rb",
-    "spec/unit/term_value_operators_spec.rb",
-    "spec/unit/term_xpath_generator_spec.rb",
-    "spec/unit/terminology_builder_spec.rb",
-    "spec/unit/terminology_spec.rb",
-    "spec/unit/validation_spec.rb",
-    "spec/unit/xml_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<om>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-    else
-      s.add_dependency(%q<om>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-      s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-    end
-  else
-    s.add_dependency(%q<om>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-    s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<equivalent-xml>, [">= 0.2.4"])
-  end
 end
-

data/spec/unit/document_spec.rb

@@ -74,7 +74,13 @@ describe "OM::XML::Document" do
   after(:all) do
     Object.send(:remove_const, :DocumentTest)
   end
-    
+  
+  it "should automatically include the necessary modules" do
+    DocumentTest.included_modules.should include(OM::XML::Container)
+    DocumentTest.included_modules.should include(OM::XML::TermValueOperators)
+    DocumentTest.included_modules.should include(OM::XML::Validation)
+  end
+  
   describe ".ox_namespaces" do
     it "should merge terminology namespaces with document namespaces" do
       @fixturemods.ox_namespaces.should == {"oxns"=>"http://www.loc.gov/mods/v3", "xmlns:ns2"=>"http://www.w3.org/1999/xlink", "xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance", "xmlns:ns3"=>"http://www.loc.gov/mods/v3", "xmlns"=>"http://www.loc.gov/mods/v3"}

data/spec/unit/nokogiri_sanity_spec.rb

@@ -0,0 +1,75 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "om"
+
+describe "OM::XML::TermValueOperators" do
+  
+  describe "find_by_terms" do
+    before(:each) do
+      @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
+    end
+  
+    it "should do" do
+      @article.find_by_terms({:journal=>0}).length.should == 1
+    end
+  end
+  
+  describe "update_values" do
+    before(:each) do
+      @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
+    end
+  
+    it "should respond with a hash of updated values and their indexes" do
+      test_args = {[{"person"=>"0"},"description"]=>{"-1"=>"mork", "1"=>"york"}}      
+      result = @article.update_values(test_args)
+      result.should == {"person_0_description"=>{"0"=>"mork","1"=>"york"}}
+    end
+    
+    it "should update the xml in the specified datatsream and save those changes to Fedora" do
+      @article.term_values({:person=>0}, :first_name).should == ["GIVEN NAMES"]
+      test_args = {[{:person=>0}, :first_name]=>{"0"=>"Replacement FirstName"}}
+      @article.update_values(test_args)
+      @article.term_values({:person=>0}, :first_name).should == ["Replacement FirstName"]
+    end
+    
+    it "should update the xml according to the find_by_terms_and_values in the given hash" do
+      terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      result = @article.update_values(terms_update_hash)
+      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      
+      # Trying again with a more complex update hash
+      terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
+      result = @article.update_values(terms_update_hash)
+      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}}
+    end
+    
+    it "should work when you re-run the command" do
+      terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      result = @article.update_values(terms_update_hash)
+      @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
+      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      
+      # result = @article.update_values(terms_update_hash)
+      # result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
+      result = @article.update_values(terms_update_hash)
+      @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
+      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      result = @article.update_values(terms_update_hash)
+      
+      terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
+      result = @article.update_values(terms_update_hash)
+      @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
+      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      
+      # Trying again with a more complex update hash
+      terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
+      result = @article.update_values(terms_update_hash)
+      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}}
+    end
+  end
+  
+
+  
+end