winton-active_wrapper 0.1.6 → 0.1.7

data/README.markdown

@@ -24,6 +24,8 @@ $db, $log, $mail = ActiveWrapper.setup(
   :stdout => true
 )
 
+$db.drop_db
+$db.create_db
 $db.establish_connection
 $db.generate_migration('my_migration')
 $db.migrate('001')

data/active_wrapper.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_wrapper}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Winton Welsh"]
-  s.date = %q{2009-07-28}
+  s.date = %q{2009-07-29}
   s.email = %q{mail@wintoni.us}
   s.extra_rdoc_files = ["README.markdown"]
-  s.files = ["active_wrapper.gemspec", "gemspec.rb", "lib", "lib/active_wrapper", "lib/active_wrapper/db.rb", "lib/active_wrapper/log.rb", "lib/active_wrapper/mail.rb", "lib/active_wrapper/tasks.rb", "lib/active_wrapper.rb", "MIT-LICENSE", "Rakefile", "README.markdown", "resources", "resources/migration.template", "spec", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.files = ["active_wrapper.gemspec", "gemspec.rb", "lib", "lib/active_wrapper", "lib/active_wrapper/db.rb", "lib/active_wrapper/log.rb", "lib/active_wrapper/mail.rb", "lib/active_wrapper/tasks.rb", "lib/active_wrapper.rb", "MIT-LICENSE", "Rakefile", "README.markdown", "resources", "resources/migration.template", "spec", "spec/active_wrapper", "spec/active_wrapper/db_spec.rb", "spec/active_wrapper/log_spec.rb", "spec/example_project", "spec/example_project/config", "spec/example_project/config/database.yml", "spec/example_project/db", "spec/example_project/db/migrate", "spec/example_project/db/migrate/001_test.rb", "spec/example_project/Rakefile", "spec/spec.opts", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/winton/active_wrapper}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.1}

data/gemspec.rb

@@ -1,5 +1,9 @@
 GEM_NAME = 'active_wrapper'
-GEM_FILES = FileList['**/*'] - FileList['coverage', 'coverage/**/*', 'pkg', 'pkg/**/*']
+GEM_FILES = FileList['**/*'] - FileList[
+  'coverage', 'coverage/**/*',
+  'pkg', 'pkg/**/*',
+  'spec/example_project/log', 'spec/example_project/log/*'
+]
 GEM_SPEC = Gem::Specification.new do |s|
   # == CONFIGURE ==
   s.author = "Winton Welsh"
@@ -15,5 +19,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 end

data/lib/active_wrapper/db.rb

@@ -1,68 +1,101 @@
 module ActiveWrapper
   class Db
     
-    attr_reader :base, :env
+    attr_reader :base, :config, :env
     
     def initialize(options)
       @base = options[:base]
+      if File.exists?(path = "#{base}/config/database.yml")
+        @config = YAML::load(File.open(path))
+      end
       @env = options[:env].to_s
     end
     
-    def establish_connection
-      unless ActiveRecord::Base.connected?
-        config = YAML::load(File.open("#{base}/config/database.yml"))
-        ActiveRecord::Base.configurations = config
+    def connected?
+      ActiveRecord::Base.connected?
+    end
+    
+    def create_db
+      establish_connection('database' => nil)
+      ActiveRecord::Base.connection.create_database config[env]['database']
+      establish_connection({})
+    end
+    
+    def drop_db
+      establish_connection('database' => nil)
+      ActiveRecord::Base.connection.drop_database config[env]['database']
+    end
+    
+    def establish_connection(options=nil)
+      if !connected? || options
+        config_clone = Marshal.load(Marshal.dump(config))
+        config_clone[env].merge!(options || {})
+        ActiveRecord::Base.configurations = config_clone
         ActiveRecord::Base.establish_connection(env)
       end
     end
 
     def migrate(version=nil)
-      ActiveRecord::Migrator.migrate("#{base}/db/migrate", version)
+      redirect_stdout do
+        ActiveRecord::Migrator.migrate("#{base}/db/migrate", version)
+      end
     end
 
     def migrate_reset
-      if @env == 'test'
-        stdout = $stdout
-        $stdout = File.new('/dev/null', 'w')
-      end
-      migrate(0)
-      migrate
-      if @env == 'test'
-        $stdout = stdout
+      redirect_stdout do
+        migrate(0)
+        migrate
       end
     end
 
     def generate_migration(name=nil)
-      raise "Please specify desired migration name with NAME=my_migration_name" unless name
+      redirect_stdout do
+        raise "Please specify desired migration name with NAME=my_migration_name" unless name
   
-      migration_name = name.strip.chomp
-      migrations_path = "#{base}/db/migrate"
-      migrations_template = File.expand_path("#{File.dirname(__FILE__)}/../../resources/migration.template")
+        migration_name = name.strip.chomp
+        migrations_path = "#{base}/db/migrate"
+        migrations_template = File.expand_path("#{File.dirname(__FILE__)}/../../resources/migration.template")
   
-      # Find the highest existing migration version or set to 1
-      if (existing_migrations = Dir[File.join(migrations_path, '*.rb')]).length > 0
-        version = File.basename(existing_migrations.sort.reverse.first)[/^(\d+)_/,1].to_i + 1
-      else
-        version = 1
-      end
+        # Find the highest existing migration version or set to 1
+        if (existing_migrations = Dir[File.join(migrations_path, '*.rb')]).length > 0
+          version = File.basename(existing_migrations.sort.reverse.first)[/^(\d+)_/,1].to_i + 1
+        else
+          version = 1
+        end
   
-      # Read the contents of the migration template into string
-      migrations_template = File.read(migrations_template)
+        # Read the contents of the migration template into string
+        migrations_template = File.read(migrations_template)
   
-      # Replace the migration name in template with the acutal one
-      migration_content = migrations_template.gsub('__migration_name__', migration_name.camelize)
-      migration_content = migration_content.gsub('__migration_table__', migration_name)
+        # Replace the migration name in template with the acutal one
+        migration_content = migrations_template.gsub('__migration_name__', migration_name.camelize)
+        migration_content = migration_content.gsub('__migration_table__', migration_name)
   
-      # Generate migration filename
-      migration_filename = "#{"%03d" % version}_#{migration_name}.rb"
+        # Generate migration filename
+        migration_filename = "#{"%03d" % version}_#{migration_name}.rb"
   
-      # Write the migration
-      File.open(File.join(migrations_path, migration_filename), "w+") do |migration|
-        migration.puts migration_content
-      end
+        # Write the migration
+        File.open(File.join(migrations_path, migration_filename), "w+") do |migration|
+          migration.puts migration_content
+        end
   
-      # Done!
-      puts "Successfully created migration #{migration_filename}"
+        # Done!
+        puts "Successfully created migration #{migration_filename}"
+      end
+    end
+    
+    def method_missing(method, *args)
+      ActiveRecord::Base.connection.send(method, *args)
+    end
+    
+    def redirect_stdout(&block)
+      if env == 'test'
+        stdout = $stdout
+        $stdout = File.new('/dev/null', 'w')
+      end
+      yield
+      if env == 'test'
+        $stdout = stdout
+      end
     end
   end
 end

data/lib/active_wrapper/mail.rb

@@ -5,6 +5,7 @@ module ActiveWrapper
     
     def initialize(options)
       @base = options[:base]
+      @config = {}
       @env = options[:env].to_s
       
       path = "#{base}/config/mail.yml"
@@ -15,11 +16,10 @@ module ActiveWrapper
         @config[:smtp] = options[:smtp]
         @config[:imap] = options[:imap]
         if File.exists?(path)
-          @config = YAML::load(File.open(path))
-          if @config && @config = @config[@env]
-            @config = @config.to_options
-            @config[:imap] = @config[:imap].to_options unless @config[:imap]
-            @config[:smtp] = @config[:smtp].to_options unless @config[:smtp]
+          yaml = YAML::load(File.open(path))
+          if yaml && yaml = yaml[@env].to_options
+            @config[:imap] = yaml[:imap].to_options unless @config[:imap]
+            @config[:smtp] = yaml[:smtp].to_options unless @config[:smtp]
           end
         end
         if @config[:smtp]

data/lib/active_wrapper/tasks.rb

@@ -7,18 +7,25 @@ module ActiveWrapper
       
       task :environment do
         $db, $log = ActiveWrapper.setup(options)
-        $db.establish_connection
         yield if block
       end
       
       namespace :db do
+        desc "Create the database"
+        task :create do
+          $db.create_db
+        end
+        
+        desc "Drop the database"
+        task :drop do
+          $db.drop_db
+        end
+        
         desc "Migrate the database with optional VERSION"
         task :migrate => :environment do
           $db.migrate(ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
         end
-      end
-      
-      namespace :generate do
+        
         desc "Generate a migration with given NAME"
         task :migration => :environment do
           $db.generate_migration(ENV['NAME'])

data/spec/active_wrapper/db_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ActiveWrapper::Db do
+  
+  before(:each) do
+    $db, $log, $mail = ActiveWrapper.setup(
+      :base => SPEC + '/example_project',
+      :env => 'test'
+    )
+    $db.drop_db
+    $db.create_db
+  end
+  
+  it "should establish a connection" do
+    $db.disconnect!
+    $db.establish_connection
+    $db.connected?.should == true
+  end
+
+  it "should create a database" do
+    $db.current_database.should == 'active_wrapper_test'
+  end
+
+  it "should drop a database" do
+    $db.drop_db
+    $db.current_database.should == nil
+  end
+  
+  it "should migrate a database" do
+    $db.migrate
+    $db.execute('insert into tests () values ()')
+    $db.execute('select * from tests').num_rows.should == 1
+  end
+  
+  it "should migrate reset a database" do
+    $db.migrate
+    $db.execute('insert into tests () values ()')
+    $db.migrate_reset
+    $db.execute('select * from tests').num_rows.should == 0
+  end
+  
+  it "should generate a migration" do
+    $db.generate_migration 'another_test'
+    path = SPEC + "/example_project/db/migrate/002_another_test.rb"
+    File.exists?(path).should == true
+    FileUtils.rm_f path
+  end
+end

data/spec/active_wrapper/log_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+
+describe ActiveWrapper::Log do
+  
+  before(:each) do
+    FileUtils.rm_f(@path = SPEC + "/example_project/log/test.log")
+    $db, $log, $mail = ActiveWrapper.setup(
+      :base => SPEC + '/example_project',
+      :env => 'test'
+    )
+  end
+  
+  it "should create a log file" do
+    File.exists?(@path).should == true
+  end
+  
+  it "should log to the log file" do
+    $log.info "test"
+    File.read(@path).include?('test').should == true
+  end
+  
+  it "should clear the log file while keeping the logger intact" do
+    $log.clear
+    File.read(@path).include?('test').should == false
+    $log.info "test"
+    File.read(@path).include?('test').should == true
+  end
+end

data/spec/example_project/Rakefile

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'rake'
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/active_wrapper/tasks")
+
+ActiveWrapper::Tasks.new(
+  :base => File.dirname(__FILE__),
+  :env => 'test'
+)

data/spec/example_project/config/database.yml

@@ -0,0 +1,6 @@
+test:
+ database: active_wrapper_test
+ adapter: mysql
+ username: root
+ password: 
+ host: localhost

data/spec/example_project/db/migrate/001_test.rb

@@ -0,0 +1,10 @@
+class Test < ActiveRecord::Migration
+  def self.up
+    create_table :tests do |t|
+    end
+  end
+
+  def self.down
+    drop_table :tests
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-active_wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -07:00
+date: 2009-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,16 @@ files:
 - resources
 - resources/migration.template
 - spec
+- spec/active_wrapper
+- spec/active_wrapper/db_spec.rb
+- spec/active_wrapper/log_spec.rb
+- spec/example_project
+- spec/example_project/config
+- spec/example_project/config/database.yml
+- spec/example_project/db
+- spec/example_project/db/migrate
+- spec/example_project/db/migrate/001_test.rb
+- spec/example_project/Rakefile
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: false