lib/scrivito/migrations/migrator.rb in scrivito_sdk-1.9.1 vs lib/scrivito/migrations/migrator.rb in scrivito_sdk-1.10.0.rc1

- old
+ new

@@ -1,34 +1,32 @@ module Scrivito module Migrations class Migrator - class << self - def migrations_path - Rails.root + Scrivito::Configuration.migration_path - end + def self.migrations_path + Rails.root + Scrivito::Configuration.migration_path + end - def determine_migrations(paths) - paths = Array(paths) - files = Dir[*paths.map { |path| "#{path}/**/[0-9]*_*.rb" }] - splitter = /([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?\.rb\z/ + def self.determine_migrations(paths) + paths = Array(paths) + files = Dir[*paths.map { |path| "#{path}/**/[0-9]*_*.rb" }] + splitter = /([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?\.rb\z/ - migrations = files.map do |filename| - version, name, scope = filename.scan(splitter).first + migrations = files.map do |filename| + version, name, scope = filename.scan(splitter).first - unless version - raise ScrivitoError.new("Illegal name for migration file: #{filename}\n\t - (only lower case letters, numbers, and '_' allowed)") - end - - version = version - name = name.camelize - - require(File.expand_path(filename)) - name.constantize.new(name, version, filename, scope) + unless version + raise ScrivitoError.new("Illegal name for migration file: #{filename}\n\t + (only lower case letters, numbers, and '_' allowed)") end - migrations.sort_by(&:version) + version = version + name = name.camelize + + require(File.expand_path(filename)) + name.constantize.new(name, version, filename, scope) end + + migrations.sort_by(&:version) end attr_reader :migrations attr_reader :workspace_lock