rack-datamapper 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.5 / 2009-12-04
+
+* restful transaction does commit on status between 200 and 399 now
+
 === 0.2.3 / 2009-10-06
 
 * added mapping to fix naming problem between rack_datamapper and rack-datamapper

data/lib/rack_datamapper/restful_transactions.rb

@@ -17,7 +17,7 @@ module DataMapper
           transaction = DataMapper::Transaction.new(DataMapper.repository(@name))
           transaction.commit do
             status, headers, response = @app.call(env)
-            raise Rollback unless [301, 302, 303, 307].include?(status)
+            raise Rollback unless (200 <= status && status < 400)
           end
         rescue Rollback 
           # ignore, 

data/lib/rack_datamapper/session/abstract/store.rb

@@ -7,7 +7,7 @@ module DataMapper
 
         def initialize(app, options, id_generator)
           @mutex = Mutex.new
-          if options.delete(:cache)
+          if cache = options.delete(:cache)
             @@cache = if RUBY_PLATFORM =~ /java/
                         begin
                           # to avoid memory leaks use a hashmap which clears
@@ -27,7 +27,7 @@ module DataMapper
                       end
             @@semaphore = Mutex.new
           else
-            @@cache = nil unless self.class.class_variable_defined? :@@cache
+            @@cache = nil unless cache.nil? && self.class.class_variable_defined?(:@@cache)
           end
           @@session_class = options.delete(:session_class) || Session unless (self.class.class_variable_defined?(:@@session_class) and @@session_class)
           @id_generator = id_generator

data/lib/rack_datamapper/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module DataMapper
-    VERSION = '0.2.4'.freeze
+    VERSION = '0.2.5'.freeze
   end
 end

data/spec/restful_transactions_spec.rb

@@ -84,7 +84,7 @@ describe DataMapper::RestfulTransactions do
 
   it 'should rollback when status is not redirect and method is not GET' do
     mock_request.should_receive(:request_method).any_number_of_times.and_return("PUT")
-    app = RestfulTransactionsApp.new(200) do
+    app = RestfulTransactionsApp.new(404) do
       Name.create(:name => 'first')
       # TODO is this read uncommited ?
       Name.all.size.should == 1
@@ -92,7 +92,7 @@ describe DataMapper::RestfulTransactions do
     DataMapper::RestfulTransactions.new(app).call(nil)
     Name.all.size.should == 0
 
-    app = RestfulTransactionsApp.new(404) do
+    app = RestfulTransactionsApp.new(100) do
       Name.create(:name => 'first')
       # TODO is this read uncommited ?
       Name.all.size.should == 1

data/spec/spec_helper.rb

@@ -1,12 +1,10 @@
 require 'pathname'
 require 'rubygems'
-
-gem 'rspec', '~>1.2'
-require 'spec'
-
+gem 'dm-core', '0.9.10'
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 require 'rack_datamapper'
-
+require 'dm-core/version'
+p DataMapper::VERSION
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
@@ -15,6 +13,7 @@ def load_driver(name, default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
     true
   rescue LoadError => e
+    p e.backtrace
     warn "Could not load do_#{name}: #{e}"
     false
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 +05:30
+date: 2009-12-18 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rack-datamapper
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: this collection of plugins helps to add datamapper functionality to Rack