flounder 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc0f113f0d254c49373affa1869e3f8fc03a3fb
-  data.tar.gz: 8ff7ed39500492b2f965ff7e1d7c1acc2a7f2473
+  metadata.gz: 9f4ec6bd3fa4f14eccf7efa8d3aed4e81a3d8e08
+  data.tar.gz: cba009f5dc2b519b4636b643b7ac1d02bd9a493c
 SHA512:
-  metadata.gz: a0e855f62812d513ae1ca5bfb0d04d0a313c5f9d0f7c42d076de31625a60b344dd32a05e8f9cfb674346e6db7c964ea157c0f2c50f91f5dce333226612191a23
-  data.tar.gz: bc99c6125d8e890eb89f1db3ab1ad326e50f0a2d13950a4efed4089f4c209773e3d79dc2513862c33a82788d130c9484c60cc7b7a09832efd55a10a91c55b829
+  metadata.gz: 81a859be8701dc7aa497f17949ed8bb8db93cb22daaba9c24796d5d225ef4cfd936174f132648bde9755d67b4aa15c92db2c09e404fec28280e4db62d3fa302b
+  data.tar.gz: 85f24647fe87ddd7a788df1f0722811fd828d4e0c5c570c6ac295e40d9ef6d4e5fb3ead5526a20bf35566f2132638c7b355ba0e1291697e79c20f8c63a6d9c38

data/HISTORY

@@ -1,4 +1,7 @@
 
+# 0.15
+  + Condition piece generator - use this to create OR expressions: Entity#cond
+
 # 0.13
   + Expression generator (Domain#expr).
 

data/flounder.gemspec

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

data/lib/flounder/domain.rb

@@ -50,9 +50,12 @@ module Flounder
     end
 
     # Builds an SQL expression. 
+    # 
+    #   domain.expr { concat('1', '2') }
     #
-    def expr context=self, &block
-      Expression::Builder.new(self, context).call(&block)
+    def expr &block
+      builder = Expression::Builder.new(self)
+      builder.call(&block)
     end
 
     # Returns an aggregate of all query wall clock times. Please see 

data/lib/flounder/entity.rb

@@ -66,6 +66,15 @@ module Flounder
     end
     alias to_s inspect
 
+    # Builds a condition part or a general SQL expression. 
+    # 
+    #   entity.cond(a: 1)
+    #
+    def cond *conditions
+      builder = Expression::Builder.new(domain)
+      builder.interpret_conditions(self, conditions)
+    end
+
     # Starts a new select query and yields it to the block. Note that you don't 
     # need to call this method to obtain a select query - any of the methods
     # on Query::Select should work on the entity and return a new query object. 

data/lib/flounder/expression.rb

@@ -11,6 +11,12 @@ module Flounder::Expression
     def cast type
       Cast.new(@domain, type, self)
     end
+    def | expr
+      BinaryOp.new(@domain, 'OR', self, expr)
+    end
+    def & expr
+      BinaryOp.new(@domain, 'AND', self, expr)
+    end
 
     def eval argument
       case argument
@@ -83,18 +89,70 @@ module Flounder::Expression
     end
   end
 
+  class ConditionBit < Expr
+    def initialize domain, engine, bit
+      super(domain)
+      @engine = engine
+      @bit = bit
+    end
+
+    attr_accessor :bit, :engine
+
+    def to_sql
+      bit.to_sql(engine)
+    end
+  end
+
+  class BinaryOp < Expr
+    def initialize domain, op_string, *terms
+      super(domain)
+
+      @op_string = op_string
+      @terms = terms
+    end
+
+    attr_accessor :op_string
+
+    def concat term
+      @terms << term
+    end
+
+    def to_sql
+      "(" +
+        @terms.
+          map { |t| eval(t) }.
+          join(" #{op_string} ") +
+        ")"
+    end
+  end
+
   class Builder
-    def initialize domain, context
+    def initialize domain
       @domain = domain
-      @context = context
     end
 
-    attr_accessor :domain, :context
+    attr_accessor :domain
 
     def call &block
       instance_eval(&block)
     end
 
+    # Conditions are interpreted relative to an entity. 
+    def interpret_conditions entity, conditions
+      # The method we need is in there...
+      query = Flounder::Query::Select.new(domain, entity)
+      engine = Flounder::Engine.new(domain.connection_pool)
+
+      and_expr = BinaryOp.new(domain, 'AND')
+
+      # TODO parse_conditions and its call tree is not really something that
+      # belongs into the query object - we should create a new abstraction here.
+      query.parse_conditions(*conditions) { |bit| 
+        and_expr.concat(ConditionBit.new(domain, engine, bit)) }
+
+      and_expr
+    end
+
     def respond_to? sym, include_all=false
       true
     end

data/lib/flounder/query/base.rb

@@ -81,14 +81,6 @@ module Flounder::Query
       domain.log_bm measure
     end
 
-  private
-    # Prepares a kick - meaning an execution on the database or a transform
-    # to an sql string. Ready Set... 
-    #
-    def prepare_kick
-      # should be overridden
-    end
-
     # Parses a conditions array like it is found with #where and #having and
     # calls the block for each condition bit. Returns self.
     #
@@ -126,6 +118,14 @@ module Flounder::Query
       end
       return self
     end
+    
+  private
+    # Prepares a kick - meaning an execution on the database or a transform
+    # to an sql string. Ready Set... 
+    #
+    def prepare_kick
+      # should be overridden
+    end
 
     # Rewrites a statement that contains bind placeholders like '$1' to
     # contain placeholders starting at offset+1. Also checks that no

data/qed/expressions.md

@@ -4,8 +4,14 @@
 Flounder also helps with the writing of complex SQL expressions. 
 
 ~~~ruby
-    users = domain[:users]
-    domain.expr { a(b(c(1, ' ', users[:id]))) }.cast('int').as(:foo).
-      assert generates_sql("a(b(c(1, ' ', \"users\".\"id\")))::int AS foo")
+  users = domain[:users]
+  domain.expr { a(b(c(1, ' ', users[:id]))) }.cast('int').as(:foo).
+    assert generates_sql("a(b(c(1, ' ', \"users\".\"id\")))::int AS foo")
 ~~~
 
+You can also pass a condition-like hash to expr directly, it will return a Ruby object that allows for chaining. 
+
+~~~ruby
+  (users.cond(:posts, a: 1) | users.cond(a: 2)).
+    assert generates_sql("((\"posts\".\"a\" = 1) OR (\"users\".\"a\" = 2))")
+~~~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel