blacklight-sitemap 1.1.0 → 2.0.0

data/Gemfile

@@ -8,8 +8,7 @@ gem 'nokogiri'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.1.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
+  gem "rspec", "~> 2.13.0"
+  gem "jeweler", "~> 1.8.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,30 +1,33 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.2.1)
     git (1.2.5)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
+    json (1.7.7)
     nokogiri (1.4.4)
-    rake (0.8.7)
+    rake (10.0.3)
     rcov (0.9.9)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rdoc (4.0.0)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
+  jeweler (~> 1.8.4)
   nokogiri
   rcov
-  rspec (~> 2.1.0)
+  rspec (~> 2.13.0)

data/README.rdoc

@@ -4,11 +4,10 @@ Rake task for creating a sitemap from a Blacklight Solr index.
 
 == Installation
 
-* This version only works with Rails 3/Blacklight 3. For Blacklight versions 2.x, try v0.0.5
-  of this gem.
+* This version only works with Rails 3.2/Blacklight 4. Some changes to how Blacklight is configured and how it communicates with Solr mean that it will currently only work with Blacklight 4 using the standard CatalogController.
 
 * In Gemfile
-    gem 'blacklight-sitemap', '~> 1.0.0'
+    gem 'blacklight-sitemap', '~> 2.0.0'
 
 * Install the gem:
     bundle install

data/Rakefile

@@ -40,8 +40,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/lib/blacklight-sitemap.rb

@@ -74,10 +74,13 @@ module Rake
             #collect warnings here rather than raise an error
             warnings = []
 
+            blacklight_config = CatalogController.blacklight_config
+
             puts 'Creating a sitemap...'
             fl = ['id', @lastmod_field, @priority_field].compact.join(',')
             base_solr_parameters = {:qt => @qt, :fq => 'id:[* TO *]', :fl => fl}
-            number_of_resources = Blacklight.solr.find(base_solr_parameters.merge(:rows => 1))['response']['numFound']
+            response = Blacklight.solr.get(blacklight_config.solr_path, :params => base_solr_parameters.merge(:rows => 1))
+            number_of_resources = response['response']['numFound']
             puts 'Number of resources: ' + number_of_resources.to_s
             batches = (number_of_resources / @max.to_f).ceil
             puts 'Total sitemap to create: ' + batches.to_s
@@ -93,7 +96,7 @@ module Rake
               current_page = batch_number + 1
               start = batch_number * @max
               puts 'Processing batch # ' + current_page.to_s
-              response = Blacklight.solr.find(base_solr_parameters.merge(:rows => @max, :start => start))['response']
+              response = Blacklight.solr.get(blacklight_config.solr_path, :params => base_solr_parameters.merge(:rows => @max, :start => start))['response']
               sitemap_builder = Nokogiri::XML::Builder.new do |xml|
                 xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
                   response['docs'].each do |doc|

metadata

@@ -1,109 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: blacklight-sitemap
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Jason Ronallo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-26 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2013-02-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: *id001
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: bundler
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 2.13.0
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: *id005
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Blacklight sitemap rake task.
 email: jronallo@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -113,42 +92,32 @@ files:
 - lib/blacklight-sitemap.rb
 - lib/rails/generators/blacklight/sitemap/sitemap_generator.rb
 - lib/rails/generators/blacklight/sitemap/templates/default_rake_task.rb
-- spec/blacklight-sitemap_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jronallo/blacklight-sitemap
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1405675366613807619
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Blacklight sitemap rake task.
-test_files: 
-- spec/blacklight-sitemap_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/blacklight-sitemap_spec.rb

@@ -1,118 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "BlacklightSitemap" do
-  before(:all) do
-    @default_task = Rake::BlacklightSitemapTask.new
-  end
-
-  it 'should create a default task which clobbers then creates' do
-    Rake::BlacklightSitemapTask.new
-    Rake::Task['blacklight:sitemap'].should be_a_kind_of Rake::Task
-  end
-
-  it "should create the sitemap creation task" do
-    Rake::BlacklightSitemapTask.new
-    Rake::Task['blacklight:sitemap:create'].should be_a_kind_of Rake::Task
-  end
-
-  it "should be able to have the resource url attribute" do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.resource_url = 'http://example.com/catalog'
-    end
-    task.resource_url.should eq('http://example.com/catalog')
-  end
-  
-  it "should have the public URL for storing the sitemaps" do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.public_url = 'http://example.com'
-    end
-    task.public_url.should eq('http://example.com')
-  end
-
-  it 'should have a base_filename attribute' do
-    @default_task.base_filename.should eq('blacklight')
-  end
-
-  it 'should allow for changing the base_filename attribute' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.base_filename = 'bl'
-    end
-    task.base_filename.should eq('bl')
-  end
-
-  it 'should store a value for whether to gzip or not' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.gzip = true
-    end
-    task.gzip.should be_true
-  end
-
-  it 'should have a default nil value for changefreq' do
-    @default_task.changefreq.should be_nil
-  end
-
-  it 'should allow for changing the changefreq value' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.changefreq = 'never'
-    end
-    task.changefreq.should eq('never')
-  end
-
-  it 'should set the ceiling to 50,000 as a default' do
-    @default_task.max.should == 50000
-  end
-
-  it 'should allow the ceiling to be set to a different value' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.max = 50
-    end
-    task.max.should == 50
-  end
-
-  it 'should have a default value for the lastmod_field' do
-    @default_task.lastmod_field.should eq('timestamp')
-  end
-
-  it 'should allow a new value for lastmod_field' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.lastmod_field = 'date_created'
-    end
-    task.lastmod_field.should eq('date_created')
-  end
-
-  it 'should have a default value for the priority_field' do
-    @default_task.priority_field.should be_nil
-  end
-
-  it 'should allow a new value for priority_field' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.priority_field = 'priority'
-    end
-    task.priority_field.should eq('priority')
-  end
-
-  it 'should have a default value for sorting the Solr query' do
-    @default_task.sort.should eq('_docid_ asc')
-  end
-
-  it 'should be able to set a new value for sort' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.sort = 'timestamp asc'
-    end
-    task.sort.should eq('timestamp asc')
-  end
-  
-  it 'should be able to set a new value for qt' do
-    task = Rake::BlacklightSitemapTask.new do |sm|
-      sm.qt = 'bozart'
-    end
-    task.qt.should eq('bozart')
-  end
-
-  it 'should create the sitemap clobber task' do
-    Rake::BlacklightSitemapTask.new
-    Rake::Task['blacklight:sitemap:clobber'].should be_a_kind_of Rake::Task
-  end
-
-end
-

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'blacklight-sitemap'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end