flounder 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf8d5e68827d9962affb51d05cf5cd404c73c98
-  data.tar.gz: 22f1840346a7f36442e93e58b8295e0d5c718358
+  metadata.gz: a4825945deccb5f4203a803ecab116bdcc524314
+  data.tar.gz: bd2ba46841e6f4712b910dcbd4a08ccab9a3ca21
 SHA512:
-  metadata.gz: 6590b22ad34ae153be4d8d56709ca6f4d1f42dfab14908fd713bd4b81123ee5583bf61fddb6743a73c22cb405683e8c1bdf296381b64a4ade1fef432d5ad1c6f
-  data.tar.gz: a9e0b470deae3ce0edd4f0f33b583e479246ceeb078c8d9191bc464610cbb476a3034978b987d42fa3d828fb40dfbd975c151ea610da1fe16f4b35a88836a218
+  metadata.gz: 828e529a485e1714fa19f9986a4c27eeaf264f5edbc92ffe6a41760f59034494049ad05873a5067d7eb734413ad3e6ed8f8ba1367344dac0421d1c86be203e6b
+  data.tar.gz: 5d4d28be3d8dea21684440d9ad18b2365860022c2e848aeac637ab38de7b9d8ad333392d5111bfcc3d706d741994e2d6a264ed43d9e7d6a50fab203d5de110ee

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.7.1'
+  s.version  = '0.8.0'
   s.summary  = "Flounder is a way to write SQL simply in Ruby. It deals with everything BUT object relational mapping. "
   s.email    = "kaspar.schiess@technologyastronauts.ch"
   s.homepage = "https://bitbucket.org/technologyastronauts/laboratory_flounder"

data/lib/flounder/entity.rb

@@ -59,13 +59,15 @@ module Flounder
     
     # Insert or update.
     #
-    def insdate fields, hash, &inserted
+    def insdate fields, hash
       with_transaction do
         found = where(hash.select { |k, _| fields.include?(k) }).first
         if found
-          update(hash).where(:id => found.id)
+          update(hash).where(:id => found.id).returning
         else
-          insert(hash, &inserted)
+          result = insert(hash).returning
+          yield result if block_given?
+          result
         end
       end
     end

data/qed/insdate.md

@@ -5,17 +5,17 @@ Flounder offers Insdate.
 
   # Insert if not found.
   #
-  post = posts.insdate([:title], :title => 'Insdate Insert', :text => '', :user_id => users.first.id) do |u|
-    u.assert # Is called.
-  end.returning.first
+  post = posts.insdate([:title], :title => 'Insdate Insert', :text => '', :user_id => users.first.id) do |p|
+    p.first.title.assert == 'Insdate Insert'
+  end.first
   post.title.assert == 'Insdate Insert'
   post.text.assert == ''
 
   # Update if found with the fields.
   #
-  post = posts.insdate([:title], :title => 'Insdate Insert', :text => 'Insdate Update Text') do |u|
-    assert false # Not called.
-  end.returning.first
+  post = posts.insdate([:title], :title => 'Insdate Insert', :text => 'Insdate Update Text') do |p|
+    assert false # Not called on update.
+  end.first
   post.title.assert == 'Insdate Insert'
   post.text.assert == 'Insdate Update Text'
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Kaspar Schiess