active-fedora 9.0.0.beta4 → 9.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 868c4057e2767f632105de888a5b5ca519ddf483
-  data.tar.gz: a40dfbdc7a7e9047413c4cec194cbfa66969677d
+  metadata.gz: 17554700da06c7fc155b4336f11cc269e1114d42
+  data.tar.gz: 85dc2454b14e8a65334524debae01d56c690c712
 SHA512:
-  metadata.gz: 9736c5cd63546aa1cf1d82119ab84d0376e6d06a8507026bce1c474ef340fb193149e352107ebbf6c215b74a110d095e2e126f0e95fa9186a3ba3b8143ac15f9
-  data.tar.gz: 05a30a175532f659499d94d3362b18b89a025f2610aa462b0de0860b21b87690d9ba7c74a2fc153a0da574d0607b9aecba3074623a92438ed91e6b953fe98339
+  metadata.gz: 94d352731c92f119bc6b7ec521dcead14a68099588c840874dece0f38c27e47b29e45ee063bd010df1bf7624161b302b57d958ee29c7c66ec241eef8a8b4b7ce
+  data.tar.gz: 3cdf222ffa305dc0f452ddbfb8008a8a628ec7a222f969c52f043fd3ffc4506042a4c84f1908065b74c30d190ef1c18f2dae1bf9e0ba8c71197d023e4d68acb3

data/lib/active_fedora/rdf/indexing.rb

@@ -15,10 +15,13 @@ module ActiveFedora
           fields.each do |field_key, field_info|
             values = resource.get_values(field_key)
             Array(values).each do |val|
-              if val.kind_of? ::RDF::URI
-                val = val.to_s
-              elsif val.kind_of? ActiveTriples::Resource
-                val = val.solrize
+              val = case val
+                when ::RDF::URI, ActiveTriples::Term
+                  val.to_s
+                when ActiveTriples::Resource
+                  val.solrize
+                else
+                  val
               end
               self.class.create_and_insert_terms(apply_prefix(field_key, opts[:name]), val, field_info[:behaviors], solr_doc)
             end

data/lib/active_fedora/version.rb

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

data/spec/unit/base_spec.rb

@@ -254,39 +254,6 @@ describe ActiveFedora::Base do
       end
     end
 
-    describe ".to_solr" do
-      it "should provide .to_solr" do
-        expect(@test_object).to respond_to(:to_solr)
-      end
-
-      it "should add id, system_create_date, system_modified_date from object attributes" do
-        expect(@test_object).to receive(:create_date).and_return(DateTime.parse("2012-03-04T03:12:02Z")).twice
-        expect(@test_object).to receive(:modified_date).and_return(DateTime.parse("2012-03-07T03:12:02Z")).twice
-        allow(@test_object).to receive(:id).and_return('changeme:123')
-        solr_doc = @test_object.to_solr
-        expect(solr_doc[ActiveFedora::SolrQueryBuilder.solr_name("system_create", :stored_sortable, type: :date)]).to eql("2012-03-04T03:12:02Z")
-        expect(solr_doc[ActiveFedora::SolrQueryBuilder.solr_name("system_modified", :stored_sortable, type: :date)]).to eql("2012-03-07T03:12:02Z")
-        expect(solr_doc[:id]).to eql("changeme:123")
-      end
-
-      it "should add self.class as the :active_fedora_model" do
-        @test_history = FooHistory.new()
-        solr_doc = @test_history.to_solr
-        expect(solr_doc[ActiveFedora::SolrQueryBuilder.solr_name("active_fedora_model", :stored_sortable)]).to eql("FooHistory")
-      end
-
-      it "should call .to_solr on all datastreams, passing the resulting document to solr" do
-        mock1 = double("ds1")
-        expect(mock1).to receive(:to_solr).and_return({})
-        mock2 = double("ds2")
-        expect(mock2).to receive(:to_solr).and_return({})
-
-        allow(@test_object).to receive(:attached_files).and_return(ds1: mock1, ds2: mock2)
-        expect(@test_object.indexing_service).to receive(:solrize_relationships)
-        @test_object.to_solr
-      end
-    end
-
     describe "update_attributes" do
       it "should set the attributes and save" do
         m = FooHistory.new

data/spec/unit/indexing_spec.rb

@@ -23,4 +23,56 @@ describe ActiveFedora::Indexing do
       it { should be true }
     end
   end
+
+  describe "#to_solr" do
+    before :all do
+      class SpecNode < ActiveFedora::Base
+        property :title, predicate: ::RDF::DC.title do |index|
+          index.as :stored_searchable
+        end
+        property :abstract, predicate: ::RDF::DC.abstract, multiple: false do |index|
+          index.as :stored_sortable
+        end
+      end
+    end
+    after :all do
+      Object.send(:remove_const, :SpecNode)
+    end
+
+    let(:test_object) { SpecNode.new(title: ['first title'], abstract: 'The abstract') }
+
+    subject { test_object.to_solr }
+
+    it "should index the rdf properties" do
+      expect(subject).to include('title_tesim' => ['first title'], 'abstract_ssi' => 'The abstract')
+    end
+
+    it "should add id, system_create_date, system_modified_date from object attributes" do
+      expect(test_object).to receive(:create_date).and_return(DateTime.parse("2012-03-04T03:12:02Z")).twice
+      expect(test_object).to receive(:modified_date).and_return(DateTime.parse("2012-03-07T03:12:02Z")).twice
+      allow(test_object).to receive(:id).and_return('changeme:123')
+      solr_doc = test_object.to_solr
+      expect(solr_doc[ActiveFedora::SolrQueryBuilder.solr_name("system_create", :stored_sortable, type: :date)]).to eql("2012-03-04T03:12:02Z")
+      expect(solr_doc[ActiveFedora::SolrQueryBuilder.solr_name("system_modified", :stored_sortable, type: :date)]).to eql("2012-03-07T03:12:02Z")
+      expect(solr_doc[:id]).to eql("changeme:123")
+    end
+
+    it "should add self.class as the :active_fedora_model" do
+      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("active_fedora_model", :stored_sortable)]).to eql "SpecNode"
+    end
+
+    context "with attached files" do
+      let(:mock1) { double("ds1") }
+      let(:mock2) { double("ds2") }
+
+      it "should call .to_solr on all datastreams, passing the resulting document to solr" do
+        expect(mock1).to receive(:to_solr).and_return("one" => "title one")
+        expect(mock2).to receive(:to_solr).and_return("two" => "title two")
+
+        allow(test_object).to receive(:attached_files).and_return(ds1: mock1, ds2: mock2)
+        expect(subject).to include('one' => 'title one', 'two' => 'title two')
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta4
+  version: 9.0.0.beta5
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr