active-fedora 1.2.7 → 1.2.8

data/VERSION

@@ -1 +1 @@
-1.2.7
+1.2.8

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.2.7"
+  s.version = "1.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-11-14}
+  s.date = %q{2010-12-15}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [

data/lib/active_fedora/base.rb

@@ -56,12 +56,19 @@ module ActiveFedora
     
     # Constructor. If +attrs+  does  not comtain +:pid+, we assume we're making a new one,
     # and call off to the Fedora Rest API for the next available Fedora pid, and mark as new object.
+    # Also, if +attrs+ does not contain +:pid+ but does contain +:namespace+ it will pass the
+    # +:namespace+ value to Fedora::Repository.nextid to generate the next pid available within
+    # the given namespace.
     # 
     # If there is a pid, we're re-hydrating an existing object, and new object is false. Once the @inner_object is stored,
     # we configure any defined datastreams.
     def initialize(attrs = {})
       unless attrs[:pid]
-        attrs = attrs.merge!({:pid=>Fedora::Repository.instance.nextid})  
+        if attrs[:namespace]
+          attrs = attrs.merge!({:pid=>Fedora::Repository.instance.nextid({:namespace=>attrs[:namespace]})})
+        else
+          attrs = attrs.merge!({:pid=>Fedora::Repository.instance.nextid})  
+        end
         @new_object=true
       else
         @new_object = attrs[:new_object] == false ? false : true

data/lib/active_fedora/content_model.rb

@@ -13,8 +13,16 @@ module ActiveFedora
     
     def self.pid_from_ruby_class(klass,attrs={})
       sanitized_class_name = klass.name.gsub(/(::)/, '_')
-      pid_suffix = attrs.has_key?(:pid_suffix) ? attrs[:pid_suffix] : CMODEL_PID_SUFFIX
-      namespace = attrs.has_key?(:namespace) ? attrs[:namespace] : CMODEL_NAMESPACE   
+      unless klass.respond_to? :pid_suffix
+        pid_suffix = attrs.has_key?(:pid_suffix) ? attrs[:pid_suffix] : CMODEL_PID_SUFFIX
+      else
+        pid_suffix = klass.pid_suffix
+      end
+      unless klass.respond_to? :pid_namespace
+        namespace = attrs.has_key?(:namespace) ? attrs[:namespace] : CMODEL_NAMESPACE   
+      else
+        namespace = klass.pid_namespace
+      end
       return "#{namespace}:#{sanitized_class_name}#{pid_suffix}" 
     end
     
@@ -71,4 +79,4 @@ module ActiveFedora
     end
     
   end
-end
+end

data/lib/active_fedora/model.rb

@@ -53,21 +53,32 @@ module ActiveFedora
       # Takes :all or a pid as arguments
       # Returns an Array of objects of the Class that +find+ is being 
       # called on
-      def find(args)
+      def find(args, opts={})
+        opts = {:rows=>25}.merge(opts)
+        return_multiple = false
         if args == :all
+          return_multiple = true
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
           q = "#{ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}"
         elsif args.class == String
           escaped_id = args.gsub(/(:)/, '\\:')
           q = "#{SOLR_DOCUMENT_ID}:#{escaped_id}"
         end
-        hits = SolrService.instance.conn.query(q).hits 
+        if return_multiple == true
+          hits = SolrService.instance.conn.query(q, :rows=>opts[:rows]).hits 
+        else
+          hits = SolrService.instance.conn.query(q).hits 
+        end
         results = hits.map do |hit|
           obj = Fedora::Repository.instance.find_model(hit[SOLR_DOCUMENT_ID], self)
           #obj.inner_object.new_object = false
           #return obj
         end
-        results.first
+        if return_multiple == true
+          return results
+        else
+          return results.first
+        end
       end
 
       #Sends a query directly to SolrService

data/lib/active_fedora/semantic_node.rb

@@ -606,8 +606,9 @@ module ActiveFedora
       def create_inbound_relationship_finders(name, predicate, opts = {})
         class_eval <<-END
         def #{name}(opts={})
+          opts = {:rows=>25}.merge(opts)
           escaped_uri = self.internal_uri.gsub(/(:)/, '\\:')
-          solr_result = SolrService.instance.conn.query("#{predicate}_s:\#{escaped_uri}")
+          solr_result = SolrService.instance.conn.query("#{predicate}_s:\#{escaped_uri}", :rows=>opts[:rows])
           if opts[:response_format] == :solr
             return solr_result
           else
@@ -684,6 +685,7 @@ module ActiveFedora
 
         class_eval <<-END
         def #{name}(opts={})
+          opts = {:rows=>25}.merge(opts)
           if opts[:response_format] == :solr || opts[:response_format] == :load_from_solr
             escaped_uri = self.internal_uri.gsub(/(:)/, '\\:')
             query = "#{inbound_predicate}_s:\#{escaped_uri}"
@@ -691,7 +693,7 @@ module ActiveFedora
             outbound_id_array = #{outbound_method_name}(:response_format=>:id_array)
             query = query + " OR " + ActiveFedora::SolrService.construct_query_for_pids(outbound_id_array)
             
-            solr_result = SolrService.instance.conn.query(query)
+            solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
             
             if opts[:response_format] == :solr
               return solr_result

data/lib/fedora/repository.rb

@@ -116,8 +116,10 @@ module Fedora
       object.new_object? ? create(object) : update(object)
     end
 
-    def nextid
-      d = REXML::Document.new(connection.post(fedora_url.path+"/management/getNextPID?xml=true").body)
+    def nextid(attrs={})
+      request_url = fedora_url.path+"/management/getNextPID?xml=true"
+      request_url += "&namespace=#{attrs[:namespace]}" if attrs[:namespace]
+      d = REXML::Document.new(connection.post(request_url).body)
       d.elements['//pid'].text
     end
 

data/script/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # File: script/console
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
+ENV["RUBYLIB"] = "lib"
 libs =  " -r irb/completion"
 libs << " -r #{File.dirname(__FILE__) + '/../spec/spec_helper'}"
 #libs << " -r rubygems"

data/spec/integration/base_spec.rb

@@ -70,10 +70,18 @@ describe ActiveFedora::Base do
     end
   end
   
-  
-  it "calling constructor should create a new Fedora Object" do    
-    @test_object.should have(0).errors
-    @test_object.pid.should_not be_nil
+  describe ".initialize" do
+    it "calling constructor should create a new Fedora Object" do    
+      @test_object.should have(0).errors
+      @test_object.pid.should_not be_nil
+    end
+
+    it "passing namespace to constructor with no pid should generate a pid with the supplied namespace" do
+      @test_object2 = ActiveFedora::Base.new({:namespace=>"randomNamespace"})
+      #@test_object2.pid.match('changeme:\d+').to_a.first.should == @test_object2.pid
+      # will be nil if match failed, otherwise will equal pid
+      @test_object2.pid.match('randomNamespace:\d+').to_a.first.should == @test_object2.pid
+    end
   end
   
   describe ".save" do

data/spec/unit/base_spec.rb

@@ -35,6 +35,7 @@ describe ActiveFedora::Base do
 
   after(:each) do
     begin
+    ActiveFedora::SolrService.stubs(:instance)
     @test_object.delete
     rescue
     end

data/spec/unit/content_model_spec.rb

@@ -50,6 +50,14 @@ describe ActiveFedora::ContentModel do
      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == "afmodel:ActiveFedora_ContentModel"
      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class, :namespace => "foo", :pid_suffix => "BarBar").should == "foo:ActiveFedora_ContentModelBarBar"
     end
+    it "should construct pids with the namespace declared in the model" do
+      ActiveFedora::ContentModel.stubs(:pid_namespace).returns("test-cModel")
+      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == "test-cModel:ActiveFedora_ContentModel"
+    end
+    it "should construct pids with the suffix declared in the model" do
+      ActiveFedora::ContentModel.stubs(:pid_suffix).returns("-TEST-SUFFIX")
+      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == 'afmodel:ActiveFedora_ContentModel-TEST-SUFFIX'
+    end
   end
   
   describe "models_asserted_by" do

data/spec/unit/model_spec.rb

@@ -103,11 +103,11 @@ describe ActiveFedora::Model do
       mock_solr = mock("SolrConnection")
       mock_result = mock("MockResult")
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
-      mock_solr.expects(:query).with('active_fedora_model_s:SpecModel\:\:Basic').returns(mock_result)
+      mock_solr.expects(:query).with('active_fedora_model_s:SpecModel\:\:Basic', :rows=>1001).returns(mock_result)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
-      Fedora::Repository.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object")
-      Fedora::Repository.instance.expects(:find_model).with("changeme:22", SpecModel::Basic).returns("Fake Object")
-      SpecModel::Basic.find(:all)
+      Fedora::Repository.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object1")
+      Fedora::Repository.instance.expects(:find_model).with("changeme:22", SpecModel::Basic).returns("Fake Object2")
+      SpecModel::Basic.find(:all, :rows=>1001).should == ["Fake Object1", "Fake Object2"]
     end
     
     it "(String) should query solr for an object with the given id and return that object" do

