active-fedora 1.2.5 → 1.2.6

data/.gitignore

@@ -22,5 +22,6 @@ coverage
 rdoc
 pkg
 /.bundle
+/.rvmrc
 
 ## PROJECT::SPECIFIC

data/Gemfile

@@ -7,10 +7,12 @@ gem 'multipart-post'
 gem 'nokogiri'
 gem 'om', '>= 1.0'
 gem 'solrizer', '>=0.3.0'
-# gem 'yaml'
+gem 'activeresource', '>3.0.0'
+gem 'mediashelf-loggable'
 
 group :development, :test do
-  gem "rspec", ">= 1.2.9"
+  gem "jeweler"
+  gem "rspec", "<2.0.0"
   gem "mocha", ">= 0.9.8"
   gem "ruby-debug"
 end

data/Gemfile.lock

@@ -1,17 +1,27 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    active-fedora (1.2.4)
-      mime-types (>= 1.16)
-      multipart-post
-      nokogiri
-      om (>= 1.0)
-      solr-ruby (>= 0.0.6)
-      xml-simple (>= 1.0.12)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
+    builder (2.1.2)
     columnize (0.3.1)
-    diff-lcs (1.1.2)
     facets (2.9.0)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    i18n (0.4.2)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
     linecache (0.43)
+    mediashelf-loggable (0.4.0)
     mime-types (1.16)
     mocha (0.9.9)
       rake
@@ -21,37 +31,36 @@ GEM
       facets
       nokogiri (>= 1.4.2)
     rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    rspec (1.3.1)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
     ruby-debug-base (0.10.3)
       linecache (>= 0.3)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
     solr-ruby (0.0.8)
     solrizer (0.3.0)
-      active-fedora (>= 1.1.5)
-      om (>= 1.0.0)
+      mediashelf-loggable
+      nokogiri
+      nokogiri
+      om
+      solr-ruby
     xml-simple (1.0.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activeresource (> 3.0.0)
+  jeweler
+  mediashelf-loggable
   mime-types (>= 1.16)
   mocha (>= 0.9.8)
   multipart-post
   nokogiri
   om (>= 1.0)
-  rspec (>= 1.2.9)
+  rspec (< 2.0.0)
   ruby-debug
   solr-ruby (>= 0.0.6)
   solrizer (>= 0.3.0)

data/History.txt

@@ -1,3 +1,12 @@
+1.2.6
+
+Requires Solrizer 0.3.0 or higher
+
+HYDRA-274 Configurable Facets
+HYDRA-275 Update ActiveFedora to use Solrizer::XML::TermBasedSolrizer when indexing NokogiriDatastreams
+
+1.2.5 -- botched version release
+
 1.2.4
 
 Bug: Base.file_objects_append wasn't saving the child object after modifying its RELS-EXT

data/Rakefile

@@ -14,6 +14,17 @@ begin
     gem.homepage = "http://yourmediashelf.com/activefedora"
     gem.authors = ["Matt Zumwalt", "McClain Looney"]
     gem.rubyforge_project = 'rubyfedora'
+    gem.add_dependency('solr-ruby', '>= 0.0.6')
+    gem.add_dependency('xml-simple', '>= 1.0.12')
+    gem.add_dependency('mime-types', '>= 1.16')
+    gem.add_dependency('multipart-post')
+    gem.add_dependency('nokogiri')
+    gem.add_dependency('om', '>= 1.0')
+    gem.add_dependency('solrizer', '>=0.3.0')
+    gem.add_dependency("activeresource", "<3.0.0")
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "mocha", ">= 0.9.8"
+    gem.add_development_dependency "ruby-debug"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.6

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   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-10-26}
+  s.date = %q{2010-10-27}
   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/config/solr_mappings.yml

@@ -1,14 +1,16 @@
 id: id
-date: _dt
-string: _t
-text: _t
-symbol: _s
-integer: _i
-long: _l
-boolean: _b
-float: _f
-double: _d
-facet: _facet
-display: _display
-sort: _sort
-unstemmed_search: _unstem_search
+default: searchable
+searchable: 
+  date: _dt
+  string: _t
+  text: _t
+  symbol: _s
+  integer: _i
+  long: _l
+  boolean: _b
+  float: _f
+  double: _d
+displayable: _display
+facetable: _facet
+sortable: _sort
+unstemmed_searchable: _unstem_search

data/config/solr_mappings_af_0.1.yml

@@ -1,16 +1,9 @@
 id: id
