sinatra-activerecord 2.0.0.rc → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73174bc1c11d020135e4dc1ad39349cb924a96b5
-  data.tar.gz: 41f81bf2f42246da958410ee0f36580d641ab755
+  metadata.gz: d5a793e2e9766107769c69e570aad46e5d3388c3
+  data.tar.gz: 1f1a0f0bcc4a133ded8adbf47625747b54bf6635
 SHA512:
-  metadata.gz: 7bb21bcd938987562b04c529a8cfa37f0e68626fd832f488da1812a74493eb9fa6e58b7888363b153f3c7580a077cde84b439bc8e30ad8371c66d8b927c808af
-  data.tar.gz: b60744c2788b99a3b0d5a59a3ea03da15372a52a5cdd2fb571bf2980408e369fc6117db4401912a63dbdb893bd8bf817c47e56faa0beb85e67ae7cdc03455d3f
+  metadata.gz: 64bf50a0e2d7bd17fdb0dbb4d08eac01cf669eb773e9d497cfc6cc31e5f351ac5e6c616b75b8cb5ae72619b691bfb4f7d0d6616c770e0cd6618a969fc5913315
+  data.tar.gz: 1e53a2d583f2dba949d4cfc5ce6e32f693c7c8701715378ddf918535785ba31762d828d13fdf1ad3a1baf4b6aa32fa17a44d9e478d511b8db2f86fb7484c4612

data/lib/sinatra/activerecord/rake/activerecord_3.rb

@@ -0,0 +1,27 @@
+require "active_support/string_inquirer"
+
+module Rails
+  extend self
+
+  def root
+    Pathname.new(Rake.application.original_dir)
+  end
+
+  def env
+    ActiveSupport::StringInquirer.new(ENV["RACK_ENV"] || "development")
+  end
+
+  def application
+    seed_loader = Object.new
+    seed_loader.instance_eval do
+      def load_seed
+        load "db/seeds.rb"
+      end
+    end
+    seed_loader
+  end
+end
+
+Rake::Task.define_task("db:environment")
+Rake::Task["db:load_config"].clear
+Rake::Task.define_task("db:rails_env")

data/lib/sinatra/activerecord/rake/activerecord_4.rb

@@ -0,0 +1,19 @@
+seed_loader = Object.new
+seed_loader.instance_eval do
+  def load_seed
+    load "#{ActiveRecord::Tasks::DatabaseTasks.db_dir}/seeds.rb"
+  end
+end
+
+ActiveRecord::Tasks::DatabaseTasks.tap do |config|
+  config.root                   = Rake.application.original_dir
+  config.env                    = ENV["RACK_ENV"] || "development"
+  config.db_dir                 = "db"
+  config.migrations_paths       = ["db/migrate"]
+  config.fixtures_path          = "test/fixtures"
+  config.seed_loader            = seed_loader
+  config.database_configuration = ActiveRecord::Base.configurations
+end
+
+Rake::Task.define_task("db:environment")
+Rake::Task["db:test:deprecated"].clear if Rake::Task.task_defined?("db:test:deprecated")

data/lib/sinatra/activerecord/rake.rb

@@ -1,51 +1,6 @@
-case ActiveRecord::VERSION::MAJOR
-when 4
+load "active_record/railties/databases.rake"
+require "sinatra/activerecord/rake/activerecord_#{ActiveRecord::VERSION::MAJOR}"
 
-  seed_loader = Object.new
-  seed_loader.instance_eval do
-    def load_seed
-      load "#{ActiveRecord::Tasks::DatabaseTasks.db_dir}/seeds.rb"
-    end
-  end
-
-  ActiveRecord::Tasks::DatabaseTasks.tap do |config|
-    config.root                   = Rake.application.original_dir
-    config.env                    = ENV["RACK_ENV"] || "development"
-    config.db_dir                 = "db"
-    config.migrations_paths       = ["db/migrate"]
-    config.fixtures_path          = "test/fixtures"
-    config.seed_loader            = seed_loader
-    config.database_configuration = ActiveRecord::Base.configurations
-  end
-
-when 3
-
-  require "active_support/string_inquirer"
-
-  module Rails
-    extend self
-
-    def root
-      Pathname.new(Rake.application.original_dir)
-    end
-
-    def env
-      ActiveSupport::StringInquirer.new(ENV["RACK_ENV"] || "development")
-    end
-
-    def application
-      seed_loader = Object.new
-      seed_loader.instance_eval do
-        def load_seed
-          load "db/seeds.rb"
-        end
-      end
-      seed_loader
-    end
-  end
-
-end
+load "sinatra/activerecord/tasks.rake"
 
 ActiveRecord::Base.logger = nil
-
-load 'sinatra/activerecord/tasks.rake'

data/lib/sinatra/activerecord/tasks.rake

@@ -1,7 +1,6 @@
 require "active_support/core_ext/string/strip"
 require "pathname"
-
-load "active_record/railties/databases.rake"
+require "fileutils"
 
 namespace :db do
   desc "Create a migration (parameters: NAME, VERSION)"
@@ -14,12 +13,21 @@ namespace :db do
     name    = ENV["NAME"]
     version = ENV["VERSION"] || Time.now.utc.strftime("%Y%m%d%H%M%S")
 
+    ActiveRecord::Migrator.migrations_paths.each do |directory|
+      next unless File.exists?(directory)
+      migration_files = Pathname(directory).children
+      if duplicate = migration_files.find { |path| path.basename.to_s.include?(name) }
+        puts "Another migration is already named \"#{name}\": #{duplicate}."
+        exit
+      end
+    end
+
     filename = "#{version}_#{name}.rb"
     dirname  = ActiveRecord::Migrator.migrations_path
-    path     = Pathname(File.join(dirname, filename))
+    path     = File.join(dirname, filename)
 
-    path.dirname.mkpath
-    path.write <<-MIGRATION.strip_heredoc
+    FileUtils.mkdir_p(dirname)
+    File.write path, <<-MIGRATION.strip_heredoc
       class #{name.camelize} < ActiveRecord::Migration
         def change
         end
@@ -28,13 +36,4 @@ namespace :db do
 
     puts path
   end
-
-  task :environment
-
-  Rake::Task["db:test:deprecated"].clear if Rake::Task.task_defined?("db:test:deprecated")
-
-  if ActiveRecord::VERSION::MAJOR == 3
-    Rake::Task["db:load_config"].clear
-    task :rails_env
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -105,6 +105,8 @@ files:
 - README.md
 - lib/sinatra/activerecord.rb
 - lib/sinatra/activerecord/rake.rb
+- lib/sinatra/activerecord/rake/activerecord_3.rb
+- lib/sinatra/activerecord/rake/activerecord_4.rb
 - lib/sinatra/activerecord/tasks.rake
 homepage: http://github.com/janko-m/sinatra-activerecord
 licenses:
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extends Sinatra with ActiveRecord helpers.