squirm 0.0.2 → 0.0.3

data/README.md

@@ -42,13 +42,17 @@ Here's a quick demo of how you might use it:
     id = create.call(email: "johndoe@example.com", name: "John Doe")
 
 In and of itself, Squirm offers very little, but is meant to be a basic building
-block for other libraries.
+block for other libraries, such as [Squirm
+Model](https://github.com/bvision/squirm_model), which supplies an Active Model
+compatible ORM based on stored procedures.
 
-One such library is Squirm Model, which is currently under development.
+## Using it with Rails
 
-This library will offer an ActiveModel-compatible, ORM-like library that uses
-stored procedures and SQL rather than generating the SQL for you. Stay tuned
-for more details.
+Squirm can use Active Record's connection pool rather than its own, all you have
+to do is pass in the pool to `Squirm.connect`:
+
+    # in config/initializers/squirm.rb
+    Squirm.connect pool: ActiveRecord::Base.connection_pool
 
 ## Author
 

data/lib/squirm.rb

@@ -59,7 +59,15 @@ some reason you want to use them:
     proc.call("Jan 1, 2011") #=> "2011-01-01"
 
 =end
+
+
 module Squirm
   Rollback, Timeout = 2.times.map { Class.new RuntimeError }
   extend Core
 end
+
+module Kernel
+  def Squirm(&block)
+    Squirm.instance_eval(&block)
+  end
+end

data/lib/squirm/core.rb

@@ -40,6 +40,10 @@ module Squirm
       end
     end
 
+    def procedure(*args)
+      Procedure.load(*args)
+    end
+
     # Gets the connection pool.
     # @return [Squirm::Pool] The connection pool.
     def pool
@@ -60,8 +64,10 @@ module Squirm
     end
 
     # Rolls back from inside a #transaction block.
-    def rollback
-      raise Rollback
+    # When called with block, performs a transaction inside a block and rolls
+    # back when it gets to the end. This can be useful in tests.
+    def rollback(&block)
+      block_given? ? transaction {yield; rollback} : (raise Rollback)
     end
 
     # Checks out a connection and uses it for all database access inside the
@@ -70,7 +76,7 @@ module Squirm
       conn = @pool.checkout
       begin
         Thread.current[:squirm_connection] = conn
-        yield conn
+        yield conn.respond_to?(:raw_connection) ? conn.raw_connection : conn
       ensure
         Thread.current[:squirm_connection] = nil
         @pool.checkin conn

data/lib/squirm/procedure.rb

@@ -49,6 +49,11 @@ module Squirm
       @arguments = Arguments.new(options[:args]) if options[:args]
     end
 
+    # Creates procedure and loads it right away.
+    def self.load(*args)
+      new(*args).load
+    end
+
     # Loads meta info about the stored procedure.
     #
     # This action is not performed in the constructor to allow instances to
@@ -86,6 +91,11 @@ module Squirm
 
     alias [] call
 
+    # Gets a Ruby proc that calls this procedure.
+    def to_proc
+      ->(*args) {call(*args)}
+    end
+
     # Checks the number of values returned when looking up meta info about
     # the procedure.
     # @see #load

data/lib/squirm/version.rb

@@ -1,3 +1,3 @@
 module Squirm
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squirm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000 Z
+date: 2011-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70156030613100 !ruby/object:Gem::Requirement
+  requirement: &70214491275780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70156030613100
+  version_requirements: *70214491275780
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70156030612340 !ruby/object:Gem::Requirement
+  requirement: &70214494717880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70156030612340
+  version_requirements: *70214494717880
 description: ! '"Squirm is an anti-ORM for database-loving programmers"'
 email:
 - norman@njclarke.com
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ! '"An anti-ORM for database-loving programmers"'
@@ -85,3 +85,4 @@ test_files:
 - spec/helper.rb
 - spec/pool_spec.rb
 - spec/procedure_spec.rb
+has_rdoc: