blacklight 3.0.0pre8 → 3.0.0

data/VERSION

@@ -1 +1 @@
-3.0.0pre8
+3.0.0

data/app/views/catalog/index.atom.builder

@@ -1,4 +1,5 @@
 require 'base64'
+page_info = paginate_params(@response)
 
 xml.instruct!(:xml, :encoding => "UTF-8")
 
@@ -16,18 +17,18 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
   # Navigational and context links
   
   xml.link( "rel" => "next", 
-            "href" => url_for(params.merge(:only_path => false, :page => (@response.docs.current_page() + 1).to_s))
-           ) if  @response.docs.has_next?
+            "href" => url_for(params.merge(:only_path => false, :page => (page_info.current_page + 1).to_s))
+           ) if  page_info.num_pages > page_info.current_page
   
   xml.link( "rel" => "previous", 
-            "href" => url_for(params.merge(:only_path => false, :page => (@response.docs.current_page() - 1).to_s))
-           ) if @response.docs.has_previous?
+            "href" => url_for(params.merge(:only_path => false, :page => (page_info.current_page - 1).to_s))
+           ) if page_info.current_page > 1
            
   xml.link( "rel" => "first", 
             "href" => url_for(params.merge(:only_path => false, :page => "1")))
   
   xml.link( "rel" => "last",
-            "href" => url_for(params.merge(:only_path => false, :page => @response.docs.total_pages.to_s)))
+            "href" => url_for(params.merge(:only_path => false, :page => page_info.num_pages.to_s)))
   
   # "search" doesn't seem to actually be legal, but is very common, and
   # used as an example in opensearch docs
@@ -36,10 +37,10 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
             "href" =>  url_for(:controller=>'catalog',:action => 'opensearch', :format => 'xml', :only_path => false))
 
   # opensearch response elements
-  xml.opensearch :totalResults, @response.docs.total.to_s
-  xml.opensearch :startIndex, @response.docs.start.to_s
-  xml.opensearch :itemsPerPage, @response.docs.per_page.to_s
-  xml.opensearch :Query, :role => "request", :searchTerms => params[:q], :startPage => @response.docs.current_page
+  xml.opensearch :totalResults, @response.total.to_s
+  xml.opensearch :startIndex, @response.start.to_s
+  xml.opensearch :itemsPerPage, page_info.limit_value
+  xml.opensearch :Query, :role => "request", :searchTerms => params[:q], :startPage => page_info.current_page
   
   
   # updated is required, for now we'll just set it to now, sorry

data/blacklight.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # PRODUCTION GEM REQUIREMENTS
   # ---------------------------------------   
   s.add_dependency "rails", "~> 3.0"
-  s.add_dependency "nokogiri", "~>1.5.0.beta.3"   # XML Parser
+  s.add_dependency "nokogiri", "~>1.5"   # XML Parser
   s.add_dependency "unicode" # provides C-form normalization of unicode characters, as required by refworks.
   s.add_dependency "marc", "~> 0.4.3"  # Marc record parser
   s.add_dependency "rsolr",  '~> 1.0' # Library for interacting with rSolr.

data/lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb

@@ -3,12 +3,10 @@ class AddUserTypesToBookmarksSearches < ActiveRecord::Migration
   def self.up
     add_column :searches, :user_type, :string
     add_column :bookmarks, :user_type, :string
-    execute <<-SQL
-       UPDATE searches set user_type="<%=model_name%>"
-    SQL
-    execute <<-SQL
-       UPDATE bookmarks set user_type="<%=model_name%>"
-    SQL
+    Search.reset_column_information
+    Bookmark.reset_column_information
+    Search.update_all("user_type = '<%=model_name%>'")
+    Bookmark.update_all("user_type = '<%=model_name%>'")
   end
 
   def self.down

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 0
-  - 0pre8
-  version: 3.0.0pre8
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Jonathan Rochkind
@@ -21,108 +22,112 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -04:00
+date: 2011-07-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 5
-        - 0
-        - beta
-        - 3
-        version: 1.5.0.beta.3
+        version: "1.5"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: unicode
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: marc
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 4
         - 3
         version: 0.4.3
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rsolr
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rsolr-ext
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: kaminari
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id007
 description: "Blacklight is a free and open source ruby-on-rails based discovery interface (a.k.a. \xE2\x80\x9Cnext-generation catalog\xE2\x80\x9D) especially optimized for heterogeneous collections. You can use it as a library catalog, as a front end for a digital repository, or as a single-search interface to aggregate digital content that would otherwise be siloed."
 email: 
@@ -402,24 +407,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4202533913713398219
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: blacklight
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A next-geration Library Catalag for Universities