umlaut 3.0.0beta1 → 3.0.0beta2

data/app/controllers/resolve_controller.rb

@@ -12,8 +12,7 @@ class ResolveController < UmlautController
   @@no_create_request_actions = ['background_update']
   after_filter :save_request
   
-  # Take layout from config, default to resolve_basic.rhtml layout. 
-  layout umlaut_config.resolve_layout,  
+  layout :layout_name,  
          :except => [:partial_html_sections]
   
   	
@@ -137,6 +136,11 @@ class ResolveController < UmlautController
   protected
   
   
+  # We intentionally use a method calculated at request-time for layout,
+  # so it can be changed in config at request-time. 
+  def layout_name
+    umlaut_config.resolve_layout
+  end
 
     
   # Retrives or sets up the relevant Umlaut Request, and returns it. 

data/app/controllers/search_controller.rb

@@ -30,7 +30,7 @@ class SearchController < UmlautController
   @@az_batch_size = 20
   @@autocomplete_limit = 15
   
-  layout umlaut_config.search_layout, :except => [ :opensearch, :opensearch_description ]
+  layout :layout_name, :except => [ :opensearch, :opensearch_description ]
 
   before_filter :normalize_params
   
@@ -161,6 +161,12 @@ class SearchController < UmlautController
 
   protected
 
+  # We intentionally use a method calculated at request-time for layout,
+  # so it can be changed in config at request-time. 
+  def layout_name
+    umlaut_config.search_layout
+  end
+
   def normalize_params
     # citation search params  
   

data/app/controllers/store_controller.rb

@@ -3,7 +3,12 @@ class StoreController < UmlautController
   require 'openurl'
   def index
     
-    perm = Permalink.find(:first, :conditions => { :id => params[:id]})
+    perm = Permalink.where(params[:id]).first
+    
+    unless perm
+      raise NotFound.new("Permalink request could not be resolved. Returning 404. Permalink id: #{params[:id]}")
+    end
+    
     co = OpenURL::ContextObject.new
 
     # We might have a link to a Referent in our db, or we might

data/app/controllers/umlaut/error_handling.rb

@@ -39,8 +39,10 @@ module Umlaut::ErrorHandling
     message << "  User-Agent: #{request.user_agent}\n"
     message << "  Client IP: #{request.remote_addr}\n\n"
     
-    message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)        
-    message << "  " << Rails.backtrace_cleaner.clean(exception.backtrace).join("\n ")
+    message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
+    # mysterious :noise param seems to match how default rails does it, so
+    # we actually get a backtrace. 
+    message << "  " << Rails.backtrace_cleaner.clean(exception.backtrace, :noise).join("\n  ")    
                     
     logger.send(severity, "#{message}\n\n")          
   end

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0beta1"
+  VERSION = "3.0.0beta2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.0.0beta1
+  version: 3.0.0beta2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &131100140 !ruby/object:Gem::Requirement
+  requirement: &76003100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *131100140
+  version_requirements: *76003100
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &131099160 !ruby/object:Gem::Requirement
+  requirement: &76002660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131099160
+  version_requirements: *76002660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &131098040 !ruby/object:Gem::Requirement
+  requirement: &76002040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *131098040
+  version_requirements: *76002040
 - !ruby/object:Gem::Dependency
   name: openurl
-  requirement: &131096100 !ruby/object:Gem::Requirement
+  requirement: &76001480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *131096100
+  version_requirements: *76001480
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &131095000 !ruby/object:Gem::Requirement
+  requirement: &76000980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *131095000
+  version_requirements: *76000980
 - !ruby/object:Gem::Dependency
   name: isbn
-  requirement: &131093960 !ruby/object:Gem::Requirement
+  requirement: &76000560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131093960
+  version_requirements: *76000560
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &131223160 !ruby/object:Gem::Requirement
+  requirement: &75998660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131223160
+  version_requirements: *75998660
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &131221400 !ruby/object:Gem::Requirement
+  requirement: &75998200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131221400
+  version_requirements: *75998200
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &131219920 !ruby/object:Gem::Requirement
+  requirement: &75997580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *131219920
+  version_requirements: *75997580
 - !ruby/object:Gem::Dependency
   name: soap4r-ruby1.9
-  requirement: &131217780 !ruby/object:Gem::Requirement
+  requirement: &75997140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131217780
+  version_requirements: *75997140
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &131216380 !ruby/object:Gem::Requirement
+  requirement: &75996580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *131216380
+  version_requirements: *75996580
 - !ruby/object:Gem::Dependency
   name: single_test
-  requirement: &131170000 !ruby/object:Gem::Requirement
+  requirement: &75996060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *131170000
+  version_requirements: *75996060
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &131169140 !ruby/object:Gem::Requirement
+  requirement: &75995540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *131169140
+  version_requirements: *75995540
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &131168160 !ruby/object:Gem::Requirement
+  requirement: &75995060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *131168160
+  version_requirements: *75995060
 description: 
 email:
 - umlaut-general@rubyforge.org
@@ -385,6 +385,40 @@ files:
 - README.md
 - ./test/integration/request_test.rb
 - ./test/integration/request_reuse_test.rb
+- ./test/dummy/tmp/cache/assets/DA6/A80/sprockets%2F92e26d8e58d5bcc8b8f6c25d1b05b9c1
+- ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
+- ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
+- ./test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
+- ./test/dummy/tmp/cache/assets/D94/FF0/sprockets%2F3b56a1aa77de0d570c38a4a9d5f4b1d6
+- ./test/dummy/tmp/cache/assets/CBD/730/sprockets%2F034c1086748b981c36672d5a56e7fed6
+- ./test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
+- ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
+- ./test/dummy/tmp/cache/assets/D24/360/sprockets%2F6987b047a96dc685ba3cf39b31477f6d
+- ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
+- ./test/dummy/tmp/cache/assets/DFD/300/sprockets%2Fabac9489cf7f1db8ef00d72a1571ee1e
+- ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
+- ./test/dummy/tmp/cache/assets/D43/0D0/sprockets%2F682843a8d0795a5fbcfeb2f0c81727d0
+- ./test/dummy/tmp/cache/assets/C80/980/sprockets%2Fc94807409c1523d43e18d25f35d93c41
+- ./test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
+- ./test/dummy/tmp/cache/assets/D6C/7D0/sprockets%2F8a05d6981ec0d38c51739bef0b3a9c2b
+- ./test/dummy/tmp/cache/assets/D37/2B0/sprockets%2F40834fb07d7318c1fddd5003bd9e04f6
+- ./test/dummy/tmp/cache/assets/DFC/040/sprockets%2F15ea81cf915c0cb1dfc9cc04c9fef364
+- ./test/dummy/tmp/cache/assets/DF7/960/sprockets%2F99ac6db10b44a64fbba4ee847b35ba8b
+- ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
+- ./test/dummy/tmp/cache/assets/D97/6B0/sprockets%2Fb070e8c799d1a4ad5e62e0a1ae3b83e6
+- ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
+- ./test/dummy/tmp/cache/assets/E38/FE0/sprockets%2Fe1fc875efa817cbb94a5d8de25ea4e6b
+- ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
+- ./test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
+- ./test/dummy/tmp/cache/assets/C45/A30/sprockets%2F39494895e462697b478d3d0c79298a26
+- ./test/dummy/tmp/cache/assets/DC0/D20/sprockets%2F1ccf7405cd252dcec4bf23af82e2563a
+- ./test/dummy/tmp/cache/assets/D74/4C0/sprockets%2F64fdf30f75592d6e45fcfc45a48d20a2
+- ./test/dummy/tmp/cache/assets/C5F/340/sprockets%2F99692920160b7a279b86a80415b79db7
+- ./test/dummy/tmp/cache/assets/DD2/D80/sprockets%2Fc66d103807d0f971fbbcf9aa8b8b27ee
+- ./test/dummy/tmp/cache/assets/C2A/410/sprockets%2Fd654b74912b4773a2534616863fb6565
+- ./test/dummy/tmp/cache/assets/D33/FD0/sprockets%2F2ba0b4e6334a77b923e5f770381bb2bf
+- ./test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - ./test/dummy/tmp/performance/ProfilerTest#test_puts_foo_process_time_graph.html
 - ./test/dummy/tmp/performance/BenchmarkerTest#test_puts_foo_gc_time.csv
 - ./test/dummy/tmp/performance/minus.png
@@ -466,7 +500,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2566118564482520120
+      hash: 4604852421173402450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -475,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL
@@ -483,6 +517,40 @@ summary: For Libraries, a just-in-time last-mile service aggregator, taking Open
 test_files:
 - ./test/integration/request_test.rb
 - ./test/integration/request_reuse_test.rb
+- ./test/dummy/tmp/cache/assets/DA6/A80/sprockets%2F92e26d8e58d5bcc8b8f6c25d1b05b9c1
+- ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
+- ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
+- ./test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
+- ./test/dummy/tmp/cache/assets/D94/FF0/sprockets%2F3b56a1aa77de0d570c38a4a9d5f4b1d6
+- ./test/dummy/tmp/cache/assets/CBD/730/sprockets%2F034c1086748b981c36672d5a56e7fed6
+- ./test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
+- ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
+- ./test/dummy/tmp/cache/assets/D24/360/sprockets%2F6987b047a96dc685ba3cf39b31477f6d
+- ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
+- ./test/dummy/tmp/cache/assets/DFD/300/sprockets%2Fabac9489cf7f1db8ef00d72a1571ee1e
+- ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
+- ./test/dummy/tmp/cache/assets/D43/0D0/sprockets%2F682843a8d0795a5fbcfeb2f0c81727d0
+- ./test/dummy/tmp/cache/assets/C80/980/sprockets%2Fc94807409c1523d43e18d25f35d93c41
+- ./test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
+- ./test/dummy/tmp/cache/assets/D6C/7D0/sprockets%2F8a05d6981ec0d38c51739bef0b3a9c2b
+- ./test/dummy/tmp/cache/assets/D37/2B0/sprockets%2F40834fb07d7318c1fddd5003bd9e04f6
+- ./test/dummy/tmp/cache/assets/DFC/040/sprockets%2F15ea81cf915c0cb1dfc9cc04c9fef364
+- ./test/dummy/tmp/cache/assets/DF7/960/sprockets%2F99ac6db10b44a64fbba4ee847b35ba8b
+- ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
+- ./test/dummy/tmp/cache/assets/D97/6B0/sprockets%2Fb070e8c799d1a4ad5e62e0a1ae3b83e6
+- ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
+- ./test/dummy/tmp/cache/assets/E38/FE0/sprockets%2Fe1fc875efa817cbb94a5d8de25ea4e6b
+- ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
+- ./test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
+- ./test/dummy/tmp/cache/assets/C45/A30/sprockets%2F39494895e462697b478d3d0c79298a26
+- ./test/dummy/tmp/cache/assets/DC0/D20/sprockets%2F1ccf7405cd252dcec4bf23af82e2563a
+- ./test/dummy/tmp/cache/assets/D74/4C0/sprockets%2F64fdf30f75592d6e45fcfc45a48d20a2
+- ./test/dummy/tmp/cache/assets/C5F/340/sprockets%2F99692920160b7a279b86a80415b79db7
+- ./test/dummy/tmp/cache/assets/DD2/D80/sprockets%2Fc66d103807d0f971fbbcf9aa8b8b27ee
+- ./test/dummy/tmp/cache/assets/C2A/410/sprockets%2Fd654b74912b4773a2534616863fb6565
+- ./test/dummy/tmp/cache/assets/D33/FD0/sprockets%2F2ba0b4e6334a77b923e5f770381bb2bf
+- ./test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - ./test/dummy/tmp/performance/ProfilerTest#test_puts_foo_process_time_graph.html
 - ./test/dummy/tmp/performance/BenchmarkerTest#test_puts_foo_gc_time.csv
 - ./test/dummy/tmp/performance/minus.png