active-fedora 9.0.4 → 9.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8399fafb48e7230ac7b01d1902b7f5c08cbbd32c
-  data.tar.gz: a7bba75db0807336e62720997ccc30465b492356
+  metadata.gz: 436ba8923ff37c5dd40860044ff513a17c7ad780
+  data.tar.gz: e9b48072342526acefc2ab0210a9da725057b118
 SHA512:
-  metadata.gz: 25eaf5eacaacbe1c4889f3c2cc2381a06a38a7aced2c5dd06b9ea6d5497b512b24f923fca57b8b3b1a49ace425841463a71c8d2e036dd3db6e2d46006bb09810
-  data.tar.gz: 8e5a5556ad3acd780f352feb6043053a41b1ae9be13446d269676748d46ce0830a4beae2550621b14af1ee897145eb7a6151d3a98d0a81ee60e49337ecd60527
+  metadata.gz: b58f0179c05783ff6897723088979c1605d5d4a1901b082e2893c6f1ef7b7023c701bd6a91fa345c9ce19833a0ce37a7040b250282ca07a2e8cd6e8f79fcdf8b
+  data.tar.gz: 47851b957993caf1586409266240480f8763b65643bcf41cc9269aaf717ffe010df2cd3ede6bf940aac648179bf20aa992a9920daf8266338e39a2578fb08d66

data/active-fedora.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "jettywrapper", ">= 2.0.0"
   s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.7.1'
 

data/lib/active_fedora/associations/builder/has_many.rb

@@ -2,7 +2,7 @@ module ActiveFedora::Associations::Builder
   class HasMany < CollectionAssociation #:nodoc:
     self.macro = :has_many
 
-    self.valid_options += [:dependent, :inverse_of]
+    self.valid_options += [:as, :dependent, :inverse_of]
 
     def build
       reflection = super

data/lib/active_fedora/associations/contains_association.rb

@@ -7,7 +7,9 @@ module ActiveFedora
       end
 
       def find_target
-        reflection.build_association(target_uri)
+        reflection.build_association(target_uri).tap do |record|
+          configure_datastream(record) if reflection.options[:block]
+        end 
       end
 
       def target_uri

data/lib/active_fedora/attached_files.rb

@@ -53,7 +53,10 @@ module ActiveFedora
       end
     end
 
-    # Adds datastream to the object.
+    # Add an ActiveFedora::File to the object.
+    # @param [ActiveFedora::File] file
+    # @param [String] file_path
+    # @param [Hash] opts
     # @return [String] path of the added datastream
     def attach_file(file, file_path, opts={})
       create_singleton_association(file_path)
@@ -80,9 +83,9 @@ module ActiveFedora
       add_file(file, opts)
     end
 
-    # Attach the given file to object
+    # Attach the given stream/string to object
     #
-    # @param [File] file the file to add
+    # @param [IO, String] file the file to add
     # @param [Hash] opts options: :dsid, :prefix, :mime_type
     # @option opts [String] :path The file path
     # @option opts [String] :prefix The path prefix (for auto-generated path)

data/lib/active_fedora/change_set.rb

@@ -19,8 +19,8 @@ module ActiveFedora
 
     def changes
       @changes ||= changed_attributes.each_with_object({}) do |key, result|
-        if m = /^.*_ids?$/.match(key)
-          predicate = object.association(m[0].to_sym).reflection.predicate
+        if object.respond_to?(:association) && object.association(key.to_sym).present?
+          predicate = object.association(key.to_sym).reflection.predicate
           result[predicate] = graph.query(predicate: predicate)
         elsif object.class.properties.keys.include?(key)
           predicate = graph.reflections.reflect_on_property(key).predicate

data/lib/active_fedora/fedora_attributes.rb

@@ -5,7 +5,7 @@ module ActiveFedora
     included do
       include ActiveTriples::Properties
       include ActiveTriples::Reflection
-      delegate :rdf_subject, :get_values, to: :resource
+      delegate :rdf_subject, :get_values, :type, to: :resource
 
       property :has_model, predicate: ActiveFedora::RDF::Fcrepo::Model.hasModel
       property :create_date, predicate: ActiveFedora::RDF::Fcrepo4.created
@@ -76,6 +76,10 @@ module ActiveFedora
             klass
         end
       end
+
+      def type(uri)
+        resource_class.configure type: uri
+      end
     end
   end
 end

data/lib/active_fedora/file.rb

@@ -156,21 +156,6 @@ module ActiveFedora
       super || content_changed?
     end
 
-
-    class << self
-      def default_attributes
-        {}
-      end
-    end
-
-    def default_attributes
-      @default_attributes ||= self.class.default_attributes
-    end
-
-    def default_attributes= attributes
-      @default_attributes = default_attributes.merge attributes
-    end
-
     def original_name= name
       @original_name = name
     end

data/lib/active_fedora/nom_datastream.rb

@@ -18,10 +18,6 @@ module ActiveFedora
       @terminology
     end
 
