ruby-app-ar 0.1 → 0.1.1

data/README.md

@@ -3,9 +3,12 @@ RubyAppAr
 
 [RubyApp](http://github.com/kostya/ruby-app) extension, adds ActiveRecord support.
 
+Install
+-------
+
 Use generator:
 
-    ruby-app new_app -ar
+    ruby-app new app --ar
     
 
 ### OR Manually
@@ -25,5 +28,15 @@ Create
     
     db/migrate
     config/database.yml
+
+
+Using
+-----
+
+Use as it is in Rails. But use APP_ENV for specify environment.
+
+Examples:
+
+    $ rake db:create APP_ENV=test
+    $ rake db:migrate
     
-    

data/lib/init-activerecord.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+require 'active_record'
+
+# establish connection
+ActiveRecord::Base.configurations = App.config.database_yml
+ActiveRecord::Base.establish_connection App.config.database_settings
+
+if ActiveRecord::VERSION::MAJOR == 2
+
+  class RubyAppDumpLogger
+    def method_missing(method, *args)
+    end
+  end
+
+  ActiveRecord::Base.logger = RubyAppDumpLogger.new
+end

data/lib/ruby-app-ar.rb

@@ -9,7 +9,7 @@ if defined?(Application) && (Application.send(:identifier) rescue '-') == 'ruby-
   # add initializers
   App.initializer_paths << [
       File.join(File.dirname(__FILE__), %w{ config.rb }),
-      File.join(File.dirname(__FILE__), %w{ activerecord.rb })
+      File.join(File.dirname(__FILE__), %w{ init-activerecord.rb })
     ].map{|f| File.expand_path(f) }  
 
 end

data/lib/ruby-app-ar/tasks.rake

@@ -187,7 +187,7 @@ namespace :db do
   end
 
   desc "Raises an error if there are pending migrations"
-  task :abort_if_pending_migrations => :environment do
+  task :pending_migrations => :environment do
     if defined? ActiveRecord
       pending_migrations = ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations
 
@@ -381,7 +381,11 @@ def drop_database(config)
   when 'mysql'
     ActiveRecord::Base.connection.drop_database config['database']
   when /^sqlite/
-    FileUtils.rm(File.join(Application.root, config['database']))
+    if config['database'].start_with?('db')
+      FileUtils.rm(File.join(Application.root, config['database']))
+    else
+      FileUtils.rm(config['database'])
+    end
   when 'postgresql'
     ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
     ActiveRecord::Base.connection.drop_database config['database']

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RubyAppAr
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-app-ar
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Makarchev Konstantin
@@ -14,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-22 00:00:00 Z
+date: 2012-06-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +28,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-app
   prerelease: false
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,11 +44,11 @@ dependencies:
         - 1
         - 4
         version: 0.1.4
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
+  name: ruby-app
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,11 +58,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -72,11 +72,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
+  name: rake
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -86,8 +86,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id005
+  prerelease: false
+  name: sqlite3
 description: RubyApp extension, adds ActiveRecord support
 email: kostya27@gmail.com
 executables: []
@@ -102,8 +103,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/activerecord.rb
 - lib/config.rb
+- lib/init-activerecord.rb
 - lib/ruby-app-ar.rb
 - lib/ruby-app-ar/tasks.rake
 - lib/version.rb

data/lib/activerecord.rb

@@ -1,6 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require 'active_record'
-
-# establish connection
-ActiveRecord::Base.establish_connection App.config.database_settings