active_fedora-registered_attributes 0.2.0 → 0.2.1

data/lib/active_fedora/registered_attributes.rb

@@ -6,9 +6,6 @@ require "active_fedora/registered_attributes/attribute_registry"
 module ActiveFedora
   module RegisteredAttributes
     extend ActiveSupport::Concern
-    included do
-      class_attribute :attribute_registry, instance_writer: false, instance_reader: false
-    end
 
     delegate :attribute_defaults, to: :attribute_registry
     delegate :input_options_for, to: :attribute_registry
@@ -22,6 +19,17 @@ module ActiveFedora
     private :attribute_registry
 
     module ClassMethods
+      def attribute_registry
+        @attribute_registry ||=
+        begin
+          if superclass.respond_to?(:attribute_registry)
+            superclass.attribute_registry.copy_to(self)
+          else
+            AttributeRegistry.new(self)
+          end
+        end
+      end
+
       def registered_attribute_names
         attribute_registry.keys.collect(&:to_s)
       end
@@ -35,7 +43,6 @@ module ActiveFedora
       end
 
       def attribute(attribute_name, options ={})
-        self.attribute_registry ||= AttributeRegistry.new(self)
         self.attribute_registry.register(attribute_name, options) do |attribute|
 
           attribute.with_validation_options do |name, opts|

data/lib/active_fedora/registered_attributes/attribute_registry.rb

@@ -7,9 +7,13 @@ module ActiveFedora
   module RegisteredAttributes
     class AttributeRegistry < DelegateClass(HashWithIndifferentAccess)
       attr_accessor :context_class
-      def initialize(context_class)
+      def initialize(context_class, initial_container = HashWithIndifferentAccess.new)
         @context_class = context_class
-        super(HashWithIndifferentAccess.new)
+        super(initial_container)
+      end
+
+      def copy_to(target)
+        self.class.new(target, __getobj__.dup)
       end
 
       def register(attribute_name, options)

data/lib/active_fedora/registered_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module RegisteredAttributes
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/lib/active_fedora/registered_attributes_spec.rb

@@ -75,6 +75,11 @@ describe 'ActiveFedora::RegisteredAttributes' do
       }
     }
   end
+
+  class ChildModel < MockDelegateAttribute
+    attribute :not_on_parent
+  end
+
   subject { MockDelegateAttribute.new() }
 
   describe '.registered_attribute_names' do
@@ -125,6 +130,29 @@ describe 'ActiveFedora::RegisteredAttributes' do
   end
 
   describe '.attribute' do
+
+    context 'for model inheritance' do
+      it 'does not add child declared attributes to parent class' do
+        expect {
+          MockDelegateAttribute.attribute_registry.fetch(:not_on_parent)
+        }.to raise_error(KeyError)
+      end
+
+      it 'children have parent attributes' do
+        expect {
+          ChildModel.attribute_registry.fetch(:title)
+        }.to_not raise_error(KeyError)
+      end
+
+      it 'children have attribute setting from parent' do
+        child = ChildModel.new
+
+        expect {
+          child.title = 'Hello'
+        }.to_not raise_error(NoMethodError)
+      end
+    end
+
     it 'handles attributes not delegated to a datastream' do
       subject.not_in_the_datastream = 'World?'
       expect(subject.not_in_the_datastream).to eq('World?')

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-registered_attributes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 6.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 6.7.0
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,29 +62,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An ActiveFedora extension for registring attributes
@@ -110,26 +121,33 @@ files:
 homepage: http://github.com/projecthydra/active_fedora-registered_attributes
 licenses:
 - APACHE2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 136137362571869666
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 136137362571869666
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: An ActiveFedora extension for registring attributes
 test_files:
 - spec/lib/active_fedora/registered_attributes/attribute_registry_spec.rb
@@ -137,4 +155,3 @@ test_files:
 - spec/lib/active_fedora/registered_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/book.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4dc9320ae00b5cf5bb2128d3d6174300ea078e14
-  data.tar.gz: 669c91334c14819d2c81d2bca307330f9d225b7f
-SHA512:
-  metadata.gz: 2abaf01c420893621250fc64e6f2de6b8dad920611c72ed17824ccb64821689a6c907371602fc486075e2afd900cb37122176c468380985dff90bc6dd3157889
-  data.tar.gz: 72631225b897f31797a2c1cb3abf1084a473e318a47d6ed79f0bd0bb67f341a3ccd70da18fac29ee8084b918fdd9ac9ec358354e9fc06cc3b01cbc4528fa0ff0