active-fedora 3.1.0.pre12 → 3.1.0.pre13

data/lib/active_fedora/rels_ext_datastream.rb

@@ -56,7 +56,6 @@ module ActiveFedora
           writer << statement
         end
       end
-
       xml
 
     end

data/lib/active_fedora/semantic_node.rb

@@ -42,13 +42,14 @@ module ActiveFedora
     end
 
     # Create an RDF statement
-    # @param pid a string represending the pid of the subject
+    # @param uri a string represending the subject
     # @param predicate a predicate symbol
     # @param target an object to store
-    def build_statement(pid, predicate, target)
-      raise "Not allowed anymore" if pid == :self
+    def build_statement(uri, predicate, target)
+      raise "Not allowed anymore" if uri == :self
+      raise "Doesn't seem to be a URI(#{uri})" unless /^info/.match(uri)
       target = target.internal_uri if target.respond_to? :internal_uri
-      subject =  RDF::URI.new(pid)  #TODO cache
+      subject =  RDF::URI.new(uri)  #TODO cache
       begin
         literal = URI.parse(target).scheme.nil?
       rescue URI::InvalidURIError
@@ -147,7 +148,10 @@ module ActiveFedora
     end
     
     def relationships
-      @subject ||=  RDF::URI.new(internal_uri)
+      unless @subject 
+        raise "Must have internal_uri" unless internal_uri
+        @subject =  RDF::URI.new(internal_uri)
+      end
       @relationships ||= RDF::Graph.new
       load_relationships if !relationships_loaded
       @relationships

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre12"
+    VERSION = "3.1.0.pre13"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -31,7 +31,7 @@ task :hudson do
   Rake::Task["active_fedora:doc"].invoke
   Rake::Task["active_fedora:configure_jetty"].invoke
   jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 20
+  jetty_params[:startup_wait]= 30
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task["active_fedora:load_fixtures"].invoke
     Rake::Task["active_fedora:rspec"].invoke

data/spec/unit/semantic_node_spec.rb

@@ -9,6 +9,9 @@ class SpecNode2
   include ActiveFedora::SemanticNode
   
   attr_accessor :pid
+  def internal_uri
+    'info:fedora/' + pid.to_s
+  end
 end
 
 describe ActiveFedora::SemanticNode do
@@ -34,6 +37,9 @@ describe ActiveFedora::SemanticNode do
       def initialize (params={}) 
         self.pid = params[:pid]
       end
+      def internal_uri
+        'info:fedora/' + pid.to_s
+      end
     end
   
     class AudioRecord
@@ -41,6 +47,9 @@ describe ActiveFedora::SemanticNode do
       def initialize (params={}) 
         self.pid = params[:pid]
       end
+      def internal_uri
+        'info:fedora/' + pid.to_s
+      end
     end
     
     @node = SpecNode.new
@@ -367,7 +376,6 @@ describe ActiveFedora::SemanticNode do
         local_node = SpecNode.new
         mock_repo = mock("repo")
         mock_repo.expects(:find_model).never
-        local_node.stubs(:internal_uri)
         local_node.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
         ActiveFedora::SolrService.instance.conn.expects(:query).returns(solr_result)
         local_node.constituents(:response_format => :solr).should equal(solr_result)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832001
+  hash: 1923832003
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 12
-  version: 3.1.0.pre12
+  - 13
+  version: 3.1.0.pre13
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 -05:00
+date: 2011-10-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency