active-fedora 1.2.4 → 1.2.5

data/.gitignore

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

data/Gemfile

@@ -0,0 +1,16 @@
+source "http://rubygems.org"
+
+gem 'solr-ruby', '>= 0.0.6'
+gem 'xml-simple', '>= 1.0.12'
+gem 'mime-types', '>= 1.16'
+gem 'multipart-post'
+gem 'nokogiri'
+gem 'om', '>= 1.0'
+gem 'solrizer', '>=0.3.0'
+# gem 'yaml'
+
+group :development, :test do
+  gem "rspec", ">= 1.2.9"
+  gem "mocha", ">= 0.9.8"
+  gem "ruby-debug"
+end

data/Gemfile.lock

@@ -0,0 +1,58 @@
+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)
+    columnize (0.3.1)
+    diff-lcs (1.1.2)
+    facets (2.9.0)
+    linecache (0.43)
+    mime-types (1.16)
+    mocha (0.9.9)
+      rake
+    multipart-post (1.0.1)
+    nokogiri (1.4.3.1)
+    om (1.0.0)
+      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)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    solr-ruby (0.0.8)
+    solrizer (0.3.0)
+      active-fedora (>= 1.1.5)
+      om (>= 1.0.0)
+    xml-simple (1.0.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mime-types (>= 1.16)
+  mocha (>= 0.9.8)
+  multipart-post
+  nokogiri
+  om (>= 1.0)
+  rspec (>= 1.2.9)
+  ruby-debug
+  solr-ruby (>= 0.0.6)
+  solrizer (>= 0.3.0)
+  xml-simple (>= 1.0.12)

data/Rakefile

@@ -14,21 +14,6 @@ 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', '>= 0.1.9')
-    gem.add_dependency('om', '>= 1.0')
-    # gem.add_dependency('solrizer', '>=0.1.4')
-    # gem.add_dependency('yaml')
-
-    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/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   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-20}
+  s.date = %q{2010-10-26}
   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 = [
@@ -169,6 +169,8 @@ Gem::Specification.new do |s|
      ".hgtags",
      "COPYING.txt",
      "COYING.LESSER.txt",
+     "Gemfile",
+     "Gemfile.lock",
      "History.txt",
      "LICENSE",
      "License.txt",
@@ -348,6 +350,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<om>, [">= 1.0"])
+      s.add_runtime_dependency(%q<solrizer>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<activeresource>, ["< 3.0.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
@@ -358,6 +362,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<om>, [">= 1.0"])
+      s.add_dependency(%q<solrizer>, [">= 0.3.0"])
+      s.add_dependency(%q<activeresource>, ["< 3.0.0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
@@ -369,6 +375,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<om>, [">= 1.0"])
+    s.add_dependency(%q<solrizer>, [">= 0.3.0"])
+    s.add_dependency(%q<activeresource>, ["< 3.0.0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])

data/config/fedora.yml

@@ -7,7 +7,7 @@ test:
   fedora:
     url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
   solr:
-    url: http://127.0.0.1:8983/solr/test
+    url: http://127.0.0.1:8983/solr/development
 production:
   fedora:
     url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora

data/lib/active_fedora/base.rb

@@ -878,7 +878,7 @@ module ActiveFedora
       #need to call rels_ext once so it exists when iterating over datastreams
       obj.rels_ext
       obj.datastreams.each_value do |ds|
-        if ds.respond_to? (:from_solr)
+        if ds.respond_to?(:from_solr)
           ds.from_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream))
         end
       end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -84,11 +84,6 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
     #do nothing for now 
   end
   
-  #overriding this method just so metadatahelper method does not get called
-  def from_solr(solr_doc)
-    #do nothing for now 
-  end
-  
   def solrize_accessor(accessor_name, accessor_info, opts={})
     solr_doc = opts.fetch(:solr_doc, Solr::Document.new)
     parents = opts.fetch(:parents, [])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -05:00
+date: 2010-10-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,9 +110,41 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: solrizer
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: activeresource
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,11 +156,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,11 +172,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,7 +186,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: matt.zumwalt@yourmediashelf.com
 executables: []
@@ -317,6 +349,8 @@ files:
 - .hgtags
 - COPYING.txt
 - COYING.LESSER.txt
+- Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - License.txt