om 2.1.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488ae138adaa9a02906a669cfd607f93f4a3579d
-  data.tar.gz: 7ca3f44c638ead4ab8cf05d3f84e7a43cbfdc5b5
+  metadata.gz: 047198eb8ea0cf1f0b32818fb21ea09be9f4edd7
+  data.tar.gz: 771c06c6304173f63d98db27a490eaf9adc38205
 SHA512:
-  metadata.gz: 1d0bc70088ba01c72ed720b3f3b5d2934688d69bbe366ea27ac027bae53e7c939b44c0c1736c033fc0a04f2c07deb75c316eb7be3d504adbf858c1a51a2ad1fd
-  data.tar.gz: 0c2fda47f9a07f3802e24d636b7a60ca070c7db3d39de1503737a2fd3829f757f0805d1d6f90077db5ed99db0f895bfdb45f7aab0413f79e507ac43bfc7cebd6
+  metadata.gz: d7c61df6a42241e45281c0831dbf822282c2630a019617d13c3e8aca005e9b017a6b16adfb10541df0553091e272b428a90d73eb9a29a7c3f0816a863415aca5
+  data.tar.gz: 2d5a6d8d73f56fd06ac885a55468c38c62f642d3d5090ce7c1c7e81af32dc0f93183647a63bc5f919a771223df8347374846b8798b413fbdda66b761b7fd1c82

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - gemfiles/gemfile.rails3
+  - gemfiles/gemfile.rails4
+
+notifications:
+  irc: "irc.freenode.org#projecthydra"

data/History.textile

@@ -1,3 +1,9 @@
+h3. 2.2.0 (20 June 2013)
+  Deprecate passing Hash values into DynamicNode#val= or 
+  Document#update_attributes. This behavior will be removed in 3.0.0
+  Rails 4 support
+  Pass nil in order to remove a node (instead of blank string)
+
 h3. 2.1.2 (3 May 2013)
   Fix missing comma after exception
 

data/gemfiles/gemfile.rails3

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '~> 3.2.13'
+
+group :development, :test do
+  gem 'rcov', :platform => :mri_18
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/gemfiles/gemfile.rails4

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '4.0.0.rc1'
+
+group :development, :test do
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/lib/om.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
-require 'active_support/concern'
-require 'active_model/dirty'
+require 'active_model'
 require 'deprecation'
 require 'nokogiri'
 

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "2.1.2"
+  VERSION = "2.2.1"
 end

data/lib/om/xml/term.rb

@@ -91,6 +91,7 @@ class OM::XML::Term
   
   # @param val [String,Date,Integer]
   def serialize (val)
+    return if val.nil?
     case type
     when :date, :integer
       val.to_s

data/lib/om/xml/term_value_operators.rb

@@ -29,7 +29,10 @@ module OM::XML::TermValueOperators
   # 
   # @param [Hash] params
   # @example
-  #   {[{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"}, [{:person=>1}, :family_name]=>"Andronicus", [{"person"=>"1"},:given_name]=>["Titus"],[{:person=>1},:role,:text]=>["otherrole1","otherrole2"] }
+  #   {[{":person"=>"0"}, "role", "text"]=>["role1", "role2", "role3"], 
+  #     [{:person=>1}, :family_name]=>"Andronicus", 
+  #     [{"person"=>"1"},:given_name]=>["Titus"],
+  #     [{:person=>1},:role,:text]=>["otherrole1","otherrole2"] }
   def update_values(params={})
     # remove any terms from params that this datastream doesn't recognize    
     
@@ -205,7 +208,6 @@ module OM::XML::TermValueOperators
   
   def term_value_update(node_select,node_index,new_value,opts={})
     ng_xml_will_change!
-    # template = opts.fetch(:template,nil)
     
     node = find_by_terms_and_value(*node_select)[node_index]
     if delete_on_update?(node, new_value)
@@ -216,7 +218,7 @@ module OM::XML::TermValueOperators
   end
 
   def delete_on_update?(node, new_value)
-    new_value == "" || new_value == :delete
+    new_value.nil? || new_value == :delete
   end
   
   # def term_value_set(term_ref, query_opts, node_index, new_value)

data/spec/integration/serialization_spec.rb

@@ -137,8 +137,7 @@ EOF
            <active>true</active>
          </outer>'
       end
-      it "should serialize nil values" do
-        # I'm not sure that this is the correct behavior for this. Should it remove nodes or just blank them.
+      it "should serialize empty string values" do
         subject.my_int = [nil]
         subject.my_date = [nil]
         subject.active = [nil]

data/spec/unit/dynamic_node_spec.rb

@@ -8,13 +8,13 @@ describe "OM::XML::DynamicNode" do
 
         set_terminology do |t|
           t.root(:path=>"dc", :xmlns=>"http://purl.org/dc/terms/")
-          t.creator( :namespace_prefix => "dcterms")
-          t.foo(:namespace_prefix => "dcterms")
-          t.date_created(:path=>'date.created', :namespace_prefix => "dcterms")
+          t.creator()
+          t.foo()
+          t.date_created(:path=>'date.created')
         end
 
         def self.xml_template
-          Nokogiri::XML::Document.parse("<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'/>")
+          Nokogiri::XML::Document.parse("<dc xmlns='http://purl.org/dc/terms/' />")
         end
 
       end
@@ -23,6 +23,7 @@ describe "OM::XML::DynamicNode" do
     after do
       Object.send(:remove_const, :Sample)
     end
+
     it "should create templates for dynamic nodes" do
       @sample.creator = "Foo"
       @sample.creator.should == ['Foo']
@@ -31,6 +32,12 @@ describe "OM::XML::DynamicNode" do
       @sample.creator = ["Foo", "Bar"]
       @sample.creator.should == ['Foo', 'Bar']
     end
+
+    it "should create templates for dynamic nodes with empty string values" do
+      @sample.creator = ['']
+      @sample.creator.should == ['']
+    end
+
     it "should create templates for plain nodes" do
       @sample.foo = ['in a galaxy far far away']
       @sample.foo.should == ['in a galaxy far far away']

data/spec/unit/term_value_operators_spec.rb

@@ -45,6 +45,11 @@ describe "OM::XML::TermValueOperators" do
       person_1_roles[0].text.should == "otherrole1"
       person_1_roles[1].text.should == "otherrole2"
     end
+
+    it "should allow setting a blank string " do
+      @article.update_values({[:title_info, :main_title]=>['']})
+      @article.term_values(:title_info, :main_title).should == ["", "Artikkelin otsikko Hydrangea artiklan 1", "TITLE OF HOST JOURNAL"]    end
+
     it "should call term_value_update if the corresponding node already exists" do
       @article.should_receive(:term_value_update).with('//oxns:titleInfo/oxns:title', 0, "My New Title")
       @article.update_values( {[:title_info, :main_title] => "My New Title"} )
@@ -208,7 +213,7 @@ describe "OM::XML::TermValueOperators" do
       @article.update_values(att)
       @article.term_values(:journal, :title_info).should == ['york', 'mangle', 'mork']
       
-      @article.update_values({[:journal, :title_info]=>{"1"=>""}})
+      @article.update_values({[:journal, :title_info]=>{"1"=>nil}})
       @article.term_values(:journal, :title_info).should == ['york', 'mork']
       
       @article.update_values({[:journal, :title_info]=>{"0"=>:delete}})
@@ -224,11 +229,11 @@ describe "OM::XML::TermValueOperators" do
       end
 
       it "by default, setting to empty string deletes the node" do
-        @article.update_values({[:journal, :title_info]=>{"1"=>""}})
+        @article.update_values({[:journal, :title_info]=>{"1"=>nil}})
         @article.term_values(:journal, :title_info).should == ['york', 'mork']
       end
 
-      it "if delete_on_update? returns false, setting to empty string won't delete node" do
+      it "if delete_on_update? returns false, setting to nil won't delete node" do
         @article.stub('delete_on_update?').and_return(false)
         @article.update_values({[:journal, :title_info]=>{"1"=>""}})
         @article.term_values(:journal, :title_info).should == ['york', '', 'mork']
@@ -389,18 +394,18 @@ describe "OM::XML::TermValueOperators" do
       )
       1.should == 2
     end
-    it "should delete nodes if value is :delete or empty string" do
+    it "should delete nodes if value is :delete or nil" do
       @article.update_values([:title_info]=>{"0"=>"york", "1"=>"mangle","2"=>"mork"})
       xpath = @article.class.terminology.xpath_for(:title_info)
       
-      @article.term_value_update([:title_info], 1, "")
+      @article.term_value_update([:title_info], 1, nil)
       @article.term_values(:title_info).should == ['york', 'mork']
       
       @article.term_value_update([:title_info], 1, :delete)
       @article.term_values(:title_info).should == ['york']
     end
-    it "should create empty nodes if value is nil" do
-      @article.update_values([:title_info]=>{"0"=>"york", "1"=>nil,"2"=>"mork"})
+    it "should create empty nodes if value is empty string" do
+      @article.update_values([:title_info]=>{"0"=>"york", "1"=>'',"2"=>"mork"})
       @article.term_values(:title_info).should == ['york', "", "mork"]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,6 +206,7 @@ extra_rdoc_files:
 files:
 - .document
 - .gitignore
+- .travis.yml
 - COMMON_OM_PATTERNS.textile
 - GETTING_FANCY.textile
 - GETTING_STARTED.textile
@@ -218,6 +219,8 @@ files:
 - UPDATING_DOCUMENTS.textile
 - container_spec.rb
 - devel/notes.txt
+- gemfiles/gemfile.rails3
+- gemfiles/gemfile.rails4
 - lib/om.rb
 - lib/om/tree_node.rb
 - lib/om/version.rb