active-fedora 7.0.0.rc2 → 7.0.0.rc3

data/lib/active_fedora/relation.rb

@@ -57,6 +57,7 @@ module ActiveFedora
       args[:sort] = order_values if order_values
       
       @records = to_enum(:find_each, where_values, args).to_a
+      @loaded = true
 
       @records
     end

data/lib/active_fedora/relation/finder_methods.rb

@@ -151,9 +151,8 @@ module ActiveFedora
       if where_values.empty?
         load_from_fedora(pid, cast)
       else
-        query = [ActiveFedora::SolrService.construct_query_for_rel(where_values),
-                 ActiveFedora::SolrService.raw_query(SOLR_DOCUMENT_ID, pid)].
-                join(" AND ".freeze)
+        conditions = where_values + [ActiveFedora::SolrService.raw_query(SOLR_DOCUMENT_ID, pid)]
+        query = conditions.join(" AND ".freeze)
         to_enum(:find_each, query, {}).to_a.first
       end
     end
@@ -196,18 +195,27 @@ module ActiveFedora
     # Returns a solr query for the supplied conditions
     # @param[Hash] conditions solr conditions to match
     def create_query(conditions)
-      conditions.kind_of?(Hash) ? create_query_from_hash(conditions) : create_query_from_string(conditions)
+        case conditions
+        when Hash
+          build_query([create_query_from_hash(conditions)])
+        when String
+          build_query(["(#{conditions})"])
+        else
+          build_query(conditions)
+        end
     end
 
-    def create_query_from_hash(conditions)
+    def build_query(conditions)
       clauses = search_model_clause ?  [search_model_clause] : []
-      conditions.each_pair do |key,value|
-        clauses << condition_to_clauses(key, value)
-      end
+      clauses += conditions.reject{|c| c.blank?}
       return "*:*" if clauses.empty?
       clauses.compact.join(" AND ")
     end
 
+    def create_query_from_hash(conditions)
+      conditions.map {|key,value| condition_to_clauses(key, value)}.compact.join(" AND ")
+    end
+
     def condition_to_clauses(key, value)
       unless value.nil?
         # if the key is a property name, turn it into a solr field
@@ -227,15 +235,6 @@ module ActiveFedora
       end
     end
 
-    def create_query_from_string(conditions)
-      model_clause = search_model_clause
-      if model_clause 
-        conditions ? "#{model_clause} AND (#{conditions})" : model_clause
-      else
-        conditions
-      end
-    end
-
     # Return the solr clause that queries for this type of class
     def search_model_clause
       unless @klass == ActiveFedora::Base

data/lib/active_fedora/relation/merger.rb

@@ -14,7 +14,7 @@ module ActiveFedora
 
       def merge
         # TODO merge order
-        relation.where_values = relation.where_values.merge(other.where_values)
+        relation.where_values += other.where_values
         relation
       end
     end

data/lib/active_fedora/relation/query_methods.rb

@@ -11,7 +11,7 @@ module ActiveFedora
     end
 
     def where_values
-      @values[:where] ||= {}
+      @values[:where] ||= []
     end
 
     def where_values=(values)
@@ -49,12 +49,20 @@ module ActiveFedora
     end
 
     def where!(values)
-      if values.is_a?(String)
-        self.where_values = values
+      self.where_values += build_where(values)
+      self
+    end
+
+    def build_where(values)
+      return [] if values.blank?
+      case values
+      when Hash
+        [create_query_from_hash(values)]
+      when String
+        ["(#{values})"]
       else
-        self.where_values = self.where_values.merge(values)
+        [values]
       end
-      self
     end
 
     # Order the returned records by the field and direction provided

data/lib/active_fedora/reload_on_save.rb

@@ -0,0 +1,16 @@
+module ActiveFedora #:nodoc:
+  # = Active Fedora Reload On Save
+  module ReloadOnSave
+
+    attr_writer :reload_on_save
+
+    def reload_on_save?
+      !!@reload_on_save
+    end
+
+    def refresh
+      self.reload if reload_on_save?
+    end
+  end
+end
+

data/lib/active_fedora/rubydora_connection.rb

@@ -15,7 +15,6 @@ module ActiveFedora
       return unless @connection.nil? or force
       allowable_options = [:url, :user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key, :validateChecksum]
       client_options = options.reject { |k,v| not allowable_options.include?(k) }
