om 1.4.3 → 1.4.4

data/Gemfile

@@ -2,9 +2,11 @@ source "http://rubygems.org"
 
 gemspec
 
+gem 'ruby-debug', :platform => :ruby_18
+gem 'ruby-debug19', :platform => :ruby_19
 
 group :development, :test do
   gem "rcov"
   gem "yard"
-  gem "RedCloth"
+  gem "RedCloth", "~> 4.2.9"
 end

data/Gemfile.lock

@@ -1,39 +1,65 @@
 PATH
   remote: .
   specs:
-    om (1.3.0)
+    om (1.4.3)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.7)
-    columnize (0.3.2)
-    equivalent-xml (0.2.6)
+    RedCloth (4.2.9)
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.5)
+    diff-lcs (1.1.3)
+    equivalent-xml (0.2.8)
       nokogiri (>= 1.4.3)
-    linecache (0.43)
-    mediashelf-loggable (0.4.7)
-    mocha (0.9.12)
-    nokogiri (1.4.4)
-    rcov (0.9.9)
-    rspec (1.3.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mediashelf-loggable (0.4.9)
+    metaclass (0.0.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    nokogiri (1.5.0)
+    rbx-require-relative (0.0.5)
+    rcov (0.9.11)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    yard (0.6.8)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    yard (0.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth
+  RedCloth (~> 4.2.9)
   equivalent-xml (>= 0.2.4)
   mocha (>= 0.9.8)
   om!
   rcov
-  rspec (< 2.0.0)
+  rspec (~> 2.0)
   ruby-debug
+  ruby-debug19
   yard

data/History.textile

@@ -1,3 +1,16 @@
+h3. 1.4.4
+
+  HYDRA-415 https://jira.duraspace.org/browse/HYDRA-415 Fixed insert of attribute nodes
+  update to rspec2
+  compatibility fixes for ruby 1.9
+  RedCloth updated to 4.2.9
+  Replace local 'delimited_list' logic with Array#join
+
+h3. 1.4.3
+
+  HYDRA-681 https://jira.duraspace.org/browse/HYDRA-681 Om was calling .dirty when updating nodes, it should only do that when it's operating on a Nokogiri:Datastream
+  HYDRA-682 https://jira.duraspace.org/browse/HYDRA-682 Om first level terms support update
+
 h3. 1.4.2
   
   "HYDRA-667":https://jira.duraspace.org/browse/HYDRA-667 Fixed bug where updating nodes wasn't marking the document as dirty

data/Rakefile

@@ -4,18 +4,8 @@ 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|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+task :spec => ['om:rspec']
+task :rcov => ['om:rcov']
 
 # task :spec => :check_dependencies
 

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

data/lib/om/xml.rb

@@ -23,7 +23,7 @@ module OM::XML
   
   # Transforms an array of values into a string delimited by +delimiter+
   def self.delimited_list( values_array, delimiter=", ")
-    result = values_array.collect{|a| a + delimiter}.to_s.chomp(delimiter)
+    values_array.join(delimiter)
   end
   
   # Class Methods -- These methods will be available on classes that include this Module 

data/lib/om/xml/container.rb

@@ -20,6 +20,10 @@ module OM::XML::Container
       return tmpl
     end
     
+    # By default, new OM Document instances will create an empty xml document, but if you override self.xml_template to return a different object (e.g. Nokogiri::XML::Document), that will be created instead.
+    # You can make this method create the documents however you want as long as it returns a Nokogiri::XML::Document.
+    # In the tutorials, we use Nokogiri::XML::Builder in this mehtod and call its .doc method at the end of xml_template in order to return the Nokogiri::XML::Document object. Instead of using Nokogiri::XML::Builder, you could put your template into an actual xml file and have xml_template use Nokogiri::XML::Document.parse to load it. That’s up to you. 
+    # @return Nokogiri::XML::Document
     def xml_template
       Nokogiri::XML::Document.parse("")
     end

data/lib/om/xml/named_term_proxy.rb

@@ -50,11 +50,7 @@ class OM::XML::NamedTermProxy
   
   # Any unknown method calls will be proxied to the proxied term
   def method_missing method, *args, &block 
-    if args.empty?
-      return self.proxied_term.send(method)
-    else
-      return self.proxied_term.send(method, args)
-    end
+    return self.proxied_term.send(method, *args)
   end
   
-end
+end

data/lib/om/xml/term.rb

@@ -253,6 +253,8 @@ class OM::XML::Term
       template = "xml['#{ns_prefix}'].#{path_name}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
     elsif !self.namespace_prefix.nil? and self.namespace_prefix != 'oxns'
       template = "xml['#{self.namespace_prefix}'].#{self.path}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
+    elsif self.path.kind_of?(Hash) && self.path[:attribute]
+      template = "xml.@#{self.path[:attribute]}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
     else
       template = "xml.#{self.path}( #{OM::XML.delimited_list(node_options)} )" + node_child_template
     end

data/lib/om/xml/term_value_operators.rb

@@ -138,8 +138,12 @@ module OM::XML::TermValueOperators
     builder = Nokogiri::XML::Builder.with(parent_node) do |xml|
       new_values.each do |builder_new_value|
         builder_new_value.gsub!(/'/, "\\\\'") # escape any apostrophes in the new value
-        builder_arg = eval('"'+ template + '"') # this inserts builder_new_value into the builder template
-        eval(builder_arg)
+        if matchdata = /xml\.@(\w+)/.match(template)
+          parent_node.set_attribute(matchdata[1], builder_new_value)
+        else 
+          builder_arg = eval('"'+ template + '"') # this inserts builder_new_value into the builder template
+          eval(builder_arg)
+        end
       end
     end
     return parent_node

data/lib/om/xml/term_xpath_generator.rb

@@ -220,11 +220,9 @@ module OM::XML::TermXpathGenerator
     return xpath
   end
   
-  # Turns an Array into a String containing values separated by a delimiter.  Defaults to comma as a delimiter.
-  # @param [Array] values_array to convert
-  # @param [String] delimiter.  Default: ", "
-  def self.delimited_list( values_array, delimiter=", ")
-    result = values_array.collect{|a| a + delimiter}.to_s.chomp(delimiter)
+  # @see OM::XML.delimited_list
+  def self.delimited_list(*args)
+    OM::XML.delimited_list(*args)
   end
   
   # Adds xpath xpath node index predicate to the end of your xpath query

data/lib/tasks/om.rake

@@ -7,18 +7,16 @@ 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']
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |spec|
+      spec.pattern = FileList['spec/**/*_spec.rb']
+        spec.pattern += 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
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+     spec.pattern = FileList['spec/**/*_spec.rb']
+     spec.pattern += FileList['spec/*_spec.rb']
+     spec.rcov = true
   end
 
   # Use yard to build docs

data/om.gemspec

@@ -14,9 +14,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency('nokogiri', ">= 1.4.2")
   s.add_dependency('mediashelf-loggable')
-  s.add_development_dependency "rspec", "<2.0.0"
+  s.add_development_dependency "rspec", "~> 2.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")

data/spec/spec_helper.rb

@@ -1,15 +1,11 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'om'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'equivalent-xml/rspec_matchers'
-require 'ruby-debug'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end
 
 def fixture(file)
   File.new(File.join(File.dirname(__FILE__), 'fixtures', file))
-end
+end

data/spec/unit/dynamic_node_spec.rb

@@ -22,6 +22,19 @@ describe "OM::XML::DynamicNode" do
       @article.abstract.should == ["My Abstract"]
     end
 
+    describe "setting attributes" do
+      it "when they exist" do
+        @article.title_info(0).main_title.main_title_lang = "ger"
+        @article.title_info(0).main_title.main_title_lang.should == ["ger"]
+      end
+      it "when they don't exist" do
+        title = @article.title_info(0)
+        title.language = "rus"
+        @article.title_info(0).language.should == ["rus"]
+      end
+
+    end
+
     it "should find elements two deep" do
       #TODO reimplement so that method_missing with name is only called once.  Create a new method for name.
       @article.name.name_content.val.should == ["Describes a person"]

data/spec/unit/term_spec.rb

@@ -183,9 +183,8 @@ describe "OM::XML::Term" do
     end
     
     it "should support terms that are attributes" do
-      pending "HYDRA-415"
       @type_attribute_term = OM::XML::Term.new(:type_attribute, :path=>{:attribute=>:type})
-      @type_attribute_term.xml_builder_template.should == "TODO!"
+      @type_attribute_term.xml_builder_template.should == "xml.@type( '\#{builder_new_value}' )"
     end
     
     it "should support terms with namespaced attributes" do
@@ -194,9 +193,8 @@ describe "OM::XML::Term" do
     end
     
     it "should support terms that are namespaced attributes" do
-      pending "HYDRA-415"
       @xml_lang_attribute_term = OM::XML::Term.new(:xml_lang_attribute, :path=>{:attribute=>"xml:lang"})
-      @xml_lang_attribute_term.xml_builder_template.should == "TODO!"
+      @xml_lang_attribute_term.xml_builder_template.should == "xml.@xml:lang( '\#{builder_new_value}' )"
     end
     
   end

data/spec/unit/term_value_operators_spec.rb

@@ -258,13 +258,13 @@ describe "OM::XML::TermValueOperators" do
     end
     
     it "should support adding attribute values" do
-      pending 
-      pointer = [:title_info, :language]
+      pointer = [{:title_info=>0}, :language]
       test_val = "language value"
+debugger
       @article.term_values_append( 
-        :parent_select => :title_info,
-        :parent_index => :first,
-        :template => [:title_info, :language],
+        :parent_select => [{:title_info=>0}],
+        :parent_index => 0,
+        :template => [{:title_info=>0}, :language],
         :values => test_val
       )
       @article.term_values(*pointer).first.should == test_val

data/spec/unit/terminology_spec.rb

@@ -123,11 +123,13 @@ describe "OM::XML::Terminology" do
       # role_term.xpath_constrained.should == '//oxns:name[contains(oxns:role/oxns:roleTerm, "#{constraint_value}")]'.gsub('"', '\"')
     end
 
-    it "supports treating attributes as properties" do    
-      language_term = @test_full_terminology.retrieve_term(:title_info, :language)
-      language_term.xpath.should == '//oxns:titleInfo/@lang'
-      language_term.xpath_relative.should == '@lang'
-      language_term.xpath_constrained.should == '//oxns:titleInfo/@lang[contains(., "#{constraint_value}")]'.gsub('"', '\"')
+    describe "treating attributes as properties" do
+      it "should build correct xpath" do    
+        language_term = @test_full_terminology.retrieve_term(:title_info, :language)
+        language_term.xpath.should == '//oxns:titleInfo/@lang'
+        language_term.xpath_relative.should == '@lang'
+        language_term.xpath_constrained.should == '//oxns:titleInfo/@lang[contains(., "#{constraint_value}")]'.gsub('"', '\"')
+      end
     end
 
     it "should support deep nesting of properties" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 4
+  version: 1.4.4
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 -05:00
+date: 2011-12-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,14 +54,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        version: "2.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -80,24 +79,10 @@ dependencies:
         version: 0.9.8
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: equivalent-xml
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,7 +94,7 @@ dependencies:
         - 4
         version: 0.2.4
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: "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"
 email: matt.zumwalt@yourmediashelf.com
 executables: []