active_fedora-registered_attributes 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ee85f6f0ae625db22d43140c987cb8b47cd317
-  data.tar.gz: a19e3fca5ad2e5b920c763c73e2ee5387e9d18a5
+  metadata.gz: 4dc9320ae00b5cf5bb2128d3d6174300ea078e14
+  data.tar.gz: 669c91334c14819d2c81d2bca307330f9d225b7f
 SHA512:
-  metadata.gz: 7058001b7d437cef228a70989f71380ac281c9dfe3c6e631760ef284a5e784edce847bf9f44a968ff0b7295f1442e239339e30b0b1930044846648b2dc814007
-  data.tar.gz: 74329cf1c0dcd822971766c1d44f134060490595e417cdaf65c368a7db56aed8f759bfe1f61d6682617da7d8940f3c7f54d49734561c23b0e3096ebfc6bbbe60
+  metadata.gz: 2abaf01c420893621250fc64e6f2de6b8dad920611c72ed17824ccb64821689a6c907371602fc486075e2afd900cb37122176c468380985dff90bc6dd3157889
+  data.tar.gz: 72631225b897f31797a2c1cb3abf1084a473e318a47d6ed79f0bd0bb67f341a3ccd70da18fac29ee8084b918fdd9ac9ec358354e9fc06cc3b01cbc4528fa0ff0

data/.travis.yml

@@ -3,10 +3,13 @@ rvm:
   - "1.9.3"
   - "2.0.0"
 
-script: "rspec"
+script: "bundle exec rspec"
+
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
 notifications:
   irc: "irc.freenode.org#ndlib"
 
-before_install:
-  - gem install bundler
+cache: bundler

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
   watch('spec/support/*')  { "spec" }
 end

data/README.md

@@ -1,5 +1,6 @@
 # ActiveFedora::RegisteredAttributes
 
+[![Gem Version](https://badge.fury.io/rb/active_fedora-registered_attributes.png)](http://badge.fury.io/rb/active_fedora-registered_attributes)
 [![Build Status](https://travis-ci.org/projecthydra/active_fedora-registered_attributes.png?branch=master)](https://travis-ci.org/projecthydra/active_fedora-registered_attributes)
 
 An ActiveFedora extension for consolidating the attribute definitions for an object.

data/active_fedora-registered_attributes.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "active-fedora", ">= 6.6.0.rc2"
+  spec.add_dependency "active-fedora", ">= 6.7.0"
   spec.add_dependency "active_attr", "~> 0.8.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/active_fedora/registered_attributes.rb

@@ -47,7 +47,7 @@ module ActiveFedora
           end
 
           attribute.with_delegation_options do |name, opts|
-            delegate(name, opts)
+            has_attributes(name, opts)
           end
 
           attribute.wrap_writer_method(self)

data/lib/active_fedora/registered_attributes/attribute.rb

@@ -2,6 +2,11 @@ module ActiveFedora
   module RegisteredAttributes
     class Attribute
 
+      VALID_ATTRIBUTE_OPTIONS = [
+        :default, :displayable, :editable, :form, :datastream, :validates,
+        :multiple, :writer, :reader, :label, :hint, :skip_accessor
+      ].freeze
+
       attr_reader :context_class, :name, :datastream
       private :context_class
 
@@ -40,7 +45,7 @@ module ActiveFedora
       #    A supplement to the Attribute's :label
       def initialize(context_class, name, options = {})
         @options = options.symbolize_keys
-        @options.assert_valid_keys(:default, :displayable, :editable, :form, :datastream, :validates, :multiple, :writer, :reader, :label, :hint, :skip_accessor)
+        @options.assert_valid_keys(VALID_ATTRIBUTE_OPTIONS)
         @context_class = context_class
         @datastream = @options.fetch(:datastream, false)
         @name = name
@@ -136,7 +141,7 @@ module ActiveFedora
             datastream.merge(multiple: multiple?)
           else
             {
-              to: datastream,
+              datastream: datastream,
               multiple: multiple?
             }
           end

data/lib/active_fedora/registered_attributes/attribute_registry.rb

@@ -20,16 +20,14 @@ module ActiveFedora
       end
 
       def editable_attributes
-        @editable_attributes ||= each_with_object([]) {|(name, attribute), m|
-          m << attribute if attribute.editable?
-          m
+        @editable_attributes ||= select_matching_attributes { |attribute|
+          attribute.editable?
         }
       end
 
       def displayable_attributes
-        @displayable_attributes ||= each_with_object([]) {|(name, attribute),m|
-          m << attribute if attribute.displayable?
-          m
+        @displayable_attributes ||= select_matching_attributes { |attribute|
+          attribute.displayable?
         }
       end
 
@@ -51,6 +49,14 @@ module ActiveFedora
       rescue KeyError
         name.to_s.titleize
       end
+
+      private
+      def select_matching_attributes
+        each_with_object([]) do |(name, attribute),m|
+          m << attribute if yield(attribute)
+          m
+        end
+      end
     end
 
   end

data/lib/active_fedora/registered_attributes/version.rb

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

data/spec/{active_fedora → lib/active_fedora}/registered_attributes/attribute_registry_spec.rb

@@ -5,7 +5,7 @@ describe ActiveFedora::RegisteredAttributes::AttributeRegistry do
   let(:context) { Book }
   let(:name) { "My Name" }
   let(:options) { {} }
-  subject { ActiveFedora::RegisteredAttributes::AttributeRegistry.new(context) }
+  subject { described_class.new(context) }
 
   describe '#register' do
     it 'yields an attribute' do

data/spec/{active_fedora → lib/active_fedora}/registered_attributes/attribute_spec.rb

@@ -21,7 +21,7 @@ describe ActiveFedora::RegisteredAttributes::Attribute do
   let(:displayable) { true }
   let(:editable) { true }
   let(:default_value) { nil }
-  subject { ActiveFedora::RegisteredAttributes::Attribute.new(context, field_name, options) }
+  subject { described_class.new(context, field_name, options) }
 
   describe '#displayable?' do
     its (:displayable?) { should == displayable }
@@ -60,7 +60,7 @@ describe ActiveFedora::RegisteredAttributes::Attribute do
           subject.with_delegation_options {|name,opts|
             @yielded = true
             expect(name).to eq(field_name)
-            expect(opts).to eq(to: datastream, multiple: true)
+            expect(opts).to eq(datastream: datastream, multiple: true)
           }
           expect(@yielded).to eq(true)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-registered_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 6.6.0.rc2
+        version: 6.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 6.6.0.rc2
+        version: 6.7.0
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -102,9 +102,9 @@ files:
 - lib/active_fedora/registered_attributes/attribute.rb
 - lib/active_fedora/registered_attributes/attribute_registry.rb
 - lib/active_fedora/registered_attributes/version.rb
-- spec/active_fedora/registered_attributes/attribute_registry_spec.rb
-- spec/active_fedora/registered_attributes/attribute_spec.rb
-- spec/active_fedora/registered_attributes_spec.rb
+- spec/lib/active_fedora/registered_attributes/attribute_registry_spec.rb
+- spec/lib/active_fedora/registered_attributes/attribute_spec.rb
+- spec/lib/active_fedora/registered_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/book.rb
 homepage: http://github.com/projecthydra/active_fedora-registered_attributes
@@ -127,14 +127,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An ActiveFedora extension for registring attributes
 test_files:
-- spec/active_fedora/registered_attributes/attribute_registry_spec.rb
-- spec/active_fedora/registered_attributes/attribute_spec.rb
-- spec/active_fedora/registered_attributes_spec.rb
+- spec/lib/active_fedora/registered_attributes/attribute_registry_spec.rb
+- spec/lib/active_fedora/registered_attributes/attribute_spec.rb
+- spec/lib/active_fedora/registered_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/book.rb
 has_rdoc: