active-fedora 5.0.0.rc1 → 5.0.0.rc2

data/Gemfile

@@ -5,9 +5,6 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'ruby-debug', :platform => :ruby_18
-#  gem 'debugger', :platform => :ruby_19
-
   gem 'rcov', :platform => :mri_18
   gem 'simplecov', :platform => :mri_19
   gem 'simplecov-rcov', :platform => :mri_19

data/active-fedora.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |s|
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
 
   s.rubyforge_project = "rubyfedora"
-  s.rubygems_version = %q{1.3.7}
+  s.required_ruby_version     = '>= 1.9.3'
 
   s.add_dependency('rsolr')
-  s.add_dependency('om', '~> 1.7.0.rc2')
-  s.add_dependency('solrizer', '~>2.0.0.rc1')
+  s.add_dependency('om', '~> 1.8.0.rc1')
+  s.add_dependency('solrizer', '~>2.0.0.rc6')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')

data/lib/active_fedora/associations/association_collection.rb

@@ -119,7 +119,8 @@ module ActiveFedora
                 @target = find_target
               end
             end
-          rescue ObjectNotFoundError
+          rescue ObjectNotFoundError => e
+            logger.error "Solr and Fedora may be out of sync:\n" + e.message
             reset
           end
         end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -217,7 +217,7 @@ module ActiveFedora
                #just use index supplied instead of trying possibilities
                index = term_pointer[i-1].values.first
                solr_name_base = OM::XML::Terminology.term_hierarchical_name({bases[j]=>index},current_last)
-               solr_name = generate_solr_symbol(solr_name_base, term.data_type)
+               solr_name = generate_solr_symbol(solr_name_base, term.type)
                bases.delete_at(j)
                #insert the new solr name base if found
                bases.insert(j,solr_name_base) if has_solr_name?(solr_name,solr_doc)
@@ -227,14 +227,14 @@ module ActiveFedora
                current_base = bases[j]
                bases.delete_at(j)
                solr_name_base = OM::XML::Terminology.term_hierarchical_name({current_base=>index},current_last)
-               solr_name = generate_solr_symbol(solr_name_base, term.data_type)
+               solr_name = generate_solr_symbol(solr_name_base, term.type)
                #check for indexes that exist until we find all nodes
                while has_solr_name?(solr_name,solr_doc) do
                  #only reinsert if it exists
                  bases.insert(j,solr_name_base)
                  index = index + 1
                  solr_name_base = OM::XML::Terminology.term_hierarchical_name({current_base=>index},current_last)
-                 solr_name = generate_solr_symbol(solr_name_base, term.data_type)
+                 solr_name = generate_solr_symbol(solr_name_base, term.type)
                end
              end
            end
@@ -242,7 +242,7 @@ module ActiveFedora
 
          #all existing applicable solr_names have been found and we can now grab all values and build up our value array
          bases.each do |base|
-           field_name = generate_solr_symbol(base.to_sym, term.data_type)
+           field_name = generate_solr_symbol(base.to_sym, term.type)
            value = (solr_doc[field_name].nil? ? solr_doc[field_name.to_s]: solr_doc[field_name])
            unless value.nil?
              value.is_a?(Array) ? values.concat(value) : values << value
@@ -251,7 +251,7 @@ module ActiveFedora
       else
          #this is not hierarchical and we can simply look for the solr name created using the terms without any indexes
          generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
-         generic_field_name = generate_solr_symbol(generic_field_name_base, term.data_type)
+         generic_field_name = generate_solr_symbol(generic_field_name_base, term.type)
          value = (solr_doc[generic_field_name].nil? ? solr_doc[generic_field_name.to_s]: solr_doc[generic_field_name])
          unless value.nil?
            value.is_a?(Array) ? values.concat(value) : values << value

data/lib/active_fedora/predicates.rb

@@ -62,7 +62,7 @@ module ActiveFedora
     end
 
     def self.predicate_namespaces
-      predicate_config[:predicate_namespaces] || {}
+      predicate_config[:predicate_namespaces] ||= {}
     end
     
     def self.predicate_mappings

data/lib/active_fedora/rels_ext_datastream.rb

@@ -37,6 +37,7 @@ module ActiveFedora
       if (xml.nil?)
         ### maybe put the template here?
       else
+        ensure_predicates_exist!(xml)
         RDF::RDFXML::Reader.new(xml) do |reader|
           reader.each_statement do |statement|
             literal = statement.object.kind_of?(RDF::Literal)
@@ -62,6 +63,23 @@ module ActiveFedora
       xml
     end
 
+    def self.ensure_predicates_exist!(xml)
+      statements = Nokogiri::XML(xml).xpath('//rdf:Description/*', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')
+      predicates = statements.collect { |e| { :prefix => e.namespace.prefix, :uri => e.namespace.href, :predicate => e.name } }.uniq
+      predicates.each do |pred|
+        unless Predicates.predicate_mappings[pred[:uri]]
+          Predicates.predicate_mappings[pred[:uri]] = {}
+          if pred[:prefix] and not Predicates.predicate_namespaces.has_value?(pred[:uri])
+            Predicates.predicate_namespaces[pred[:prefix].to_sym] = pred[:uri]
+          end
+        end
+        ns = Predicates.predicate_mappings[pred[:uri]]
+        unless ns.invert[pred[:predicate]]
+          ns["#{pred[:prefix]}_#{pred[:predicate].underscore}".to_sym] = pred[:predicate]
+        end
+      end
+    end
+
     def self.short_predicate(predicate)
       # for this regex to short-circuit correctly, namespaces must be sorted into descending order by length
       if match = /^(#{Predicates.predicate_mappings.keys.sort.reverse.join('|')})(.+)$/.match(predicate.to_str)

data/lib/active_fedora/solr_service.rb

@@ -86,6 +86,13 @@ module ActiveFedora
       result['response']['docs']
     end
 
+    # Get the count of records that match the query
+    # @param [String] query a solr query 
+    # @returns [Integer] number of records matching
+    def self.count(query)
+        SolrService.query(query, :raw=>true, :rows=>0)['response']['numFound'].to_i
+    end
+
     def self.add(doc)
       SolrService.instance.conn.add(doc)
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.0.0.rc1"
+  VERSION = "5.0.0.rc2"
 end

data/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml

@@ -141,7 +141,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
           </titleInfo>
           <originInfo>
               <publisher>PUBLISHER</publisher>
-              <dateIssued>DATE</dateIssued>
+              <dateIssued>FEB. 2007</dateIssued>
           </originInfo>
           <identifier type="issn">0013-8908</identifier>    
           <part>

data/spec/integration/associations_spec.rb

@@ -320,7 +320,54 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe "single direction habtm" do
+    before :all do
+      class LibraryBook < ActiveFedora::Base
+        has_and_belongs_to_many :pages, :property=>:is_part_of
+      end
+      class Page < ActiveFedora::Base
+        has_many :library_books, :property=>:is_part_of
+      end
+        
+    end
+    after :all do
+      Object.send(:remove_const, :LibraryBook)
+      Object.send(:remove_const, :Page)
+    end
+
+    describe "with a parent that has two children" do
+      before do
+        @book = LibraryBook.create
+        @p1 = Page.create()
+        @p2 = Page.create()
+        @book.pages = [@p1, @p2]
+        @book.save
+      end
+
+      it "should load the association stored in the parent" do
+        @reloaded_book = LibraryBook.find(@book.pid)
+        @reloaded_book.pages.should == [@p1, @p2]
+      end
+
+      it "should allow a parent to be deleted from the has_many association" do
+        @reloaded_book = LibraryBook.find(@book.pid)
+        @p1.library_books.delete(@reloaded_book)
+        @reloaded_book.save
 
+        @reloaded_book = LibraryBook.find(@book.pid)
+        @reloaded_book.pages.should == [@p2]
+      end
 
+      it "should allow a child to be deleted from the has_and_belongs_to_many association" do
+        pending "This isn't working and we ought to fix it"
+        @reloaded_book = LibraryBook.find(@book.pid)
+        @reloaded_book.pages.delete(@p1)
+        @reloaded_book.save
+        @p1.save
 
+        @reloaded_book = LibraryBook.find(@book.pid)
+        @reloaded_book.pages.should == [@p2]
+      end
+    end
+  end
 end

data/spec/integration/nokogiri_datastream_spec.rb

@@ -16,6 +16,10 @@ describe ActiveFedora::NokogiriDatastream do
 
   end
 
+  after(:all) do
+    Object.send(:remove_const, :HydrangeaArticle2)
+  end
+
   describe '.term_values' do
     before do
       @pid = "hydrangea:fixture_mods_article1"
@@ -66,4 +70,18 @@ describe ActiveFedora::NokogiriDatastream do
       @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Funder"]
     end    
   end
+
+
+  describe ".to_solr" do
+    before do
+      object = HydrangeaArticle2.new
+      object.descMetadata.journal.issue.publication_date = Date.parse('2012-11-02')
+      object.save!
+      @test_object = HydrangeaArticle2.find(object.pid)
+
+    end
+    it "should solrize terms with :type=>'date' to *_dt solr terms" do
+      @test_object.to_solr['mods_journal_issue_publication_date_dt'].should == ['2012-11-02T00:00:00Z']
+    end
+  end
 end

data/spec/samples/hydra-mods_article_datastream.rb

@@ -38,7 +38,7 @@ module Hydra
       t.topic_tag(:proxy=>[:subject, :topic])    
       # t.topic_tag(:index_as=>[:facetable],:path=>"subject", :default_content_path=>"topic")
       # This is a mods:name.  The underscore is purely to avoid namespace conflicts.
-      t.name_ {
+      t.name_(:index_as=>[:searchable]) {
         # this is a namepart
         t.namePart(:type=>:string, :label=>"generic name")
         # affiliations are great
@@ -58,8 +58,8 @@ module Hydra
       t.department(:proxy=>[:person,:description],:index_as=>[:facetable])
       t.organization(:ref=>:name, :attributes=>{:type=>"corporate"}, :index_as=>[:facetable])
       t.conference(:ref=>:name, :attributes=>{:type=>"conference"}, :index_as=>[:facetable])
-      t.role {
-        t.text(:path=>"roleTerm",:attributes=>{:type=>"text"})
+      t.role(:index_as=>[:searchable]) {
+        t.text(:path=>"roleTerm",:attributes=>{:type=>"text"}, :index_as=>[:searchable])
         t.code(:path=>"roleTerm",:attributes=>{:type=>"code"})
       }
       t.journal(:path=>'relatedItem', :attributes=>{:type=>"host"}) {
@@ -80,7 +80,7 @@ module Hydra
           }
           t.start_page(:proxy=>[:pages, :start])
           t.end_page(:proxy=>[:pages, :end])
-          t.publication_date(:path=>"date")
+          t.publication_date(:path=>"date", :type=>:date, :index_as=>[:searchable])
         }
       }
       t.note
@@ -89,7 +89,7 @@ module Hydra
       }
       t.publication_url(:proxy=>[:location,:url])
       t.peer_reviewed(:proxy=>[:journal,:origin_info,:issuance], :index_as=>[:facetable])
-      t.title(:proxy=>[:mods,:title_info, :main_title])
+      t.title(:proxy=>[:title_info, :main_title])
       t.journal_title(:proxy=>[:journal, :title_info, :main_title])
     end
     

data/spec/unit/nokogiri_datastream_spec.rb

@@ -273,7 +273,7 @@ describe ActiveFedora::NokogiriDatastream do
  
     it "should return correct values from solr_doc given different term pointers" do
       mock_term = mock("OM::XML::Term")
-      mock_term.stubs(:data_type).returns(:text)
+      mock_term.stubs(:type).returns(:text)
       mock_terminology = mock("OM::XML::Terminology")
       mock_terminology.stubs(:retrieve_term).returns(mock_term)
       ActiveFedora::NokogiriDatastream.stubs(:terminology).returns(mock_terminology)

data/spec/unit/rels_ext_datastream_spec.rb

@@ -125,6 +125,25 @@ describe ActiveFedora::RelsExtDatastream do
       @test_obj.relationships.size.should == 5 
       @test_obj.ids_for_outbound("foo").should == ["foo:bar"]
     end
+    it "should automatically map un-mapped predicates" do
+      xml = <<-EOS
+        <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+          <rdf:Description rdf:about='info:fedora/test:sample_pid'>
+            <isMemberOf rdf:resource='info:fedora/demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+            <isPartOf rdf:resource='info:fedora/demo:11' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+            <hasPart rdf:resource='info:fedora/demo:12' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+            <hasModel rdf:resource='info:fedora/afmodel:OtherModel' xmlns='info:fedora/fedora-system:def/model#'/>
+            <hasModel rdf:resource='info:fedora/afmodel:SampleModel' xmlns='info:fedora/fedora-system:def/model#'/>
+            <missing:hasOtherRelationship rdf:resource='info:fedora/demo:13' xmlns:missing='http://example.org/ns/missing'/>
+          </rdf:Description>
+        </rdf:RDF>
+      EOS
+      model = ActiveFedora::Base.new
+      new_ds = ActiveFedora::RelsExtDatastream.new(nil, nil)
+      new_ds.model = model
+      lambda { ActiveFedora::RelsExtDatastream.from_xml(xml, new_ds) }.should_not raise_exception
+      new_ds.to_rels_ext.should =~ /missing:hasOtherRelationship/
+    end
     it "should handle un-mapped literals" do
       xml = "
                 <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"  xmlns:oai=\"http://www.openarchives.org/OAI/2.0/\">

data/spec/unit/solr_service_spec.rb

@@ -82,6 +82,15 @@ describe ActiveFedora::SolrService do
       ActiveFedora::SolrService.query('querytext', :raw=>true).should == stub_result
     end
   end
+  describe ".count" do
+    it "should return a count of matching records" do 
+      mock_conn = mock("Connection")
+      stub_result = {'response' => {'numFound'=>'7'}}
+      mock_conn.expects(:get).with('select', :params=>{:rows=>0, :q=>'querytext', :qt=>'standard'}).returns(stub_result)
+      ActiveFedora::SolrService.stubs(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.count('querytext').should == 7 
+    end
+  end
   describe ".add" do
     it "should call solr" do 
       mock_conn = mock("Connection")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0.rc2
+        version: 1.8.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0.rc2
+        version: 1.8.0.rc1
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc6
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -539,10 +539,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1658600528590412066
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: