Compatability with latest merb

.gitignore

@@ -0,0 +1 @@
+pkg/

Rakefile

@@ -1,9 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-# Assume a typical dev checkout to fetch the current merb-core version
-require File.expand_path('../../merb/merb-core/lib/merb-core/version', __FILE__)
-
 # Load this library's version information
 require File.expand_path('../lib/merb_activerecord/version', __FILE__)
 
@@ -13,7 +10,6 @@ begin
   require 'jeweler'
 
   Jeweler::Tasks.new do |gemspec|
-
     gemspec.version     = Merb::ActiveRecord::VERSION
 
     gemspec.name        = "merb_activerecord"
@@ -27,8 +23,8 @@ begin
     gemspec.files       = %w(Generators LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
 
     # Runtime dependencies
-    gemspec.add_dependency 'merb-core',    "= #{Merb::VERSION}"
-    gemspec.add_dependency 'activerecord', '>= 2.3.4'
+    gemspec.add_dependency 'merb-core',    "~> 1.1.3"
+    gemspec.add_dependency 'activerecord', '= 3.0.7'
 
     # Development dependencies
     gemspec.add_development_dependency 'rspec', '>= 1.2.9'

lib/merb_activerecord.rb

@@ -1,11 +1,10 @@
-if defined?(Merb::Plugins)  
-
-  dependency "activerecord"
-
+if defined?(Merb::Plugins)
+  require 'active_record'
+
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "cleanup" )
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection")
   Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "active_record" / "merbtasks"))
-  
+
   class Merb::Orms::ActiveRecord::Connect < Merb::BootLoader
     after BeforeAppLoads
 
@@ -19,23 +18,20 @@ def self.run
       # can be used as the default resource key
       Merb::Router.root_behavior = Merb::Router.root_behavior.identify(ActiveRecord::Base => :id)
     end
-
   end
-  
+
   class Merb::Orms::ActiveRecord::DisconnectBeforeFork < Merb::BootLoader
     after AfterAppLoads
-    
-    def self.run      
+
+    def self.run
       Merb.logger.debug "Disconnecting database connection before forking."
       ::ActiveRecord::Base.clear_active_connections!
     end
-  end  
-
-
+  end
+
   generators = File.join(File.dirname(__FILE__), 'generators')
   Merb.add_generators generators / :migration
   Merb.add_generators generators / :model
   Merb.add_generators generators / :resource_controller
   Merb.add_generators generators / :session_migration
-
-end
+end

lib/merb_activerecord/version.rb

@@ -1,5 +1,5 @@
 module Merb
   module ActiveRecord
-    VERSION = '1.1.0.pre'.freeze
+    VERSION = '1.2.0'
   end
-end
+end

merb_activerecord.gemspec

@@ -0,0 +1,70 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{merb_activerecord}
+  s.version = "1.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Duane Johnson}]
+  s.date = %q{2011-06-20}
+  s.description = %q{Merb plugin that provides ActiveRecord support}
+  s.email = %q{canadaduane@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README",
+     "TODO"
+  ]
+  s.files = [
+    "Generators",
+     "LICENSE",
+     "README",
+     "Rakefile",
+     "TODO",
+     "lib/active_record/merbtasks.rb",
+     "lib/generators/migration.rb",
+     "lib/generators/model.rb",
+     "lib/generators/resource_controller.rb",
+     "lib/generators/session_migration.rb",
+     "lib/generators/templates/migration/schema/migrations/%file_name%.rb",
+     "lib/generators/templates/model/app/models/%file_name%.rb",
+     "lib/generators/templates/resource_controller/app/controllers/%file_name%.rb",
+     "lib/generators/templates/resource_controller/app/views/%file_name%/edit.html.erb",
+     "lib/generators/templates/resource_controller/app/views/%file_name%/index.html.erb",
+     "lib/generators/templates/resource_controller/app/views/%file_name%/new.html.erb",
+     "lib/generators/templates/resource_controller/app/views/%file_name%/show.html.erb",
+     "lib/generators/templates/session_migration/schema/migrations/%version%_database_sessions.rb",
+     "lib/merb/orms/active_record/cleanup.rb",
+     "lib/merb/orms/active_record/connection.rb",
+     "lib/merb/orms/active_record/database.yml.sample",
+     "lib/merb/session/active_record_session.rb",
+     "lib/merb_activerecord.rb",
+     "lib/merb_activerecord/version.rb"
+  ]
+  s.homepage = %q{http://github.com/merb/merb_activerecord}
+  s.rdoc_options = [%q{--charset=UTF-8}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.3}
+  s.summary = %q{This plugin allows seamless integration of the ActiveRecord ORM with merb}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<merb-core>, ["~> 1.1.3"])
+      s.add_runtime_dependency(%q<activerecord>, ["= 3.0.7"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<merb-core>, ["~> 1.1.3"])
+      s.add_dependency(%q<activerecord>, ["= 3.0.7"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<merb-core>, ["~> 1.1.3"])
+    s.add_dependency(%q<activerecord>, ["= 3.0.7"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+