flounder 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5865e63fb12cfb93c2514d412f9640e00383072
-  data.tar.gz: 09a4d7dfab77ccea44f7b7c0f0fb9f8212e9d909
+  metadata.gz: a2a4bab6f9430ad7169aafe13673bb79debf2d1a
+  data.tar.gz: ddaa62449b7848ba338f79e48c22eab8d95da823
 SHA512:
-  metadata.gz: 61fe664adec772a796f5136ecba197754aefb6656a9a2839dbddbea8ff4ef1b5331d2e2df023df299ff4365b2d7dfbe2ebdac0ab87eeb9713c53850f89220370
-  data.tar.gz: c711c60ddee3a053ed91ef745773b3b4febb87edb5965028e8d0ff0ef1e17d2857b32d631f6855ac316249572b48228712c80f7483d9ed9a23efb4128c3b3729
+  metadata.gz: ef55ee6011bb3a31c99161529775800e347691a93b39b685eb6561c7ad0364a2f1b37d03e8c4236dd99e32d63cfd656900aed69404ffe2143e846dafaac34f91
+  data.tar.gz: c86cfee4eb453d63af98b23da4a5faeaad3292a3023b983631c159c53ad7bb7037eacd3cc2a8c341b73e0144f79db3166d9377eea5ac0bf10b1f34182f93fad4

data/HISTORY

@@ -15,4 +15,5 @@
  0.9.3
  + DELETE FROM - entity#delete
 
- 
+ 0.9.4 
+ + nested transactions

data/flounder.gemspec

@@ -2,21 +2,26 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.9.3'
+  s.version  = '0.9.4'
   s.summary  = "Flounder is a way to write SQL simply in Ruby. It deals with everything BUT object relational mapping. "
   s.email    = "kaspar.schiess@technologyastronauts.ch"
   s.homepage = "https://bitbucket.org/technologyastronauts/oss_flounder"
   s.authors  = ['Kaspar Schiess', 'Florian Hanke']
   
-  # s.description = <<-EOF
-  # EOF
+  s.description = <<-EOF
+    Flounder is the missing piece between the database and your Ruby code. It 
+    allows very simple access to database tables without going all the way to
+    begin an object mapper. 
+  EOF
 
   s.add_runtime_dependency 'arel', '~> 5', '> 5.0.1'
-  s.add_runtime_dependency 'pg', '> 0.17'
+  s.add_runtime_dependency 'pg', '~> 0.17'
   s.add_runtime_dependency 'hashie', '~> 3', '>= 3.2'
   s.add_runtime_dependency 'connection_pool', '~> 2'
   
   s.files         = Dir['**/*']
   s.test_files    = Dir['qed/**/*']
   s.require_paths = ["lib"]
+
+  s.licenses      = 'MIT'
 end

data/lib/flounder/domain.rb

@@ -3,10 +3,6 @@ require 'forwardable'
 require 'logger'
 
 module Flounder
-  # Raised when an entity name cannot be found in this domain. 
-  class NoSuchEntity < StandardError
-  end
-
   class Domain
     # A device that discards all logging made to it. This is used to be silent
     # by default while still allowing the logging of all queries. 
@@ -29,8 +25,11 @@ module Flounder
       @oids_entity_map = {}
 
       @logger = Logger.new(NilDevice.new)
+
+      @savepoints = Hash.new(0)
     end
 
+    attr_reader :savepoints
     attr_reader :connection_pool
     attr_accessor :logger
 
@@ -39,8 +38,12 @@ module Flounder
 
     def transaction &block
       with_connection do |conn|
-        conn.transaction do
-          block.call(conn)
+        if in_transaction?(conn)
+          savepoint(conn) { block.call(conn) }
+        else
+          conn.transaction do
+            savepoint(conn) { block.call(conn) }
+          end
         end
       end
     end
@@ -89,6 +92,38 @@ module Flounder
     end
 
   private
+    def sp_count connection
+      savepoints[connection.object_id]
+    end
+    def inc_sp connection
+      savepoints[connection.object_id] += 1
+    end
+    def dec_sp connection
+      savepoints[connection.object_id] -= 1
+      if savepoints[connection.object_id] < 0
+        fail "ASSERTION FAILURE: Savepoint count cannot drop below zero!"
+      end
+
+      nil
+    end
+    def in_transaction? connection
+      sp_count(connection) > 0
+    end
+    def savepoint connection, &block
+      sp_number = inc_sp(connection)
+      sp_name = "s#{sp_number}"
+
+      connection.exec("SAVEPOINT #{sp_name};")
+      begin
+        yield
+      rescue Exception
+        connection.exec("ROLLBACK TO SAVEPOINT #{sp_name};")
+        raise
+      ensure
+        dec_sp(connection)
+      end
+    end
+
     def table_oid table_name
       connection_pool.with_connection do |conn|
         # TBD

data/lib/flounder/exceptions.rb

@@ -1,6 +1,9 @@
 
 
 module Flounder
+  # Raised when an entity name cannot be found in this domain. 
+  class NoSuchEntity < StandardError; end
+  
   # Indicates a field reference in a chain method that cannot be resolved 
   # to a real field on the underlying relation. 
   #

data/qed/database_technicalities.md

@@ -4,26 +4,36 @@ Transactions are supported on the domain and on entities. Since you need to make
 
 ~~~ruby
   expect RuntimeError do
-    domain.with_connection do |conn|
-      conn.transaction do
-        posts.update(title: 'A single title for everyone').kick(conn)
-        fail 'rollback'
-      end
+    domain.transaction do |conn| 
+      posts.update(title: 'A single title for everyone').kick(conn)
+      fail 'rollback'
     end
   end
 
   posts.first.title.assert != 'A single title for everyone'
 ~~~
 
-The same works on any entity from the domain. Please note that there is a shortcut for getting at a transaction.
+The same works on any entity from the domain. 
 
 ~~~ruby
-  domain.transaction do |conn| 
+  posts.transaction do |conn|
     posts.all(conn)
   end
+~~~
 
-  posts.transaction do |conn|
-    posts.all(conn)
+Domain transactions can be nested. Internally, this is realized using PostgreSQL savepoints.
+
+~~~ruby
+  domain.transaction do |connection|
+    begin
+      domain.transaction do |conn| 
+        posts.update(title: 'A single title for everyone').kick(conn)
+        fail 'rollback'
+      end
+    rescue RuntimeError
+    end
+
+    posts.first.title.assert != 'A single title for everyone'
   end
 ~~~
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -35,14 +35,14 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
@@ -79,7 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-description: 
+description: "    Flounder is the missing piece between the database and your Ruby
+  code. It \n    allows very simple access to database tables without going all the
+  way to\n    begin an object mapper. \n"
 email: kaspar.schiess@technologyastronauts.ch
 executables: []
 extensions: []
@@ -90,8 +92,6 @@ files:
 - HISTORY
 - LICENSE
 - README
-- flounder-0.9.1.gem
-- flounder-0.9.2.gem
 - flounder.gemspec
 - lib/flounder.rb
 - lib/flounder/connection.rb
@@ -128,7 +128,8 @@ files:
 - qed/selects.md
 - qed/updates.md
 homepage: https://bitbucket.org/technologyastronauts/oss_flounder
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []