swift 0.9.1 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.10.0

data/ext/adapter.cc

@@ -87,11 +87,16 @@ static VALUE adapter_escape(VALUE self, VALUE value) {
 
 // TODO: Change bind_values to an array in the interface? Avoid array -> splat -> array.
 static VALUE adapter_execute(int argc, VALUE *argv, VALUE self) {
-  VALUE statement, bind_values, block, rows;
+  VALUE statement, bind_values, block, rows, scheme = Qnil;
 
   dbi::Handle *handle = adapter_handle(self);
   rb_scan_args(argc, argv, "1*&", &statement, &bind_values, &block);
 
+  if (TYPE(statement) == T_CLASS) {
+    scheme    = statement;
+    statement = rb_ary_shift(bind_values);
+  }
+
   try {
     Query query;
     query.sql    = CSTRING(statement);
@@ -104,6 +109,8 @@ static VALUE adapter_execute(int argc, VALUE *argv, VALUE self) {
       rb_raise(eSwiftRuntimeError, "%s", query.error);
 
     VALUE result = result_wrap_handle(cSwiftResult, self, handle->conn()->result(), true);
+    if (!NIL_P(scheme))
+      rb_iv_set(result, "@scheme", scheme);
     return rb_block_given_p() ? result_each(result) : result;
   }
   CATCH_DBI_EXCEPTIONS();
@@ -177,7 +184,7 @@ static VALUE adapter_rollback(int argc, VALUE *argv, VALUE self) {
 
 static VALUE adapter_transaction(int argc, VALUE *argv, VALUE self) {
   int status;
-  VALUE sp, block;
+  VALUE sp, block, block_result = Qnil;
 
   dbi::Handle *handle = adapter_handle(self);
 
@@ -188,7 +195,7 @@ static VALUE adapter_transaction(int argc, VALUE *argv, VALUE self) {
 
   try {
     handle->begin(save_point);
-    rb_protect(rb_yield, self, &status);
+    block_result = rb_protect(rb_yield, self, &status);
     if (!status && handle->transactions().size() > 0) {
       handle->commit(save_point);
     }
@@ -199,7 +206,7 @@ static VALUE adapter_transaction(int argc, VALUE *argv, VALUE self) {
   }
   CATCH_DBI_EXCEPTIONS();
 
-  return Qtrue;
+  return block_result;
 }
 
 static VALUE adapter_write(int argc, VALUE *argv, VALUE self) {

data/swift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swift}
-  s.version = "0.9.1"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-  s.date = %q{2011-02-10}
+  s.date = %q{2011-04-04}
   s.description = %q{A rational rudimentary database abstraction.}
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extensions = ["ext/extconf.rb"]

data/test/test_scheme.rb

@@ -57,6 +57,11 @@ describe 'scheme' do
         Swift.db.migrate! @user
       end
 
+      it 'should return scheme instance when given scheme in #execute' do
+        user = @user.create
+        assert_equal 1, Swift.db.execute(@user, 'select * from users').first.id
+      end
+
       it 'adapter should destroy valid instance' do
         user = @user.create
         assert_equal 1, user.id

data/test/test_transactions.rb

@@ -25,6 +25,10 @@ describe 'Adapter' do
         end
       end
 
+      it 'should return result from block' do
+        assert_equal :foobar, @db.transaction {|db| foobar = 1; foobar = :foobar }
+      end
+
       describe 'commits work' do
         before do
           @db.execute('delete from users')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 1
-  version: 0.9.1
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Shane Hanna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +11:00
+date: 2011-04-04 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency