datamapper4rails 0.3.0 → 0.3.1

data/Rakefile

@@ -9,11 +9,12 @@ require 'pathname'
 
 require './lib/datamapper4rails/version.rb'
 
-Hoe.new('datamapper4rails', Datamapper4rails::VERSION) do |p|
+Hoe.spec('datamapper4rails') do |p|
   p.rubyforge_name = 'datamapper4rail'
   p.developer('mkristian', 'm.kristian@web.de')
-  p.extra_deps = [['rack-datamapper', '~>0.2'], 'rails_datamapper']
+  p.extra_deps = [['rack-datamapper', '~>0.2'], ['rails_datamapper', '>= 0']]
   p.remote_rdoc_dir = '' # Release to root
+  p.rspec_options << '--options' << 'spec/spec.opts'
 end
 
 desc 'Install the package as a gem.'
@@ -22,14 +23,6 @@ task :install => [:clean, :package] do
   sh "gem install --local #{gem} --no-ri --no-rdoc"
 end
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  if File.exists?('spec/spec.opts')
-    t.spec_opts << '--options' << 'spec/spec.opts'
-  end
-  t.spec_files = Pathname.glob('./spec/**/*_spec.rb')
-end
-
 desc 'generate rails using all generators and run the specs'
 task :integration_tests => [:spec, :install] do
   require 'datamapper4rails/integration_test'

data/datamapper_rails_templates.rb

@@ -2,10 +2,10 @@
 ###################################################
 
 # get all datamapper related gems
-gem "addressable", :lib => "addressable/uri"
+gem 'addressable', :lib => 'addressable/uri'
 
 # assume sqlite3 to be database
-gem "do_sqlite3"
+gem 'do_sqlite3'
 
 # assume you want to have validations and timestamps in your models
 gem 'dm-validations'
@@ -14,25 +14,25 @@ gem 'dm-migrations'
 gem 'dm-serializer' # to allow xml interface to work
 
 # assume you prefer rspec over unit tests
-gem "rspec", :lib => false
-gem "rspec-rails", :lib => false
+gem 'rspec', :lib => false
+gem 'rspec-rails', :lib => false
 
 # this pulls in rails_datamapper and rack_datamapper
-gem "datamapper4rails"
+gem 'datamapper4rails'
 
 # install all gems
-rake "gems:install"
+rake 'gems:install'
 
 # install specs rake tasks
-generate("rspec", "-f")
+generate('rspec', '-f')
 
 # install datamapper rake tasks
-generate("datamapper_install")
+generate('datamapper_install')
 
 # fix config files to work with datamapper instead of active_record
-environment "" 
-environment "config.frameworks -= [ :active_record ]"
-environment "# deactive active_record"
+environment ''
+environment 'config.frameworks -= [ :active_record ]'
+environment '# deactive active_record'
 gsub_file 'spec/spec_helper.rb', /^\s*config[.]/, '  #\0'
 gsub_file 'test/test_helper.rb', /^[^#]*fixtures/, '  #\0'
 
@@ -42,16 +42,15 @@ CODE
 
 # add middleware
 def middleware(name)
-  log "middleware", name
+  log 'middleware', name
   environment "config.middleware.use '#{name}'"
 end
 
-environment ""
-middleware "DataMapper::RestfulTransactions"
-middleware "DataMapper::IdentityMaps"
-middleware "Rack::Deflater"
-environment "# add middleware"
-
+environment ''
+middleware 'DataMapper::RestfulTransactions'
+middleware 'DataMapper::IdentityMaps'
+middleware 'Rack::Deflater'
+environment '# add middleware'
 
 # init a session store
 initializer 'datamapper_store.rb', <<-CODE
@@ -102,6 +101,7 @@ echo
 echo "more info on"
 echo "\thttp://github.org/mkristian/rails-maven-plugin"
 echo
+echo
 CODE
 
 rake 'db:sessions:create'

data/generators/datamapper_install/templates/datamapper.rake

@@ -46,8 +46,10 @@ namespace :db do
 
   # this is needed for rspec and test tasks  
   namespace :test do
-    RAILS_ENV = 'test'
-    task :prepare => :automigrate
+    task :prepare do
+      RAILS_ENV='test'
+      Rake::Task['db:automigrate'].invoke
+    end
   end
 
   namespace :migrate do

data/lib/datamapper4rails/overlay.rb

@@ -49,7 +49,7 @@ Rails::Generator::NamedBase.class_eval do
       file = path.nil? ? name : path
       dirs.each do |dir|
         if (f = File.join(dir, file)) and File.exists?(f)
-          logger.overlay f
+          logger.overlay f if options[:backtrace]
           return f
         end
       end

data/lib/datamapper4rails/version.rb

@@ -1,3 +1,3 @@
 class Datamapper4rails
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'dm-core'
+require 'base64'
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 
 # just define a empty abstract store

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper4rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +05:30
+date: 2009-10-30 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.3.3
     version: 
 description: collection of datamapper related extensions. mostly needed to run within rails. the restful transactions is around filter for rails actions if needed to control such transaction on per action base otherwise use the rack extension from rack-datamapper. datamapper store is a session store for rails which uses datamapper as persistent layer and is just a wrapper around the datamapper session store from rack-datamapper. the generators produces datamapper models for your rails application.
 email: