hyperion-sql 0.0.1.alpha5 → 0.1.0

data/lib/hyperion/sql.rb

@@ -1,23 +1,22 @@
 require 'data_objects'
-require 'hyperion/api'
+require 'hyperion'
 require 'hyperion/sql/transaction'
+require 'hyperion/util'
 
 module Hyperion
   module Sql
 
     def self.with_connection(url)
-      connection = DataObjects::Connection.new(url)
-      Thread.current[:connection] = connection
-      result = yield
-      connection.close
-      Thread.current[:connection] = nil
-      result
-    end
-
-    def self.with_connection_and_ds(url, name, opts={})
-      API.with_datastore(name, opts) do
-        with_connection(url) do
-          yield
+      if Thread.current[:connection]
+        yield
+      else
+        connection = DataObjects::Connection.new(url)
+        begin
+          Util.bind(:connection, connection) do
+            yield
+          end
+        ensure
+          connection.close
         end
       end
     end
@@ -28,8 +27,8 @@ module Hyperion
 
     def self.rollback
       with_txn do |txn|
+        savepoint_id = txn.begin_savepoint
         begin
-          savepoint_id = txn.begin_savepoint
           yield
         ensure
           txn.rollback_to_savepoint(savepoint_id)
@@ -39,8 +38,8 @@ module Hyperion
 
     def self.transaction
       with_txn do |txn|
+        savepoint_id = txn.begin_savepoint
         begin
-          savepoint_id = txn.begin_savepoint
           result = yield
           txn.release_savepoint(savepoint_id)
           result
@@ -53,25 +52,21 @@ module Hyperion
 
     private
 
-    def self.in_transaction?
-      !Thread.current[:transaction].nil?
-    end
-
     def self.with_txn
       if Thread.current[:transaction]
         yield(Thread.current[:transaction])
       else
-        txn = (Thread.current[:transaction] = Transaction.new(connection))
-        txn.begin
-        result = yield(txn)
-        txn.commit
-        result
+        txn = Transaction.new(connection)
+        Util.bind(:transaction, txn) do
+          txn.begin
+          result = yield(txn)
+          txn.commit
+          result
+        end
       end
     rescue Exception => e
       txn.rollback
       raise e
-    ensure
-      Thread.current[:transaction] = nil
     end
   end
 end

data/lib/hyperion/sql/datastore.rb

@@ -1,4 +1,4 @@
-require 'hyperion/api'
+require 'hyperion'
 require 'hyperion/key'
 require 'hyperion/sql/query_builder'
 require 'hyperion/sql/query_executor'
@@ -8,54 +8,73 @@ module Hyperion
 
     class Datastore
 
-      def initialize(db_strategy, query_executor_strategy, query_builder_strategy)
+      def initialize(connection_url, db_strategy, query_executor_strategy, query_builder_strategy)
+        @connection_url = connection_url
         @db_strategy = db_strategy
         @query_executor = QueryExecutor.new(query_executor_strategy)
         @query_builder = QueryBuilder.new(query_builder_strategy)
       end
 
       def save(records)
-        records.map do |record|
-          if API.new?(record)
-            execute_save_query(query_builder.build_insert(record), record)
-          elsif non_empty_record?(record)
-            execute_save_query(query_builder.build_update(record), record)
-          else
-            record
+        with_connection do
+          records.map do |record|
+            if Hyperion.new?(record)
+              execute_save_query(query_builder.build_insert(record), record)
+            elsif non_empty_record?(record)
+              execute_save_query(query_builder.build_update(record), record)
+            else
+              record
+            end
           end
         end
       end
 
       def find_by_key(key)
-        find(query_from_key(key)).first
+        with_connection do
+          find(query_from_key(key)).first
+        end
       end
 
       def find(query)
-        sql_query = query_builder.build_select(query)
-        results = query_executor.execute_query(sql_query)
-        results.map { |record| record_from_db(record, query.kind) }
+        with_connection do
+          sql_query = query_builder.build_select(query)
+          results = query_executor.execute_query(sql_query)
+          results.map { |record| record_from_db(record, query.kind) }
+        end
       end
 
       def delete_by_key(key)
-        delete(query_from_key(key))
+        with_connection do
+          delete(query_from_key(key))
+        end
       end
 
       def delete(query)
-        sql_query = query_builder.build_delete(query)
-        query_executor.execute_mutation(sql_query)
-        nil
+        with_connection do
+          sql_query = query_builder.build_delete(query)
+          query_executor.execute_mutation(sql_query)
+          nil
+        end
       end
 
       def count(query)
-        sql_query = query_builder.build_count(query)
-        results = query_executor.execute_query(sql_query)
-        db_strategy.process_count_result(results[0])
+        with_connection do
+          sql_query = query_builder.build_count(query)
+          results = query_executor.execute_query(sql_query)
+          db_strategy.process_count_result(results[0])
+        end
       end
 
       private
 
       attr_reader :query_builder, :query_executor, :db_strategy
 
+      def with_connection
+        Sql.with_connection(@connection_url) do
+          yield
+        end
+      end
+
       def non_empty_record?(record)
         record = record.dup
         record.delete(:kind)
@@ -70,7 +89,7 @@ module Hyperion
       end
 
       def record_from_db(record, table)
-        record[:key] = Key.compose_key(table, record.delete('id')) if API.new?(record)
+        record[:key] = Key.compose_key(table, record.delete('id')) if Hyperion.new?(record)
         record[:kind] = table
         record
       end

data/lib/hyperion/sql/middleware.rb

@@ -30,17 +30,19 @@ module Hyperion
         @app = app
         @connection_url = opts[:connection_url]
         @ds = opts[:ds]
-        @ds_opts = opts[:ds_opts]
+        @ds_opts = opts[:ds_opts] || {}
       end
 
       def call(env)
-        Sql.with_connection_and_ds(@connection_url, @ds, @ds_opts) do
-          Sql.transaction do
-            @app.call(env)
+        Hyperion.with_datastore(@ds, @ds_opts.merge(:connection_url => @connection_url)) do
+          Sql.with_connection(@connection_url) do
+            Sql.transaction do
+              @app.call(env)
+            end
           end
         end
-      end
 
+      end
     end
   end
 end

data/lib/hyperion/sql/transaction_spec.rb

@@ -1,4 +1,4 @@
-require 'hyperion/api'
+require 'hyperion'
 require 'hyperion/sql'
 
 shared_examples_for 'Sql Transactions' do
@@ -25,7 +25,7 @@ shared_examples_for 'Sql Transactions' do
   end
 
   def test_count
-    Hyperion::API.count_by_kind('test')
+    Hyperion.count_by_kind('test')
   end
 
   context 'rollback' do
@@ -45,7 +45,7 @@ shared_examples_for 'Sql Transactions' do
           write("INSERT INTO test (name, age) VALUES ('Myles', 23)")
           test_count.should == 2
         end
-          test_count.should == 1
+        test_count.should == 1
       end
       test_count.should == 0
     end

data/spec/hyperion/sql/middleware_spec.rb

@@ -1,5 +1,5 @@
-require 'hyperion/sql/middleware'
 require 'do_sqlite3'
+require 'hyperion/sql/middleware'
 
 describe Hyperion::Sql::Middleware do
 
@@ -29,10 +29,10 @@ describe Hyperion::Sql::Middleware do
 
   it 'assigns the datastore' do
     midd = middleware lambda { |env|
-      Hyperion::API.datastore.class.should == Hyperion::Memory
+      Hyperion.datastore.class.should == Hyperion::Memory
     }
     midd.call(nil)
-    expect {Hyperion::API.datastore}.to raise_error
+    expect {Hyperion.datastore}.to raise_error
   end
 
   it 'starts a transaction' do

data/spec/hyperion/sql_spec.rb

@@ -1,4 +1,38 @@
+require 'do_sqlite3'
 require 'hyperion/sql'
 
 describe Hyperion::Sql do
+
+  def sql
+    Hyperion::Sql
+  end
+
+  context 'with_connection' do
+    it 'assigns the connection' do
+      sql.with_connection('sqlite3::memory:') do
+        Thread.current[:connection].should be_a(DataObjects::Connection)
+      end
+    end
+
+    it 'returns the block result' do
+      sql.with_connection('sqlite3::memory:') do
+        :return
+      end.should == :return
+    end
+
+    it 'closes the connection' do
+      sql.with_connection('sqlite3::memory:') do
+        Thread.current[:connection].should_receive(:close)
+      end
+    end
+
+    it 'closes the connection when an exception is raised' do
+      expect {
+        sql.with_connection('sqlite3::memory:') do
+          Thread.current[:connection].should_receive(:close)
+          raise
+        end
+      }.to raise_error
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hyperion-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha5
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
-- 8th Light, Inc.
+- Myles Megyesi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,6 @@ dependencies:
 description: Shared behavior for Sql databases
 email:
 - myles@8thlight.com
-- skim@8thlight.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -109,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24