umlaut 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 10ee00671d4ada36a612ab886c0dba3169b0c5f5
-  data.tar.gz: c13eccc534870dbcd6b35335adb3ab6edd3d8acd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2YxZDZjOGJmZjQ0MWUwZTgxN2UwYzlmMWQ4ZjRhNGIyM2YyNjI5OQ==
+  data.tar.gz: !binary |-
+    M2IwZjIzMGIyYjc4MmJjZGFlOWUwMTllMDg1MGM4NDMwNDM2NTIyMQ==
 SHA512:
-  metadata.gz: bd230f38e80c13e192e0c91001bc38a3628c9908eef08b9c5d035883c5f911d910f147a679283ed3c6bfac9db5a6bb4fa59e616ff6de7b66189030313d339c18
-  data.tar.gz: df56e4a11ea2955b53463d9902c7a889b4a6860c7dd33a49dda259338e87c9d88dd83c328b51ef6ed1cbdbd2c407ce07aebfd6d974db63967361bb7a9a74ebdd
+  metadata.gz: !binary |-
+    ZmJlMGZkMTM1ZTJiYjBlOGQ1YzQ5NjRlYWFhZjNiNGE5MGY0OTNiMmU4ODFj
+    YmVlN2EyN2FhYTI3OTk2MmE0M2UwNGZiNzVhZDc4NWE5MTc4ZDU4NmMyYmIx
+    NWUxOWJkYjJlMTY3ODgxOTQ5MDUxNzU1MTAyOTQxYTA4YzE5MTU=
+  data.tar.gz: !binary |-
+    NzEyYjllYzYzZDQ2Y2Q0YmYxNzVhNTNhN2JjYWQ2ZDM0Mjg5N2UwZmMyOTVl
+    N2U1NmVlYTRiNjU3ZjJmNDY0ODUxYWQzNDFiMzg0NTljMWJmYmY5OGFlYTYw
+    MzY3Y2JmNzgxY2I1NjU0ZmExY2E2MmI5MzMxYTVjZTNmZDhlMjM=

data/app/helpers/resolve_helper.rb

@@ -197,7 +197,7 @@ module ResolveHelper
   # background updates.
   def bg_update_sections
     unless (@@bg_update_sections)
-      @@bg_update_sections = umlaut_config.lookup!("resolve_sections", []).find_all do |section|
+      @@bg_update_sections = config_resolve_sections.find_all do |section|
         section[:bg_update] != false
       end
     end
@@ -208,7 +208,7 @@ module ResolveHelper
   # that should be included in the partial_html_sections api response.
   def partial_html_sections
     unless (@@partial_update_sections)
-      @@partial_update_sections = umlaut_config.lookup!("resolve_sections", []).find_all do |section|
+      @@partial_update_sections = config_resolve_sections.find_all do |section|
         section[:partial_html_api] != false
       end
     end
@@ -230,10 +230,10 @@ module ResolveHelper
   def config_resolve_sections
     unless defined? @_config_resolve_sections
       @_config_resolve_sections = umlaut_config.lookup!("resolve_sections", UmlautConfigurable::ResolveSectionsArray.new)
+      # deep dup it, so we aren't reordering the original
+      @_config_resolve_sections = @_config_resolve_sections.deep_dup
       
       umlaut_config.lookup!("resolve_sections_filter", []).each do |reorder_proc|
-        # deep dup it, so we aren't reordering the original
-        @_config_resolve_sections = @_config_resolve_sections.deep_dup
         reorder_proc.call(@user_request, @_config_resolve_sections)
       end
     end
@@ -242,7 +242,7 @@ module ResolveHelper
   end
 
   def html_section_by_div_id(div_id)
-    umlaut_config.lookup!("resolve_sections", []).find do |defn|
+    config_resolve_sections.find do |defn|
       defn[:div_id] == div_id
     end
   end

data/app/service_adaptors/google_book_search.rb

@@ -402,11 +402,13 @@ class GoogleBookSearch < Service
     type = nil
     if (viewability == ViewPartialValue && 
         url = iv["volumeInfo"]["previewLink"])
+      url = fix_pg_gbs_link(url)
       display_text = @display_name
       display_text_i18n = "display_name"
       type = ServiceTypeValue[:excerpts]
     else
-      url = url = iv["volumeInfo"]["infoLink"]
+      url = iv["volumeInfo"]["infoLink"]
+      url = fix_pg_gbs_link(url)
       display_text = "Book Information"
       display_text_i18n = "book_information"
       type = ServiceTypeValue[:highlighted_link]
@@ -422,6 +424,14 @@ class GoogleBookSearch < Service
      )
   end
   
+  # google books direct links do weird things with linking to
+  # internal pages, perhaps intending to be based on our
+  # search criteria, which pages matched, but we're not
+  # using it like that for links to excerpts or full page. 
+  # reverse engineer it to go to full page. 
+  def fix_pg_gbs_link(url)
+    url.sub(/([\?\;\&])(pg=[^;&]+)/, '\1pg=1')
+  end
 
   
  

data/lib/umlaut/version.rb

@@ -1,5 +1,5 @@
 module Umlaut
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 
   # This is used in Umlaut's .gemspec for generating the gem,
   # and is also used in the umlaut app generator to make sure

metadata

@@ -1,275 +1,275 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: openurl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: marc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: isbn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: scrub_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -514,17 +514,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL