flounder 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 484ff8cd8a8111a3d280cad0dc9d4fff81d53df5
-  data.tar.gz: 87115495df74ecf98166c0f801c787ee1457554f
+  metadata.gz: a661579acf9b8efd91248bf500928fa995ae4cf1
+  data.tar.gz: 70c604ee69bf1cf6a45b19724e85e865e35a335f
 SHA512:
-  metadata.gz: 0f145748074a522cdef6ae67e6148701cd6c256e885f30c4f301e101c4cda1c1a26f47bc013397caf92c45c433474d2982f1afd5c4ecc4bb881d49655412f0da
-  data.tar.gz: 24104884f69252858840d7ff839db49f1a25f8e3720daf49f38ae467f881f7851aa90882d350171a21da164431ebd943af88a554e9ca26f0313692b32bb976da
+  metadata.gz: 0315371d93b05f38a6902ced435eda2811eb2931db4647d4e1fa97610194a4d25b4cf1b4101b280ca4088570d6515743d7c8f48a4d46397c1a0ad4b42b6ed4c6
+  data.tar.gz: 16cbfd112bc6362748dedacb4472fdddf727f5f1038f90c74e90e6efd32c152a784b40360f8a1240deb7037118d8912edda7a7ef6115c89880cc6f569678d77f

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.5.0'
+  s.version  = '0.6.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/connection.rb

@@ -83,8 +83,8 @@ module Flounder
         # Certainly needs refactoring.
         #
         processed_entity, processed_name = yield name if block_given?
-        entity = processed_entity || entity
-        name   = processed_name || name
+        entity = processed_entity if processed_entity
+        name   = processed_name if processed_name
 
         typecast_value = typecast(type_oid, value)
 

data/lib/flounder/entity.rb

@@ -56,6 +56,21 @@ module Flounder
         u.update(hash)
       }
     end
+    
+    # Insert or update.
+    #
+    # TODO Envelop in transaction.
+    # Not sure yet where the right level of abstraction is to
+    # insert START TRANSACTION/COMMIT TRANSACTION.
+    #
+    def insdate fields, hash, &if_inserted
+      found = where(hash.select { |k, _| fields.include?(k) }).first
+      if found
+        update(hash).where(:id => hash.delete(:id))
+      else
+        insert(hash, &Proc.new)
+      end
+    end
 
     # Temporarily creates a new entity that is available as if it was declared
     # with the given plural and singular, but referencing to the same

data/lib/flounder/query.rb

@@ -37,7 +37,7 @@ module Flounder
     # prefix during this query. 
     attr_reader :projection_prefixes
 
-    def where conditions={}
+    def where conditions
       conditions.each do |k, v|
         manager.where(transform_hash(k, v))
       end

data/qed/conditions.md

@@ -0,0 +1,13 @@
+A simple use case. 
+
+~~~ruby
+  s2013 = domain[:users].where(:id => 1).first
+  s2013.user.id.assert == 1
+~~~
+
+# Using strings in where to allow for cases not covered in Flounder/Arel.
+#
+# ~~~ruby
+#   posts = domain[:posts].where('id == (?) OR title == "(?)"', 1, "Hello").all
+#   posts.first.id.assert == 1
+# ~~~

data/qed/insdate.md

@@ -0,0 +1,23 @@
+Flounder offers Insdate.
+
+~~~ruby
+  user = users.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|
+    u.assert # Is called.
+  end.returning
+  results.first.name.assert == 'Mr. Insdate Insert'
+  
+  # Reset QED.
+  #
+  users.update(:name => 'John Snow').where(:id => user.id).returning('*')
+~~~

data/qed/inserts.md

@@ -40,4 +40,10 @@ Flounder fields can be used as keys.
   results.first.name.assert == 'Mr. Flounder Field'
 ~~~
 
-TODO It does not yet support multi-row inserts.
+TODO It does not yet support multi-row inserts.
+
+~~~ruby
+  # users.insert({ :name => 'Mr. First Row'}, { :name => 'Mr. Second Row' }).returning
+  # OR
+  # users.insert(:name => 'Mr. First Row').insert(:name => 'Mr. Second Row').returning
+~~~

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 == 6
+  users.size.assert == 7
   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']*6
+  updated.map(&:name).assert == ['Update Multiple Rows']*7
 ~~~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -109,9 +109,11 @@ files:
 - qed/applique/ae.rb
 - qed/applique/flounder.rb
 - qed/applique/setup_domain.rb
+- qed/conditions.md
 - qed/exceptions.md
 - qed/flounder.sql
 - qed/index.md
+- qed/insdate.md
 - qed/inserts.md
 - qed/ordering.md
 - qed/projection.md
@@ -146,9 +148,11 @@ test_files:
 - qed/applique/ae.rb
 - qed/applique/flounder.rb
 - qed/applique/setup_domain.rb
+- qed/conditions.md
 - qed/exceptions.md
 - qed/flounder.sql
 - qed/index.md
+- qed/insdate.md
 - qed/inserts.md
 - qed/ordering.md
 - qed/projection.md