sinatra-activerecord 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c133323fecd58b8b5cbc3191b786cb37be8908e
-  data.tar.gz: a9e18e09f160a989811f63a7d9bbd8def3a2a985
+  metadata.gz: 7edc0684bddd8d0f9cc24239a89dc19361301dea
+  data.tar.gz: c51d1ade72ed09fda8477a1dc375aa33136eaa8c
 SHA512:
-  metadata.gz: 72bfb753f3af935b94b743af3ef7c3306bd145f2791750b1be973472515b7ced8bc68c09ce3f524a5fe1fe59485b6762306f86b130ca84749a4f027d8040d7a9
-  data.tar.gz: 39421549e92c8d5826fb43022da5519c1f9c16aba7b006db251c0c5072e6167a0a76a1b935de4a30abf7c57071a18bb6b2bb01bf614685dbc9b6eee0c88d192c
+  metadata.gz: 8d5eef19d30808bb280a1eb32743e63224f678f2a8c646a5c88629d39e2e071821e4c72b3163263ba80c18fc6475a0f6816786d7822869459b4cc9cb3a18fbcf
+  data.tar.gz: 006139024a60db57dbb2967045aee49ef8819981b39599b4c281f7457982284268e740d0463034465795fe263b0d13f3e7d7a885c14f62fd845fbcb16e2fede8

data/README.md

@@ -125,7 +125,7 @@ This gem was made in 2009 by Blake Mizerany, creator of Sinatra.
 
 ## Social
 
-You can follow me on Twitter, I'm [@m_janko](http://twitter.com/m_janko).
+You can follow me on Twitter, I'm [@jankomarohnic](http://twitter.com/jankomarohnic).
 
 ## License
 

data/lib/sinatra/activerecord.rb

@@ -21,7 +21,10 @@ module Sinatra
       @database ||= begin
         ActiveRecord::Base.logger = activerecord_logger
         ActiveRecord::Base.establish_connection(resolve_spec(database_spec))
-        ActiveRecord::Base.connection
+        begin
+          ActiveRecord::Base.connection
+        rescue Exception => e
+        end
         ActiveRecord::Base
       end
     end
@@ -37,7 +40,10 @@ module Sinatra
         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

data/lib/sinatra/activerecord/rake.rb

@@ -6,6 +6,32 @@ 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/seeds.rb")
+      end
+    end
+
+    def setup
+      silence_activerecord do
+        create()
+        load_schema()
+        seed()
+      end
+    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?
 
@@ -58,6 +84,10 @@ module Sinatra
 
     private
 
+    def config
+      ActiveRecord::Base.configurations[Sinatra::Application.environment.to_s]
+    end
+
     def migrations_dir
       ActiveRecord::Migrator.migrations_path
     end

data/lib/sinatra/activerecord/tasks.rake

@@ -1,6 +1,26 @@
 require 'rake'
 
 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
+
   desc "create an ActiveRecord migration"
   task :create_migration do
     Sinatra::ActiveRecordTasks.create_migration(ENV["NAME"], ENV["VERSION"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra