umlaut 3.0.0alpha1 → 3.0.0alpha2

data/README.md

@@ -22,10 +22,10 @@ config/customization/enhancement seperate from distro, not so much to let you
 
 ## Installation
 
-For installation instructions suitable for the neophyte, see 
+For complete step-by-step install instructions suitable even for the neophyte, see:
 https://github.com/team-umlaut/umlaut/wiki/Installation. 
 
-The Rails expert super concise summary is:
+The Rails/Umlaut super-concise expert summary is:
 
 * Rails 3.1+
 
@@ -38,6 +38,8 @@ The Rails expert super concise summary is:
 * mysql database strongly encouraged, sqlite3 probably won't work. 
 
 * configuration in `./config/umlaut_services.yml` and `./app/controllers/umlaut_controller.rb` 
+
+* Umlaut uses multi-threaded concurrency in a way incompatible with development-mode class reloading. You need cache_classes=false even in dev, the Umlaut install generator changes this for you. 
     
 ## Source
 

data/lib/generators/umlaut/install_generator.rb

@@ -27,8 +27,8 @@ module Umlaut
       end
     end
     
-    def database_yml_hint
-      guarded(:database_yml_hint) do
+    def database_yml_hints
+      guarded(:database_yml_hints) do
         insert_into_file("config/database.yml", :before => /^(\s*)development:/) do                     
           <<-eos
 #
@@ -48,7 +48,29 @@ module Umlaut
 #   pool: 30
 
           eos
-        end        
+        end
+        append_to_file("config/database.yml") do
+          <<-eos
+          
+#
+# UMLAUT: for the 'search' functions (A-Z title lookup) to work, you need
+# a direct database connection to the SFX database, under 'sfx_db' key. 
+# You should manually set up a new read-only MySQL account in the SFX db
+# for this purpose, rather than use one of the full-access existing SFX
+# mysql accounts. 
+#
+#sfx_db:
+#  adapter: mysql2
+#  host: my_sfx_host.u.edu
+#  port: 3310 # 3310 is defualt SFX embedded mysql port
+#  database: sfxlcl41 # or other sfx instance db
+#  username:
+#  password:
+#  pool: 5
+#  encoding: utf8
+# 
+          eos
+        end
       end
     end
     

data/lib/umlaut/routes.rb

@@ -37,7 +37,7 @@ module Umlaut
       # for now include root generation in Umlaut auto-generation
       def root
         add_routes do |options|
-          root :to => "resolve#index"
+          root :to => "search#index"
         end
       end
       

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0alpha1"
+  VERSION = "3.0.0alpha2"
 end

data/test/dummy/config/{database.yml → database.yml-jh}

@@ -3,13 +3,7 @@
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
+adfadf# Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: umlaut
 version: !ruby/object:Gem::Version 
-  hash: -3702664386
+  hash: -3702664392
   prerelease: 5
   segments: 
   - 3
   - 0
   - 0
   - alpha
-  - 1
-  version: 3.0.0alpha1
+  - 2
+  version: 3.0.0alpha2
 platform: ruby
 authors: 
 - Jonathan Rochkind, et al
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-28 00:00:00 Z
+date: 2011-12-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -414,7 +414,6 @@ files:
 - test/dummy/config/environments/test.rb
 - test/dummy/config/application.rb
 - test/dummy/config/environment.rb
-- test/dummy/config/database.yml
 - test/dummy/config/umlaut_services.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/locales/en.yml
@@ -426,6 +425,7 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/database-jhu.yml
+- test/dummy/config/database.yml-jh
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/config.ru
@@ -538,7 +538,6 @@ test_files:
 - test/dummy/config/environments/test.rb
 - test/dummy/config/application.rb
 - test/dummy/config/environment.rb
-- test/dummy/config/database.yml
 - test/dummy/config/umlaut_services.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/locales/en.yml
@@ -550,6 +549,7 @@ test_files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/database-jhu.yml
+- test/dummy/config/database.yml-jh
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/config.ru