active-fedora 4.0.0.rc4 → 4.0.0.rc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc4)
+    active-fedora (4.0.0.rc5)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc4
+4.0.0.rc5
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed

data/NOKOGIRI_DATASTREAMS.textile

@@ -20,13 +20,13 @@ h2. Setup
 
 This tutorial assumes that you've run script/console from the root of ActiveFedora and have imported the hydrangea:fixture_mods_article1 object.  If you haven't done that, see "CONSOLE_GETTING_STARTED":http://hudson.projecthydra.org/job/active_fedora/Documentation/file.CONSOLE_GETTING_STARTED.html for instructions.
 
-The model definition we're using in this tutorial is {SpecialThing} ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/lib/active_fedora/samples/special_thing.rb )
+The model definition we're using in this tutorial is SpecialThing ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/special_thing.rb )
 
 
 Look in these datastream definitions to see the OM Terminologies they define.  They have extra comments in the code:
-* {Hydra::ModsArticleDatastream} ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/lib/active_fedora/samples/hydra-mods_article_datastream.rb ) 
-* {Hydra::RightsMetadataDatastream} ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/lib/active_fedora/samples/hydra-rights_metadata_datastream.rb }
-* {Marpa::DcDatastream} ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/lib/active_fedora/samples/marpa-dc_datastream.rb )
+* Hydra::ModsArticleDatastream ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/hydra-mods_article_datastream.rb ) 
+* Hydra::RightsMetadataDatastream ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/hydra-rights_metadata_datastream.rb }
+* Marpa::DcDatastream ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/marpa-dc_datastream.rb )
 
 
 h2. Using Existing OM Terminology

data/lib/active_fedora/model.rb

@@ -262,7 +262,7 @@ module ActiveFedora
 
       private 
       # Retrieve the Fedora object with te given pid, explore the returned object, determine its model 
-      # using #{known_models_for} and cast to that class.
+      # using #{ActiveFedora::ContentModel.known_models_for} and cast to that class.
       # @param [String] pid of the object to load
       #
       # @example because the object hydra:dataset1 asserts it is a Dataset (hasModel info:fedora/afmodel:Dataset), return a Dataset object (not a Book).

data/lib/active_fedora/solr_service.rb

@@ -72,7 +72,7 @@ module ActiveFedora
 
     def self.query(query, args={})
       raw = args.delete(:raw)
-      args = args.merge(:q=>query)
+      args = args.merge(:q=>query, :qt=>'standard')
       result = SolrService.instance.conn.get('select', :params=>args)
       return result if raw
       result['response']['docs']

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc4"
+    VERSION = "4.0.0.rc5"
 end

data/spec/unit/solr_service_spec.rb

@@ -74,5 +74,15 @@ describe ActiveFedora::SolrService do
       ActiveFedora::SolrService.escape_uri_for_query("my:pid").should == 'my\:pid'
     end
   end
+
+  describe ".query" do
+    it "should call rubydora" do 
+      mock_conn = mock("Connection")
+      stub_result = stub("Result")
+      mock_conn.expects(:get).with('select', :params=>{:q=>'querytext', :qt=>'standard'}).returns(stub_result)
+      ActiveFedora::SolrService.stubs(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.query('querytext', :raw=>true).should == stub_result
+    end
+  end
   
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424157
+  hash: 15424159
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 4
-  version: 4.0.0.rc4
+  - 5
+  version: 4.0.0.rc5
 platform: ruby
 authors: 
 - Matt Zumwalt