data/spec/unit/semantic_node_spec.rb

@@ -244,7 +244,7 @@ describe ActiveFedora::SemanticNode do
       SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
       local_node = SpecNode.new()
       local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
-      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid").returns(solr_result)
+      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(solr_result)
       Fedora::Repository.expects(:instance).returns(mock_repo).times(3)
       Kernel.expects(:const_get).with("AudioRecord").returns("AudioRecord").times(3)
       local_node.parts.should == ["AR1", "AR2", "AR3"]
@@ -257,8 +257,8 @@ describe ActiveFedora::SemanticNode do
       mock_repo = mock("repo")
       mock_repo.expects(:find_model).never
       local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
-      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid").returns(solr_result)
-      local_node.constituents(:response_format => :solr).should equal(solr_result)
+      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid", :rows=>101).returns(solr_result)
+      local_node.constituents(:response_format => :solr, :rows=>101).should equal(solr_result)
     end
     
     
@@ -266,7 +266,7 @@ describe ActiveFedora::SemanticNode do
       SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
       local_node = SpecNode.new
       local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
-      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid").returns(mock("solr result", :hits => [Hash["id"=>"pid1"], Hash["id"=>"pid2"]]))
+      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(mock("solr result", :hits => [Hash["id"=>"pid1"], Hash["id"=>"pid2"]]))
       local_node.parts(:response_format => :id_array).should == ["pid1", "pid2"]
     end
     
@@ -366,21 +366,21 @@ describe ActiveFedora::SemanticNode do
       @local_node.should respond_to(:all_parts_outbound)
     end
     it "should rely on inbound & outbound finders" do      
-      @local_node.expects(:all_parts_inbound).returns(["foo1"])
-      @local_node.expects(:all_parts_outbound).returns(["foo2"])
+      @local_node.expects(:all_parts_inbound).with(:rows => 25).returns(["foo1"])
+      @local_node.expects(:all_parts_outbound).with(:rows => 25).returns(["foo2"])
       @local_node.all_parts.should == ["foo1", "foo2"]
     end
     it "(:response_format => :id_array) should rely on inbound & outbound finders" do
-      @local_node.expects(:all_parts_inbound).with(:response_format=>:id_array).returns(["fooA"])
-      @local_node.expects(:all_parts_outbound).with(:response_format=>:id_array).returns(["fooB"])
-      @local_node.all_parts(:response_format=>:id_array).should == ["fooA", "fooB"]
+      @local_node.expects(:all_parts_inbound).with(:response_format=>:id_array, :rows => 34).returns(["fooA"])
+      @local_node.expects(:all_parts_outbound).with(:response_format=>:id_array, :rows => 34).returns(["fooB"])
+      @local_node.all_parts(:response_format=>:id_array, :rows => 34).should == ["fooA", "fooB"]
     end
     it "(:response_format => :solr) should construct a solr query that combines inbound and outbound searches" do
       # get the id array for outbound relationships then construct solr query by combining id array with inbound relationship search
       @local_node.expects(:all_parts_outbound).with(:response_format=>:id_array).returns(["mypid:1"])
       id_array_query = ActiveFedora::SolrService.construct_query_for_pids(["mypid:1"])
       solr_result = mock("solr result")
-      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid OR #{id_array_query}").returns(solr_result)
+      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid OR #{id_array_query}", :rows=>25).returns(solr_result)
       @local_node.all_parts(:response_format=>:solr)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 2
-  - 7
-  version: 1.2.7
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-14 00:00:00 -05:00
+date: 2010-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency