hyperion-sql 0.0.1.alpha2 → 0.0.1.alpha3

data/lib/hyperion/sql/middleware.rb

@@ -0,0 +1,47 @@
+require 'hyperion/sql'
+
+module Hyperion
+  module Sql
+
+    # = Middleware
+    #
+    # This rack middleware will do the following
+    #
+    #   1. Wrap the request with a db connection using the :connection_url option
+    #   2. Wrap the request with a datastore using the :ds and :ds_opts options
+    #   3. Wrap the request with a transaction
+    #
+    # Examples
+    #
+    # 1. sqlite3
+    #
+    # use Hyperion::Sql::Middleware connection_url: 'sqlite3::memory:', db: :sqlite
+    #
+    # with Rails...
+    # config.middleware.use Hyperion::Sql::Middleware connection_url: 'sqlite3::memory:', ds: :sqlite
+    #
+    # 2. postgres
+    #
+    # use Hyperion::Sql::Middleware connection_url: 'postgres://localhost/hyperion_ruby', ds: :postgres
+
+    class Middleware
+
+      def initialize(app, opts={})
+        @app = app
+        @connection_url = opts[:connection_url]
+        @ds = opts[:ds]
+        @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)
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/hyperion/sql.rb

@@ -1,3 +1,4 @@
+require 'hyperion/api'
 require 'hyperion/sql/transaction'
 
 module Hyperion
@@ -6,11 +7,19 @@ module Hyperion
     def self.with_connection(url)
       connection = DataObjects::Connection.new(url)
       Thread.current[:connection] = connection
-      yield(connection)
+      yield
       connection.close
       Thread.current[:connection] = nil
     end
 
+    def self.with_connection_and_ds(url, name, opts={})
+      with_connection(url) do
+        API.with_datastore(name, opts) do
+          yield
+        end
+      end
+    end
+
     def self.connection
       Thread.current[:connection] || raise('No Connection Established')
     end

data/spec/hyperion/sql/middleware_spec.rb

@@ -0,0 +1,46 @@
+require 'hyperion/sql/middleware'
+require 'do_sqlite3'
+
+describe Hyperion::Sql::Middleware do
+
+  def middleware(app)
+    midd = Hyperion::Sql::Middleware.new(app, {
+      connection_url: 'sqlite3::memory:',
+      ds: :memory,
+      ds_opts: {someopts: 1}
+    })
+  end
+
+  it 'passes the env' do
+    mock_env = mock(:env)
+    midd = middleware lambda { |env|
+      env.should == mock_env
+    }
+    midd.call(mock_env)
+  end
+
+  it 'establishes a connection' do
+    midd = middleware lambda { |env|
+      expect {Hyperion::Sql.connection}.to_not raise_error
+    }
+    midd.call(nil)
+    expect {Hyperion::Sql.connection}.to raise_error
+  end
+
+  it 'assigns the datastore' do
+    midd = middleware lambda { |env|
+      Hyperion::API.datastore.class.should == Hyperion::Memory
+    }
+    midd.call(nil)
+    expect {Hyperion::API.datastore}.to raise_error
+  end
+
+  it 'starts a transaction' do
+    midd = middleware lambda { |env|
+      Thread.current[:transaction].should_not be_nil
+    }
+    midd.call(nil)
+    Thread.current[:transaction].should be_nil
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperion-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha2
+  version: 0.0.1.alpha3
   prerelease: 6
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha2
+        version: 0.0.1.alpha3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha2
+        version: 0.0.1.alpha3
+- !ruby/object:Gem::Dependency
+  name: do_sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.8
 description: Shared behavior for Sql databases
 email:
 - myles@8thlight.com
@@ -54,10 +70,12 @@ files:
 - lib/hyperion/sql.rb
 - lib/hyperion/sql/query_executor.rb
 - lib/hyperion/sql/sql_query.rb
+- lib/hyperion/sql/middleware.rb
 - lib/hyperion/sql/transaction.rb
 - lib/hyperion/sql/transaction_spec.rb
 - lib/hyperion/sql/query_builder.rb
 - lib/hyperion/sql/datastore.rb
+- spec/hyperion/sql/middleware_spec.rb
 - spec/hyperion/sql_spec.rb
 homepage: https://github.com/mylesmegyesi/hyperion-ruby
 licenses:
@@ -85,4 +103,5 @@ signing_key:
 specification_version: 3
 summary: Shared behavior for Sql databases
 test_files:
+- spec/hyperion/sql/middleware_spec.rb
 - spec/hyperion/sql_spec.rb