sinatra-activerecord 1.7.0 → 2.0.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e6daf84b3cb0108a5eb8ccf9d9c12235ff8880c
-  data.tar.gz: 767c48d339c80928c7efd9e3439317a108725606
+  metadata.gz: 73174bc1c11d020135e4dc1ad39349cb924a96b5
+  data.tar.gz: 41f81bf2f42246da958410ee0f36580d641ab755
 SHA512:
-  metadata.gz: f13743ccadcb71e61e284df3bca9e8b502f93e447ccbc082d5e8147f1c92bc2a01ccfd152313a971185a45b96425d72233c65bb6461e52e3733a9ecc6061ef2b
-  data.tar.gz: 84c62f7fdad2bc8087da92592b23f6d71888ffca5b072e574b8a0c21f74b29951bb4dbcca713b7b8acf9c4686acf59a539f99ae8b448ca32fbcadf54f077f0da
+  metadata.gz: 7bb21bcd938987562b04c529a8cfa37f0e68626fd832f488da1812a74493eb9fa6e58b7888363b153f3c7580a077cde84b439bc8e30ad8371c66d8b927c808af
+  data.tar.gz: b60744c2788b99a3b0d5a59a3ea03da15372a52a5cdd2fb571bf2980408e369fc6117db4401912a63dbdb893bd8bf817c47e56faa0beb85e67ae7cdc03455d3f

data/lib/sinatra/activerecord.rb

@@ -1,7 +1,11 @@
 require 'sinatra/base'
 require 'active_record'
+require 'active_support/core_ext/hash/keys'
+
 require 'logger'
-require 'active_support/core_ext/string/strip'
+require 'pathname'
+require 'yaml'
+require 'erb'
 
 module Sinatra
   module ActiveRecordHelper
@@ -11,50 +15,11 @@ module Sinatra
   end
 
   module ActiveRecordExtension
-    def database=(spec)
-      set :database_spec, spec
-      @database = nil
-      database
-    end
-
-    def database
-      @database ||= begin
-        ActiveRecord::Base.logger = activerecord_logger
-        ActiveRecord::Base.establish_connection(resolve_spec(database_spec))
-        begin
-          ActiveRecord::Base.connection
-        rescue Exception => e
-        end
-        ActiveRecord::Base
-      end
-    end
-
-    def database_file=(path)
-      require 'pathname'
-
-      return if root.nil?
-      path = File.join(root, path) if Pathname.new(path).relative?
-
-      if File.exists?(path)
-        require 'yaml'
-        require 'erb'
-
-        database_hash = YAML.load(ERB.new(File.read(path)).result) || {}
-        ActiveRecord::Base.configurations = database_hash
-
-        database_hash = database_hash[environment.to_s] if database_hash[environment.to_s]
-
-        set :database, database_hash
-      end
-    end
-
-    protected
-
     def self.registered(app)
-      app.set :activerecord_logger, Logger.new(STDOUT)
-      app.set :database_spec, ENV['DATABASE_URL']
-      app.set :database_file, "#{Dir.pwd}/config/database.yml"
-      app.database if app.database_spec
+      app.set :database, ENV['DATABASE_URL'] if ENV['DATABASE_URL']
+      app.set :database_file, "#{Dir.pwd}/config/database.yml" if File.exists?("#{Dir.pwd}/config/database.yml")
+      ActiveRecord::Base.logger = Logger.new(STDOUT)
+
       app.helpers ActiveRecordHelper
 
       # re-connect if database connection dropped
@@ -62,21 +27,27 @@ module Sinatra
       app.after  { ActiveRecord::Base.clear_active_connections! }
     end
 
-    private
+    def database_file=(path)
+      path = File.join(root, path) if Pathname(path).relative? and root
+      spec = YAML.load(ERB.new(File.read(path)).result) || {}
+      set :database, spec
+    end
 
