rack-datamapper 0.2.6 → 0.3.2

data/History.txt

@@ -1,6 +1,14 @@
-=== 0.2.6 / 2010-06-15
+=== 0.3.2 / 2010-06-15
 
-* just disallow datamapper 1.0.0 which does not work for some parts, use rack_datamapper 0.3.0 gem if you need datamapper 1.0.0
+* fixed now the session store works also with dm-validations
+
+=== 0.3.1 / 2010-06-15
+
+* maven did not handle the declared deps nicely, repush the gem with proper deps version
+
+=== 0.3.0 / 2010-06-15
+
+* removed hoe use gemspec or maven instead, works only with datamapper version '~>1.0.0'
 
 === 0.2.5 / 2009-12-04
 

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Kristian Meier
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,18 +1,24 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
-require './lib/rack_datamapper/version.rb'
 
 require 'spec'
 require 'spec/rake/spectask'
 require 'pathname'
 require 'yard'
 
-Hoe.spec('rack-datamapper') do |p|
-  p.developer('mkristian', 'm.kristian@web.de')
-  p.extra_deps = [['dm-core', ['>0.9.10', '<1.0.0']]]
-  p.rspec_options << '--options' << 'spec/spec.opts'
+desc "Run specs"
+Spec::Rake::SpecTask.new('spec')
+
+task :clean do
+  sh "rm -r pkg"
+end
+
+desc 'Package as a gem.'
+task :package do
+  sh "gem build rack_datamapper.gemspec" 
+  sh "mkdir -p pkg"
+  sh "mv rack-datamapper-*.gem pkg"
 end
 
 desc 'Install the package as a gem.'

data/lib/rack_datamapper/identity_maps.rb

@@ -6,11 +6,9 @@ module DataMapper
     end
   
     def call(env)
-      status, headers, response = nil, nil, nil
       DataMapper.repository(@name) do
-        status, headers, response = @app.call(env)
+        @app.call(env)
       end
-      [status, headers, response]
     end
   end
 end

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

@@ -84,6 +84,7 @@ module DataMapper
           elsif session.save
             session.session_id
           else
+            warn session.errors.inspect if session.errors.size > 0
             false
           end
         ensure
@@ -101,16 +102,16 @@ module DataMapper
         
         property :session_id, String, :key => true
         
-        property :data, Text, :nullable => false, :default => ::Base64.encode64(Marshal.dump({}))
+        property :raw_data, Text, :required => true, :default => ::Base64.encode64(Marshal.dump({})), :field => 'data'
         
-        property :updated_at, DateTime, :nullable => true, :index => true
+        property :updated_at, DateTime, :required => false, :index => true
         
         def data=(data)
-          attribute_set(:data, ::Base64.encode64(Marshal.dump(data)))
+           attribute_set(:raw_data, ::Base64.encode64(Marshal.dump(data)))
         end
         
         def data
-          Marshal.load(::Base64.decode64(attribute_get(:data)))
+          Marshal.load(::Base64.decode64(attribute_get(:raw_data)))
         end
       end
     end

data/lib/rack_datamapper/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module DataMapper
-    VERSION = '0.2.6'.freeze
+    VERSION = '0.3.2'.freeze
   end
 end

data/spec/datamapper_store_spec.rb

