merb_activerecord 0.9.8 → 0.9.9

data/Generators

@@ -0,0 +1,4 @@
+scope 'merb-gen' do
+  dir = File.join(File.dirname(__FILE__), 'lib', 'generators/')
+  Merb.add_generators dir + 'migration', dir + 'model', dir + 'resource_controller', dir + 'session_migration'
+end

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "canadaduane@gmail.com"
 
 GEM_NAME    = "merb_activerecord"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.9") + PKG_BUILD
 
 RELEASE_NAME  = "REL #{GEM_VERSION}"
 
@@ -35,9 +35,9 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.8')
+  s.add_dependency('merb-core', '>= 0.9.9')
   s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")  
+  s.files = %w(LICENSE README Rakefile TODO Generators) + Dir.glob("{lib}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Duane Johnson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-07 00:00:00 +03:00
+date: 2008-10-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 description: Merb plugin that provides ActiveRecord support for Merb
 email: canadaduane@gmail.com
@@ -37,6 +37,7 @@ files:
 - README
 - Rakefile
 - TODO
+- Generators
 - lib/active_record
 - lib/active_record/merbtasks.rb
 - lib/generators
@@ -75,9 +76,6 @@ files:
 - lib/merb/session
 - lib/merb/session/active_record_session.rb
 - lib/merb_activerecord.rb
-- specs/merb_active_record_session_spec.rb
-- specs/merb_active_record_spec.rb
-- specs/spec_helper.rb
 has_rdoc: true
 homepage: http://merbivore.com
 post_install_message: 

data/specs/merb_active_record_session_spec.rb

@@ -1,57 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'merb-core'
-require 'merb-core/test'
-require 'merb-core/test/helpers'
-
-Merb::BootLoader.before_app_loads do
-  require "merb/session/active_record_session"
-end
-
-Merb.start_environment( :environment => 'test', :adapter => 'runner', 
-                        :session_store => 'activerecord')
-
-Spec::Runner.configure do |config|
-  config.include Merb::Test::RequestHelper
-end
-
-require 'merb_activerecord'
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", 
-                                        :dbfile => ":memory:")
-
-ActiveRecord::Schema.define do
-  create_table :sessions do |t|
-    t.column :session_id, :string
-    t.column :data,       :text
-    t.column :created_at, :datetime
-  end
-end
-
-# Load up the shared specs from merb-core
-if (gem_spec = Gem.source_index.search(Gem::Dependency.new('merb-core', '>=0.9.6')).last) && 
-  gem_spec.files.include?('spec/public/session/controllers/sessions.rb')
-  require gem_spec.full_gem_path / 'spec/public/session/controllers/sessions.rb'
-  require gem_spec.full_gem_path / 'spec/public/session/session_spec.rb' 
-end
-
-describe Merb::ActiveRecordSession do
-
-  before do 
-    @session_class = Merb::ActiveRecordSession
-    @session = @session_class.generate
-  end
-
-  it_should_behave_like "All session-store backends"
-
-  it "should have a session_store_type class attribute" do
-    @session.class.session_store_type.should == :activerecord
-  end
-
-end
-
-describe Merb::ActiveRecordSession, "mixed into Merb::Controller" do
-
-  before(:all) { @session_class = Merb::ActiveRecordSession }
-
-  it_should_behave_like "All session-stores mixed into Merb::Controller"
-
-end

data/specs/merb_active_record_spec.rb

@@ -1,60 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Merb::Orms::ActiveRecord::Connect do
-  it "is loaded at plugin bootstrap" do
-    defined?(Merb::Orms::ActiveRecord::Connect).should == "constant"
-  end
-
-  it "is a merb bootloader" do
-    Merb::Orms::ActiveRecord::Connect.superclass.should == Merb::BootLoader
-  end
-end
-
-describe "Merb ActiveRecord extension" do
-  before :all do
-    @wd = Dir.pwd
-    Merb.stub!(:dir_for).with(:config).and_return(@wd)
-    @config_file_path = @wd / "config" / "database.yml"
-    @sample_file_path = @wd / "config" / "database.yml.sample"
-
-    @sample_source = Merb::Orms::ActiveRecord.sample_source
-    @config_sample = Erubis.load_yaml_file(@sample_source)
-  end
-
-  it "is loaded at plugin booststrap" do
-    defined?(Merb::Orms::ActiveRecord).should == "constant"
-  end
-
-  it "loads config from Merb configurations directory" do
-    Merb::Orms::ActiveRecord.config_file.should == @config_file_path
-  end
-
-  it "loads config sample from Merb configurations directory" do
-    Merb::Orms::ActiveRecord.sample_dest.should == @sample_file_path
-  end
-
-  it "provides a sample database.yml with development environment" do
-    @config_sample[:development].should be_an_instance_of(Hash)
-  end
-
-  it "provides a sample database.yml with test environment" do
-    @config_sample[:test].should be_an_instance_of(Hash)
-  end
-
-  it "provides a sample database.yml with production environment" do
-    @config_sample[:production].should be_an_instance_of(Hash)
-  end
-
-  it "uses Unicode and localhost in sample" do
-    @config_sample[:development][:host].should == "localhost"
-    @config_sample[:development][:encoding].should == "utf8"
-  end
-
-  it "provides Rack with a way to start a transcantion" do
-    Merb::Orms::ActiveRecord.should respond_to(:open_sandbox!)
-  end
-
-  it "provides Rack with a way to stop a transcantion" do
-    Merb::Orms::ActiveRecord.should respond_to(:close_sandbox!)
-  end
-end

data/specs/spec_helper.rb

@@ -1,3 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'merb-core'
-require 'merb_activerecord'