om 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/container_spec.rb

@@ -0,0 +1,88 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "nokogiri"
+require "om"
+
+describe "OM::XML::Container" do
+  
+  before(:all) do
+    class ContainerTest
+      include OM::XML::Container
+    end
+  end
+  
+  before(:each) do
+    @container = ContainerTest.from_xml("<foo><bar>1</bar></foo>")
+  end
+  
+  it "should add .ng_xml accessor" do
+    @container.should respond_to(:ng_xml)
+    @container.should respond_to(:ng_xml=)    
+  end
+  
+  describe "new" do
+    it "should populate ng_xml with an instance of Nokogiri::XML::Document" do
+      @container.ng_xml.class.should == Nokogiri::XML::Document
+    end
+  end
+  
+  describe '#xml_template' do
+    it "should return an empty xml document" do
+      ContainerTest.xml_template.to_xml.should == "<?xml version=\"1.0\"?>\n"
+    end
+  end
+  
+  describe "#from_xml" do
+    it "should accept a String, parse it and store it in .ng_xml" do
+      Nokogiri::XML::Document.expects(:parse).returns("parsed xml")
+      container1 = ContainerTest.from_xml("<foo><bar>1</bar></foo>")
+      container1.ng_xml.should == "parsed xml"
+    end
+    it "should accept a File, parse it and store it in .ng_xml" do
+      file = fixture(File.join("mods_articles", "hydrangea_article1.xml"))
+      Nokogiri::XML::Document.expects(:parse).returns("parsed xml")
+      container1 = ContainerTest.from_xml(file)
+      container1.ng_xml.should == "parsed xml"
+    end
+    it "should accept Nokogiri nodes as input and leave them as-is" do
+      parsed_xml = Nokogiri::XML::Document.parse("<foo><bar>1</bar></foo>")
+      container1 = ContainerTest.from_xml(parsed_xml)
+      container1.ng_xml.should == parsed_xml
+    end
+    it "should initialize from #xml_template if no xml is provided" do
+      ContainerTest.expects(:xml_template).returns("fake template")
+      ContainerTest.from_xml.ng_xml.should == "fake template"
+    end
+  end
+  
+  describe ".to_xml" do
+    it  "should call .ng_xml.to_xml" do
+      @container.ng_xml.expects(:to_xml).returns("ng xml")
+      @container.to_xml.should == "ng xml"
+    end
+    
+    it 'should accept an optional Nokogiri::XML Document as an argument and insert its fields into that (mocked test)' do
+      doc = Nokogiri::XML::Document.parse("<test_xml/>")
+      mock_new_node = mock("new node")
+      doc.root.expects(:add_child).with(@container.ng_xml.root).returns(mock_new_node)
+      result = @container.to_xml(doc)
+    end
+    
+    it 'should accept an optional Nokogiri::XML Document as an argument and insert its fields into that (functional test)' do
+      doc = Nokogiri::XML::Document.parse("<test_xml/>")
+      @container.to_xml(doc).should == "<?xml version=\"1.0\"?>\n<test_xml>\n  <foo>\n    <bar>1</bar>\n  </foo>\n</test_xml>\n"
+    end
+    
+    it 'should add to root of Nokogiri::XML::Documents, but add directly to the elements if a Nokogiri::XML::Node is passed in' do
+      mock_new_node = mock("new node")
+      mock_new_node.stubs(:to_xml).returns("foo")
+      
+      doc = Nokogiri::XML::Document.parse("<test_document/>")
+      el = Nokogiri::XML::Node.new("test_element", Nokogiri::XML::Document.new)
+      doc.root.expects(:add_child).with(@container.ng_xml.root).returns(mock_new_node)
+      el.expects(:add_child).with(@container.ng_xml.root).returns(mock_new_node)
+      @container.to_xml(doc).should 
+      @container.to_xml(el)
+    end
+  end
+  
+end

data/lib/om/xml/accessors.rb

@@ -200,7 +200,7 @@ module OM::XML::Accessors
     if xpath.nil?
       return nil
     else
-      return ng_xml.xpath(xpath, "oxns"=>"http://www.loc.gov/mods/v3") 
+      return ng_xml.xpath(xpath, ox_namespaces) 
     end   
   end
   

data/lib/om/xml/container.rb

@@ -9,8 +9,10 @@ module OM::XML::Container
     # @xml String, File or Nokogiri::XML::Node
     # @tmpl ActiveFedora::MetadataDatastream
     # Careful! If you call this from a constructor, be sure to provide something 'ie. self' as the @tmpl. Otherwise, you will get an infinite loop!