-      #puts "CLIENT OPTS #{client_options.inspect}"
       @connection = Rubydora.connect client_options
 
       Rubydora::Transaction.after_rollback do |options|

data/lib/active_fedora/sharding.rb

@@ -8,7 +8,7 @@ module ActiveFedora
     end
 
     module ClassMethods
-      # Uses {shard_index} to find or create the rubydora connection for this pid
+      # Uses {#shard_index} to find or create the rubydora connection for this pid
       # @param [String] pid the identifier of the object to get the connection for
       # @return [Rubydora::Repository] The repository that the identifier exists in.
       def connection_for_pid(pid)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.0.0.rc2"
+  VERSION = "7.0.0.rc3"
 end

data/script/console

@@ -1,15 +1,14 @@
 #!/usr/bin/env ruby
 # File: script/console
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-ENV["RUBYLIB"] = "lib"
-libs =  " -r irb/completion"
-libs << " -r rubygems"
-libs << " -r #{File.dirname(__FILE__) + '/../spec/spec_helper'}"
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/active_fedora.rb'}"
-
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-# libs <<  " -r #{File.dirname(__FILE__) + '/../lib/afed-regem.rb'}"
-# puts "Loading afed-regem gem"
-exec "#{irb} #{libs} --simple-prompt"
+
+requires = %w{ irb/completion samples/samples }
+includes = %w{ lib spec }
+
+def to_param(flag, items)
+  items.map{|lib| "#{flag} #{lib}"}.join(' ')
+end
+
+exec "#{irb} #{to_param('-I', includes)} #{to_param('-r', requires)} --simple-prompt"
+
 

data/spec/config_helper.rb

@@ -2,7 +2,7 @@ def mock_yaml(hash, path)
   mock_file = double(path.split("/")[-1])
   File.stub(:exist?).with(path).and_return(true)
   File.stub(:open).with(path).and_return(mock_file)
-  YAMLAdaptor.stub(:load).and_return(hash)
+  Psych.stub(:load).and_return(hash)
 end
 
 def default_predicate_mapping_file

data/spec/fixtures/solr_rdf_descMetadata.nt

@@ -1,4 +1,4 @@
-<info:fedora/test:1> <http://purl.org/dc/terms/created> "2009-10-10" .
+<info:fedora/test:1> <http://purl.org/dc/terms/created> "2009-10-10"^^<http://www.w3.org/2001/XMLSchema#date> .
 <info:fedora/test:1> <http://purl.org/dc/terms/title> "fake-title" .
 <info:fedora/test:1> <http://purl.org/dc/terms/publisher> "publisher1" .
 <info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "coverage1" .

data/spec/integration/auditable_spec.rb

@@ -22,7 +22,7 @@ describe ActiveFedora::Auditable do
     record.action.should == "addDatastream"
     record.component_id.should == "RELS-EXT"
     record.responsibility.should == "fedoraAdmin"
-    record.date.should == @test_object.modified_date
+    expect(DateTime.parse(record.date)).to eq DateTime.parse(@test_object.modified_date)
     record.justification.should == ""
   end
   

data/spec/integration/base_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "A base object with metadata" do
   before :all do
     class MockAFBaseRelationship < ActiveFedora::Base
-      has_metadata :name=>'foo', :type=>Hydra::ModsArticleDatastream 
+      has_metadata 'foo', type: Hydra::ModsArticleDatastream 
     end
   end
   after :all do
@@ -20,7 +20,7 @@ describe "A base object with metadata" do
       obj = ActiveFedora::Base.find(@obj.pid)
       obj.foo.should_not be_new
       obj.foo.person.should == ['bob']
-      person_field = ActiveFedora::SolrService.solr_name('person', type: :string)
+      person_field = ActiveFedora::SolrService.solr_name('foo__person', type: :string)
       solr_result = ActiveFedora::SolrService.query("{!raw f=id}#{@obj.pid}", :fl=>"id #{person_field}").first
       expect(solr_result).to eq("id"=>@obj.pid, person_field =>['bob'])
     end
@@ -51,7 +51,7 @@ describe "A base object with metadata" do
       end
       it "should save the datastream." do
         MockAFBaseRelationship.find(@release.pid).foo.person.should == ['frank']
-        person_field = ActiveFedora::SolrService.solr_name('person', type: :string)
+        person_field = ActiveFedora::SolrService.solr_name('foo__person', type: :string)
         ActiveFedora::SolrService.query("id:#{@release.pid.gsub(":", "\\:")}", :fl=>"id #{person_field}").first.should == {"id"=>@release.pid, person_field =>['frank']}
       end
     end
@@ -248,6 +248,24 @@ describe ActiveFedora::Base do
       inner_object.pid.should == @test_object2.pid
       inner_object.should respond_to(:lastModifiedDate)
     end
+
+    it 'when the object is updated, it also updates modification time field in solr' do
+      @test_object2.save
+
+      # Make sure the modification time changes by at least 1 second
+      sleep 1
+
+      @test_object2.state = 'I' 
+      @test_object2.save
+      @test_object2.reload
+
+      pid = @test_object2.pid.sub(':', '\:')
+      solr_doc = ActiveFedora::SolrService.query("id:#{pid}")
+
+      new_time_fedora = Time.parse(@test_object2.modified_date).to_i
+      new_time_solr = Time.parse(solr_doc.first['system_modified_dtsi']).to_i
+      new_time_solr.should == new_time_fedora
+    end
   end
   
   describe ".datastreams" do

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -2,29 +2,24 @@ require 'spec_helper'
 
 describe "Nested Rdf Objects" do
   describe "without type" do
-    before(:each) do 
+    before(:each) do
       class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-        map_predicates do |map|
-          map.parts(:in=> RDF::DC, :to=>'hasPart', :class_name=>'Component')
-        end
+        property :parts, predicate: RDF::DC.hasPart, class_name: 'Component'
 
-        class Component
-          include ActiveFedora::RdfObject
-          map_predicates do |map|
-            map.label(:in=> RDF::DC, :to=>'title')
-          end
+        class Component < ActiveFedora::Rdf::Resource
+          property :label, predicate: RDF::DC.title
         end
       end
 
     end
-    
+
     after(:each) do
       Object.send(:remove_const, :SpecDatastream)
     end
 
     let (:ds) do
-      mock_obj = double(:mock_obj, :pid=>'test:124', :new_record? => true)
-      ds = SpecDatastream.new(mock_obj)
+      test_obj = ActiveFedora::Base.new(pid: 'test:124')
+      ds = SpecDatastream.new(test_obj, 'descMd')
     end
 
     describe "#new_record?" do
@@ -36,16 +31,11 @@ describe "Nested Rdf Objects" do
       it "should not be new when it's loaded from fedora" do
         ds.content = '_:g70324142325120 <http://purl.org/dc/terms/title> "Alternator" .
 <info:fedora/test:124> <http://purl.org/dc/terms/hasPart> _:g70324142325120 .'
+        ds.resource.persist!
         ds.parts.first.should_not be_new_record
       end
     end
 
-    it "should not choke on invalid data" do
-      # set a string in the graph where model expects a node
-      ds.parts = ["foo"]
-      expect {ds.parts.inspect}.to raise_error(ArgumentError, "Expected the value of http://purl.org/dc/terms/hasPart to be an RDF object but it is a String \"foo\"")
-    end
-    
     it "should be able to nest a complex object" do
       comp = SpecDatastream::Component.new(ds.graph)
       comp.label = ["Alternator"]
@@ -139,30 +129,25 @@ END
 
 
   describe "with type" do
-    describe "one class per assertion" do 
-      before(:each) do 
+    describe "one class per assertion" do
+      before(:each) do
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-          map_predicates do |map|
-            map.mediator(:in=> RDF::DC, :class_name=>'MediatorUser')
-          end
+          property :mediator, predicate: RDF::DC.mediator, class_name: 'MediatorUser'
 
-          class MediatorUser
-            include ActiveFedora::RdfObject
-            rdf_type RDF::DC.AgentClass
-            map_predicates do |map|
-              map.title(:in=> RDF::DC)
-            end
+          class MediatorUser < ActiveFedora::Rdf::Resource
+            configure type: RDF::DC.AgentClass
+            property :title, predicate: RDF::DC.title
           end
         end
       end
-      
+
       after(:each) do
         Object.send(:remove_const, :SpecDatastream)
       end
 
       let (:ds) do
-        mock_obj = double(:mock_obj, :pid=>'test:124', :new_record? => true)
-        ds = SpecDatastream.new(mock_obj)
+        mock_obj = double(:mock_obj, pid: 'test:124', :new_record? => true)
+        ds = SpecDatastream.new(mock_obj, 'descMd')
       end
 
 
@@ -194,44 +179,36 @@ END
     end
 
     describe "shared assertion to different classes" do
-      before(:each) do 
+      before(:each) do
         class EbuCore < RDF::Vocabulary("http://www.ebu.ch/metadata/ontologies/ebucore#")
           property :isEpisodeOf
           property :title
         end
-        
+
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-          map_predicates do |map|
-            map.series(:to => 'isEpisodeOf', :in=> EbuCore, :class_name=>'Series')
-            map.program(:to => 'isEpisodeOf', :in=> EbuCore, :class_name=>'Program')
-          end
+          property :series, predicate: EbuCore.isEpisodeOf, class_name: 'Series'
+          property :program, predicate: EbuCore.isEpisodeOf, class_name: 'Program'
 
-          class Series
-            include ActiveFedora::RdfObject
-            rdf_type 'http://www.ebu.ch/metadata/ontologies/ebucore#Series'
-            map_predicates do |map|
-              map.title(:in=> EbuCore)
-            end
+          class Series < ActiveFedora::Rdf::Resource
+            configure type: 'http://www.ebu.ch/metadata/ontologies/ebucore#Series'
+            property :title, predicate: EbuCore.title
           end
 
-          class Program 
-            include ActiveFedora::RdfObject
-            rdf_type 'http://www.ebu.ch/metadata/ontologies/ebucore#Programme'
-            map_predicates do |map|
-              map.title(:in=> EbuCore)
-            end
+          class Program  < ActiveFedora::Rdf::Resource
+            configure type: 'http://www.ebu.ch/metadata/ontologies/ebucore#Programme'
+            property :title, predicate: EbuCore.title
           end
         end
 
       end
-      
+
       after(:each) do
         Object.send(:remove_const, :SpecDatastream)
       end
 
       let (:ds) do
-        mock_obj = double(:mock_obj, :pid=>'test:124', :new_record? => true)
-        ds = SpecDatastream.new(mock_obj)
+        mock_obj = double(:mock_obj, pid: 'test:124', :new_record? => true)
+        ds = SpecDatastream.new(mock_obj, 'descMd')
       end
 
 
@@ -245,9 +222,9 @@ END
         ds.program = program
 
         ds.program.first.type.size.should == 1
-        ds.program.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Programme' 
+        ds.program.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Programme'
         ds.series.first.type.size.should == 1
-        ds.series.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Series' 
+        ds.series.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Series'
       end
 
       it "should create an object of the correct type" do

data/spec/integration/field_to_solr_name_spec.rb

@@ -5,14 +5,12 @@ describe "An object with RDF backed attributes" do
   before do
     class TestOne < ActiveFedora::Base
       class MyMetadata < ActiveFedora::NtriplesRDFDatastream
-        map_predicates do |map|
-          map.title(in: RDF::DC) do |index|
-            index.as :stored_searchable
-          end
-          map.date_uploaded(to: "dateSubmitted", in: RDF::DC) do |index|
-            index.type :date
-            index.as :stored_searchable, :sortable
-          end
+        property :title, predicate: RDF::DC.title do |index|
+          index.as :stored_searchable
+        end
+        property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
+          index.type :date
+          index.as :stored_searchable, :sortable
         end
       end
       has_metadata 'descMetadata', type: MyMetadata

data/spec/integration/has_many_associations_spec.rb

@@ -7,7 +7,7 @@ describe "Looking up collection members" do
     end
 
     class Book < ActiveFedora::Base 
-      belongs_to :library, :property=>:has_constituent
+      belongs_to :library, property: :has_constituent
     end
   end
   after :all do
@@ -20,12 +20,19 @@ describe "Looking up collection members" do
     before do
       library.books = [book]
       library.save!
+      library.reload
     end
     it "should read book_ids from solr" do
-      library.reload.book_ids.should ==[book.pid]
+      expect(library.book_ids).to eq [book.pid]
     end
     it "should read books from solr" do
-      library.reload.books.should ==[book]
+      expect(library.books).to eq [book]
+    end
+
+    it "should cache the results" do
+      expect(library.books.loaded?).to be_false
+      expect(library.books).to eq [book]
+      expect(library.books.loaded?).to be_true
     end
   end
 end