om 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a06b8c699f06fb0cb851e7b4e66110738a00cf7
-  data.tar.gz: 36671447b086cdb74d25ac39cf50d35573a94c72
+  metadata.gz: 774ca56c42282c5d31bef07b86d7f6e5e54d74b7
+  data.tar.gz: bcf4d74285aa0283c8c4a926e988b5444f0706ae
 SHA512:
-  metadata.gz: d159dd3d980dc79f7aed168c4f621941819ce89efca387b50ca34781a119da2490d07fd210e69dadd5e700cc5c8ec66cb0fa8ada329f490330dcf72137d4d0eb
-  data.tar.gz: c388b9688995e643be94e472e804daf31e227d69746fd65c10cfd09ab824fdf1fd4426912eba5beaaca4137066f1faae097268c8ce239553bfc661bcb22dad47
+  metadata.gz: 8c277df99dae62c250a6747bd05f68aa058477ccec12c03861818880e2ce828f20e21a1203bda0204d088830ecf59b9769caba20929fd0643bd3d28362c38091
+  data.tar.gz: d145e98cd6c1387c58b6c98715d502b5bdb30e970050f0ab75c52c1c7fdb00b23ee83f09fdcf1c70565bd5fb6aecd3ab1794bc86b59d83dc0a2aaa1ed7a0d1a4

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
 
 gemfile:
   - gemfiles/gemfile.rails3
@@ -8,3 +9,7 @@ gemfile:
 
 notifications:
   irc: "irc.freenode.org#projecthydra"
+
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/History.textile

@@ -1,3 +1,17 @@
+h3. 3.1.0 (17 Jul 2014)
+  2014-07-17: Bump solrizer version to ~> 3.3 [Justin Coyne]
+
+  2014-07-17: Use the system libxml2 on travis [Justin Coyne]
+
+  2014-07-17: Remove dependency on mediashelf-loggable [Justin Coyne]
+
+  2014-06-13: Setting values on a proxy term should build the parent terms if they
+  don't exist [Justin Coyne]
+
+  2014-06-05: Handle invalid time for Rails 3 [Justin Coyne]
+
+  2014-06-02: Updating solrizer, correcting rspec deprecations [Adam Wead]
+
 h3. 3.0.1 (25 Jun 2013)
   Fix bug where values that were the same as the existing values were 
     removed from the update list

data/lib/om.rb

@@ -1,69 +1,73 @@
 require 'rubygems'
 require 'active_model'
-require 'deprecation'
 require 'nokogiri'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module OM
-  # Recursively changes any strings beginning with : to symbols and any number strings to integers
-  # @param [String, Array, Hash] params
-  # @example
-  #   [{":person"=>"0"}, ":last_name"] #=> [{:person=>0}, :last_name]
-  def self.destringify(params)
-    case params
-    when String       
-      if params == "0" || params.to_i != 0
-        result = params.to_i
-      elsif params[0,1] == ":"
-        result = params.sub(":","").to_sym
+  mattr_accessor :logger
+
+  class << self
+    # Recursively changes any strings beginning with : to symbols and any number strings to integers
+    # @param [String, Array, Hash] params
+    # @example
+    #   [{":person"=>"0"}, ":last_name"] #=> [{:person=>0}, :last_name]
+    def destringify(params)
+      case params
+      when String       
+        if params == "0" || params.to_i != 0
+          result = params.to_i
+        elsif params[0,1] == ":"
+          result = params.sub(":","").to_sym
+        else
+          result = params.to_sym
+        end
+        return result
+      when Hash 
+        result = {}
+        params.each_pair do |k,v|
+          result[ destringify(k) ] = destringify(v)
+        end
+        return result
+      when Array 
+        result = []
+        params.each do |x|
+          result << destringify(x)
+        end
+        return result
       else
-        result = params.to_sym
-      end
-      return result
-    when Hash 
-      result = {}
-      params.each_pair do |k,v|
-        result[ destringify(k) ] = destringify(v)
+        return params
       end
-      return result
-    when Array 
-      result = []
-      params.each do |x|
-        result << destringify(x)
-      end
-      return result
-    else
-      return params
     end
-  end
-  
-  # Convert a Term pointer into a flat array without Hashes.
-  # If include_indices is set to false, node indices will be removed.
-  #
-  # @param [Array] pointers array that you would pass into other Accessor methods
-  # @param [Boolean] include_indices (default: true) if set to false, parent indices will be excluded from the array
-  # @example Turn a pointer into a flat array with node indices preserved
-  #   OM.pointers_to_flat_array( [{:conference=>0}, {:role=>1}, :text] ) 
-  #   => [:conference, 0, :role, 1, :text]
-  # @example Remove node indices by setting include_indices to false
-  #   OM.pointers_to_flat_array( [{:conference=>0}, {:role=>1}, :text], false ) 
-  #   => [:conference, :role, :text]
-  def self.pointers_to_flat_array(pointers, include_indices=true)
-    flat_array = []
-    pointers.each do |pointer|
-      if pointer.kind_of?(Hash)
-        flat_array << pointer.keys.first
-        if include_indices 
-          flat_array << pointer.values.first
+    
+    # Convert a Term pointer into a flat array without Hashes.
+    # If include_indices is set to false, node indices will be removed.
+    #
+    # @param [Array] pointers array that you would pass into other Accessor methods
+    # @param [Boolean] include_indices (default: true) if set to false, parent indices will be excluded from the array
+    # @example Turn a pointer into a flat array with node indices preserved
+    #   OM.pointers_to_flat_array( [{:conference=>0}, {:role=>1}, :text] ) 
+    #   => [:conference, 0, :role, 1, :text]
+    # @example Remove node indices by setting include_indices to false
+    #   OM.pointers_to_flat_array( [{:conference=>0}, {:role=>1}, :text], false ) 
+    #   => [:conference, :role, :text]
+    def pointers_to_flat_array(pointers, include_indices=true)
+      flat_array = []
+      pointers.each do |pointer|
+        if pointer.kind_of?(Hash)
+          flat_array << pointer.keys.first
+          if include_indices 
+            flat_array << pointer.values.first
+          end
+        else
+          flat_array << pointer
         end
-      else
-        flat_array << pointer
       end
+      return flat_array
     end
-    return flat_array
-  end
 
-  def self.version
-    Om::VERSION
+    def version
+      Om::VERSION
+    end
   end
 
   class TypeMismatch < StandardError; end

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "3.0.7"
+  VERSION = "3.1.0"
 end

data/lib/om/xml/term_value_operators.rb

@@ -1,5 +1,4 @@
 require "open-uri"
-require "logger"
 
 class OM::XML::ParentNodeNotFoundError < RuntimeError; end
 module OM::XML::TermValueOperators
@@ -13,7 +12,7 @@ module OM::XML::TermValueOperators
     find_by_terms(*term_pointer).each {|node| result << (trim_text ? node.text.strip : node.text) }
 
     if term_pointer.length == 1 && term_pointer.first.kind_of?(String)
-      logger.warn "Passing a xpath to term_values means that OM can not properly find the associated term. Pass a term pointer instead."
+      OM.logger.warn "Passing a xpath to term_values means that OM can not properly find the associated term. Pass a term pointer instead." if OM.logger
       result
     else
       term = self.class.terminology.retrieve_term(*OM.pointers_to_flat_array(OM.destringify(term_pointer), false))

data/lib/om/xml/term_xpath_generator.rb

@@ -1,6 +1,4 @@
-require 'loggable'
 module OM::XML::TermXpathGenerator
-  include Loggable
   
   # Generate relative xpath for a term
   # @param [OM::XML::Term] term that you want to generate relative xpath for
@@ -168,7 +166,7 @@ module OM::XML::TermXpathGenerator
       # If we've encountered a NamedTermProxy, insert path sections corresponding to each entry in its proxy_pointer (rather than just the final term that it points to).
       # TODO Looks like this only works if the last key is a NamedTermProxy, what if we cross proxies on the way there?
       if term.kind_of? OM::XML::NamedTermProxy
-        logger.warn "You attempted to call an index value of #{index} on the term \"#{k.inspect}\". However \"#{k.inspect}\" is a proxy so we are ignoring the index. See https://jira.duraspace.org/browse/HYDRA-643" if index
+        OM.logger.warn "You attempted to call an index value of #{index} on the term \"#{k.inspect}\". However \"#{k.inspect}\" is a proxy so we are ignoring the index. See https://jira.duraspace.org/browse/HYDRA-643" if index && OM.logger
         current_location = term.parent.nil? ? term.terminology : term.parent
         relative_path = ""
         term.proxy_pointer.each_with_index do |proxy_pointer, proxy_pointer_index|

data/om.gemspec

@@ -16,10 +16,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport'
   s.add_dependency 'activemodel'
-  s.add_dependency 'solrizer', '~> 3.1.0'
+  s.add_dependency 'solrizer', '~> 3.3'
   s.add_dependency('nokogiri', ">= 1.4.2")
-  s.add_dependency('mediashelf-loggable')
-  s.add_dependency('deprecation')
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "yard"

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ require 'om'
 require 'rspec'
 require 'equivalent-xml/rspec_matchers'
 require 'samples'
+require 'logger'
+
+OM.logger = Logger.new(STDERR)
 
 RSpec.configure do |config|
 end

data/spec/unit/document_spec.rb

@@ -149,13 +149,13 @@ describe "OM::XML::Document" do
   
   describe "node_exists?" do
     it "should return true if any nodes are found" do
-      @mods_article.node_exists?( {:person=>1}, :first_name).should be_true
+      @mods_article.node_exists?( {:person=>1}, :first_name).should be true
     end
     it "should return false if no nodes are found" do
-      @mods_article.node_exists?( {:person=>8}, :first_name ).should be_false
+      @mods_article.node_exists?( {:person=>8}, :first_name ).should be false
     end
     it "should support xpath queries" do
-      @mods_article.node_exists?('//oxns:name[@type="personal"][1]/oxns:namePart[1]').should be_true
+      @mods_article.node_exists?('//oxns:name[@type="personal"][1]/oxns:namePart[1]').should be true
     end
   end
    

data/spec/unit/term_spec.rb

@@ -2,12 +2,14 @@ require 'spec_helper'
 
 describe OM::XML::Term do
   describe "without a type" do
-    subject { OM::XML::Term.new(:test_term) }
-    its (:type) { should == :string }
+    it "should default to string" do
+      OM::XML::Term.new(:test_term).type.should == :string
+    end
   end
   describe "when type is specified" do
-    subject { OM::XML::Term.new(:test_term, :type=>:date)}
-    its (:type) { should == :date }
+    it "should accept date" do
+      OM::XML::Term.new(:test_term, :type=>:date).type.should == :date
+    end
   end
 
   describe "a big test" do

data/spec/unit/terminology_spec.rb

@@ -195,14 +195,14 @@ describe "OM::XML::Terminology" do
 
   describe ".has_term?" do
     it "should return true if the specified term does exist in the terminology" do
-      @test_full_terminology.has_term?(:journal,:issue,:end_page).should be_true
+      @test_full_terminology.has_term?(:journal,:issue,:end_page).should be true
     end
     it "should support term_pointers with array indexes in them (ignoring the indexes)" do
-      @test_full_terminology.has_term?(:title_info, :main_title).should be_true
-      @test_full_terminology.has_term?({:title_info=>"0"}, :main_title).should be_true
+      @test_full_terminology.has_term?(:title_info, :main_title).should be true
+      @test_full_terminology.has_term?({:title_info=>"0"}, :main_title).should be true
     end
     it "should return false if the specified term does not exist in the terminology" do
-      @test_full_terminology.has_term?(:name, :date, :nonexistentTerm, :anotherTermName).should be_false
+      @test_full_terminology.has_term?(:name, :date, :nonexistentTerm, :anotherTermName).should be_falsey
     end
   end
 

data/spec/unit/validation_spec.rb

@@ -69,8 +69,8 @@ describe "OM::XML::Validation" do
       ValidationTest.send(:file_from_url, "http://google.com")
     end
     it "should raise an error if the url is invalid" do
-      lambda {ValidationTest.send(:file_from_url, "")}.should raise_error(RuntimeError, "Could not retrieve file from . Error: No such file or directory - ")
-      lambda {ValidationTest.send(:file_from_url, "foo")}.should raise_error(RuntimeError, "Could not retrieve file from foo. Error: No such file or directory - foo")
+      lambda {ValidationTest.send(:file_from_url, "")}.should raise_error(RuntimeError, /Could not retrieve file from /)
+      lambda {ValidationTest.send(:file_from_url, "foo")}.should raise_error(RuntimeError, /Could not retrieve file from foo/)
     end
     it "should raise an error if file retrieval fails" do
       skip "no internet connection"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -67,34 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: mediashelf-loggable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: deprecation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement