active-fedora 6.2.0 → 6.3.0

data/spec/samples/models/{hydrangea_article.rb → mods_article.rb}

@@ -2,10 +2,10 @@ require "active-fedora"
 require_relative '../hydra-mods_article_datastream.rb'
 require_relative '../hydra-rights_metadata_datastream.rb'
 
-# This Model is used to load & index the hydrangea:fixture_mods_article1 fixture for use in tests.
+# This Model is used to load & index the test:fixture_mods_article1 fixture for use in tests.
 #
 # See lib/samples/sample_thing.rb for a fuller, annotated example of an ActiveFedora Model
-class HydrangeaArticle < ActiveFedora::Base
+class ModsArticle < ActiveFedora::Base
   
   has_metadata :name => "descMetadata", :type=> Hydra::ModsArticleDatastream  
   has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadataDatastream

data/spec/samples/samples.rb

@@ -1,3 +1,3 @@
 # require all of the files in the samples directory
-require 'samples/models/hydrangea_article'
+require 'samples/models/mods_article'
 require 'samples/special_thing'

data/spec/unit/base_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   describe 'descendants' do
     it "should record the decendants" do
-      ActiveFedora::Base.descendants.should include(HydrangeaArticle, SpecialThing)
+      ActiveFedora::Base.descendants.should include(ModsArticle, SpecialThing)
     end
   end
 
@@ -14,7 +14,7 @@ describe ActiveFedora::Base do
     end
 
     context "When the repository is NOT sharded" do
-      subject {ActiveFedora::Base.connection_for_pid('foo:bar')}
+      subject {ActiveFedora::Base.connection_for_pid('test:bar')}
       before(:each) do
         ActiveFedora.config.stub(:sharded?).and_return(false)
         ActiveFedora::Base.fedora_connection = {}
@@ -29,7 +29,7 @@ describe ActiveFedora::Base do
           # TODO: This juggling of Fedora credentials & establishing connections should be handled by an establish_fedora_connection method, 
           # possibly wrap it all into a fedora_connection method - MZ 06-05-2012
           stubfedora = mock("Fedora")
-          stubfedora.should_receive(:connection).and_return(mock("Connection", :next_pid =>"<pid>sample:newpid</pid>"))
+          stubfedora.should_receive(:connection).and_return(mock("Connection", :mint =>"sample:newpid"))
           # Should use ActiveFedora.config.credentials as a single hash rather than an array of shards
           ActiveFedora::RubydoraConnection.should_receive(:new).with(ActiveFedora.config.credentials).and_return(stubfedora)
           ActiveFedora::Base.assign_pid(ActiveFedora::Base.new.inner_object)
@@ -37,7 +37,7 @@ describe ActiveFedora::Base do
       end
       describe "shard_index" do
         it "should always return zero (the first and only connection)" do
-          ActiveFedora::Base.shard_index('foo:bar').should == 0
+          ActiveFedora::Base.shard_index('test:bar').should == 0
         end
       end
     end
@@ -51,7 +51,7 @@ describe ActiveFedora::Base do
         it "should always use the first shard to generate pids" do
           stubhard1 = mock("Shard")
           stubhard2 = mock("Shard")
-          stubhard1.should_receive(:connection).and_return(mock("Connection", :next_pid =>"<pid>sample:newpid</pid>"))
+          stubhard1.should_receive(:connection).and_return(mock("Connection", :mint =>"sample:newpid"))
           stubhard2.should_receive(:connection).never
           ActiveFedora::Base.fedora_connection = {0 => stubhard1, 1 => stubhard2}
           ActiveFedora::Base.assign_pid(ActiveFedora::Base.new.inner_object)
@@ -59,19 +59,19 @@ describe ActiveFedora::Base do
       end
       describe "shard_index" do
         it "should use modulo of md5 of the pid to distribute objects across shards" do
-          ActiveFedora::Base.shard_index('foo:bar').should == 0
-          ActiveFedora::Base.shard_index('foo:nanana').should == 1
+          ActiveFedora::Base.shard_index('test:bar').should == 0
+          ActiveFedora::Base.shard_index('test:nanana').should == 1
         end
       end
       describe "the repository" do
-        describe "for foo:bar" do
-          subject {ActiveFedora::Base.connection_for_pid('foo:bar')}
+        describe "for test:bar" do
+          subject {ActiveFedora::Base.connection_for_pid('test:bar')}
           it "should be shard1" do
             subject.client.url.should == 'shard1'
           end
         end
-        describe "for foo:baz" do
-          subject {ActiveFedora::Base.connection_for_pid('foo:nanana')}
+        describe "for test:baz" do
+          subject {ActiveFedora::Base.connection_for_pid('test:nanana')}
           it "should be shard1" do
             subject.client.url.should == 'shard2'
           end
@@ -457,7 +457,7 @@ describe ActiveFedora::Base do
       end
 
       it "should call .to_solr on the relationships rels-ext is dirty" do
-        @test_object.add_relationship(:has_collection_member, "info:fedora/foo:member")
+        @test_object.add_relationship(:has_collection_member, "info:fedora/test:member")
         rels_ext = @test_object.rels_ext
         rels_ext.should be_changed
         @test_object.should_receive(:solrize_relationships)

data/spec/unit/datastreams_spec.rb

@@ -175,16 +175,6 @@ describe ActiveFedora::Datastreams do
     end
   end
 
-  describe "#dc" do
-    it "should be the DC datastream" do
-      subject.dc.should be_kind_of ActiveFedora::Datastream
-    end
-    it "should be an inline datastream" do
-      subject.dc.controlGroup.should == 'X'
-    end
-  end
-
-
   describe "#relsext" do
     it "should be the RELS-EXT datastream" do
       m = mock

data/spec/unit/has_and_belongs_to_many_collection_spec.rb

@@ -29,31 +29,4 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
 
   end
   
-  it "should call remove_relationship" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
-    ActiveFedora::SolrService.stub(:query).and_return([])
-    ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
-  
-    subject.should_receive(:remove_relationship).with('predicate', object)
- 
-    ac.delete(object)
-
-  end
-
-  it "should call remove_relationship on subject and object when inverse_of given" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate', :inverse_of => 'inverse_predicate'}, :class_name=> nil)
-    ActiveFedora::SolrService.stub(:query).and_return([])
-    ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
-  
-    subject.should_receive(:remove_relationship).with('predicate', object)
-    object.should_receive(:remove_relationship).with('inverse_predicate', subject)
- 
-    ac.delete(object)
-
-  end
-
 end

data/spec/unit/has_many_collection_spec.rb

@@ -14,32 +14,4 @@ describe ActiveFedora::Associations::HasManyAssociation do
 
   end
   
-  it "should call remove_relationship" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
-    ActiveFedora::SolrService.stub(:query).and_return([])
-    ac = ActiveFedora::Associations::HasManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
-  
-    object.should_receive(:remove_relationship).with('predicate', subject)
- 
-    ac.delete(object)
-
-  end
-
-  it "should be able to replace the collection" do
-    @owner = stub(:new_record? => false, :to_ary => nil, :internal_uri => 'info:fedora/changeme:99')
-    @reflection = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
-    ac = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
-    @target = [stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true), stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true), stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true)]
-    ac.target = @target 
-
-    @expected1 = stub(:new_record? => false, :add_relationship=>true, :save=>true, :to_ary => nil)
-    @expected2 = stub(:new_record? => false, :add_relationship=>true, :save=>true, :to_ary => nil)
-    ac.replace([@expected1, @expected2])
-    ac.target.should == [@expected1, @expected2]
-
-  end
-
-
 end

data/spec/unit/om_datastream_spec.rb

@@ -72,7 +72,7 @@ describe ActiveFedora::OmDatastream do
     
     before(:each) do
       @mods_ds = Hydra::ModsArticleDatastream.new(nil, 'descMetadata')
-      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
+      @mods_ds.content=fixture(File.join("mods_articles","mods_article1.xml")).read
     end
     
     it "should apply submitted hash to corresponding datastream field values" do
@@ -151,7 +151,7 @@ describe ActiveFedora::OmDatastream do
     
     before(:each) do
       @mods_ds = Hydra::ModsArticleDatastream.new(nil, 'modsDs')
-      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
+      @mods_ds.content=fixture(File.join("mods_articles","mods_article1.xml")).read
     end
     
     it "should call lookup with field_name and return the text values from each resulting node" do
@@ -271,7 +271,7 @@ describe ActiveFedora::OmDatastream do
   describe '.get_values_from_solr' do
     before(:each) do
       @mods_ds = ActiveFedora::OmDatastream.new
-      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
+      @mods_ds.content=fixture(File.join("mods_articles","mods_article1.xml")).read
     end
 
     it "should return empty array if internal_solr_doc not set" do
@@ -327,7 +327,7 @@ describe ActiveFedora::OmDatastream do
   describe '.update_values' do
     before(:each) do
       @mods_ds = ActiveFedora::OmDatastream.new
-      @mods_ds.content= fixture(File.join("mods_articles","hydrangea_article1.xml")).read
+      @mods_ds.content= fixture(File.join("mods_articles","mods_article1.xml")).read
     end
 
     it "should throw an exception if we have initialized the internal_solr_doc." do