@@ -0,0 +1,143 @@
+$LOAD_PATH << File.dirname(__FILE__)
+require 'spec_helper'
+
+describe DataMapper::Session::Abstract::Store do
+
+  describe 'without cache' do
+
+    def mock_session(stubs={})
+      @mock_session ||= mock(DataMapper::Session::Abstract::Session, stubs)
+    end
+
+    before :each do
+      @store = DataMapper::Session::Abstract::Store.new(nil, 
+                                                       {:cache => false}, 
+                                                       Proc.new do
+                                                          1
+                                                       end
+                                                       )
+    end
+
+    it 'should get the session data' do
+      DataMapper::Session::Abstract::Session.stub!(:get).and_return(mock_session)
+      mock_session.should_receive(:data).and_return({:id => "id"})
+      @store.get_session({}, "sid").should == ["sid",{:id => "id"}]
+    end
+
+    it 'should create a new session' do
+      DataMapper::Session::Abstract::Session.should_receive(:create).and_return(mock_session)
+      mock_session.should_receive(:data).and_return({})
+      result = @store.get_session({}, nil)
+      result[0].should_not be_nil
+      result[1].should == {}
+    end
+
+    it 'should set the session data' do
+      DataMapper::Session::Abstract::Session.should_receive(:create).and_return(mock_session)
+      DataMapper::Session::Abstract::Session.should_receive(:get).twice.and_return(mock_session)
+      mock_session.should_receive(:data).and_return({})
+      mock_session.should_receive(:data=).with({:id => 432})
+      mock_session.should_receive(:save).and_return(true)
+      mock_session.should_receive(:data).and_return({:id => 123})
+      
+      session_id = @store.get_session({}, nil)[0]
+      mock_session.should_receive(:session_id).and_return(session_id);
+      @store.set_session({}, session_id, {:id => 432}, {}).should == session_id
+      result =  @store.get_session({}, session_id)
+      
+      result[0].should_not be_nil
+      result[1].should == {:id => 123}
+    end
+
+    it 'should delete empty sessions' do
+      DataMapper::Session::Abstract::Session.should_receive(:create).and_return(mock_session)
+      DataMapper::Session::Abstract::Session.should_receive(:get).and_return(mock_session)
+      mock_session.should_receive(:data).and_return({})
+      mock_session.should_receive(:data=).with({})
+      mock_session.should_receive(:destroy).and_return(true)
+
+      session_id = @store.get_session({}, nil)[0]
+      @store.set_session({}, session_id, {}, {}).should be_false
+    end
+  end
+
+  describe 'with cache' do
+    
+    def mock_session(stubs={})
+      @mock_session ||= mock(DataMapper::Session::Abstract::Session, stubs)
+    end
+
+    before :each do
+      @store = DataMapper::Session::Abstract::Store.new(nil, 
+                                                        {:cache => true}, 
+                                                        Proc.new do
+                                                          1
+                                                        end)
+    end
+
+    it 'should create a new session' do
+      DataMapper::Session::Abstract::Session.should_receive(:create).and_return(mock_session)
+      mock_session.should_receive(:data).and_return({})
+      result = @store.get_session({}, nil)
+      result[0].should_not be_nil
+      result[1].should == {}
+    end
+
+    it 'should get the session data from storage' do
+      DataMapper::Session::Abstract::Session.stub!(:get).and_return(mock_session)
+      mock_session.should_receive(:data).twice.and_return({:id => "id"})
+      @store.get_session({}, "sid").should == ["sid",{:id => "id"}]
+      # second get should use the cache
+      @store.get_session({}, "sid").should == ["sid",{:id => "id"}]
+    end
+
+    it 'should get the session data from cache' do
+      DataMapper::Session::Abstract::Session.should_receive(:create).and_return(mock_session)
+      mock_session.should_receive(:data).twice.and_return({})
+      session_id = @store.get_session({}, nil)[0]
+      
+      result =  @store.get_session({}, session_id)
+      result[0].should_not be_nil
+      result[1].should == {}
+    end
+
+    it 'should set the session data with empty cache' do
+      DataMapper::Session::Abstract::Session.should_receive(:get).and_return(mock_session)
+      mock_session.should_receive(:data=).with({:id => 432})
+      mock_session.should_receive(:save).and_return(true)
+      mock_session.should_receive(:session_id).and_return("sid")
+      mock_session.should_receive(:data).and_return({:id => 123})
+      @store.set_session({}, "sid", {:id => 432},{}).should == "sid"
+      result =  @store.get_session({}, "sid")
+
+      result[0].should_not be_nil
+      result[1].should == {:id => 123}
+    end
+
+    it 'should set the session data' do
+      DataMapper::Session::Abstract::Session.should_receive(:create).and_return(mock_session)
+      mock_session.should_receive(:data).and_return({})
+      mock_session.should_receive(:data=).with({:id => 432})
+      mock_session.should_receive(:save).and_return(true)
+      mock_session.should_receive(:data).and_return({:id => 123})
+
+      session_id = @store.get_session({}, nil)[0]
+      mock_session.should_receive(:session_id).and_return(session_id);
+      @store.set_session({}, session_id, {:id => 432},{}).should == session_id
+      result =  @store.get_session({}, session_id)
+
+      result[0].should_not be_nil
+      result[1].should == {:id => 123}
+    end
+
+    it 'should delete empty sessions' do
+      DataMapper::Session::Abstract::Session.should_receive(:create).and_return(mock_session)
+      mock_session.should_receive(:data).and_return({})
+      mock_session.should_receive(:data=).with({})
+      mock_session.should_receive(:destroy).and_return(true)
+
+      session_id = @store.get_session({}, nil)[0]
+      @store.set_session({}, session_id, {}, {}).should be_false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 require 'pathname'
 require 'rubygems'
-#gem 'dm-core', '0.9.10'
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 require 'rack_datamapper'
 require 'dm-core/version'
+require 'dm-migrations'
+require 'dm-transactions'
 p DataMapper::VERSION
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s

metadata

@@ -1,92 +1,122 @@
 --- !ruby/object:Gem::Specification 
 name: rack-datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.2
 platform: ruby
 authors: 
-- mkristian
+  - mkristian
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 +05:30
+date: 2010-06-13 00:00:00 +05:30
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.9.10
-    - - <
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: dm-core
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: rack
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "1.0"
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: dm-migrations
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: dm-transactions
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: dm-sqlite-adapter
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.3.0
+      version: 
 description: this collection of plugins helps to add datamapper functionality to Rack. there is a IdentityMaps plugin which wrappes the request and with it all database actions are using that identity map. the transaction related plugin TransactionBoundaries and RestfulTransactions wrappes the request into a transaction. for using datamapper to store session data there is the DatamapperStore.
 email: 
-- m.kristian@web.de
+  - m.kristian@web.de
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+  - History.txt
+  - README.txt
 files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- lib/rack-datamapper.rb
-- lib/rack_datamapper.rb
-- lib/softhashmap.jar
-- lib/rack_datamapper/identity_maps.rb
-- lib/rack_datamapper/restful_transactions.rb
-- lib/rack_datamapper/session/abstract/store.rb
-- lib/rack_datamapper/session/datamapper.rb
-- lib/rack_datamapper/transaction_boundaries.rb
-- lib/rack_datamapper/version.rb
-- spec/datamapper_session_spec.rb
-- spec/identity_maps_spec.rb
-- spec/restful_transactions_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/transaction_boundaries_spec.rb
+  - History.txt
+  - MIT-LICENSE
+  - README.txt
+  - Rakefile
+  - lib/softhashmap.jar
+  - lib/rack_datamapper.rb
+  - lib/rack-datamapper.rb
+  - lib/rack_datamapper/transaction_boundaries.rb
+  - lib/rack_datamapper/restful_transactions.rb
+  - lib/rack_datamapper/identity_maps.rb
+  - lib/rack_datamapper/version.rb
+  - lib/rack_datamapper/session/datamapper.rb
+  - lib/rack_datamapper/session/abstract/store.rb
 has_rdoc: true
 homepage: http://github.com/mkristian/rack_datamapper
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+  - --main
+  - README.txt
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 requirements: []
 
@@ -95,5 +125,10 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: this collection of plugins helps to add datamapper functionality to Rack
-test_files: []
-
+test_files: 
+  - spec/identity_maps_spec.rb
+  - spec/transaction_boundaries_spec.rb
+  - spec/spec_helper.rb
+  - spec/restful_transactions_spec.rb
+  - spec/datamapper_session_spec.rb
+  - spec/datamapper_store_spec.rb

data/Manifest.txt

@@ -1,19 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-lib/rack-datamapper.rb
-lib/rack_datamapper.rb
-lib/softhashmap.jar
-lib/rack_datamapper/identity_maps.rb
-lib/rack_datamapper/restful_transactions.rb
-lib/rack_datamapper/session/abstract/store.rb
-lib/rack_datamapper/session/datamapper.rb
-lib/rack_datamapper/transaction_boundaries.rb
-lib/rack_datamapper/version.rb
-spec/datamapper_session_spec.rb
-spec/identity_maps_spec.rb
-spec/restful_transactions_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/transaction_boundaries_spec.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---colour