blacklight 3.3.1 → 3.3.2

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/app/controllers/saved_searches_controller.rb

@@ -23,7 +23,11 @@ class SavedSearchesController < ApplicationController
   # Only dereferences the user rather than removing the item in case it
   # is in the session[:history]
   def forget
-    if current_user.search_ids.include?(params[:id].to_i) && Search.update(params[:id].to_i, :user_id => nil)
+    if current_user.search_ids.include?(params[:id].to_i) 
+      search = Search.find(params[:id])
+      search.user_id = nil
+      search.save
+
       flash[:notice] = "Successfully removed that saved search."
     else
       flash[:error] = "Couldn't remove that saved search."

data/app/models/bookmark.rb

@@ -3,5 +3,6 @@ class Bookmark < ActiveRecord::Base
   
   belongs_to :user
   validates_presence_of :user_id, :scope=>:document_id
+  attr_accessible :id, :document_id, :title
   
 end

data/app/models/search.rb

@@ -4,6 +4,7 @@ class Search < ActiveRecord::Base
   belongs_to :user
   
   serialize :query_params
+  attr_accessible :query_params
   
   # A Search instance is considered a saved search if it has a user_id.
   def saved?

data/blacklight.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "rsolr-ext", '~> 1.0.3'  # extension to the above for some rails-ish behaviors - currently embedded in our solr document ojbect.
   s.add_dependency "kaminari"               # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "sass-rails", "~> 3.2.0"
+  s.add_dependency "sass-rails"
   s.add_development_dependency "jettywrapper", ">= 1.2.0"
   s.add_dependency "compass-rails", "~> 1.0.0"
   s.add_dependency "compass-susy-plugin", ">= 0.9.0"

data/test_support/spec/models/bookmark_spec.rb

@@ -18,7 +18,7 @@ describe Bookmark do
   end
   
   it "should be valid" do
-    @bookmark.attributes = valid_bookmark_attributes
+    @bookmark.assign_attributes valid_bookmark_attributes, :without_protection => true
     @bookmark.should be_valid
   end
    
@@ -31,7 +31,7 @@ describe Bookmark do
   end
 
   it "should be valid after saving" do
-    @bookmark.attributes = valid_bookmark_attributes
+    @bookmark.assign_attributes valid_bookmark_attributes, :without_protection => true
     @bookmark.save
     @bookmark.should be_valid
   end

data/test_support/spec/models/search_spec.rb

@@ -20,7 +20,10 @@ describe Search do
   
   describe "saved?" do
     it "should be true when user_id is not NULL and greater than 0" do
-      @search = Search.create(:user_id => 1)
+      @search = Search.new
+      @search.assign_attributes({:user_id => 1}, :without_protection => true)
+      @search.save
+
       @search.saved?.should be_true
     end
     it "should be false when user_id is NULL or less than 1" do
@@ -42,10 +45,19 @@ describe Search do
     it "should destroy searches with no user_id that are older than X days" do
       Search.destroy_all
       days_old = 7
-      unsaved_search_today = Search.create(:user_id => nil, :created_at => Date.today)
-      unsaved_search_past = Search.create(:user_id => nil, :created_at => Date.today - (days_old + 1).days)
-      saved_search_today = Search.create(:user_id => 1, :created_at => Date.today)
-      saved_search_past = Search.create(:user_id => 1, :created_at => (Date.today - (days_old + 1).days))
+      unsaved_search_today = Search.new
+      unsaved_search_today.assign_attributes({:user_id => nil, :created_at => Date.today}, :without_protection => true)
+      unsaved_search_today.save
+      unsaved_search_past = Search.new
+      unsaved_search_past.assign_attributes({:user_id => nil, :created_at => Date.today - (days_old + 1).days}, :without_protection => true)
+      unsaved_search_past.save
+      saved_search_today = Search.new
+      saved_search_today.assign_attributes({:user_id => 1, :created_at => Date.today}, :without_protection => true)
+      saved_search_today.save
+      saved_search_past = Search.new
+      saved_search_past.assign_attributes({:user_id => 1, :created_at => (Date.today - (days_old + 1).days)}, :without_protection => true)
+      saved_search_past.save
+
       lambda do
         Search.delete_old_searches(days_old)
       end.should change(Search, :count).by(-1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -16,11 +16,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &261497360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -28,10 +28,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *261497360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &261496880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,10 +44,15 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *261496880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &261496500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +60,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *261496500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &261495920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +76,15 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *261495920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &261495400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +92,15 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *261495400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &261494940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +108,15 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *261494940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &261494560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -94,21 +124,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *261494560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &261494020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *261494020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &261493520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,10 +156,15 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *261493520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: compass-rails
-  requirement: &261493060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +172,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *261493060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: compass-susy-plugin
-  requirement: &261492600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -138,7 +188,12 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *261492600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: Blacklight is a free and open source ruby-on-rails based discovery interface
   (a.k.a. “next-generation catalog”) especially optimized for heterogeneous collections.
   You can use it as a library catalog, as a front end for a digital repository, or
@@ -446,7 +501,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4403143798290505525
+      hash: 1253427252595743180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -455,10 +510,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4403143798290505525
+      hash: 1253427252595743180
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A next-generation Library Catalag for Universities