umlaut 3.0.0alpha2 → 3.0.0alpha3

data/app/controllers/link_router_controller.rb

@@ -31,20 +31,6 @@ class LinkRouterController < UmlautController
   
   protected
   
-  # Must return a Hash where each key is a unique service name, and
-  # each value a hash that defines a service. Like the hash in services.yml
-  # under default/services.  By default, this method in fact just loads
-  # and returns that hash, but can be over-ridden with local logic for
-  # determining proper list of services for current request.
-  #
-  # Local over-ride could even in theory return a custom subclass of Collection, 
-  # with customized dispatch behavior. Probably not a great idea though.  
-  def create_collection    
-    # trim out ones with disabled:true
-    services = ServiceStore.config["default"]["services"].reject {|id, hash| hash["disabled"] == true}
-            
-    return Collection.new(@user_request, services)
-  end
   
   
   # Used to calculate a destination/target url for an Umlaut response item.

data/app/controllers/resolve_controller.rb

@@ -137,20 +137,7 @@ class ResolveController < UmlautController
   protected
   
   
-  # Must return a Hash where each key is a unique service name, and
-  # each value a hash that defines a service. Like the hash in services.yml
-  # under default/services.  By default, this method in fact just loads
-  # and returns that hash, but can be over-ridden with local logic for
-  # determining proper list of services for current request.
-  #
-  # Local over-ride could even in theory return a custom subclass of Collection, 
-  # with customized dispatch behavior. Probably not a great idea though.  
-  def create_collection    
-    # trim out ones with disabled:true
-    services = ServiceStore.config["default"]["services"].reject {|id, hash| hash && hash["disabled"] == true}
-            
-    return Collection.new(@user_request, services)
-  end
+
     
   # Retrives or sets up the relevant Umlaut Request, and returns it. 
   def init_processing

data/app/controllers/umlaut/controller_behavior.rb

@@ -16,5 +16,20 @@ module Umlaut::ControllerBehavior
     UmlautConfigurable.set_default_configuration!(controller.umlaut_config)
   end
   
+  protected
+  
+  # Returns a Collection object with currently configured services. 
+  # Loads from Rails.root/config/umlaut_services.yml
+  #
+  # Local app can in theory override in local UmlautController to have
+  # different custom behavior for calculating the collection, but this
+  # is not entirely tested yet. 
+  def create_collection    
+    # trim out ones with disabled:true
+    services = ServiceStore.config["default"]["services"].reject {|id, hash| hash && hash["disabled"] == true}
+            
+    return Collection.new(@user_request, services)
+  end
+  
   
 end

data/app/models/sfx_db/sfx_db_base.rb

@@ -18,6 +18,10 @@ module SfxDb
     def readonly?() 
       return true
     end
+    
+    # ActiveRecord likes it when we tell it this is an abstract
+    # class only. 
+    self.abstract_class = true 
 
     # Atttempts to extract all URLs that SFX knows about from the db.
     # This process is not 100%, becuase of the way SFX calculates URLs

data/lib/generators/umlaut/install_generator.rb

@@ -111,7 +111,7 @@ module Umlaut
           "              " +
           word_wrap("After setting up your 'development' database in config/databases.yml, run `rake db:migrate`", :line_width => 60).
             split("\n").
-            join("\n              ")
+            join("\n              ") + "\n"
           )
         
     end

data/lib/tasks/umlaut_migrate_permalinks.rake

