sufia 3.3.0 → 3.4.0

data/sufia-models/lib/sufia/models/generic_file/metadata.rb

@@ -0,0 +1,22 @@
+module Sufia
+  module GenericFile
+    module Metadata
+      extend ActiveSupport::Concern
+
+      included do
+        has_metadata "descMetadata", type: GenericFileRdfDatastream
+        has_metadata "properties", type: PropertiesDatastream
+        has_file_datastream "content", type: FileContentDatastream
+        has_file_datastream "thumbnail"
+
+
+        has_attributes :relative_path, :depositor, :import_url, datastream: :properties, multiple: false
+        has_attributes :date_uploaded, :date_modified, datastream: :descMetadata, multiple: false 
+        has_attributes :related_url, :based_near, :part_of, :creator,
+                                    :contributor, :title, :tag, :description, :rights,
+                                    :publisher, :date_created, :subject,
+                                    :resource_type, :identifier, :language, datastream: :descMetadata, multiple: true
+      end
+    end
+  end
+end

data/sufia-models/lib/sufia/models/generic_file/mime_types.rb

@@ -3,6 +3,29 @@ module Sufia
     module MimeTypes
       extend ActiveSupport::Concern
 
+      def pdf?
+        self.class.pdf_mime_types.include? self.mime_type
+      end
+
+      def image?
+        self.class.image_mime_types.include? self.mime_type
+      end
+
+      def video?
+        self.class.video_mime_types.include? self.mime_type
+      end
+
+      def audio?
+        self.class.audio_mime_types.include? self.mime_type
+      end
+
+      def file_format
+        return nil if self.mime_type.blank? and self.format_label.blank?
+        return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
+        return self.mime_type.split('/')[1] unless self.mime_type.blank?
+        return self.format_label
+      end
+
       module ClassMethods
         def image_mime_types
           ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']

data/sufia-models/lib/sufia/models/generic_file/permissions.rb

@@ -2,12 +2,12 @@ module Sufia
   module GenericFile
     module Permissions
       extend ActiveSupport::Concern
-      #we're overriding the permissions= method which is in RightsMetadata
-      include Hydra::ModelMixins::RightsMetadata
-      include Sufia::GenericFile::Visibility
+      #we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Visibility
 
       included do
-        has_metadata :name => "rightsMetadata", :type => ParanoidRightsDatastream
+        has_metadata "rightsMetadata", :type => ParanoidRightsDatastream
         validate :paranoid_permissions
       end
 
@@ -29,6 +29,11 @@ module Sufia
         rightsMetadata.update_permissions(perm_hash)
       end
 
+      def permissions
+        perms = super
+        perms.map {|p| { name: p.name, access: p.access, type:p.type } }
+      end
+
       private
 
       def permission_hash

data/sufia-models/lib/sufia/models/generic_file/trophies.rb

@@ -0,0 +1,15 @@
+module Sufia
+  module GenericFile
+    module Trophies
+      extend ActiveSupport::Concern
+      included do
+        before_destroy :cleanup_trophies
+      end
+
+      def cleanup_trophies
+        Trophy.destroy_all(generic_file_id: self.noid)
+      end
+
+    end
+  end
+end

data/sufia-models/lib/sufia/models/generic_file/versions.rb

@@ -0,0 +1,16 @@
+module Sufia
+  module GenericFile
+    module Versions
+      def record_version_committer(user)
+        version = content.latest_version
+        # content datastream not (yet?) present
+        return if version.nil?
+        VersionCommitter.create(:obj_id => version.pid,
+                                :datastream_id => version.dsid,
+                                :version_id => version.versionID,
+                                :committer_login => user.user_key)
+      end
+
+    end
+  end
+end

data/sufia-models/lib/sufia/models/generic_file.rb

@@ -4,9 +4,11 @@ module Sufia
     extend ActiveSupport::Autoload
     autoload :Actions, 'sufia/models/generic_file/actions'
     autoload :Permissions, 'sufia/models/generic_file/permissions'
-    autoload :Visibility, 'sufia/models/generic_file/visibility'
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
+    autoload :Trophies, 'sufia/models/generic_file/trophies'
+    autoload :Metadata, 'sufia/models/generic_file/metadata'
+    autoload :Versions, 'sufia/models/generic_file/versions'
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::MimeTypes
@@ -17,55 +19,18 @@ module Sufia
     include Sufia::GenericFile::Permissions
     include Sufia::GenericFile::WebForm
     include Sufia::GenericFile::Derivatives
+    include Sufia::GenericFile::Trophies
+    include Sufia::GenericFile::Metadata
+    include Sufia::GenericFile::Versions
 
     included do
-      has_metadata :name => "descMetadata", :type => GenericFileRdfDatastream
-      has_metadata :name => "properties", :type => PropertiesDatastream
-      has_file_datastream :name => "content", :type => FileContentDatastream
-      has_file_datastream :name => "thumbnail"
-
       belongs_to :batch, :property => :is_part_of
 
-      delegate_to :properties, [:relative_path, :depositor, :import_url], :unique => true
-      delegate_to :descMetadata, [:date_uploaded, :date_modified], :unique => true
-      delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
-                                  :contributor, :title, :tag, :description, :rights,
-                                  :publisher, :date_created, :subject,
-                                  :resource_type, :identifier, :language]
-
       around_save :characterize_if_changed, :retry_warming
-      before_destroy :cleanup_trophies
 
       attr_accessible *(ds_specs['descMetadata'][:type].fields + [:permissions])
     end
 
-
-    def record_version_committer(user)
-      version = content.latest_version
-      # content datastream not (yet?) present
-      return if version.nil?
-      VersionCommitter.create(:obj_id => version.pid,
-                              :datastream_id => version.dsid,
-                              :version_id => version.versionID,
-                              :committer_login => user.user_key)
-    end
-
-    def pdf?
-      self.class.pdf_mime_types.include? self.mime_type
-    end
-
-    def image?
-      self.class.image_mime_types.include? self.mime_type
-    end
-
-    def video?
-      self.class.video_mime_types.include? self.mime_type
-    end
-
-    def audio?
-      self.class.audio_mime_types.include? self.mime_type
-    end
-
     def persistent_url
       "#{Sufia.config.persistent_hostpath}#{noid}"
     end
@@ -101,10 +66,6 @@ module Sufia
         end
     end
 
-    def cleanup_trophies
-      Trophy.destroy_all(generic_file_id: self.noid)
-    end
-
     def related_files
       relateds = begin
                    self.batch.generic_files
@@ -131,13 +92,6 @@ module Sufia
       return solr_doc
     end
 
-    def file_format
-      return nil if self.mime_type.blank? and self.format_label.blank?
-      return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
-      return self.mime_type.split('/')[1] unless self.mime_type.blank?
-      return self.format_label
-    end
-
     # Redefine this for more intuitive keys in Redis
     def to_param
       noid

data/sufia-models/lib/sufia/models/noid.rb

@@ -1,7 +1,7 @@
 module Sufia
   module Noid
     def Noid.noidify(identifier)
-      identifier.split(":").last
+      String(identifier).split(":").last
     end
 
     def Noid.namespaceize(identifier)

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.3.0"
+    VERSION = "3.4.0"
   end
 end

data/sufia-models/lib/sufia/models.rb

@@ -6,12 +6,6 @@ require 'mailboxer'
 require 'acts_as_follower'
 require 'paperclip'
 require "active_resource" # used by GenericFile to catch errors & by GeoNamesResource
-begin
-  # activerecord-import 0.3.1 does not support rails 4, so we don't require it.
-  require 'activerecord-import'
-rescue LoadError
-  $stderr.puts "Sufia-models is unable to load activerecord-import"
-end
 require 'resque/server'
 
 module Sufia

data/sufia-models/sufia-models.gemspec

@@ -29,11 +29,16 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rails', '>= 3.2.13', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
-  spec.add_dependency "hydra-head", "~> 6.3.0"
-  spec.add_dependency 'active-fedora', "~> 6.5.0"
+
+  # spec.add_dependency "hydra", "6.1.0.rc2"
+  # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible 
+  # without an explicit dependency
+  spec.add_dependency "active-fedora", "~> 6.7.0"
+  spec.add_dependency "blacklight", "~> 4.5.0"
+  spec.add_dependency "hydra-head", "~> 6.4.0"
 
   spec.add_dependency 'nest', '~> 1.1.1'
-  spec.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'
+  spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
   spec.add_dependency 'mailboxer', '~> 0.11.0'
@@ -41,6 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
-  # https://github.com/zdennis/activerecord-import/pull/79
-  #spec.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
+  spec.add_dependency 'activerecord-import'
 end

data/sufia.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |gem|
   gem.license       = 'APACHE2'
 
   gem.add_dependency 'sufia-models', version
-  gem.add_dependency 'blacklight', '~> 4.0', '< 4.4' # blacklight 4.4.1/0 doesn't work with kaminari > 0.14.1
   gem.add_dependency 'blacklight_advanced_search', '~> 2.1.0'
 
-  gem.add_dependency 'hydra-batch-edit', '~> 1.0'
+  gem.add_dependency 'hydra-batch-edit', '>= 1.1.1', '< 2.0.0'
 
   gem.add_dependency 'daemons', '1.1.9'
   gem.add_dependency 'mail_form'

data/tasks/release.rake

@@ -2,6 +2,8 @@ root    = File.expand_path('../../', __FILE__)
 version = File.read("#{root}/SUFIA_VERSION").strip
 tag     = "v#{version}"
 
+directory 'pkg'
+
 ['sufia-models', 'sufia'].each do |framework|
   namespace framework do
     gem     = "pkg/#{framework}-#{version}.gem"

data/tasks/sufia-dev.rake

@@ -26,7 +26,7 @@ end
 desc "Run specs"
 RSpec::Core::RakeTask.new(:rspec) do |t|
   t.pattern = '../**/*_spec.rb'
-  t.rspec_opts = "--colour -I ../"
+  t.rspec_opts = ["--colour -I ../", '--backtrace']
 end
 
 desc "Load fixtures"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -16,34 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: blacklight
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +42,22 @@ dependencies:
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +162,7 @@ files:
 - Rakefile
 - Releasing_sufia.md
 - SUFIA_VERSION
+- UpgradeGuide.md
 - app/assets/images/blacklight/bg.png
 - app/assets/images/blacklight/border.png
 - app/assets/images/blacklight/bul_sq_gry.gif
@@ -266,6 +253,8 @@ files:
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
 - app/controllers/batch_edits_controller.rb
+- app/controllers/concerns/sufia/contact_form_controller_behavior.rb
+- app/controllers/concerns/sufia/dashboard_controller_behavior.rb
 - app/controllers/concerns/sufia/users_controller_behavior.rb
 - app/controllers/contact_form_controller.rb
 - app/controllers/dashboard_controller.rb
@@ -484,21 +473,9 @@ files:
 - lib/generators/sufia/sufia_generator.rb
 - lib/generators/sufia/templates/catalog_controller.rb
 - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
-- lib/generators/sufia/templates/migrations/acts_as_follower_migration.rb
-- lib/generators/sufia/templates/migrations/add_avatars_to_users.rb
-- lib/generators/sufia/templates/migrations/add_groups_to_users.rb
-- lib/generators/sufia/templates/migrations/add_ldap_attrs_to_user.rb
-- lib/generators/sufia/templates/migrations/add_social_to_users.rb
-- lib/generators/sufia/templates/migrations/create_checksum_audit_logs.rb
-- lib/generators/sufia/templates/migrations/create_local_authorities.rb
-- lib/generators/sufia/templates/migrations/create_single_use_links.rb
-- lib/generators/sufia/templates/migrations/create_trophies.rb
-- lib/generators/sufia/templates/migrations/create_version_committers.rb
 - lib/sufia.rb
 - lib/sufia/batch_edits_controller_behavior.rb
-- lib/sufia/contact_form_controller_behavior.rb
 - lib/sufia/controller.rb
-- lib/sufia/dashboard_controller_behavior.rb
 - lib/sufia/downloads_controller_behavior.rb
 - lib/sufia/files_controller/local_ingest_behavior.rb
 - lib/sufia/files_controller/upload_complete_behavior.rb
@@ -547,12 +524,14 @@ files:
 - spec/fixtures/genreForms.nt
 - spec/fixtures/icons.zip
 - spec/fixtures/image.jp2
+- spec/fixtures/image.jpg
 - spec/fixtures/jp2_fits.xml
 - spec/fixtures/jpg_fits.xml
 - spec/fixtures/lexvo.rdf
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
 - spec/fixtures/piano_note.wav
+- spec/fixtures/png_fits.xml
 - spec/fixtures/small_file.txt
 - spec/fixtures/sufia/.gitignore
 - spec/fixtures/sufia/bg_header.jpg
@@ -590,7 +569,6 @@ files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
-- spec/models/access_right_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -628,8 +606,7 @@ files:
 - sufia-models/Rakefile
 - sufia-models/app/models/batch.rb
 - sufia-models/app/models/checksum_audit_log.rb
-- sufia-models/app/models/concerns/sufia/models/access_right.rb
-- sufia-models/app/models/concerns/sufia/models/with_access_right.rb
+- sufia-models/app/models/concerns/sufia/user.rb
 - sufia-models/app/models/datastreams/batch_rdf_datastream.rb
 - sufia-models/app/models/datastreams/file_content_datastream.rb
 - sufia-models/app/models/datastreams/fits_datastream.rb
@@ -682,10 +659,12 @@ files:
 - sufia-models/lib/sufia/models/generic_file/characterization.rb
 - sufia-models/lib/sufia/models/generic_file/derivatives.rb
 - sufia-models/lib/sufia/models/generic_file/export.rb
+- sufia-models/lib/sufia/models/generic_file/metadata.rb
 - sufia-models/lib/sufia/models/generic_file/mime_types.rb
 - sufia-models/lib/sufia/models/generic_file/permissions.rb
 - sufia-models/lib/sufia/models/generic_file/thumbnail.rb
-- sufia-models/lib/sufia/models/generic_file/visibility.rb
+- sufia-models/lib/sufia/models/generic_file/trophies.rb
+- sufia-models/lib/sufia/models/generic_file/versions.rb
 - sufia-models/lib/sufia/models/generic_file/web_form.rb
 - sufia-models/lib/sufia/models/id_service.rb
 - sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb
@@ -701,7 +680,6 @@ files:
 - sufia-models/lib/sufia/models/noid.rb
 - sufia-models/lib/sufia/models/resque.rb
 - sufia-models/lib/sufia/models/solr_document_behavior.rb
-- sufia-models/lib/sufia/models/user.rb
 - sufia-models/lib/sufia/models/user_local_directory_behavior.rb
 - sufia-models/lib/sufia/models/utils.rb
 - sufia-models/lib/sufia/models/version.rb
@@ -763,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -803,12 +781,14 @@ test_files:
 - spec/fixtures/genreForms.nt
 - spec/fixtures/icons.zip
 - spec/fixtures/image.jp2
+- spec/fixtures/image.jpg
 - spec/fixtures/jp2_fits.xml
 - spec/fixtures/jpg_fits.xml
 - spec/fixtures/lexvo.rdf
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
 - spec/fixtures/piano_note.wav
+- spec/fixtures/png_fits.xml
 - spec/fixtures/small_file.txt
 - spec/fixtures/sufia/.gitignore
 - spec/fixtures/sufia/bg_header.jpg
@@ -846,7 +826,6 @@ test_files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
-- spec/models/access_right_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb

data/lib/generators/sufia/templates/migrations/acts_as_follower_migration.rb

@@ -1,17 +0,0 @@
-class ActsAsFollowerMigration < ActiveRecord::Migration
-  def self.up
-    create_table :follows, :force => true do |t|
-      t.references :followable, :polymorphic => true, :null => false
-      t.references :follower,   :polymorphic => true, :null => false
-      t.boolean :blocked, :default => false, :null => false
-      t.timestamps
-    end
-
-    add_index :follows, ["follower_id", "follower_type"],     :name => "fk_follows"
-    add_index :follows, ["followable_id", "followable_type"], :name => "fk_followables"
-  end
-
-  def self.down
-    drop_table :follows
-  end
-end

data/lib/generators/sufia/templates/migrations/add_avatars_to_users.rb

@@ -1,9 +0,0 @@
-class AddAvatarsToUsers < ActiveRecord::Migration
-  def self.up
-    add_attachment :users, :avatar
-  end
-
-  def self.down
-    remove_attachment :users, :avatar
-  end
-end

data/lib/generators/sufia/templates/migrations/add_groups_to_users.rb

@@ -1,11 +0,0 @@
-class AddGroupsToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :group_list, :text
-    add_column :users, :groups_last_update, :datetime
-  end
-
-  def self.down
-    remove_column :users, :group_list
-    remove_column :users, :groups_last_update
-  end
-end

data/lib/generators/sufia/templates/migrations/add_ldap_attrs_to_user.rb

@@ -1,27 +0,0 @@
-class AddLdapAttrsToUser < ActiveRecord::Migration
-  def self.up
-    add_column :users, :display_name, :string
-    add_column :users, :address, :string
-    add_column :users, :admin_area, :string
-    add_column :users, :department, :string
-    add_column :users, :title, :string
-    add_column :users, :office, :string
-    add_column :users, :chat_id, :string
-    add_column :users, :website, :string
-    add_column :users, :affiliation, :string
-    add_column :users, :telephone, :string
-  end
-
-  def self.down
-    remove_column :users, :display_name
-    remove_column :users, :address
-    remove_column :users, :admin_area
-    remove_column :users, :department
-    remove_column :users, :title
-    remove_column :users, :office
-    remove_column :users, :chat_id
-    remove_column :users, :website
-    remove_column :users, :affiliation
-    remove_column :users, :telephone
-  end
-end

data/lib/generators/sufia/templates/migrations/add_social_to_users.rb

@@ -1,13 +0,0 @@
-class AddSocialToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :facebook_handle, :string
-    add_column :users, :twitter_handle, :string
-    add_column :users, :googleplus_handle, :string
-  end
-
-  def self.down
-    remove_column :users, :facebook_handle, :string
-    remove_column :users, :twitter_handle, :string
-    remove_column :users, :googleplus_handle, :string
-  end
-end

data/lib/generators/sufia/templates/migrations/create_checksum_audit_logs.rb

@@ -1,20 +0,0 @@
-class CreateChecksumAuditLogs < ActiveRecord::Migration
-  def self.up
-    create_table :checksum_audit_logs do |t|
-      t.string :pid
-      t.string :dsid
-      t.string :version
-      t.integer :pass
-      t.string :expected_result
-      t.string :actual_result
-      t.timestamps
-    end
-    add_index :checksum_audit_logs, [:pid, :dsid], :name=>'by_pid_and_dsid', :order => {:created_at => "DESC" }
-    
-  end
-
-  def self.down
-    remove_index(:checksum_audit_logs, :name => 'by_pid_and_dsid')
-    drop_table :checksum_audit_logs
-  end
-end

data/lib/generators/sufia/templates/migrations/create_local_authorities.rb

@@ -1,50 +0,0 @@
-class CreateLocalAuthorities < ActiveRecord::Migration
-  def self.up
-    create_table :local_authority_entries, :force => true do |t|
-      t.integer :local_authority_id
-      t.string :label
-      t.string :uri
-    end
-
-    create_table :local_authorities, :force => true do |t|
-      t.string :name, :unique => true
-    end
-
-    create_table :domain_terms, :force => true do |t|
-      t.string :model
-      t.string :term
-    end
-
-    create_table :domain_terms_local_authorities, :id => false do |t|
-      t.integer :domain_term_id, :foreign_key => true
-      t.integer :local_authority_id, :foreign_key => true
-    end
-
-    create_table :subject_local_authority_entries, :force => true  do |t|
-      t.string :label
-      t.string :lowerLabel
-      t.string :url
-    end
-
-    add_index :local_authority_entries, [:local_authority_id, :label], :name => 'entries_by_term_and_label'
-    add_index :local_authority_entries, [:local_authority_id, :uri], :name => 'entries_by_term_and_uri'
-    add_index :domain_terms, [:model, :term], :name => 'terms_by_model_and_term'
-    add_index :domain_terms_local_authorities, [:local_authority_id, :domain_term_id], :name => 'dtla_by_ids1'
-    add_index :domain_terms_local_authorities, [:domain_term_id, :local_authority_id], :name => 'dtla_by_ids2'
-    add_index :subject_local_authority_entries, [:lowerLabel], :name => 'entries_by_lower_label'
-  end
-
-  def self.down
-    drop_table :local_authority_entries
-    drop_table :local_authorities
-    drop_table :domain_terms
-    drop_table :domain_terms_local_authorities
-    drop_table :subject_local_authority_entries
-    remove_index :local_authority_entries, :name => "entries_by_term_and_label"
-    remove_index :local_authority_entries, :name => "entries_by_term_and_uri"
-    remove_index :domain_terms, :name => "terms_by_model_and_term"
-    remove_index :subject_local_authority_entries, :name => 'entries_by_lower_label'
-    remove_index :domain_terms_local_authorities, :name => 'dtla_by_ids1'
-    remove_index :domain_terms_local_authorities, :name => 'dtla_by_ids2'
-  end
-end