active-fedora 9.0.0.beta5 → 9.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17554700da06c7fc155b4336f11cc269e1114d42
-  data.tar.gz: 85dc2454b14e8a65334524debae01d56c690c712
+  metadata.gz: d8fb1d0fea1b50349e3da9a6cb685e3865fcb716
+  data.tar.gz: 518c8edc13fd3a87ef09c7022eee3d6a29c2ddb0
 SHA512:
-  metadata.gz: 94d352731c92f119bc6b7ec521dcead14a68099588c840874dece0f38c27e47b29e45ee063bd010df1bf7624161b302b57d958ee29c7c66ec241eef8a8b4b7ce
-  data.tar.gz: 3cdf222ffa305dc0f452ddbfb8008a8a628ec7a222f969c52f043fd3ffc4506042a4c84f1908065b74c30d190ef1c18f2dae1bf9e0ba8c71197d023e4d68acb3
+  metadata.gz: 5c0bce8730af54df688fc1a3c0d5f41bc7df148070b21bfbeb81246c7766f650d73abf12b70deb3cefc415e40d416fb31c7856808705be923886334ced6200de
+  data.tar.gz: f6467c70c153178f4c190a42d084727093b57387fe571d8a33722ca3bfea90b5ef4d2f9dd043ccac253e6ec8cef808889c255f31a6fe6bc37af0e1f732f40201

data/active-fedora.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
   s.add_dependency "activesupport", '>= 4.1.0'
-  s.add_dependency "active-triples", '~> 0.4.0'
+  s.add_dependency "active-triples", '~> 0.5.0'
   s.add_dependency "rdf-rdfxml", '~> 1.1.0'
   s.add_dependency "linkeddata"
   s.add_dependency "deprecation"

data/lib/active_fedora.rb

@@ -123,6 +123,7 @@ module ActiveFedora #:nodoc:
       autoload :Serializers
       autoload :PrimaryKey
       autoload :PropertyBuilder
+      autoload :NodeConfig
     end
   end
 

data/lib/active_fedora/attributes.rb

@@ -169,10 +169,10 @@ module ActiveFedora
       end
 
       def property name, properties={}, &block
-        find_or_create_defined_attribute(name, nil, {multiple: true}.merge(properties))
+        properties = { multiple: true }.merge(properties)
+        find_or_create_defined_attribute(name, nil, properties)
         raise ArgumentError, "#{name} is a keyword and not an acceptable property name." if protected_property_name? name
-        properties = properties.merge(multivalue: false) if properties[:multiple] == false
-        reflection = ActiveFedora::Attributes::PropertyBuilder.build(self, name, properties.except(:multiple), &block)
+        reflection = ActiveFedora::Attributes::PropertyBuilder.build(self, name, properties, &block)
         # reflection = ActiveTriple::PropertyBuilder.build(self, name, properties, &block)
         ActiveTriples::Reflection.add_reflection self, name, reflection
       end

data/lib/active_fedora/attributes/node_config.rb

@@ -0,0 +1,13 @@
+module ActiveFedora::Attributes
+  class NodeConfig < ActiveTriples::NodeConfig
+    def multiple?
+      @multiple
+    end
+
+    def initialize(term, predicate, options={})
+      super
+      @multiple = options[:multiple]
+    end
+
+  end
+end

data/lib/active_fedora/attributes/property_builder.rb

@@ -4,8 +4,13 @@ module ActiveFedora::Attributes
     def self.define_accessors(model, reflection)
       mixin = model.generated_property_methods
       name = reflection.term
-      define_readers(mixin, name)
-      reflection.multivalue ? define_writers(mixin, name) : define_singular_writers(mixin, name)
+      if reflection.multiple?
+        define_readers(mixin, name)
+        define_writers(mixin, name)
+      else
+        define_singular_readers(mixin, name)
+        define_singular_writers(mixin, name)
+      end
     end
 
     def self.define_writers(mixin, name)
@@ -19,6 +24,14 @@ module ActiveFedora::Attributes
       CODE
     end
 
+    def self.define_singular_readers(mixin, name)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}(*args)
+          get_values(:#{name}).first
+        end
+      CODE
+    end
+
     def self.define_singular_writers(mixin, name)
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)
@@ -29,5 +42,11 @@ module ActiveFedora::Attributes
         end
       CODE
     end
+
+    def build(&block)
+      NodeConfig.new(name, options[:predicate], options.except(:predicate)) do |config|
+        config.with_index(&block) if block_given?
+      end
+    end
   end
 end

data/lib/active_fedora/fedora_attributes.rb

@@ -66,8 +66,7 @@ module ActiveFedora
             klass.properties.merge(self.properties).each do |property, config|
               klass.property(config.term,
                              predicate: config.predicate,
-                             class_name: config.class_name,
-                             multivalue: config.multivalue)
+                             class_name: config.class_name)
             end
             klass
         end

data/lib/active_fedora/loadable_from_json.rb

@@ -43,7 +43,7 @@ module ActiveFedora
       # It is expected that the singular filter gets applied after fetching the value from this
       # resource, so cast everything back to an array.
       def set_value(k, v)
-        @hash[k] = v
+        @hash[k] = Array(v)
       end
 
       def get_values(k)

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -102,8 +102,7 @@ module ActiveFedora
                       klass.properties.merge(self.class.properties).each do |prop, config|
                         klass.property(config.term,
                                        predicate: config.predicate,
-                                       class_name: config.class_name,
-                                       multivalue: config.multivalue)
+                                       class_name: config.class_name)
                       end
                       klass.accepts_nested_attributes_for(*nested_attributes_options.keys) unless nested_attributes_options.blank?
                       uri_stub = self.class.rdf_subject.call(self)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.0.beta5"
+  VERSION = "9.0.0.beta6"
 end

data/spec/unit/rdf_datastream_spec.rb

@@ -12,7 +12,7 @@ describe ActiveFedora::RDFDatastream do
     before do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
         property :title, predicate: ::RDF::DC.title
-        property :description, predicate: ::RDF::DC.description, :multivalue => false
+        property :description, predicate: ::RDF::DC.description
       end
       class MyObj < ActiveFedora::Base
         has_metadata 'descMetadata', type: MyDatastream
@@ -39,13 +39,6 @@ describe ActiveFedora::RDFDatastream do
       expect(subject.title).to eq ['']
     end
 
-    describe "when multivalue: false" do
-      it "should return single values" do
-        subject.description = 'my description'
-        expect(subject.description).to eq 'my description'
-      end
-    end
-
     it "should clear stuff" do
       subject.title = ['one', 'two', 'three']
       subject.title.clear

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta5
+  version: 9.0.0.beta6
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
@@ -312,6 +312,7 @@ files:
 - lib/active_fedora/attribute_methods/read.rb
 - lib/active_fedora/attribute_methods/write.rb
 - lib/active_fedora/attributes.rb
+- lib/active_fedora/attributes/node_config.rb
 - lib/active_fedora/attributes/primary_key.rb
 - lib/active_fedora/attributes/property_builder.rb
 - lib/active_fedora/attributes/serializers.rb