@@ -0,0 +1,106 @@
+namespace :umlaut do
+    
+    desc "Migrate permalinks from an umlaut 2.x installation"
+    task :migrate_permalinks, [:connection] => [:environment] do |t,args|
+      old_connection_name = args[:connection] || "umlaut2_source"            
+      
+      begin        
+        require 'activerecord-import'        
+        ar_import = true
+      rescue LoadError
+        ar_import = false
+      end
+      
+      # Turn off all caching we can think of with AR, cause it's gonna
+      # take too much memory!
+      IdentityMap.enabled = false
+      
+      
+      unless ActiveRecord::Base.configurations[old_connection_name]
+        raise Exception.new("You must have a connection for '#{old_connection_name}' configured in database.yml, pointing to the Umlaut 2.x source db.")
+      end
+            
+      puts "\nWARNING: We will delete all existing permalinks from the '#{Rails.env}' database:"   
+      puts "  " + {}.merge(Permalink.connection_config).inspect
+      print "Sure you want to continue? (yes to continue) "
+      continue = $stdin.gets
+      raise Exception.new("Cancelled by user") unless continue.chomp == "yes" 
+      
+      Permalink.delete_all
+      
+      # dynamically create a model for Permalinks in old
+      # db, set up with connection info to old db. 
+      OldPermalink = Class.new(ActiveRecord::Base) do
+        self.set_table_name("permalinks")
+        # just to be safe
+        def read_only?
+          true
+        end
+      end
+      # Can't include this line in dynamic class generation above,
+      # have to do it now that we have a constant assigned, for it
+      # to work. 
+      OldPermalink.establish_connection old_connection_name.to_sym
+      
+      puts "\nThis may take a while #{"(include activerecord-import gem for faster importing)" unless ar_import}...\n"
+
+      # Read all the old Permalinks in, write em out to new
+      # db, _with same primary key_ since PK is used for actual
+      # user-facing permalinks. We don't copy the Referent relationship,
+      # we just copy enough to recreate, context_obj_serialized.
+      could_not_migrate = {
+        :count => 0,
+        :highest_id => 0,
+        :latest_date => 0
+      }
+      bulk_queue = []
+      i = 0
+      OldPermalink.find_each(:batch_size => 20000) do |old_p|
+        i += 1
+        
+        if old_p.context_obj_serialized.blank?
+          could_not_migrate[:count] += 1
+          count_not_migrate[:highest_id] = [count_not_migrate[:highest_id], old_p.id].max
+          could_not_migrate[:latest_date] = [could_not_migrate[:latest_date], old_p.created_on].max
+        else        
+          new_p = Permalink.new
+          new_p.id = old_p.id # keep the id the same!
+          new_p.created_on = old_p.created_on # why not keep it the same?
+          new_p.orig_rfr_id = old_p.orig_rfr_id # why not
+          
+          # the important thing to be able to actually resolve it
+          new_p.context_obj_serialized = old_p.context_obj_serialized
+          
+          if ar_import
+            bulk_queue << new_p
+          else
+            new_p.save!
+          end
+        end
+
+        print(".") if i % 1000 == 0        
+        
+        if ar_import && i % 10000 == 0
+          print "+"
+          Permalink.import(bulk_queue, :validate => false, :timestamps => false)
+          bulk_queue.clear
+        end
+        
+      end
+      
+      unless bulk_queue.empty?
+        print "+"
+        Permalink.import(bulk_queue, :validate => false, :timestamps => false)
+      end
+      
+      puts "\nDone."
+      
+      if could_not_migrate[:count] > 0
+        puts "\n\nCould not migrate #{could_not_migrate[:count]} permalinks"
+        puts "   Ending at permalink #{could_not_migrate[:highest_id]}, "
+        puts "   created at #{could_not_migrate[:latest_date]}"
+      end
+      
+    end
+    
+  end

data/lib/umlaut/version.rb

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

data/lib/umlaut.rb

@@ -25,13 +25,14 @@ module Umlaut
     # I don't entirely understand what's going on. 
     #config.eager_load_paths << File.join(self.root, "lib")
     
-    # This makes our rake tasks visible.
-    rake_tasks do
-      Dir.chdir(File.expand_path(File.join(File.dirname(__FILE__), '..'))) do
-        Dir.glob(File.join('lib', 'tasks', '*.rake')).each do |railtie|
-          load railtie
-        end
-      end
-    end
+    # This makes our rake tasks visible. NOT NEEDED, tasks in lib/tasks
+    # are avail by default, this ends up doing a double load. 
+    #rake_tasks do
+    #  Dir.chdir(File.expand_path(File.join(File.dirname(__FILE__), '..'))) do
+    #    Dir.glob(File.join('lib', 'tasks', '*.rake')).each do |railtie|
+    #      load railtie
+    #    end
+    #  end
+    #end
   end
 end

data/test/dummy/config/database.yml

@@ -0,0 +1,53 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+# UMLAUT: mysql db with mysql2 adapter strongly recommended for Umlaut, in both 
+# production and development. sqlite3 has unclear semantics under threaded 
+# concurrency which umlaut uses, and in many cases simply does not work. 
+#
+# A high (connection) pool setting is also, sadly, generally
+# required at present. 
+#
+# development:
+#   adapter: mysql2
+#   host: 
+#   username:
+#   password:
+#   database:
+#   pool: 30
+
+development:
+  adapter: mysql2
+  database: umlaut3_dev
+  pool: 30 
+  timeout: 5000
+  username: umlaut_app
+  password: uu21
+  host: app01.mse.jhu.edu
+
+# 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:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
+
+
+umlaut2_source:
+  adapter: mysql2
+  host: app01.mse.jhu.edu
+  database: umlaut_production
+  username: umlaut_app
+  password: uu21
+  encoding: utf8