-date: _date
-string: _field
-text: _field
-symbol: _field
-integer: _field
-long: _field
-boolean: _field
-float: _field
-double: _field
-facet: _facet
-display: _display
-sort: _sort
-unstemmed_search: _unstem_search
-
-
+default: searchable
+searchable:
+  default: _field
+  date: _date
+displayable: _display
+facetable: _facet
+sortable: _sort
+unstemmed_searchable: _unstem_search

data/config/solr_mappings_bl_2.4.yml

@@ -1,14 +1,17 @@
 id: id
-date: _dt
-string: _t
-text: _t
-symbol: _s
-integer: _i
-long: _l
-boolean: _b
-float: _f
-double: _d
-facet: _facet
-display: _display
-sort: _sort
-unstemmed_search: _unstem_search
+default: searchable
+searchable:
+  id: id
+  date: _dt
+  string: _t
+  text: _t
+  symbol: _s
+  integer: _i
+  long: _l
+  boolean: _b
+  float: _f
+  double: _d
+displayable: _display
+facetable: _facet
+sortable: _sort
+unstemmed_searchable: _unstem_search

data/lib/active_fedora.rb

@@ -1,13 +1,11 @@
 require 'rubygems'
 gem 'solr-ruby'
+require "loggable"
 
 $: << 'lib'
 require 'logger'
 require 'active_fedora/solr_service.rb'
-require 'solrizer/field_name_mapper'
-
-SOLR_DOCUMENT_ID = Solrizer::FieldNameMapper.mappings["id"] unless defined?(SOLR_DOCUMENT_ID)
-ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
+require "solrizer"
 
 require 'ruby-fedora'
 require 'active_fedora/base.rb'
@@ -24,6 +22,9 @@ require 'active_fedora/relationship.rb'
 require 'active_fedora/rels_ext_datastream.rb'
 require 'active_fedora/semantic_node.rb'
 
+SOLR_DOCUMENT_ID = ActiveFedora::SolrService.id_field unless defined?(SOLR_DOCUMENT_ID)
+ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
+
 module ActiveFedora #:nodoc:
   
   class << self

data/lib/active_fedora/base.rb

@@ -1,10 +1,10 @@
 require 'util/class_level_inheritable_attributes'
 require 'active_fedora/model'
 require 'active_fedora/semantic_node'
-require 'solrizer/field_name_mapper'
+require "solrizer"
 require 'nokogiri'
 
-SOLR_DOCUMENT_ID = "id" unless defined?(SOLR_DOCUMENT_ID)
+SOLR_DOCUMENT_ID = "id" unless (defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 
 module ActiveFedora
@@ -831,7 +831,7 @@ module ActiveFedora
     # If opts[:model_only] == true, the base object metadata and the RELS-EXT datastream will be omitted.  This is mainly to support shelver, which calls .to_solr for each model an object subscribes to. 
     def to_solr(solr_doc = Solr::Document.new, opts={})
       unless opts[:model_only]
-        solr_doc << {SOLR_DOCUMENT_ID.to_sym => pid, solr_name(:system_create, :date) => self.create_date, solr_name(:system_modified, :date) => self.modified_date, solr_name(:active_fedora_model, :symbol) => self.class.inspect}
+        solr_doc << {SOLR_DOCUMENT_ID.to_sym => pid, ActiveFedora::SolrService.solr_name(:system_create, :date) => self.create_date, ActiveFedora::SolrService.solr_name(:system_modified, :date) => self.modified_date, ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol) => self.class.inspect}
       end
       datastreams.each_value do |ds|
         # solr_doc = ds.to_solr(solr_doc) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) ||( ds.kind_of?(ActiveFedora::RelsExtDatastream) || ( ds.kind_of?(ActiveFedora::QualifiedDublinCoreDatastream) && !opts[:model_only] )
@@ -869,8 +869,8 @@ module ActiveFedora
        raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
      end
      
-      create_date = solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date)].nil? ? solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date).to_s] : solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date)]
-      modified_date = solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date)].nil? ? solr_doc[Solrizer::FieldNameMapper.solr_name(:system_modified, :date).to_s] : solr_doc[Solrizer::FieldNameMapper.solr_name(:system_modified, :date)]
+      create_date = solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date).to_s] : solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)]
+      modified_date = solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[ActiveFedora::SolrService.solr_name(:system_modified, :date).to_s] : solr_doc[ActiveFedora::SolrService.solr_name(:system_modified, :date)]
       obj = self.new({:pid=>solr_doc[SOLR_DOCUMENT_ID],:create_date=>create_date,:modified_date=>modified_date})
       obj.new_object = false
       #set by default to load any dependent relationship objects from solr as well
@@ -887,9 +887,9 @@ module ActiveFedora
 
     # Updates Solr index with self.
     def update_index
-      if defined?( Solrizer::Solrizer ) 
+      if defined?( Solrizer::Fedora::Solrizer ) 
         #logger.info("Trying to solrize pid: #{pid}")
-        solrizer = Solrizer::Solrizer.new
+        solrizer = Solrizer::Fedora::Solrizer.new
         solrizer.solrize( self )
       else
         #logger.info("Trying to update solr for pid: #{pid}")

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -40,7 +40,7 @@ module ActiveFedora::MetadataDatastreamHelper
   def to_solr(solr_doc = Solr::Document.new) # :nodoc:
     fields.each do |field_key, field_info|
       if field_info.has_key?(:values) && !field_info[:values].nil?
-        field_symbol = solr_name(field_key, field_info[:type])
+        field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
         field_info[:values].each do |val|             
           solr_doc << Solr::Field.new(field_symbol => val)
         end
@@ -55,14 +55,14 @@ module ActiveFedora::MetadataDatastreamHelper
   # This is utilized by ActiveFedora::Base.load_instance_from_solr to set 
   # metadata values in this object using the Solr document passed in.
   # Any keys in the solr document that map to a metadata field key within a MetadataDatastream object
-  # are set to the corresponding value.  Any others are ignored. Solrizer::FieldNameMapper.solr_name
+  # are set to the corresponding value.  Any others are ignored. ActiveFedora::SolrService.solr_name
   # is used to map solr key to field key name.
   #
   # ====Warning
   #  Solr must be synchronized with data in Fedora.
   def from_solr(solr_doc)
     fields.each do |field_key, field_info|
-      field_symbol = Solrizer::FieldNameMapper.solr_name(field_key, field_info[:type])
+      field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
       value = (solr_doc[field_symbol].nil? ? solr_doc[field_symbol.to_s]: solr_doc[field_symbol]) 
       unless value.nil?
         if value.is_a? Array

data/lib/active_fedora/model.rb

@@ -56,7 +56,7 @@ module ActiveFedora
       def find(args)
         if args == :all
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
-          q = "#{Solrizer::FieldNameMapper.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}"
+          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}"
@@ -89,7 +89,7 @@ module ActiveFedora
       def find_by_solr(query, args={})
         if query == :all
           escaped_class_name = self.name.gsub(/(:)/, '\\:')
-          SolrService.instance.conn.query("#{Solrizer::FieldNameMapper.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}", args)
+          SolrService.instance.conn.query("#{ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}", args)
         elsif query.class == String
           escaped_id = query.gsub(/(:)/, '\\:')          
           SolrService.instance.conn.query("#{SOLR_DOCUMENT_ID}:#{escaped_id}", args)
@@ -114,7 +114,7 @@ module ActiveFedora
       def find_by_fields_by_solr(query_fields,opts={})
         #create solr_args from fields passed in, needs to be comma separated list of form field1=value1,field2=value2,...
         escaped_class_name = self.name.gsub(/(:)/, '\\:')
-        query = "#{Solrizer::FieldNameMapper.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}" 
+        query = "#{ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol)}:#{escaped_class_name}" 
         
         query_fields.each_pair do |key,value|
           unless value.nil?
@@ -125,7 +125,7 @@ module ActiveFedora
             if class_fields.has_key?(key) && class_fields[key].has_key?(:type)
               type = class_fields[key][:type]
               type = :string unless type.kind_of?(Symbol)
-              solr_key = Solrizer::FieldNameMapper.solr_name(key,type)
+              solr_key = ActiveFedora::SolrService.solr_name(key,type)
             end
             
             escaped_value = value.gsub(/(:)/, '\\:')
@@ -143,7 +143,7 @@ module ActiveFedora
       
         #set default sort to created date ascending
         unless query_opts.include?(:sort)
-          query_opts.merge!({:sort=>[Solrizer::FieldNameMapper.solr_name(:system_create,:date)=>:ascending]}) 
+          query_opts.merge!({:sort=>[ActiveFedora::SolrService.solr_name(:system_create,:date)=>:ascending]}) 
         else
           #need to convert to solr names for all fields
           sort_array =[]
@@ -169,7 +169,7 @@ module ActiveFedora
          
             solr_name = field_name 
             if class_fields.include?(field_name.to_sym)
-              solr_name = Solrizer::FieldNameMapper.solr_name(key,class_fields[field_name.to_sym][:type])
+              solr_name = ActiveFedora::SolrService.solr_name(key,class_fields[field_name.to_sym][:type])
             end
             sort_array.push({solr_name=>sort_direction})
           end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -114,13 +114,13 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
   
   def solrize_node(node, accessor_pointer, solr_doc = Solr::Document.new)
     generic_field_name_base = self.class.accessor_generic_name(*accessor_pointer)
-    generic_field_name = Solrizer::FieldNameMapper.solr_name(generic_field_name_base, :text)
+    generic_field_name = ActiveFedora::SolrService.solr_name(generic_field_name_base, :text)
     
     solr_doc << Solr::Field.new(generic_field_name => node.text)
     
     if accessor_pointer.length > 1
       hierarchical_field_name_base = self.class.accessor_hierarchical_name(*accessor_pointer)
-      hierarchical_field_name = Solrizer::FieldNameMapper.solr_name(hierarchical_field_name_base, :text)
+      hierarchical_field_name = ActiveFedora::SolrService.solr_name(hierarchical_field_name_base, :text)
       solr_doc << Solr::Field.new(hierarchical_field_name => node.text)
     end
   end

data/lib/active_fedora/rels_ext_datastream.rb

@@ -58,7 +58,7 @@ module ActiveFedora
     # 
     # This is utilized by ActiveFedora::Base.load_instance_from_solr to load 
     # the relationships hash using the Solr document passed in instead of from the RELS-EXT datastream
-    # in Fedora.  Utilizes Solrizer::FieldNameMapper.solr_name to map solr key to
+    # in Fedora.  Utilizes solr_name method (provided by Solrizer::FieldNameMapper) to map solr key to
     # relationship predicate. 
     #
     # ====Warning
@@ -66,7 +66,7 @@ module ActiveFedora
     def from_solr(solr_doc)
       #cycle through all possible predicates
       PREDICATE_MAPPINGS.keys.each do |predicate|
-        predicate_symbol = Solrizer::FieldNameMapper.solr_name(predicate, :symbol)
+        predicate_symbol = ActiveFedora::SolrService.solr_name(predicate, :symbol)
         value = (solr_doc[predicate_symbol].nil? ? solr_doc[predicate_symbol.to_s]: solr_doc[predicate_symbol]) 
         unless value.nil? 
           if value.is_a? Array

data/lib/active_fedora/solr_service.rb

@@ -1,8 +1,13 @@
 require 'solr'
-require "solrizer/field_name_mapper"
+require "solrizer"
 
 module ActiveFedora
   class SolrService 
+    
+    include Solrizer::FieldNameMapper
+    include Loggable
+    
+    load_mappings
       
     attr_reader :conn
         
@@ -27,7 +32,7 @@ module ActiveFedora
       end
       results = []
       solr_result.hits.each do |hit|
-        model_value = hit[Solrizer::FieldNameMapper.solr_name("active_fedora_model", :symbol)].first
+        model_value = hit[solr_name("active_fedora_model", :symbol)].first
         if model_value.include?("::")
           classname = eval(model_value)
         else
@@ -56,22 +61,6 @@ module ActiveFedora
       return uri.gsub(/(:)/, '\\:')
     end
     
-    def self.mappings
-      Solrizer::FieldNameMapper.mappings
-    end
-    def self.mappings=(mappings)
-      Solrizer::FieldNameMapper.mappings = mappings
-    end
-        
-    def self.logger      
-      @logger ||= defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : Logger.new(STDOUT)
-    end
-    
-    # (re)load solr field name mappings
-    def self.load_mappings( config_path=nil )
-      Solrizer::FieldNameMapper.load_mappings(config_path)
-    end
-    
   
 end #SolrService
 class SolrNotInitialized < StandardError;end

data/spec/unit/solr_config_options_spec.rb

@@ -27,13 +27,12 @@ describe ActiveFedora do
   describe "field name mappings" do
     it "should default to using the mappings for the current schema" do
       from_default_yml = YAML::load(File.open(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings.yml")))
-      ActiveFedora::SolrService.mappings.should == from_default_yml
-      ActiveFedora::SolrService.mappings["date"].should == "_dt"      
+      ActiveFedora::SolrService.mappings[:searchable].data_types[:date].opts[:suffix].should == from_default_yml["searchable"]["date"]    
     end
     it "should allow you to provide your own mappings file" do
       ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
-      ActiveFedora::SolrService.mappings["date"].should == "_date"      
-      ActiveFedora::SolrService.mappings["symbol"].should == "_field"            
+      ActiveFedora::SolrService.mappings[:searchable].data_types[:date].opts[:suffix].should == "_date"      
+      ActiveFedora::SolrService.mappings[:searchable].data_types[:default].opts[:suffix].should == "_field"
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -05:00
+date: 2010-10-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency