active-fedora 7.0.0.pre2 → 7.0.0.pre3

data/spec/unit/core_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe ActiveFedora::Base do
+  before do
+    class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+      map_predicates do |map|
+        map.publisher(:in => RDF::DC)
+      end
+    end
+    class Library < ActiveFedora::Base
+    end
+    class Book < ActiveFedora::Base
+      belongs_to :library, property: :has_constituent
+      has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
+        m.field "title", :string
+      end
+      has_metadata "bar", type: MyDatastream
+      has_attributes :title, datastream: 'foo' # Om backed property
+      has_attributes :publisher, datastream: 'bar' # RDF backed property
+    end
+    subject.library = library
+  end
+  let (:library) { Library.create }
+  subject {Book.new(library: library, title: "War and Peace", publisher: "Random House")}
+  after do 
+    Object.send(:remove_const, :Book)
+    Object.send(:remove_const, :Library)
+  end
+
+  describe "#freeze" do
+    before { subject.freeze }
+
+    it "should be frozen" do
+      expect(subject).to be_frozen
+    end
+
+    it "should make the associations immutable" do
+      expect {
+        subject.library_id = Library.create!.pid
+      }.to raise_error RuntimeError, "can't modify frozen Book"
+      expect(subject.library_id).to eq library.pid
+    end
+
+    describe "when the association is set via an id" do
+      subject {Book.new(library_id: library.id)}
+      it "should be able to load the association" do
+        expect(subject.library).to eq library
+      end
+    end
+
+    it "should make the om properties immutable" do
+      expect {
+        subject.title = "HEY"
+      }.to raise_error RuntimeError, "can't modify frozen ActiveFedora::SimpleDatastream"
+      expect(subject.title).to eq "War and Peace"
+    end
+
+    it "should make the RDF properties immutable" do
+      expect {
+        subject.publisher = "HEY"
+      }.to raise_error RuntimeError, "can't modify frozen MyDatastream"
+      expect(subject.publisher).to eq "Random House"
+    end
+
+  end
+
+  describe "an object that hasn't loaded the associations" do
+    before {subject.save! }
+
+    it "should access associations" do
+      f = Book.find(subject.id)
+      f.freeze
+      f.library_id.should_not be_nil
+
+    end
+  end
+end

data/spec/unit/ntriples_datastream_spec.rb

@@ -82,8 +82,8 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @two = ActiveFedora::RDFDatastream.new('fakepid', 'myQuix')
     end
     it "should generate predictable prexies" do
-      @one .prefix("baz").should == :my_foobar__baz
-      @two.prefix("baz").should == :my_quix__baz
+      @one.apply_prefix("baz").should == 'my_foobar__baz'
+      @two.apply_prefix("baz").should == 'my_quix__baz'
     end
   end
 
@@ -180,8 +180,8 @@ describe ActiveFedora::NtriplesRDFDatastream do
     end
 
     it "should have a solr_name method" do
-      expect(MyDatastream.primary_solr_name('descMetadata', :based_near)).to eq 'desc_metadata__based_near_sim'
-      expect(MyDatastream.primary_solr_name('props', :title)).to eq 'props__title_tesim'
+      expect(MyDatastream.new(nil, 'descMetadata').primary_solr_name(:based_near)).to eq 'desc_metadata__based_near_sim'
+      expect(MyDatastream.new(nil, 'props').primary_solr_name(:title)).to eq 'props__title_tesim'
     end
 
     it "should optionally allow you to provide the Solr::Document to add fields to and return that document when done" do

data/spec/unit/om_datastream_spec.rb

@@ -55,6 +55,13 @@ describe ActiveFedora::OmDatastream do
       n.ng_xml.should be_equivalent_to("<fake template/>")
     end
   end
+
+  describe "#prefix" do
+    subject { ActiveFedora::OmDatastream.new(nil, 'descMetadata') }
+    it "should be an empty string (until active-fedora 8. Then it should be \"\#{dsid.underscore}__\"" do
+      subject.send(:prefix).should == ""
+    end
+  end
   
   describe '#xml_template' do
     it "should return an empty xml document" do
@@ -62,10 +69,39 @@ describe ActiveFedora::OmDatastream do
     end
   end
 
-  describe "an instance" do
-    subject { ActiveFedora::OmDatastream.new }
-    it{ should.respond_to? :to_solr }
-    its(:to_solr) {should == { }}
+  describe "to_solr" do
+    describe "with a dsid" do
+      subject { ActiveFedora::OmDatastream.new(@mock_inner, "descMetadata") }
+      its(:to_solr) {should == { }}
+    end
+    describe "without a dsid" do
+      subject { ActiveFedora::OmDatastream.new }
+      it "should raise an error" do
+        expect{subject.to_solr}.to raise_error RuntimeError, "to_solr requires the dsid to be set"
+      end
+    end
+
+    describe "when prefix is set" do
+      before do 
+        class MyDatastream < ActiveFedora::OmDatastream
+          set_terminology do |t|
+            t.root(:path=>"mods")
+            t.title(:index_as=>[:stored_searchable])
+          end
+          def prefix
+            "foo__"
+          end
+        end
+      end
+      after do
+        Object.send(:remove_const, :MyDatastream)
+      end
+      subject { MyDatastream.new }
+      it "should use the prefix" do
+        subject.title = 'Science'
+        expect(subject.to_solr).to have_key('foo__title_tesim')
+      end
+    end
   end
   
   describe ".update_indexed_attributes" do

data/spec/unit/query_spec.rb

@@ -84,9 +84,9 @@ describe ActiveFedora::Base do
             hash[:params][:sort] == [@sort_query] &&
             hash[:params][:fl] == 'id' && 
             hash[:params][:q].split(" AND ").include?(@model_query) &&
-            hash[:params][:q].split(" AND ").include?("foo:\"bar\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
+            hash[:params][:q].split(" AND ").include?("foo:bar") &&
+            hash[:params][:q].split(" AND ").include?("baz:quix") &&
+            hash[:params][:q].split(" AND ").include?("baz:quack")
         }.and_return('response'=>{'docs'=>mock_docs})
         SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']}).should == ["Fake Object1", "Fake Object2"]
       end
@@ -113,9 +113,9 @@ describe ActiveFedora::Base do
             hash[:params][:fl] == 'id' && 
             hash[:params][:sort] == [@sort_query] &&
             hash[:params][:q].split(" AND ").include?(@model_query) &&
-            hash[:params][:q].split(" AND ").include?("foo:\"bar\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
+            hash[:params][:q].split(" AND ").include?("foo:bar") &&
+            hash[:params][:q].split(" AND ").include?("baz:quix") &&
+            hash[:params][:q].split(" AND ").include?("baz:quack")
         }.and_return('response'=>{'docs'=>mock_docs})
         SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']}, :sort=>'title_t desc').should == ["Fake Object1", "Fake Object2"]
       end
@@ -153,9 +153,9 @@ describe ActiveFedora::Base do
             hash[:params][:sort] == [@sort_query] && 
             hash[:params][:fl] == 'id' && 
             hash[:params][:q].split(" AND ").include?(@model_query) &&
-            hash[:params][:q].split(" AND ").include?("foo:\"bar\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
+            hash[:params][:q].split(" AND ").include?("foo:bar") &&
+            hash[:params][:q].split(" AND ").include?("baz:quix") &&
+            hash[:params][:q].split(" AND ").include?("baz:quack")
         }.and_return('response'=>{'docs'=>mock_docs})
         yielded = double("yielded method")
         yielded.should_receive(:run).with { |obj| obj.class == SpecModel::Basic}.twice
@@ -177,9 +177,9 @@ describe ActiveFedora::Base do
             hash[:params][:sort] == [@sort_query] && 
             hash[:params][:fl] == 'id' && 
             hash[:params][:q].split(" AND ").include?(@model_query) &&
-            hash[:params][:q].split(" AND ").include?("foo:\"bar\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
-            hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
+            hash[:params][:q].split(" AND ").include?("foo:bar") &&
+            hash[:params][:q].split(" AND ").include?("baz:quix") &&
+            hash[:params][:q].split(" AND ").include?("baz:quack")
         }.and_return('response'=>{'docs'=>mock_docs})
         yielded = double("yielded method")
         yielded.should_receive(:run).with(mock_docs)
@@ -257,9 +257,9 @@ describe ActiveFedora::Base do
             q = args.first if args.is_a? Array
             q ||= args
             q.split(" AND ").include?(@model_query) &&
-            q.split(" AND ").include?("foo:\"bar\"") &&
-            q.split(" AND ").include?("baz:\"quix\"") &&
-            q.split(" AND ").include?("baz:\"quack\"")
+            q.split(" AND ").include?("foo:bar") &&
+            q.split(" AND ").include?("baz:quix") &&
+            q.split(" AND ").include?("baz:quack")
         }.and_return(mock_result)
       SpecModel::Basic.find_with_conditions(:foo=>'bar', :baz=>['quix','quack']).should == mock_result
     end
@@ -271,16 +271,16 @@ describe ActiveFedora::Base do
             q ||= args
             q.split(" AND ").include?(@model_query) &&
             q.split(" AND ").include?(@model_query) &&
-            q.split(" AND ").include?('foo:"9\\" Nails"') &&
-            q.split(" AND ").include?('baz:"7\\" version"') &&
-            q.split(" AND ").include?('baz:"quack"')
+            q.split(" AND ").include?('foo:9\\"\\ Nails') &&
+            q.split(" AND ").include?('baz:7\\"\\ version') &&
+            q.split(" AND ").include?('baz:quack')
         }.and_return(mock_result)
       SpecModel::Basic.find_with_conditions(:foo=>'9" Nails', :baz=>['7" version','quack']).should == mock_result
     end
 
     it "shouldn't use the class if it's called on AF:Base " do
       mock_result = double('Result')
-      ActiveFedora::SolrService.should_receive(:query).with('baz:"quack"', {:sort => [@sort_query]}).and_return(mock_result)
+      ActiveFedora::SolrService.should_receive(:query).with('baz:quack', {:sort => [@sort_query]}).and_return(mock_result)
       ActiveFedora::Base.find_with_conditions(:baz=>'quack').should == mock_result
     end
     it "should use the query string if it's provided" do

data/spec/unit/rels_ext_datastream_spec.rb

@@ -28,10 +28,11 @@ describe ActiveFedora::RelsExtDatastream do
 
   describe "#changed?" do
     it "should be false when no changes have been made" do
+      subject.model = double(:relationships_are_dirty? => false)
       subject.changed?.should == false
     end
     it "should be true when the model has changes" do
-      subject.model = double(:relationships_are_dirty=>true)
+      subject.model = double(:relationships_are_dirty? => true)
       subject.changed?.should == true
     end
   end
@@ -44,7 +45,7 @@ describe ActiveFedora::RelsExtDatastream do
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
       
-      @test_ds.stub(:new? => true, :relationships_are_dirty? =>true, :relationships => graph, :model => double(:relationships_are_dirty= => true))
+      @test_ds.stub(:new? => true, :relationships => graph, :model => double(:relationships_are_dirty? =>true, :relationships_are_not_dirty! => true))
       @test_ds.serialize!
       EquivalentXml.equivalent?(@test_ds.content, "<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n        <rdf:Description rdf:about='info:fedora/test:sample_pid'>\n        <isMemberOf rdf:resource='demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/></rdf:Description>\n      </rdf:RDF>").should be_true
     end

data/spec/unit/solr_config_options_spec.rb

@@ -1,8 +1,5 @@
 require 'spec_helper'
 
-
-#include ActiveFedora
-
 describe ActiveFedora do
   
   before(:all) do
@@ -35,7 +32,7 @@ describe ActiveFedora do
 
     it "should be used by ActiveFedora::Base#find_with_conditions" do
       mock_response = double("SolrResponse")
-      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)
+      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

@@ -91,6 +91,12 @@ describe ActiveFedora::SolrService do
       end
     end
   end
+
+  describe "raw_query" do
+    it "should generate a raw query clause" do
+      expect(ActiveFedora::SolrService.raw_query('id', "my:_PID1_")).to eq '_query_:"{!raw f=id}my:_PID1_"'
+    end
+  end
   
   describe '#construct_query_for_pids' do
     it "should generate a useable solr query from an array of Fedora pids" do
@@ -138,7 +144,7 @@ describe ActiveFedora::SolrService do
     it "should call solr" do 
       mock_conn = double("Connection")
       doc = {'id' => '1234'}
-      mock_conn.should_receive(:add).with(doc)
+      mock_conn.should_receive(:add).with(doc, {:params=>{}})
       ActiveFedora::SolrService.stub(:instance =>double("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.add(doc)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre2
+  version: 7.0.0.pre3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.10.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.10.pre1
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre1
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre1
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -478,6 +478,7 @@ files:
 - spec/unit/code_configurator_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/content_model_spec.rb
+- spec/unit/core_spec.rb
 - spec/unit/datastream_collections_spec.rb
 - spec/unit/datastream_spec.rb
 - spec/unit/datastreams_spec.rb
@@ -621,6 +622,7 @@ test_files:
 - spec/unit/code_configurator_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/content_model_spec.rb
+- spec/unit/core_spec.rb
 - spec/unit/datastream_collections_spec.rb
 - spec/unit/datastream_spec.rb
 - spec/unit/datastreams_spec.rb