umlaut 3.0.0beta6 → 3.0.0beta7

data/lib/service_adaptors/hathi_trust.rb

@@ -125,9 +125,16 @@ class HathiTrust < Service
   # the parameters for the particular service
   # FIXME consider moving this into metadata_helper
   def get_bibkey_parameters(rft)
+    # filter out special chars that ought not to be in there anyway,
+    # and that HathiTrust barfs on. 
     isbn = get_identifier(:urn, "isbn", rft)
+    isbn = isbn.gsub(/[\-\[\]]/, '') unless isbn.blank?
+    
     oclcnum = get_identifier(:info, "oclcnum", rft)
+    oclcnum = oclnum.gsub(/[\-\[\]]/, '') unless oclcnum.blank?
+    
     lccn = get_lccn(rft)
+    lccn = lccn.gsub(/[\-\[\]]/, '') unless lccn.blank?
         
     yield(isbn, lccn, oclcnum)    
   end

data/lib/tasks/Untitled-1

@@ -0,0 +1,8 @@
+
+
+file = open("Umlaut/log/production.log")
+
+file.each do |line|
+  puts line
+end
+

data/lib/umlaut.rb

@@ -36,6 +36,14 @@ module Umlaut
       app.config.assets.precompile << "umlaut_ui.js"
     end
     
+    # Patch with fixed 'fair' version of ConnectionPool, see 
+    # active_record_patch/connection_pool.rb
+    initializer("#{engine_name}.patch_connection_pool", :before => "active_record.initialize_database") do |app|
+      load File.join(self.root, "active_record_patch", "connection_pool.rb")
+    end
+    
+         
+    
     
   end
 end

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0beta6"
+  VERSION = "3.0.0beta7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.0.0beta6
+  version: 3.0.0beta7
   prerelease: 5
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &102344040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *102344040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &102355740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *102355740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &102351520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *102351520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: openurl
-  requirement: &102374560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +69,37 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *102374560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &102378660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *102378660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: isbn
-  requirement: &102376760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +107,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *102376760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &102385880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +123,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *102385880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &102404440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +139,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *102404440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &102501700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +155,15 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *102501700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: exlibris-primo
-  requirement: &102514240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +171,15 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *102514240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: single_test
-  requirement: &102512120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +187,15 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *102512120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &102509700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +203,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *102509700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &102507660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +219,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *102507660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &102522180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +235,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *102522180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - umlaut-general@rubyforge.org
@@ -300,7 +376,6 @@ files:
 - app/helpers/open_search_helper.rb
 - app/helpers/resolve_helper.rb
 - app/helpers/search_helper.rb
-- config/initializers/extensions/connection_pool.rb
 - db/seeds.rb
 - db/migrate/01_umlaut_init.rb
 - db/orig_fixed_data/service_type_values.yml
@@ -369,6 +444,7 @@ files:
 - lib/aws_product_sign.rb
 - lib/tasks/umlaut_migrate_permalinks.rake
 - lib/tasks/umlaut.rake
+- lib/tasks/Untitled-1
 - LICENSE
 - Rakefile
 - README.md
@@ -481,7 +557,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 367390304893023156
+      hash: -1531856936954228616
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -490,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL

data/config/initializers/extensions/connection_pool.rb

@@ -1,97 +0,0 @@
-# NOTE:  THIS NEEDS TO BE REMOVED WHEN RAILS IS FIXED! 
-# We expect it will be fixed in rails 3.2.3 (and broken again in 4, sorry)
-# We require at least 3.2.2, so patch only if we're 3.2.2
-
-if Rails.version == "3.2.2" 
-
-
-  class ActiveRecord::ConnectionAdapters::ConnectionPool
-    
-    ##########################
-    # Monkey patch to fix disastrous concurrency bug in 
-    # ActiveRecord ConnectionPool#with_concurrency
-    #
-    # See https://github.com/rails/rails/issues/5330
-    ##########################
-    
-    # New method we're adding viz a viz rails 3.2.2
-    # Check to see if there is an active connection for
-    # current_connection_id, that is by default the current
-    # thread.
-    def current_connection?
-      @reserved_connections.has_key?(current_connection_id)
-    end
-    
-    # Redefine with_connection viz a viz rails 3.2.2 to
-    # properly check back in connections. 
-    # If a connection already exists yield it to the block. If no connection
-    # exists checkout a connection, yield it to the block, and checkin the
-    # connection when finished.
-    def with_connection
-      connection_id = current_connection_id
-      fresh_connection = true unless current_connection?
-      yield connection
-    ensure
-      release_connection(connection_id) if fresh_connection
-    end
-    
-    
-    ###################################
-    #
-    # Monkey patch to fix bug with threads waiting
-    # on connection waking up, not succesfuly getting
-    # a connection, and giving up too early. 
-    #
-    # https://github.com/rails/rails/pull/5422
-    #
-    # yeah, we got to replace all of #checkout.
-    # that's why we only apply this patch in 3.2.2, not
-    # in future rails versions. 
-    #####################################
-    def checkout
-        synchronize do
-          waited_time = 0
-
-          loop do
-            conn = @connections.find { |c| c.lease }
-
-            unless conn
-              if @connections.size < @size
-                conn = checkout_new_connection
-                conn.lease
-              end
-            end
-
-            if conn
-              checkout_and_verify conn
-              return conn
-            end
-
-            if waited_time >= @timeout
-              raise ConnectionTimeoutError, "could not obtain a database connection#{" within #{@timeout} seconds" if @timeout} (waited #{waited_time} seconds). The max pool size is currently #{@size}; consider increasing it."
-            end
-
-            # Sometimes our wait can end because a connection is available,
-            # but another thread can snatch it up first. If timeout hasn't
-            # passed but no connection is avail, looks like that happened --
-            # loop and wait again, for the time remaining on our timeout. 
-            before_wait = Time.now
-            @queue.wait( [@timeout - waited_time, 0].max )
-            waited_time += (Time.now - before_wait)
-
-            # Will go away in Rails 4, when we don't clean up
-            # after leaked connections automatically anymore. Right now, clean
-            # up after we've returned from a 'wait' if it looks like it's
-            # needed, then loop and try again. 
-            if(active_connections.size >= @connections.size)
-              clear_stale_cached_connections!
-            end
-          end
-        end
-      end
-    
-    
-    
-  end
-  
-end