-    def self.default_attributes
-      super.merge(:mimeType => 'text/xml')
-    end
-
     def self.decorate_ng_xml(xml)
       xml.set_terminology terminology_options, &terminology
       xml.nom!
@@ -62,6 +58,12 @@ module ActiveFedora
     def respond_to? *args
       super || self.class.terminology.respond_to?(*args)
     end
+
+    protected
+
+    def default_mime_type
+      'text/xml'
+    end
   end
 end
 

data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb

@@ -2,10 +2,6 @@ require 'rdf/ntriples'
 
 module ActiveFedora
   class NtriplesRDFDatastream < RDFDatastream
-    def self.default_attributes
-      super.merge(:mimeType => 'text/plain')
-    end
-
     def serialization_format
       :ntriples
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.4"
+  VERSION = "9.0.5"
 end

data/spec/integration/associations_spec.rb

@@ -24,6 +24,37 @@ describe ActiveFedora::Base do
     end
 
   end
+  
+  describe "explicit foreign key" do
+    before do
+      class FooThing < ActiveFedora::Base
+        has_many :bars, :class_name=>'BarThing', :predicate=>ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, :as=>:foothing
+      end
+
+      class BarThing < ActiveFedora::Base
+        belongs_to :foothing, :class_name=>'FooThing', :predicate=>ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
+      end
+    end
+    
+    after do
+      Object.send(:remove_const, :FooThing)
+      Object.send(:remove_const, :BarThing)
+    end
+    
+    let(:foo) { FooThing.create }
+    let(:bar) { BarThing.create }
+    
+    it "should associate from bar to foo" do
+      bar.foothing = foo
+      bar.save
+      expect(foo.bars).to eq [bar]
+    end
+    
+    it "should associate from foo to bar" do
+      foo.bars << bar
+      expect(bar.foothing).to eq foo
+    end
+  end
 
   describe "complex example" do
     before do

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ end
 
 require 'active-fedora'
 require 'rspec'
+require 'rspec/its'
 require 'equivalent-xml/rspec_matchers'
 require 'logger'
 require 'byebug' unless ENV['TRAVIS']

data/spec/unit/base_spec.rb

@@ -28,6 +28,21 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe ".type" do
+    before do
+      class FooHistory < ActiveFedora::Base
+        type ::RDF::URI.new('http://example.com/foo')
+      end
+    end
+    after do
+      Object.send(:remove_const, :FooHistory)
+    end
+
+    subject { FooHistory.new().type }
+
+    it { is_expected.to eq [RDF::URI('http://example.com/foo')] }
+  end
+
   describe 'descendants' do
     it "should record the decendants" do
       expect(ActiveFedora::Base.descendants).to include(ModsArticle, SpecialThing)

data/spec/unit/change_set_spec.rb

@@ -18,10 +18,12 @@ describe ActiveFedora::ChangeSet do
       class Book < ActiveFedora::Base
         belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
         property :title, predicate: ::RDF::DC.title
+        property :alt_id, predicate: ::RDF::DC.identifier
       end
 
       base.library_id = 'foo'
       base.title = ['bar']
+      base.alt_id = ['12345']
     end
     after do
       Object.send(:remove_const, :Library)
@@ -36,8 +38,8 @@ describe ActiveFedora::ChangeSet do
 
       it { is_expected.to be_kind_of Hash }
 
-      it "should have two elements" do
-        expect(subject.size).to eq 2
+      it "should have three elements" do
+        expect(subject.size).to eq 3
       end
     end
 

data/spec/unit/simple_datastream_spec.rb

@@ -62,5 +62,37 @@ describe ActiveFedora::SimpleDatastream do
       expect(solr[ActiveFedora::SolrQueryBuilder.solr_name('creation_date', type: :date)]).to eq "2012-01-15"
     end
   end
+  
+  describe "datastream configuration" do
+    let(:foo) do
+      ActiveFedora::Base.create! do |obj|
+        obj.add_file(%{<?xml version="1.0"?>\n<fields><fubar>test</fubar></fields>}, path:'someData')
+      end
+    end
+    let(:resource) { Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, foo.uri) }
+    let(:orm) { Ldp::Orm.new(resource) }
+
+    before do
+      class FooHistory < ActiveFedora::Base
+        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
+          m.field "fubar", :string
+        end
+        has_attributes :fubar, datastream: 'someData', multiple: false
+      end
+
+      orm.graph.delete([orm.resource.subject_uri, ActiveFedora::RDF::Fcrepo::Model.hasModel, nil])
+      orm.graph.insert([orm.resource.subject_uri, ActiveFedora::RDF::Fcrepo::Model.hasModel, 'FooHistory'])
+      orm.save
+      foo.reload
+      foo.update_index
+    end
+    
+    after do
+      Object.send(:remove_const, :FooHistory)
+    end
+    
+    subject { FooHistory.find(foo.id) }
+    its(:fubar) { is_expected.to eq 'test' }
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.4
+  version: 9.0.5
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -222,6 +222,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement