flounder 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c24fd44d83971c04ab5af008256caa682550c92a
-  data.tar.gz: d75714297696317a7156d0f6f6ca74c6b5541ef8
+  metadata.gz: a3cf7329905c8c1b1379adeb8474f9ec7f594b77
+  data.tar.gz: 9806546b6fbb16077607e0b60930a051fbab9d1f
 SHA512:
-  metadata.gz: 2b45f93c33f514e6bdf2bc6fe1725cac663041814b6ed25fd3b82a749936fd9ec7ad737d41f2a0f26111fda23b0a9fb243ca1ebc8a81e8ac587dd95924d261e8
-  data.tar.gz: 5986acd3c19b5f836f02ac790e48a6ab1ee805b69a567a5c686f08a67b85b9cd89cec6afce452f005a797cf8165bc92c2f71a58ecc69e1261481161aacd6286f
+  metadata.gz: c74c0f97d0a716d094d0af54a3292ba5060c051e913a2b46046942ec92291005474abad4dbe3c692f1391bc3d323d7cd16d514fe92be18d2488f4b4491050156
+  data.tar.gz: b026b324cc4589a2da8c3ae677dbcbd65ad334637ce97b4ad8af5233180e67265bf396199771f625cad198114ad9c2f7c6974a4cfe98029a38045cd4718ab645

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.6.1'
+  s.version  = '0.7.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

@@ -66,7 +66,7 @@ module Flounder
     def insdate fields, hash, &inserted
       found = where(hash.select { |k, _| fields.include?(k) }).first
       if found
-        update(hash).where(:id => hash.delete(:id))
+        update(hash).where(:id => found.id)
       else
         insert(hash, &inserted)
       end
@@ -99,7 +99,7 @@ module Flounder
     end
 
     # Kickers
-    [:first, :all, :size].each do |name|
+    [:first, :all, :size, :delete].each do |name|
       define_method name do |*args|
         q = query
         q.send(name, *args)

data/lib/flounder/query.rb

@@ -140,6 +140,18 @@ module Flounder
 
       all.first.count
     end
+    def delete
+      # things.where(...).delete.all
+      #
+      # Code that I actually want:
+      #
+      # @manager = manager.compile_delete
+      # self
+      #
+      # But for now it's a kicker:
+      #
+      engine.exec(manager.compile_delete.to_sql)
+    end
 
     # Returns all rows of the query result as an array. Individual rows are
     # mapped to objects using the row mapper. 

data/qed/insdate.md

@@ -1,23 +1,25 @@
 Flounder offers Insdate.
 
 ~~~ruby
-  user = users.first
+  post = posts.first
 
-  # Update if found.
-  #
-  results = users.insdate([:id], :id => user.id, :name => 'Mr. Insdate Update') do |u|
-    assert false # Not called.
-  end.returning
-  results.first.name.assert == 'Mr. Insdate Update'
-  
   # Insert if not found.
   #
-  results = users.insdate([:name], :name => 'Mr. Insdate Insert') do |u|
+  post = posts.insdate([:title], :title => 'Insdate Insert', :text => '', :user_id => users.first.id) do |u|
     u.assert # Is called.
-  end.returning
-  results.first.name.assert == 'Mr. Insdate Insert'
+  end.returning.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.title.assert == 'Insdate Insert'
+  post.text.assert == 'Insdate Update Text'
   
-  # Reset QED.
+  # Reset this particular QED.
   #
-  users.update(:name => 'John Snow').where(:id => user.id).returning('*')
+  posts.where(:id => post.id).delete.first
 ~~~

data/qed/selects.md

@@ -27,7 +27,7 @@ If we want to see all records, we use the `all` kicker, which has some synonyms.
 
 ~~~ruby
   users = domain[:users].all
-  users.size.assert == 7
+  users.size.assert == 6
   users.assert.kind_of? Array
 
   domain[:users].map(&:id).assert == users.map(&:id)

data/qed/updates.md

@@ -64,5 +64,5 @@ Updating multiple rows is possible.
 ~~~ruby
   updated = users.update(:name => 'Update Multiple Rows').where(:name.not_eq => nil).returning
 
-  updated.map(&:name).assert == ['Update Multiple Rows']*7
+  updated.map(&:name).assert == ['Update Multiple Rows']*6
 ~~~

metadata

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