flounder 0.8.1 → 0.9.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -86,10 +86,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - HACKING
+- HISTORY
 - LICENSE
 - README
+- flounder-0.3.0.gem
 - flounder.gemspec
 - lib/flounder.rb
 - lib/flounder/connection.rb
@@ -100,27 +101,29 @@ files:
 - lib/flounder/entity_alias.rb
 - lib/flounder/exceptions.rb
 - lib/flounder/field.rb
-- lib/flounder/immediate.rb
-- lib/flounder/insert.rb
 - lib/flounder/postgres_utils.rb
-- lib/flounder/query.rb
+- lib/flounder/query/base.rb
+- lib/flounder/query/immediate.rb
+- lib/flounder/query/insert.rb
+- lib/flounder/query/returning.rb
+- lib/flounder/query/select.rb
+- lib/flounder/query/update.rb
 - lib/flounder/symbol_extensions.rb
-- lib/flounder/update.rb
 - qed/applique/ae.rb
 - qed/applique/flounder.rb
 - qed/applique/setup_domain.rb
+- qed/atomic_insert_update.md
 - qed/conditions.md
 - qed/exceptions.md
 - qed/flounder.sql
 - qed/index.md
-- qed/insdate.md
 - qed/inserts.md
 - qed/ordering.md
 - qed/projection.md
 - qed/results.md
 - qed/selects.md
 - qed/updates.md
-homepage: https://bitbucket.org/technologyastronauts/laboratory_flounder
+homepage: https://bitbucket.org/technologyastronauts/oss_flounder
 licenses: []
 metadata: {}
 post_install_message: 
@@ -139,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Flounder is a way to write SQL simply in Ruby. It deals with everything BUT
@@ -148,11 +151,11 @@ test_files:
 - qed/applique/ae.rb
 - qed/applique/flounder.rb
 - qed/applique/setup_domain.rb
+- qed/atomic_insert_update.md
 - qed/conditions.md
 - qed/exceptions.md
 - qed/flounder.sql
 - qed/index.md
-- qed/insdate.md
 - qed/inserts.md
 - qed/ordering.md
 - qed/projection.md

data/Gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    flounder (0.4.0)
-      arel (~> 5, > 5.0.1)
-      connection_pool (~> 2)
-      hashie (~> 3, >= 3.2)
-      pg (> 0.17)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ae (1.8.2)
-      ansi
-    ansi (1.4.3)
-    arel (5.0.1.20140414130214)
-    brass (1.2.1)
-    connection_pool (2.0.0)
-    facets (2.9.3)
-    hashie (3.2.0)
-    pg (0.17.1)
-    qed (2.9.1)
-      ansi
-      brass
-      facets (>= 2.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ae
-  flounder!
-  qed

data/lib/flounder/insert.rb

@@ -1,73 +0,0 @@
-module Flounder
-
-  # An insert.
-  #
-  class Insert
-    def initialize domain, into_entity
-      @domain = domain
-      @into_entity = into_entity
-      @engine = Engine.new(into_entity.domain.connection_pool)
-      @manager = Arel::InsertManager.new(@engine)
-
-      manager.into into_entity.table
-    end
-
-    # Domain that this insert was issued for. 
-    attr_reader :domain
-    # Entity that this insert acts on.
-    attr_reader :into_entity
-
-    # Arel SqlManager that accumulates this insert. 
-    attr_reader :manager
-    # Database engine that links Arel to Postgres.
-    attr_reader :engine
-    
-    # Add one row to the inserts.
-    #
-    def insert fields
-      manager.insert fields.map { |k, v| transform_hash_keys(k, v) }
-    end
-
-    # Kickers
-    def to_sql
-      manager.to_sql.tap { |sql|
-        domain.log_sql(sql) }
-    end
-    alias sql to_sql
-    
-    # Returns all rows of the insert result as an array. Individual rows are
-    # mapped to objects using the row mapper. 
-    #
-    def returning fields = '*'
-      inserted = []
-      engine.exec(sql + " RETURNING #{fields}") do |result|
-        inserted = Array.new(result.ntuples, nil)
-        result.ntuples.times do |row_idx|
-          inserted[row_idx] = engine.connection.
-            objectify_result_row(into_entity, result, row_idx)
-        end
-      end
-      inserted
-    end
-
-  private
-  
-    # Called on each key/value pair of an insert clause, this returns a 
-    # hash that can be passed to Arel #insert. 
-    #
-    def transform_hash_keys field, value
-      if value.kind_of? Field
-        value = value.arel_field
-      end
-
-      case field
-        when Symbol, String
-          [into_entity[field.to_sym].arel_field, value]
-        when Flounder::Field
-          [field.arel_field, value]
-      else
-        fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
-      end
-    end
-  end # class
-end # module Flounder

data/lib/flounder/update.rb

@@ -1,114 +0,0 @@
-module Flounder
-
-  # An update obtained by calling any of the chain methods on an entity.
-  #
-  class Update
-    def initialize domain, entity
-      @domain = domain
-      @entity = entity
-      @engine = Engine.new(entity.domain.connection_pool)
-      @manager = Arel::UpdateManager.new(@engine)
-
-      manager.table entity.table
-    end
-
-    # Domain that this update was issued from. 
-    attr_reader :domain
-    # Entity that this update acts on.
-    attr_reader :entity
-
-    # Arel SqlManager that accumulates this query. 
-    attr_reader :manager
-    # Database engine that links Arel to Postgres.
-    attr_reader :engine
-
-    # Add one row to the updates.
-    #
-    def update fields
-      manager.set fields.map { |k, v| transform_hash_keys(k, v) }
-    end
-
-    def where conditions={}
-      conditions.each do |k, v|
-        manager.where(transform_hash_condition(k, v))
-      end
-      self
-    end
-
-    # Kickers
-    def to_sql
-      manager.to_sql.tap { |sql| 
-        domain.log_sql(sql) }
-    end
-    alias sql to_sql
-
-    # Returns all rows of the update result as an array. Individual rows are
-    # mapped to objects using the row mapper. 
-    #
-    def returning fields = '*'
-      updated = nil
-      engine.exec(sql + " RETURNING #{fields}") do |result|
-        updated = Array.new(result.ntuples, nil)
-        result.ntuples.times do |row_idx|
-          updated[row_idx] = engine.connection.
-            objectify_result_row(entity, result, row_idx)
-        end
-      end
-      updated
-    end
-
-  private
-
-    # Called on each key/value pair of an update clause, this returns a 
-    # hash that can be passed to Arel #update. 
-    #
-    def transform_hash_keys field, value
-      if value.kind_of? Field
-        value = value.arel_field
-      end
-
-      case field
-        when Symbol, String
-          [entity[field.to_sym].arel_field, value]
-        when Flounder::Field
-          [field.arel_field, value]
-      else
-        fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
-      end
-    end
-
-    # Called on each key/value pair of a condition clause, this returns a 
-    # condition that can be passed to Arel #where. 
-    #
-    def transform_hash_condition field, value
-      if value.kind_of? Field
-        value = value.arel_field
-      end
-
-      case field
-        when Symbol
-          condition_part(entity[field].arel_field, value)
-        when Flounder::Field
-          condition_part(field.arel_field, value)
-        when Flounder::SymbolExtensions::Modifier
-          condition_part(
-            field.to_arel_field(entity), 
-            value, 
-            field.kind)
-      else
-        fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
-      end
-    end
-    def condition_part arel_field, value, kind=:eq
-      case value
-        when Symbol
-          value_field = entity[value].arel_field
-          arel_field.send(kind, value_field)
-        when Range
-          arel_field.in(value)
-      else
-        arel_field.send(kind, value)
-      end
-    end
-  end # class
-end # module Flounder

data/qed/insdate.md

@@ -1,25 +0,0 @@
-Flounder offers Insdate.
-
-~~~ruby
-  post = posts.first
-
-  # Insert if not found.
-  #
-  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 |p|
-    assert false # Not called on update.
-  end.first
-  post.title.assert == 'Insdate Insert'
-  post.text.assert == 'Insdate Update Text'
-  
-  # Reset this particular QED.
-  #
-  posts.where(:id => post.id).delete.first
-~~~