om 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad2b503450c856d7a7e3dbd55bab9545419c04f9
-  data.tar.gz: 2c97e1ce0d2f2b2524e1cca742726d50a2fc814f
+  metadata.gz: b8853ffe68e14cbf9ff2ff97cc6a11dc742f66b9
+  data.tar.gz: 1f871031a8b66f0537598d05c05fc1bbcbbeca2d
 SHA512:
-  metadata.gz: b9cf738d9afa3d3c08d1e2a2cb349b2c6a13b7dfc42b7400384094f3fed29f324cdf83cf1511e69452c24fb07f937a817b9759fdbbb19a2cda6b30b3bc1e16fc
-  data.tar.gz: 879531480232ee5d238745cba12be106c0b3566b38827053d930afbdcfffe78f88738159b7f63753057bb6e0a03b6e0dae2a76c7f22f79a5c2684a55b1eb31c7
+  metadata.gz: 8eb12d59198a4a22597551376e8142be99c0e5567e273490fd4eab40659419f89727267a79795e5049e3a1876c6f479df471146455f69d5c37cbd7cf167390a2
+  data.tar.gz: d8e3386ff684e7fe87d599b5842753050494fba9f6043f070882d21709de794052c46bc3fd64881638476cf099fdaeee277f63b2644fe305ad805ec290553b6c

data/lib/om/version.rb

@@ -1,3 +1,3 @@
 module Om
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/lib/om/xml/document.rb

@@ -1,6 +1,13 @@
 module OM::XML::Document
   extend ActiveSupport::Concern
 
+  included do
+    include OM::XML::Container
+    include OM::XML::TermValueOperators
+    include OM::XML::Validation
+    include ActiveModel::Dirty
+  end
+
   # Class Methods -- These methods will be available on classes that include this Module
 
   module ClassMethods
@@ -8,7 +15,12 @@ module OM::XML::Document
     attr_accessor :terminology, :terminology_builder, :template_registry
 
     def terminology
-      @terminology ||= terminology_builder.build
+      return @terminology if @terminology
+      @terminology = if superclass.respond_to? :terminology
+        superclass.terminology.dup
+      else
+        terminology_builder.build
+      end
     end
 
     def terminology_builder
@@ -16,7 +28,12 @@ module OM::XML::Document
     end
 
     def template_registry
-      @template_registry ||= OM::XML::TemplateRegistry.new
+      return @template_registry if @template_registry
+      @template_registry = if superclass.respond_to? :template_registry
+        superclass.template_registry.dup
+      else
+        OM::XML::TemplateRegistry.new
+      end
     end
 
     def rebuild_terminology!
@@ -24,6 +41,8 @@ module OM::XML::Document
     end
 
     # Sets the OM::XML::Terminology for the Document
+    # If there already is a termnology for this class, it will be replaced.
+    # @see extend_termniology If you want to add terms to an existing terminology
     # Expects +&block+ that will be passed into OM::XML::Terminology::Builder.new
     def set_terminology &block
       @terminology_builder = OM::XML::Terminology::Builder.new(&block)
@@ -60,14 +79,6 @@ module OM::XML::Document
 
   attr_accessor :ox_namespaces
 
-  included do
-    include OM::XML::Container
-    include OM::XML::TermValueOperators
-    include OM::XML::Validation
-    include ActiveModel::Dirty
-
-  end
-
   def ng_xml_will_change!
     # throw away older version.
     changed_attributes['ng_xml'] = nil

data/spec/integration/subclass_terminology_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe "Inherited terminology" do
+  describe "with basic terms" do
+    before(:all) do
+      class AbstractTerminology
+        include OM::XML::Document
+        set_terminology do |t|
+          t.root :path => 'root', :xmlns => "asdf"
+          t.foo
+        end
+      end
+
+      class ConcreteTerminology < AbstractTerminology
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, :ConcreteTerminology)
+      Object.send(:remove_const, :AbstractTerminology)
+    end
+
+    describe "on the subclass" do
+      subject do
+        xml = '<root xmlns="asdf"><foo>fooval</foo><bar>barval</bar></root>'
+        ConcreteTerminology.from_xml(xml)
+      end
+
+      it "should inherit terminology" do
+        subject.foo = "Test value"
+        subject.foo.should == ["Test value"]
+      end
+    end
+
+    describe "on the superclass" do
+      subject do
+        xml = '<root xmlns="asdf"><foo>fooval</foo><bar>barval</bar></root>'
+        AbstractTerminology.from_xml(xml)
+      end
+
+      it "should have terminology" do
+        subject.foo = "Test value"
+        subject.foo.should == ["Test value"]
+      end
+    end
+  end
+
+  describe "with template terms" do
+    before(:all) do
+      class AbstractTerminology
+        include OM::XML::Document
+        set_terminology do |t|
+          t.root :path => 'root', :xmlns => "asdf"
+        end
+
+        define_template :creator do |xml, author, role|
+          xml.pbcoreCreator {
+            xml.creator(author)
+            xml.creatorRole(role, :source=>"PBCore creatorRole") 
+          }
+        end
+      end
+
+      class ConcreteTerminology < AbstractTerminology
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, :ConcreteTerminology)
+      Object.send(:remove_const, :AbstractTerminology)
+    end
+
+    describe "on the subclass" do
+      subject do
+        xml = '<root></root>'
+        ConcreteTerminology.from_xml(xml)
+      end
+
+      it "should inherit templates" do
+        subject.add_child_node subject.ng_xml.root, :creator, 'Test author', 'Primary' 
+        subject.ng_xml.xpath('//pbcoreCreator/creatorRole[@source="PBCore creatorRole"]').text.should == "Primary"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: om
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -256,6 +256,7 @@ files:
 - spec/integration/selective_querying_spec.rb
 - spec/integration/serialization_spec.rb
 - spec/integration/set_reentrant_terminology_spec.rb
+- spec/integration/subclass_terminology_spec.rb
 - spec/integration/xpathy_stuff_spec.rb
 - spec/samples.rb
 - spec/samples/mods_article.rb
@@ -319,6 +320,7 @@ test_files:
 - spec/integration/selective_querying_spec.rb
 - spec/integration/serialization_spec.rb
 - spec/integration/set_reentrant_terminology_spec.rb
+- spec/integration/subclass_terminology_spec.rb
 - spec/integration/xpathy_stuff_spec.rb
 - spec/samples.rb
 - spec/samples/mods_article.rb