merb_activerecord 0.9.6 → 0.9.7

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.6") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +35,7 @@ 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.6')
+  s.add_dependency('merb-core', '>= 0.9.7')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")  end
 

data/lib/generators/migration.rb

@@ -1,4 +1,4 @@
-Merb::Generators::MigrationGenerator.template :migration_activerecord, :orm => :activerecord do
-  source(File.dirname(__FILE__), 'templates/migration/schema/migrations/%file_name%.rb')
-  destination("#{destination_directory}/#{file_name}.rb")
+Merb::Generators::MigrationGenerator.template :migration_activerecord, :orm => :activerecord do |t|
+  t.source = File.dirname(__FILE__) / 'templates/migration/schema/migrations/%file_name%.rb'
+  t.destination = "#{destination_directory}/#{file_name}.rb"
 end

data/lib/generators/model.rb

@@ -1,6 +1,6 @@
-Merb::Generators::ModelGenerator.template :model_activerecord, :orm => :activerecord do
-  source(File.dirname(__FILE__), "templates/model/app/models/%file_name%.rb")
-  destination("app/models", base_path, "#{file_name}.rb")
+Merb::Generators::ModelGenerator.template :model_activerecord, :orm => :activerecord do |t|
+  t.source = File.dirname(__FILE__) / "templates/model/app/models/%file_name%.rb"
+  t.destination = "app/models" / base_path / "#{file_name}.rb"
 end
     
 Merb::Generators::ModelGenerator.invoke :migration, :orm => :activerecord do |generator|

data/lib/generators/resource_controller.rb

@@ -1,12 +1,12 @@
-Merb::Generators::ResourceControllerGenerator.template :controller_activerecord, :orm => :activerecord do
-  source(File.dirname(__FILE__), "templates/resource_controller/app/controllers/%file_name%.rb")
-  destination("app/controllers", base_path, "#{file_name}.rb")
+Merb::Generators::ResourceControllerGenerator.template :controller_activerecord, :orm => :activerecord do |t|
+  t.source = File.dirname(__FILE__) / "templates/resource_controller/app/controllers/%file_name%.rb"
+  t.destination = "app/controllers" / base_path / "#{file_name}.rb"
 end
 
 [:index, :show, :edit, :new].each do |view|
   Merb::Generators::ResourceControllerGenerator.template "view_#{view}_activerecord".to_sym,
-      :orm => :activerecord, :template_engine => :erb do
-    source(File.dirname(__FILE__), "templates/resource_controller/app/views/%file_name%/#{view}.html.erb")
-    destination("app/views", base_path, "#{file_name}/#{view}.html.erb")
+      :orm => :activerecord, :template_engine => :erb do |t|
+    t.source = File.dirname(__FILE__) / "templates/resource_controller/app/views/%file_name%/#{view}.html.erb"
+    t.destination = "app/views" / base_path / "#{file_name}/#{view}.html.erb"
   end
 end

data/lib/generators/session_migration.rb

@@ -1,4 +1,4 @@
-Merb::Generators::SessionMigrationGenerator.template :session_migration_activerecord, :orm => :activerecord do
-  source(File.dirname(__FILE__), 'templates/session_migration/schema/migrations/%version%_database_sessions.rb')
-  destination("schema/migrations/#{version}_database_sessions.rb")
+Merb::Generators::SessionMigrationGenerator.template :session_migration_activerecord, :orm => :activerecord do |t|
+  t.source = File.dirname(__FILE__) / 'templates/session_migration/schema/migrations/%version%_database_sessions.rb'
+  t.destination = "schema/migrations/#{version}_database_sessions.rb"
 end

data/lib/merb/orms/active_record/connection.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'active_record'
 
 module Merb
   module Orms

data/lib/merb/session/active_record_session.rb

@@ -1,5 +1,5 @@
-require 'active_record'
 require 'merb-core/dispatch/session'
+require 'active_record'
 require 'base64'
 
 module Merb

data/specs/merb_active_record_session_spec.rb

@@ -27,7 +27,7 @@ ActiveRecord::Schema.define do
 end
 
 # Load up the shared specs from merb-core
-if (gem_spec = Gem.source_index.search('merb-core').last) && 
+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' 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Duane Johnson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-08 00:00:00 +03:00
+date: 2008-09-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.6
+        version: 0.9.7
     version: 
 description: Merb plugin that provides ActiveRecord support for Merb
 email: canadaduane@gmail.com