-    def resolve_spec(database_spec)
-      if database_spec.is_a?(String)
-        if database_spec =~ %r{^sqlite3?://[^/]+$}
-          warn <<-MESSAGE.strip_heredoc
-            It seems your database URL looks something like this: "sqlite3://<database_name>".
-            This doesn't work anymore, you need to use 3 slashes, like this: "sqlite3:///<database_name>".
-          MESSAGE
-        end
-        database_spec.sub(/^sqlite:/, "sqlite3:")
+    def database=(spec)
+      if spec.is_a?(Hash) and spec.symbolize_keys[environment]
+        ActiveRecord::Base.configurations = spec.stringify_keys
+        ActiveRecord::Base.establish_connection(environment)
       else
-        database_spec
+        ActiveRecord::Base.establish_connection(spec)
+        ActiveRecord::Base.configurations = {
+          environment.to_s => ActiveRecord::Base.connection.pool.spec.config
+        }
       end
     end
+
+    def database
+      ActiveRecord::Base
+    end
   end
 
   register ActiveRecordExtension

data/lib/sinatra/activerecord/rake.rb

@@ -1,148 +1,51 @@
-require 'active_record'
-require 'active_support/core_ext/string/strip'
-require 'fileutils'
+case ActiveRecord::VERSION::MAJOR
+when 4
 
-module Sinatra
-  module ActiveRecordTasks
-    extend self
-
-    def create
-      silence_activerecord do
-        ActiveRecord::Tasks::DatabaseTasks.create(config)
-      end
-    end
-
-    def drop
-      silence_activerecord do
-        ActiveRecord::Tasks::DatabaseTasks.drop(config)
-      end
-    end
-
-    def seed
-      silence_activerecord do
-        load("#{db_dir}/seeds.rb")
-      end
+  seed_loader = Object.new
+  seed_loader.instance_eval do
+    def load_seed
+      load "#{ActiveRecord::Tasks::DatabaseTasks.db_dir}/seeds.rb"
     end
+  end
 
-    def setup
-      silence_activerecord do
-        create
-        load_schema
-        seed
-      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
 
-    def create_migration(migration_name, version = nil)
-      raise "No NAME specified. Example usage: `rake db:create_migration NAME=create_users`" if migration_name.nil?
+when 3
 
-      migration_number = version || Time.now.utc.strftime("%Y%m%d%H%M%S")
-      migration_file = File.join(migrations_dir, "#{migration_number}_#{migration_name}.rb")
-      migration_class = migration_name.split("_").map(&:capitalize).join
+  require "active_support/string_inquirer"
 
-      FileUtils.mkdir_p(migrations_dir)
-      File.open(migration_file, 'w') do |file|
-        file.write <<-MIGRATION.strip_heredoc
-          class #{migration_class} < ActiveRecord::Migration
-            def change
-            end
-          end
-        MIGRATION
-      end
-    end
+  module Rails
+    extend self
 
-    def migrate(version = nil)
-      silence_activerecord do
-        migration_version = version ? version.to_i : version
-        ActiveRecord::Migrator.migrate(migrations_dir, migration_version)
-      end
+    def root
+      Pathname.new(Rake.application.original_dir)
     end
 
-    def rollback(step = nil)
-      silence_activerecord do
-        migration_step = step ? step.to_i : 1
-        ActiveRecord::Migrator.rollback(migrations_dir, migration_step)
-      end
+    def env
+      ActiveSupport::StringInquirer.new(ENV["RACK_ENV"] || "development")
     end
 
-    def dump_schema(file_name = "#{db_dir}/schema.rb")
-      silence_activerecord do
-        ActiveRecord::Migration.suppress_messages do
-          # Create file
-          out = File.new(file_name, 'w')
-
-          # Load schema
-          ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, out)
-
-          out.close
+    def application
+      seed_loader = Object.new
+      seed_loader.instance_eval do
+        def load_seed
+          load "db/seeds.rb"
         end
       end
-    end
-
-    def dump_structure(file_name = "#{db_dir}/structure.sql")
-      ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, file_name)
-    end
-
-    def purge
-      if config
-        ActiveRecord::Tasks::DatabaseTasks.purge(config)
-      else
-        raise ActiveRecord::ConnectionNotEstablished
-      end
-    end
-
-    def load_schema(file_name = "#{db_dir}/schema.rb")
-      load(file_name)
-    end
-
-    def load_structure(file_name = "#{db_dir}/structure.sql")
-      ActiveRecord::Tasks::DatabaseTasks.structure_load(config, file_name)
-    end
-
-    def with_config_environment(environment, &block)
-      previous_environment = config_environment
-      begin
-        config_environment(environment)
-        yield
-      ensure
-        config_environment(previous_environment)
-      end
-    end
-
-    def db_dir
-      ActiveRecord::Tasks::DatabaseTasks.db_dir ||= 'db'
-    end
-
-    def db_dir=(dir)
-      ActiveRecord::Tasks::DatabaseTasks.db_dir = dir
-    end
-
-    private
-
-    def config_environment(env = nil)
-      if env
-        @config_environment = env
-      else
-        @config_environment ||= Sinatra::Application.environment.to_s
-      end
-    end
-
-    def config
-      ActiveRecord::Base.configurations[config_environment] ||
-        #active record expects the keys to be strings, but connection_config returns them as symbols
-        Hash[ActiveRecord::Base.connection_config.map{|key, value| [key.to_s, value]}]
-    end
-
-    def migrations_dir
-      ActiveRecord::Migrator.migrations_path
-    end
-
-    def silence_activerecord(&block)
-      old_logger = ActiveRecord::Base.logger
-      ActiveRecord::Base.logger = nil
-      yield if block_given?
-      ActiveRecord::Base.logger = old_logger
+      seed_loader
     end
   end
+
 end
 
+ActiveRecord::Base.logger = nil
+
 load 'sinatra/activerecord/tasks.rake'

data/lib/sinatra/activerecord/tasks.rake

@@ -1,98 +1,40 @@
-require 'rake'
+require "active_support/core_ext/string/strip"
+require "pathname"
 
-namespace :db do
-  desc "create the database from config/database.yml from the current Sinatra env"
-  task :create do
-    Sinatra::ActiveRecordTasks.create
-  end
-
-  desc "drops the data from config/database.yml from the current Sinatra env"
-  task :drop do
-    Sinatra::ActiveRecordTasks.drop
-  end
-
-  desc "load the seed data from db/seeds.rb"
-  task :seed do
-    Sinatra::ActiveRecordTasks.seed
-  end
-
-  desc "create the database and load the schema"
-  task :setup do
-    Sinatra::ActiveRecordTasks.setup
-  end
+load "active_record/railties/databases.rake"
 
-  desc "create an ActiveRecord migration"
+namespace :db do
+  desc "Create a migration (parameters: NAME, VERSION)"
   task :create_migration do
-    Sinatra::ActiveRecordTasks.create_migration(ENV["NAME"], ENV["VERSION"])
-  end
-
-  desc "migrate the database (use version with VERSION=n)"
-  task :migrate do
-    Sinatra::ActiveRecordTasks.migrate(ENV["VERSION"])
-
-    case ActiveRecord::Base.schema_format
-      when :ruby then Rake::Task["db:schema:dump"].invoke
-      when :sql  then Rake::Task["db:structure:dump"].invoke
+    unless ENV["NAME"]
+      puts "No NAME specified. Example usage: `rake db:create_migration NAME=create_users`"
+      exit
     end
-  end
-
-  namespace :migrate do
-    task :reset => ['db:drop', 'db:create', 'db:migrate']
-  end
 
-  task :reset => ['db:drop', 'db:setup']
+    name    = ENV["NAME"]
+    version = ENV["VERSION"] || Time.now.utc.strftime("%Y%m%d%H%M%S")
 
-  desc "roll back the migration (use steps with STEP=n)"
-  task :rollback do
-    Sinatra::ActiveRecordTasks.rollback(ENV["STEP"])
+    filename = "#{version}_#{name}.rb"
+    dirname  = ActiveRecord::Migrator.migrations_path
+    path     = Pathname(File.join(dirname, filename))
 
-    case ActiveRecord::Base.schema_format
-      when :ruby then Rake::Task["db:schema:dump"].invoke
-      when :sql  then Rake::Task["db:structure:dump"].invoke
-    end
-  end
-
-  namespace :schema do
-    desc "dump schema into file"
-    task :dump do
-      Sinatra::ActiveRecordTasks.dump_schema
-    end
-
-    desc "load schema into database"
-    task :load do
-      Sinatra::ActiveRecordTasks.load_schema
-    end
-  end
-
-  namespace :structure do
-    desc "dump schema into a file as SQL"
-    task :dump do
-      Sinatra::ActiveRecordTasks.dump_structure
-    end
+    path.dirname.mkpath
+    path.write <<-MIGRATION.strip_heredoc
+      class #{name.camelize} < ActiveRecord::Migration
+        def change
+        end
+      end
+    MIGRATION
 
-    desc "load schema into database"
-    task :load do
-      Sinatra::ActiveRecordTasks.load_structure
-    end
+    puts path
   end
 
-  namespace :test do
-    task :purge do
-      Sinatra::ActiveRecordTasks.with_config_environment 'test' do
-        Sinatra::ActiveRecordTasks.purge
-      end
-    end
+  task :environment
 
-    task :load => :purge do
-      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
-      Sinatra::ActiveRecordTasks.with_config_environment 'test' do
-        Sinatra::ActiveRecordTasks.load_schema
-      end
-    end
+  Rake::Task["db:test:deprecated"].clear if Rake::Task.task_defined?("db:test:deprecated")
 
-    desc 'Prepare test database from development schema'
-    task :prepare do
-      Rake::Task["db:test:load"].invoke
-    end
+  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: 1.7.0
+  version: 2.0.0.rc
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extends Sinatra with ActiveRecord helpers.
 email: janko.marohnic@gmail.com
 executables: []
@@ -107,9 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0