@@ -349,7 +349,7 @@ describe ActiveFedora::OmDatastream do
 
     it "should set changed to true" do
       mods_ds = Hydra::ModsArticleDatastream.new
-      mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
+      mods_ds.content=fixture(File.join("mods_articles","mods_article1.xml")).read
       mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
       mods_ds.should be_changed
     end
@@ -359,7 +359,7 @@ describe ActiveFedora::OmDatastream do
 
     before(:each) do
       @mods_ds = ActiveFedora::OmDatastream.new
-      @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
+      @mods_ds.content=fixture(File.join("mods_articles","mods_article1.xml")).read
     end
 
     it "should call OM::XML::term_values if internal_solr_doc is not set and return values from xml" do

data/spec/unit/query_spec.rb

@@ -7,7 +7,7 @@ describe ActiveFedora::Base do
       class Basic < ActiveFedora::Base
       end
     end
-    @model_query = ActiveFedora::SolrService.solr_name("has_model", :symbol) + ":#{solr_uri("info:fedora/afmodel:SpecModel_Basic")}"
+    @model_query = "_query_:\"{!raw f=" + ActiveFedora::SolrService.solr_name("has_model", :symbol) + "}info:fedora/afmodel:SpecModel_Basic" + "\""
     @sort_query = ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date) + ' asc'
   end
   
@@ -185,7 +185,7 @@ describe ActiveFedora::Base do
     it "should count without a class specified" do
       mock_result = {'response'=>{'numFound'=>7}}
       ActiveFedora::SolrService.should_receive(:query).with("foo:bar", :rows=>0, :raw=>true).and_return(mock_result)
-      ActiveFedora::Base.count(:conditions=>'foo:bar').should == 7
+      ActiveFedora::Base.count(:conditions=>'foo:bar').should == 7 
     end
   end
   

data/spec/unit/solr_config_options_spec.rb

@@ -34,7 +34,7 @@ describe ActiveFedora do
 
     it "should be used by ActiveFedora::Base#find_with_conditions" do
       mock_response = mock("SolrResponse")
-      ActiveFedora::SolrService.should_receive(:query).with("#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}:info\\:fedora\\/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ["#{ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date)} asc"]}).and_return(mock_response)
+      ActiveFedora::SolrService.should_receive(:query).with("_query_:\"{!raw f=#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}}info:fedora/afmodel:SolrSpecModel_Basic\" AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ["#{ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date)} asc"]}).and_return(mock_response)
   
       SolrSpecModel::Basic.find_with_conditions(:id=>"changeme:30").should equal(mock_response)
     end

data/spec/unit/solr_service_spec.rb

@@ -59,7 +59,8 @@ describe ActiveFedora::SolrService do
   
   describe '#construct_query_for_pids' do
     it "should generate a useable solr query from an array of Fedora pids" do
-      ActiveFedora::SolrService.construct_query_for_pids(["my:_PID1_", "my:_PID2_", "my:_PID3_"]).should == 'id:my\:_PID1_ OR id:my\:_PID2_ OR id:my\:_PID3_' 
+      ActiveFedora::SolrService.construct_query_for_pids(["my:_PID1_", "my:_PID2_", "my:_PID3_"]).should == '_query_:"{!raw f=id}my:_PID1_" OR _query_:"{!raw f=id}my:_PID2_" OR _query_:"{!raw f=id}my:_PID3_"'
+
     end
     it "should return a valid solr query even if given an empty array as input" do
       ActiveFedora::SolrService.construct_query_for_pids([""]).should == "id:NEVER_USE_THIS_ID"
@@ -90,6 +91,13 @@ describe ActiveFedora::SolrService do
       ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.count('querytext').should == 7 
     end
+    it "should accept query args" do
+      mock_conn = mock("Connection")
+      stub_result = {'response' => {'numFound'=>'7'}}
+      mock_conn.should_receive(:get).with('select', :params=>{:rows=>0, :q=>'querytext', :qt=>'standard', :fq=>'filter'}).and_return(stub_result)
+      ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.count('querytext', :fq=>'filter', :rows=>10).should == 7 
+    end
   end
   describe ".add" do
     it "should call solr" do 

data/spec/unit/validations_spec.rb

@@ -8,35 +8,42 @@ describe ActiveFedora::Base do
         m.field "swank", :text
       end
       delegate :fubar, :to=>'someData'
-      delegate :swank, :to=>'someData'
+      delegate :swank, :to=>'someData', unique: true
 
       validates_presence_of :fubar
       validates_length_of :swank, :minimum=>5
       
     end
   end
+
+  subject { ValidationStub.new }
+
   after :all do
     Object.send(:remove_const, :ValidationStub)
   end
 
   describe "a valid object" do
     before do
-      @obj = ValidationStub.new(:fubar=>'here', :swank=>'long enough')
+      subject.attributes={ fubar:'here', swank:'long enough'}
     end
     
-    it "should be valid" do
-      @obj.should_not be_valid
-    end
+    it { should be_valid}
   end
   describe "an invalid object" do
     before do
-      @obj = ValidationStub.new(:swank=>'smal')
+      subject.attributes={ swank:'smal'}
     end
-    
-    it "should be invalid" do
-      @obj.should_not be_valid
-      @obj.errors[:fubar].should == ["can't be blank"]
-      @obj.errors[:swank].should == ["is too short (minimum is 5 characters)"]
+    it "should have errors" do
+      subject.should_not be_valid
+      subject.errors[:fubar].should == ["can't be blank"]
+      subject.errors[:swank].should == ["is too short (minimum is 5 characters)"]
+    end
+  end
+
+  describe "required terms" do
+    it "should be required" do
+       subject.required?(:fubar).should be_true
+       subject.required?(:swank).should be_false
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -89,6 +89,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,6 +99,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -276,8 +282,10 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .gitmodules
+- .mailmap
 - .travis.yml
 - CONSOLE_GETTING_STARTED.textile
+- CONTRIBUTORS.md
 - Gemfile
 - History.txt
 - LICENSE
@@ -387,11 +395,9 @@ files:
 - spec/fixtures/dino.jpg
 - spec/fixtures/dino_jpg_no_file_ext
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
-- spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
-- spec/fixtures/hydrangea_fixture_mods_article2.foxml.xml
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mixed_rdf_descMetadata.nt
-- spec/fixtures/mods_articles/hydrangea_article1.xml
+- spec/fixtures/mods_articles/mods_article1.xml
 - spec/fixtures/rails_root/config/fake_fedora.yml
 - spec/fixtures/rails_root/config/fedora.yml
 - spec/fixtures/rails_root/config/predicate_mappings.yml
@@ -402,6 +408,8 @@ files:
 - spec/fixtures/sharded_fedora.yml
 - spec/fixtures/solr_rdf_descMetadata.nt
 - spec/fixtures/test_12.foxml.xml
+- spec/fixtures/test_fixture_mods_article1.foxml.xml
+- spec/fixtures/test_fixture_mods_article2.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
 - spec/integration/base_spec.rb
@@ -457,8 +465,8 @@ files:
 - spec/samples/hydra-rights_metadata_datastream.rb
 - spec/samples/marpa-dc_datastream.rb
 - spec/samples/models/audio_record.rb
-- spec/samples/models/hydrangea_article.rb
 - spec/samples/models/image.rb
+- spec/samples/models/mods_article.rb
 - spec/samples/models/oral_history.rb
 - spec/samples/models/seminar.rb
 - spec/samples/models/seminar_audio_file.rb
@@ -551,11 +559,9 @@ test_files:
 - spec/fixtures/dino.jpg
 - spec/fixtures/dino_jpg_no_file_ext
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
-- spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
-- spec/fixtures/hydrangea_fixture_mods_article2.foxml.xml
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mixed_rdf_descMetadata.nt
-- spec/fixtures/mods_articles/hydrangea_article1.xml
+- spec/fixtures/mods_articles/mods_article1.xml
 - spec/fixtures/rails_root/config/fake_fedora.yml
 - spec/fixtures/rails_root/config/fedora.yml
 - spec/fixtures/rails_root/config/predicate_mappings.yml
@@ -566,6 +572,8 @@ test_files:
 - spec/fixtures/sharded_fedora.yml
 - spec/fixtures/solr_rdf_descMetadata.nt
 - spec/fixtures/test_12.foxml.xml
+- spec/fixtures/test_fixture_mods_article1.foxml.xml
+- spec/fixtures/test_fixture_mods_article2.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
 - spec/integration/base_spec.rb
@@ -621,8 +629,8 @@ test_files:
 - spec/samples/hydra-rights_metadata_datastream.rb
 - spec/samples/marpa-dc_datastream.rb
 - spec/samples/models/audio_record.rb
-- spec/samples/models/hydrangea_article.rb
 - spec/samples/models/image.rb
+- spec/samples/models/mods_article.rb
 - spec/samples/models/oral_history.rb
 - spec/samples/models/seminar.rb
 - spec/samples/models/seminar_audio_file.rb