active-fedora 9.0.0.beta2 → 9.0.0.beta3

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -103,7 +103,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
       @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new
       @test_ds.title = "War and Peace"
       solr = @test_ds.to_solr
-      expect(solr[ActiveFedora::SolrService.solr_name('title', type: :string)]).to eq "War and Peace"
+      expect(solr[ActiveFedora::SolrQueryBuilder.solr_name('title', type: :string)]).to eq "War and Peace"
     end
 
   end

data/spec/unit/query_result_builder_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe QueryResultBuilder do
+  describe "reify solr results" do
+    before(:all) do
+      class AudioRecord
+        attr_accessor :id
+        def self.connection_for_id(id)
+        end
+      end
+      @sample_solr_hits = [{"id"=>"my:_ID1_", ActiveFedora::SolrQueryBuilder.solr_name("has_model", :symbol)=>["AudioRecord"]},
+                           {"id"=>"my:_ID2_", ActiveFedora::SolrQueryBuilder.solr_name("has_model", :symbol)=>["AudioRecord"]},
+                           {"id"=>"my:_ID3_", ActiveFedora::SolrQueryBuilder.solr_name("has_model", :symbol)=>["AudioRecord"]}]
+    end
+    describe ".reify_solr_result" do
+      it "should use .find to instantiate objects" do
+        expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
+        ActiveFedora::QueryResultBuilder.reify_solr_result(@sample_solr_hits.first)
+      end
+    end
+    describe ".reify_solr_results" do
+      it "should use AudioRecord.find to instantiate objects" do
+        expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
+        expect(AudioRecord).to receive(:find).with("my:_ID2_", cast: true)
+        expect(AudioRecord).to receive(:find).with("my:_ID3_", cast: true)
+        ActiveFedora::QueryResultBuilder.reify_solr_results(@sample_solr_hits)
+      end
+    end
+    describe ".lazy_reify_solr_results" do
+      it "should lazily reify solr results" do
+        expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
+        expect(AudioRecord).to receive(:find).with("my:_ID2_", cast: true)
+        expect(AudioRecord).to receive(:find).with("my:_ID3_", cast: true)
+        ActiveFedora::QueryResultBuilder.lazy_reify_solr_results(@sample_solr_hits).each {|r| r}
+      end
+    end
+  end
+
+end

data/spec/unit/query_spec.rb

@@ -7,8 +7,8 @@ describe ActiveFedora::Base do
       class Basic < ActiveFedora::Base
       end
     end
-    @model_query = "_query_:\"{!raw f=" + ActiveFedora::SolrService.solr_name("has_model", :symbol) + "}SpecModel::Basic" + "\""
-    @sort_query = ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date) + ' asc'
+    @model_query = "_query_:\"{!raw f=" + ActiveFedora::SolrQueryBuilder.solr_name("has_model", :symbol) + "}SpecModel::Basic" + "\""
+    @sort_query = ActiveFedora::SolrQueryBuilder.solr_name("system_create", :stored_sortable, type: :date) + ' asc'
   end
 
   after(:all) do

data/spec/unit/rdf_vocab_spec.rb

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe ActiveFedora::RDF do
+  describe ActiveFedora::RDF::Fcrepo do
+    it "should register the vocabularies" do
+      namespaces = [
+        "info:fedora/fedora-system:def/model#",
+        "info:fedora/fedora-system:def/view#",
+        "info:fedora/fedora-system:def/relations-external#",
+        "info:fedora/fedora-system:"
+      ]
+      namespaces.each do |namespace|
+        vocab = RDF::Vocabulary.find(namespace)
+        expect(vocab.superclass).to be(RDF::StrictVocabulary)
+      end
+    end
+  end
+  describe ActiveFedora::RDF::ProjectHydra do
+    it "should register the vocabularies" do
+      namespaces = [
+        "http://projecthydra.org/ns/relations#"
+      ]
+      namespaces.each do |namespace|
+        vocab = RDF::Vocabulary.find(namespace)
+        expect(vocab.superclass).to be(RDF::StrictVocabulary)
+      end
+    end
+  end
+end

data/spec/unit/simple_datastream_spec.rb

@@ -58,8 +58,8 @@ describe ActiveFedora::SimpleDatastream do
   describe "#to_solr" do
     it "should have title" do
       solr = @test_ds.to_solr
-      expect(solr[ActiveFedora::SolrService.solr_name('publisher', type: :string)]).to eq "publisher1"
-      expect(solr[ActiveFedora::SolrService.solr_name('creation_date', type: :date)]).to eq "2012-01-15"
+      expect(solr[ActiveFedora::SolrQueryBuilder.solr_name('publisher', type: :string)]).to eq "publisher1"
+      expect(solr[ActiveFedora::SolrQueryBuilder.solr_name('creation_date', type: :date)]).to eq "2012-01-15"
     end
   end
 

data/spec/unit/solr_config_options_spec.rb

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

data/spec/unit/solr_query_builder_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe SolrQueryBuilder do
+  describe "raw_query" do
+    it "should generate a raw query clause" do
+      expect(ActiveFedora::SolrQueryBuilder.raw_query('id', "my:_ID1_")).to eq '_query_:"{!raw f=id}my:_ID1_"'
+    end
+  end
+
+  describe '#construct_query_for_ids' do
+    it "should generate a useable solr query from an array of Fedora ids" do
+      expect(ActiveFedora::SolrQueryBuilder.construct_query_for_ids(["my:_ID1_", "my:_ID2_", "my:_ID3_"])).to eq '_query_:"{!raw f=id}my:_ID1_" OR _query_:"{!raw f=id}my:_ID2_" OR _query_:"{!raw f=id}my:_ID3_"'
+
+    end
+    it "should return a valid solr query even if given an empty array as input" do
+      expect(ActiveFedora::SolrQueryBuilder.construct_query_for_ids([""])).to eq "id:NEVER_USE_THIS_ID"
+    end
+  end
+
+end

data/spec/unit/solr_service_spec.rb

@@ -4,11 +4,11 @@ describe ActiveFedora::SolrService do
   before do
     Thread.current[:solr_service]=nil
   end
-  
+
   after(:all) do
     ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
   end
-  
+
   it "should take a n-arg constructor and configure for localhost" do
     expect(RSolr).to receive(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr')
     ActiveFedora::SolrService.register
@@ -34,57 +34,6 @@ describe ActiveFedora::SolrService do
     expect(proc{ActiveFedora::SolrService.instance}).to raise_error(ActiveFedora::SolrNotInitialized)
   end
 
-  describe "reify solr results" do
-    before(:all) do
-      class AudioRecord
-        attr_accessor :id
-        def self.connection_for_id(id)
-        end
-      end
-      @sample_solr_hits = [{"id"=>"my:_ID1_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["AudioRecord"]},
-                           {"id"=>"my:_ID2_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["AudioRecord"]},
-                           {"id"=>"my:_ID3_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["AudioRecord"]}]
-    end
-    describe ".reify_solr_result" do
-      it "should use .find to instantiate objects" do
-        expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
-        ActiveFedora::SolrService.reify_solr_result(@sample_solr_hits.first)
-      end
-    end
-    describe ".reify_solr_results" do
-      it "should use AudioRecord.find to instantiate objects" do
-        expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
-        expect(AudioRecord).to receive(:find).with("my:_ID2_", cast: true)
-        expect(AudioRecord).to receive(:find).with("my:_ID3_", cast: true)
-        ActiveFedora::SolrService.reify_solr_results(@sample_solr_hits)
-      end
-    end
-    describe ".lazy_reify_solr_results" do
-      it "should lazily reify solr results" do
-        expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
-        expect(AudioRecord).to receive(:find).with("my:_ID2_", cast: true)
-        expect(AudioRecord).to receive(:find).with("my:_ID3_", cast: true)
-        ActiveFedora::SolrService.lazy_reify_solr_results(@sample_solr_hits).each {|r| r}
-      end
-    end
-  end
-
-  describe "raw_query" do
-    it "should generate a raw query clause" do
-      expect(ActiveFedora::SolrService.raw_query('id', "my:_ID1_")).to eq '_query_:"{!raw f=id}my:_ID1_"'
-    end
-  end
-
-  describe '#construct_query_for_ids' do
-    it "should generate a useable solr query from an array of Fedora ids" do
-      expect(ActiveFedora::SolrService.construct_query_for_ids(["my:_ID1_", "my:_ID2_", "my:_ID3_"])).to eq '_query_:"{!raw f=id}my:_ID1_" OR _query_:"{!raw f=id}my:_ID2_" OR _query_:"{!raw f=id}my:_ID3_"'
-
-    end
-    it "should return a valid solr query even if given an empty array as input" do
-      expect(ActiveFedora::SolrService.construct_query_for_ids([""])).to eq "id:NEVER_USE_THIS_ID"
-    end
-  end
-
   describe '#construct_query_for_pids' do
     it "should generate a useable solr query from an array of Fedora ids" do
       expect(Deprecation).to receive(:warn)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta2
+  version: 9.0.0.beta3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -347,15 +347,18 @@ files:
 - lib/active_fedora/predicates.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
+- lib/active_fedora/query_result_builder.rb
 - lib/active_fedora/querying.rb
 - lib/active_fedora/railtie.rb
 - lib/active_fedora/rdf.rb
 - lib/active_fedora/rdf/datastream_indexing.rb
 - lib/active_fedora/rdf/fcrepo.rb
+- lib/active_fedora/rdf/fcrepo4.rb
 - lib/active_fedora/rdf/indexing.rb
 - lib/active_fedora/rdf/ldp.rb
 - lib/active_fedora/rdf/ntriples_rdf_datastream.rb
 - lib/active_fedora/rdf/persistence.rb
+- lib/active_fedora/rdf/project_hydra.rb
 - lib/active_fedora/rdf/rdf_datastream.rb
 - lib/active_fedora/rdf/rdfxml_datastream.rb
 - lib/active_fedora/rdf/rels_ext.rb
@@ -377,6 +380,7 @@ files:
 - lib/active_fedora/serialization.rb
 - lib/active_fedora/simple_datastream.rb
 - lib/active_fedora/solr_instance_loader.rb
+- lib/active_fedora/solr_query_builder.rb
 - lib/active_fedora/solr_service.rb
 - lib/active_fedora/sparql_insert.rb
 - lib/active_fedora/test_support.rb
@@ -443,12 +447,12 @@ files:
 - spec/integration/ntriples_datastream_spec.rb
 - spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
+- spec/integration/query_result_builder_spec.rb
 - spec/integration/rdf_nested_attributes_spec.rb
 - spec/integration/relation_delegation_spec.rb
 - spec/integration/relation_spec.rb
 - spec/integration/scoped_query_spec.rb
 - spec/integration/solr_instance_loader_spec.rb
-- spec/integration/solr_service_spec.rb
 - spec/integration/versionable_spec.rb
 - spec/integration/with_metadata_spec.rb
 - spec/rcov.opts
@@ -503,9 +507,11 @@ files:
 - spec/unit/predicates_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
+- spec/unit/query_result_builder_spec.rb
 - spec/unit/query_spec.rb
 - spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_resource_datastream_spec.rb
+- spec/unit/rdf_vocab_spec.rb
 - spec/unit/rdfxml_datastream_spec.rb
 - spec/unit/readonly_spec.rb
 - spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb
@@ -514,6 +520,7 @@ files:
 - spec/unit/serializers_spec.rb
 - spec/unit/simple_datastream_spec.rb
 - spec/unit/solr_config_options_spec.rb
+- spec/unit/solr_query_builder_spec.rb
 - spec/unit/solr_service_spec.rb
 - spec/unit/sparql_insert_spec.rb
 - spec/unit/validations_spec.rb
@@ -537,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.