hyperion-sql 0.0.1.alpha4 → 0.0.1.alpha5

data/lib/hyperion/sql.rb

@@ -1,3 +1,4 @@
+require 'data_objects'
 require 'hyperion/api'
 require 'hyperion/sql/transaction'
 
@@ -7,14 +8,15 @@ module Hyperion
     def self.with_connection(url)
       connection = DataObjects::Connection.new(url)
       Thread.current[:connection] = connection
-      yield
+      result = yield
       connection.close
       Thread.current[:connection] = nil
+      result
     end
 
     def self.with_connection_and_ds(url, name, opts={})
-      with_connection(url) do
-        API.with_datastore(name, opts) do
+      API.with_datastore(name, opts) do
+        with_connection(url) do
           yield
         end
       end

data/lib/hyperion/sql/transaction.rb

@@ -1,17 +1,11 @@
-require 'socket'
-require 'digest'
-require 'digest/sha2'
+require 'uuidtools'
 
 module Hyperion
   module Sql
     class Transaction
 
-      HOST = "#{Socket::gethostbyname(Socket::gethostname)[0]}" rescue "localhost"
-
       attr_reader :connection
 
-      @@counter = 0
-
       def initialize(connection)
         @connection = connection
       end
@@ -49,7 +43,7 @@ module Hyperion
       end
 
       def new_savepoint_id
-        Digest::SHA256.hexdigest("#{HOST}:#{$$}:#{Time.now.to_f}:#{@@counter += 1}")[0..-2]
+        UUIDTools::UUID.random_create.to_s.gsub(/-/, '')
       end
     end
   end

data/lib/hyperion/sql/transaction_spec.rb

@@ -1,3 +1,6 @@
+require 'hyperion/api'
+require 'hyperion/sql'
+
 shared_examples_for 'Sql Transactions' do
   def write(query)
     command = Hyperion::Sql.connection.create_command(query)

data/spec/hyperion/sql/middleware_spec.rb

@@ -43,4 +43,11 @@ describe Hyperion::Sql::Middleware do
     Thread.current[:transaction].should be_nil
   end
 
+  it 'returns the result' do
+    midd = middleware lambda { |env|
+      :return
+    }
+    midd.call(nil).should == :return
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperion-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha4
+  version: 0.0.1.alpha5
   prerelease: 6
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: do_sqlite3
   requirement: !ruby/object:Gem::Requirement