merb_datamapper 1.1.1 → 1.1.2

data/Rakefile

@@ -1,48 +1,8 @@
 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_datamapper/version', __FILE__)
-
-begin
-
-  gem 'jeweler', '~> 1.4'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gemspec|
-
-    gemspec.version     = Merb::DataMapper::VERSION.dup
-
-    gemspec.name        = "merb_datamapper"
-    gemspec.description = "Merb plugin that provides support for datamapper"
-    gemspec.summary     = "Merb plugin that allows you to use datamapper with your merb app"
-
-    gemspec.authors     = [ "Jason Toy" ]
-    gemspec.email       = "jtoy@rubynow.com"
-    gemspec.homepage    = "http://github.com/merb/merb_datamapper"
-
-    gemspec.files       = %w(Generators LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
-
-    # Runtime dependencies
-    gemspec.add_dependency 'merb-core',     "~> 1.1"
-    gemspec.add_dependency 'dm-core',       Merb::DataMapper::DM_VERSION_REQUIREMENT
-    gemspec.add_dependency 'dm-migrations', Merb::DataMapper::DM_VERSION_REQUIREMENT
-
-    # Development dependencies
-    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
-
-  end
-
-  Jeweler::GemcutterTasks.new
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'spec/rake/spectask'
+require File.expand_path("../lib/merb_datamapper/version", __FILE__)
+
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
   spec.libs << 'lib' << 'spec'
@@ -55,5 +15,15 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
+desc "Build project gem"
+task :build do
+  sh "#{RUBY} -S gem build merb_datamapper.gemspec"
+end
+
+desc "Build and install gem"
+task :install => :build do
+  sh "#{RUBY} -S gem install -l ./merb_datamapper-#{Merb::DataMapper::VERSION}.gem --no-rdoc --no-ri"
+end
+
 desc 'Default: run spec examples'
 task :default => 'spec'

data/lib/merb_datamapper.rb

@@ -60,19 +60,17 @@ class Merb::Orms::DataMapper::Connect < Merb::BootLoader
   end
 end
 
-class Merb::Orms::DataMapper::Associations < Merb::BootLoader
+class Merb::Orms::DataMapper::Finalize < Merb::BootLoader
   after LoadClasses
 
   def self.run
-
-    Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations - defining lazy relationship properties'
-
-    DataMapper::Model.descendants.each do |model|
-      model.relationships.each_value { |r| r.child_key }
+    if DataMapper.respond_to?(:finalize)
+      DataMapper.finalize
+    else
+      DataMapper::Model.descendants.each do |model|
+        model.relationships.each_value { |r| r.child_key }
+      end
     end
-
-    Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations - complete'
-
   end
 end
 

data/lib/merb_datamapper/merbtasks.rb

@@ -16,10 +16,12 @@ namespace :db do
   end
   desc "Perform automigration"
   task :automigrate => :merb_env do
+    ::DataMapper.finalize if ::DataMapper.respond_to?(:finalize)
     ::DataMapper.auto_migrate!
   end
   desc "Perform non destructive automigration"
   task :autoupgrade => :merb_env do
+    ::DataMapper.finalize if ::DataMapper.respond_to?(:finalize)
     ::DataMapper.auto_upgrade!
   end
 

data/lib/merb_datamapper/version.rb

@@ -1,6 +1,6 @@
 module Merb
   module DataMapper
-    VERSION                = '1.1.1'.freeze
-    DM_VERSION_REQUIREMENT = '~> 0.10'.freeze
+    VERSION                = '1.1.2'.freeze
+    DM_VERSION_REQUIREMENT = '>= 0.10.2'.freeze
   end
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jason Toy
+- Jonathan Stott
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 +01:00
+date: 2010-07-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,13 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 51
         segments: 
         - 0
         - 10
-        version: "0.10"
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,13 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 51
         segments: 
         - 0
         - 10
-        version: "0.10"
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -80,54 +83,54 @@ dependencies:
   type: :development
   version_requirements: *id004
 description: Merb plugin that provides support for datamapper
-email: jtoy@rubynow.com
+email: jonathan.stott@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README
+- LICENSE
 - TODO
 files: 
 - Generators
-- LICENSE
-- README
 - Rakefile
-- TODO
-- lib/generators/data_mapper_migration.rb
-- lib/generators/data_mapper_model.rb
+- lib/merb_datamapper.rb
 - lib/generators/data_mapper_resource_controller.rb
+- lib/generators/data_mapper_model.rb
+- lib/generators/templates/views/index.html.erb
+- lib/generators/templates/views/new.html.erb
+- lib/generators/templates/views/show.html.erb
+- lib/generators/templates/views/edit.html.erb
 - lib/generators/templates/migration.rb
 - lib/generators/templates/model.rb
 - lib/generators/templates/model_migration.rb
 - lib/generators/templates/resource_controller.rb
-- lib/generators/templates/views/edit.html.erb
-- lib/generators/templates/views/index.html.erb
-- lib/generators/templates/views/new.html.erb
-- lib/generators/templates/views/show.html.erb
-- lib/merb_datamapper.rb
-- lib/merb_datamapper/connection.rb
+- lib/generators/data_mapper_migration.rb
 - lib/merb_datamapper/data_mapper_session.rb
-- lib/merb_datamapper/database.yml.sample
 - lib/merb_datamapper/merbtasks.rb
+- lib/merb_datamapper/connection.rb
 - lib/merb_datamapper/version.rb
-- spec/connection_spec.rb
-- spec/datamapper_id_map_controller.rb
-- spec/datamapper_model.rb
-- spec/datamapper_session_controller.rb
-- spec/identity_map_spec.rb
-- spec/session_spec.rb
+- lib/merb_datamapper/database.yml.sample
 - spec/session_store_spec.rb
 - spec/spec.opts
+- spec/connection_spec.rb
+- spec/identity_map_spec.rb
 - spec/spec_helper.rb
+- spec/datamapper_id_map_controller.rb
+- spec/session_spec.rb
+- spec/datamapper_session_controller.rb
+- spec/datamapper_model.rb
+- README
+- LICENSE
+- TODO
 has_rdoc: true
 homepage: http://github.com/merb/merb_datamapper
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -155,12 +158,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Merb plugin that allows you to use datamapper with your merb app
-test_files: 
-- spec/session_store_spec.rb
-- spec/connection_spec.rb
-- spec/identity_map_spec.rb
-- spec/spec_helper.rb
-- spec/datamapper_id_map_controller.rb
-- spec/session_spec.rb
-- spec/datamapper_session_controller.rb
-- spec/datamapper_model.rb
+test_files: []
+