-    def from_xml(xml, tmpl=self.new) # :nodoc:
-      if xml.kind_of? Nokogiri::XML::Node
+    def from_xml(xml=nil, tmpl=self.new) # :nodoc:
+      if xml.nil?
+        tmpl.ng_xml = self.xml_template
+      elsif xml.kind_of? Nokogiri::XML::Node
         tmpl.ng_xml = xml
       else
         tmpl.ng_xml = Nokogiri::XML::Document.parse(xml)
@@ -18,6 +20,10 @@ module OM::XML::Container
       return tmpl
     end
     
+    def xml_template
+      Nokogiri::XML::Document.parse("")
+    end
+    
   end
   
   # Instance Methods -- These methods will be available on instances of classes that include this module

data/om.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{om}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "container_spec.rb",
      "lib/om.rb",
      "lib/om/xml.rb",
      "lib/om/xml/accessors.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
      "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/accessors_spec.rb",
@@ -55,7 +57,8 @@ Gem::Specification.new do |s|
   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/spec_helper.rb",
+    "spec/integration/rights_metadata_integration_example_spec.rb",
+     "spec/spec_helper.rb",
      "spec/unit/accessors_spec.rb",
      "spec/unit/container_spec.rb",
      "spec/unit/generator_spec.rb",

data/spec/integration/rights_metadata_integration_example_spec.rb

@@ -0,0 +1,67 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "nokogiri"
+require "om"
+
+describe "OM::XML::Accessors" do
+  
+  before(:all) do
+    class RightsMDTest
+      
+      include OM::XML
+      
+      root_property :rightsMetadata, "rightsMetadata", "http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1", :schema=>"http://github.com/projecthydra/schemas/tree/v1/rightsMetadata.xsd"          
+      
+      property :access, :path=>"access",
+                  :subelements=>[:machine],
+                  :convenience_methods => {
+                    :human_readable => {:path=>"human"}
+                  }
+                  
+      property :edit_access, :variant_of=>:access, :attributes=>{:type=>"edit"}
+      
+      property :machine, :path=>"machine",
+                  :subelements=>["group","person"]
+      
+      generate_accessors_from_properties
+      # Generates an empty Mods Article (used when you call ModsArticle.new without passing in existing xml)
+      def self.xml_template
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.rightsMetadata(:version=>"0.1", "xmlns"=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1") {
+            xml.copyright {
+              xml.human
+            }
+            xml.access(:type=>"discover") {
+              xml.human
+              xml.machine
+            }
+            xml.access(:type=>"read") {
+              xml.human
+              xml.machine
+            }
+            xml.access(:type=>"edit") {
+              xml.human
+              xml.machine
+            }
+          }
+        end  
+        return builder.doc
+      end
+    end
+  end
+  
+  before(:each) do
+    @sample = RightsMDTest.from_xml(nil)
+  end
+  
+  describe "update_properties" do
+    it "should update the declared properties" do
+      pending "nesting is too deep..."
+      @sample.retrieve(*[:edit_access, :machine, :person]).length.should == 0
+      @sample.update_properties([:edit_access, :machine, :person]=>"user id").should == {"edit_access_machine_person"=>{"-1"=>"user id"}}
+      debugger
+      @sample.retrieve(*[:edit_access, :machine, :person]).length.should == 1
+      @sample.retrieve(*[:edit_access, :machine, :person]).first.text.should == "user id"
+    end
+  end
+  
+end

data/spec/unit/accessors_spec.rb

@@ -60,6 +60,7 @@ describe "OM::XML::Accessors" do
   before(:each) do
     article_xml = fixture( File.join("mods_articles", "hydrangea_article1.xml") )
     @sample = AccessorTest.from_xml(article_xml)
+    @sample.stubs(:ox_namespaces).returns("oxns"=>"http://www.loc.gov/mods/v3")
   end
   
   describe '#accessor' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: om
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -109,6 +109,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- container_spec.rb
 - lib/om.rb
 - lib/om/xml.rb
 - lib/om/xml/accessors.rb
@@ -123,6 +124,7 @@ files:
 - 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/accessors_spec.rb
@@ -168,6 +170,7 @@ signing_key:
 specification_version: 3
 summary: "OM (Opinionated Metadata): A library to help you tame sprawling XML schemas like MODS."
 test_files: 
+- spec/integration/rights_metadata_integration_example_spec.rb
 - spec/spec_helper.rb
 - spec/unit/accessors_spec.rb
 - spec/unit/container_spec.rb