active-fedora 11.0.0.rc2 → 11.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b833ffd608a93150c266715fe4a7407b4123226
-  data.tar.gz: 3eb0722fd8dd81dba86b8de505859e464a321145
+  metadata.gz: 91cff7660db1a97bf4fd92375d6f2b541e94ee17
+  data.tar.gz: 736b7165e630f80196850c4c0c8128bae538ada1
 SHA512:
-  metadata.gz: 6956d0ea72523e17d0ae7b856565f8abab7a20f9247e3fe6a410ec56c0227468a1aa242148cf10f91d6ca47279b798b04b203fb161a5b38b2ff0dd5e4879e310
-  data.tar.gz: c9202017657e945638899468958d79205fc7cbe44e41b5638347a3363a61cd24e23d4e0b81ad8781faa9f0a48e3da30804f5d8453c62d1d2cbaaca8dec762dab
+  metadata.gz: 17b5eaec5db6609a76cc0d0f0dfbcdf27c0a704556f210f6fe3b90f60b6b99037513ab96ef8beccb241c8afef10edafee26bf079dff920abf7a388f0ecafc0f7
+  data.tar.gz: 8a7956065d01ec69e5093a447661c2bee8d443eb9385a37bb8140b21288bf41e8812118bb86981ca319acf7a7505a9e50b564ed844447224f61d2881edd5f561

data/lib/active_fedora/associations/has_subresource_association.rb

@@ -25,12 +25,12 @@ module ActiveFedora
 
         def find_or_initialize_target(&block)
           if reflection.klass < ActiveFedora::File
-            reflection.build_association(target_uri, &block)
+            reflection.build_association(id: target_uri, &block)
           else
             reflection.klass.find(target_uri)
           end
         rescue ActiveFedora::ObjectNotFoundError
-          reflection.build_association(target_uri, &block)
+          reflection.build_association(id: target_uri, &block)
         end
 
         def replace(record)

data/lib/active_fedora/attribute_assignment.rb

@@ -48,7 +48,6 @@ module ActiveFedora
 
       def _assign_attribute(k, v)
         raise UnknownAttributeError.new(self, k) unless respond_to?("#{k}=")
-
         public_send("#{k}=", v)
       end
   end

data/lib/active_fedora/containers/container.rb

@@ -22,7 +22,7 @@ module ActiveFedora
     def self.find_or_initialize(id)
       find(id)
     rescue ActiveFedora::ObjectNotFoundError
-      new(id)
+      new(id: id)
     end
 
     private

data/lib/active_fedora/core.rb

@@ -22,14 +22,14 @@ module ActiveFedora
     # Also, if +attrs+ does not contain +:id+ but does contain +:namespace+ it will pass the
     # +:namespace+ value to Fedora::Repository.nextid to generate the next id available within
     # the given namespace.
-    def initialize(attributes_or_id = nil, &_block)
+    def initialize(attributes = nil, &_block)
       init_internals
-      attributes = initialize_attributes(attributes_or_id)
-      @ldp_source = build_ldp_resource(attributes.delete(:id))
+      id = attributes && (attributes.delete(:id) || attributes.delete('id'))
+      @ldp_source = build_ldp_resource(id)
       raise IllegalOperation, "Attempting to recreate existing ldp_source: `#{ldp_source.subject}'" unless ldp_source.new?
+      assign_attributes(attributes) if attributes
       assert_content_model
       load_attached_files
-      assign_attributes(attributes) if attributes
 
       yield self if block_given?
       _run_initialize_callbacks
@@ -144,19 +144,5 @@ module ActiveFedora
           raise ActiveFedora::ObjectNotFoundError, "Can't reload an object that hasn't been saved"
         end
       end
-
-      def initialize_attributes(attributes_or_id)
-        case attributes_or_id
-        when String
-          attributes = { id: attributes_or_id }.with_indifferent_access
-        when Hash
-          attributes = attributes_or_id.with_indifferent_access
-        when NilClass
-          attributes = {}.with_indifferent_access
-        else
-          raise ArgumentError, "#{attributes_or_id.class} is not acceptable"
-        end
-        attributes
-      end
   end
 end

data/lib/active_fedora/file.rb

@@ -30,7 +30,7 @@ module ActiveFedora
     # @yield [self] Yields self
     # @yieldparam [File] self the newly created file
     def initialize(identifier = nil, &_block)
-      identifier = nil if identifier.is_a? Hash
+      identifier = identifier.delete(:id) if identifier.is_a? Hash
       run_callbacks(:initialize) do
         case identifier
         when nil, ::RDF::URI

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.0.0.rc2".freeze
+  VERSION = "11.0.0.rc3".freeze
 end

data/spec/integration/eradicate_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::Base do
     end
     context "in a typical sitation" do
       specify "it cannot be reused" do
-        expect { described_class.create(ghost) }.to raise_error(Ldp::Gone)
+        expect { described_class.create(id: ghost) }.to raise_error(Ldp::Gone)
       end
     end
     specify "remove its tombstone" do

data/spec/integration/ntriples_datastream_spec.rb

@@ -138,7 +138,7 @@ EOF
       rdf_test.destroy
     end
 
-    subject(:rdf_test) { RdfTest.new('/test:99') }
+    subject(:rdf_test) { RdfTest.new(id: '/test:99') }
 
     it "writes rdf with proper subjects" do
       rdf_test.reload

data/spec/integration/query_result_builder_spec.rb

@@ -2,35 +2,23 @@ require 'spec_helper'
 
 describe ActiveFedora::QueryResultBuilder do
   describe "#reify_solr_results" do
-    before(:each) do
+    before do
       class FooObject < ActiveFedora::Base
         def self.id_namespace
           "foo"
         end
-
-        has_subresource :descMetadata, class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
       end
-      @test_object = ActiveFedora::Base.new
-      @foo_object = FooObject.new
-      attributes = { "language" => { 0 => "Italian" },
-                     "creator" => { 0 => "Linguist, A." },
-                     "geography" => { 0 => "Italy" },
-                     "title" => { 0 => "Italian and Spanish: A Comparison of Common Phrases" } }
-      @foo_object.descMetadata.update_indexed_attributes(attributes)
-      @test_object.save
-      @foo_object.save
-      @profiles = {
-        # 'test' => @test_object.profile,
-        # 'foo' => @foo_object.profile,
-        # 'foo_descMetadata' => @foo_object.datastreams['descMetadata'].profile
-      }
-      @foo_content = @foo_object.attached_files['descMetadata'].content
     end
+
+    let(:test_object) { ActiveFedora::Base.create }
+    let(:foo_object) { FooObject.create }
+
     after(:each) do
       Object.send(:remove_const, :FooObject)
     end
+
     it "returns an array of objects that are of the class stored in active_fedora_model_s" do
-      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([@test_object.id, @foo_object.id])
+      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([test_object.id, foo_object.id])
       solr_result = ActiveFedora::SolrService.query(query)
       result = described_class.reify_solr_results(solr_result)
       expect(result.length).to eq 2
@@ -40,7 +28,7 @@ describe ActiveFedora::QueryResultBuilder do
     end
 
     it '#reifies a lightweight object as a new instance' do
-      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([@foo_object.id])
+      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([foo_object.id])
       solr_result = ActiveFedora::SolrService.query(query)
       result = described_class.reify_solr_results(solr_result, load_from_solr: true)
       expect(result.first).to be_instance_of FooObject

data/spec/unit/base_spec.rb

@@ -133,21 +133,13 @@ describe ActiveFedora::Base do
       before do
         allow_any_instance_of(FooHistory).to receive(:assign_id).and_return(@this_id)
       end
+
       context "with no arguments" do
         it "does not get an id on init" do
           expect(FooHistory.new.id).to be_nil
         end
       end
 
-      context "with an id argument" do
-        it "is able to create with a custom id" do
-          expect(FooHistory).to receive(:id_to_uri).and_call_original
-          f = FooHistory.new('baz_1')
-          expect(f.id).to eq 'baz_1'
-          expect(f.id).to eq 'baz_1'
-        end
-      end
-
       context "with a hash argument" do
         context "that has an id" do
           it "is able to create with a custom id" do

data/spec/unit/has_and_belongs_to_many_association_spec.rb

@@ -18,7 +18,8 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
       Object.send(:remove_const, :Book)
       Object.send(:remove_const, :Page)
     end
-    subject(:book) { Book.new('subject-a') }
+
+    subject(:book) { Book.new(id: 'subject-a') }
 
     context "a one way relationship " do
       describe "adding memeber" do

data/spec/unit/has_many_association_spec.rb

@@ -12,8 +12,8 @@ describe ActiveFedora::Associations::HasManyAssociation do
     Object.send(:remove_const, :Book)
     Object.send(:remove_const, :Page)
   end
-  let(:book) { Book.new('subject-a') }
-  let(:page) { Page.new('object-b') }
+  let(:book) { Book.new(id: 'subject-a') }
+  let(:page) { Page.new(id: 'object-b') }
 
   describe "setting the foreign key" do
     before do

data/spec/unit/orders/list_node_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe ActiveFedora::Orders::ListNode do
         end
         context "and it doesn't exist" do
           it "returns an AT::Resource" do
-            member = Member.new("testing")
+            member = Member.new(id: "testing")
             graph << [rdf_subject, RDF::Vocab::ORE.proxyFor, member.resource.rdf_subject]
             expect(list_node.target.rdf_subject).to eq member.uri
           end

data/spec/unit/query_spec.rb

@@ -128,9 +128,9 @@ describe ActiveFedora::Base do
         .and_return('response' => { 'docs' => mock_docs })
 
       allow(relation).to receive(:load_from_fedora).with("changeme-30", nil)
-        .and_return(SpecModel::Basic.new('changeme-30'))
+        .and_return(SpecModel::Basic.new(id: 'changeme-30'))
       allow(relation).to receive(:load_from_fedora).with("changeme-22", nil)
-        .and_return(SpecModel::Basic.new('changeme-22'))
+        .and_return(SpecModel::Basic.new(id: 'changeme-22'))
       SpecModel::Basic.find_each { |obj| obj.class == SpecModel::Basic }
     end
 
@@ -144,8 +144,8 @@ describe ActiveFedora::Base do
       let(:mock_docs) { [{ "id" => "changeme-30" }, { "id" => "changeme-22" }] }
 
       it "filters by the provided fields" do
-        expect(relation).to receive(:load_from_fedora).with("changeme-30", nil).and_return(SpecModel::Basic.new('changeme-30'))
-        expect(relation).to receive(:load_from_fedora).with("changeme-22", nil).and_return(SpecModel::Basic.new('changeme-22'))
+        expect(relation).to receive(:load_from_fedora).with("changeme-30", nil).and_return(SpecModel::Basic.new(id: 'changeme-30'))
+        expect(relation).to receive(:load_from_fedora).with("changeme-22", nil).and_return(SpecModel::Basic.new(id: 'changeme-22'))
 
         expect(mock_docs).to receive(:has_next?).and_return(false)
         expect(solr).to receive(:paginate).with(1, 1000, 'select', expected_params).and_return('response' => { 'docs' => mock_docs })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.0.0.rc2
+  version: 11.0.0.rc3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr