flounder 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e69174de167de70dbf0357305fa02c71164c8bea
-  data.tar.gz: 278919200dee79e529c0ed56aa4dce90db7aed69
+  metadata.gz: 04d1106f4e95ce3826634ec72900b5ccd131a216
+  data.tar.gz: 2fab08b9cfbe86039810223e9756eb121a7d7e92
 SHA512:
-  metadata.gz: f64f07a05f24cc5bc2f2460285f495300ea2e4e6a0474d4b7e3d896ccca6e1852b252b3c4f710fa2ff7f9a1d1ce71b06bb72c68dde6b6e2b2bcad6b158375d57
-  data.tar.gz: 5076c7c51a2e30eb9a19c69f9139ab56c4db7b0cfcfa27acdccd8b3ddc591947a69bdf7adc90efed1ef7b72cebf66bfce6e5432193cd4297b323c5c20356b850
+  metadata.gz: b172e8b4b323d12ae34950b98fb596c8b624b53aa0e4f9c9799f2b4d6a2aceca1e277f04c064e21e33aecc944e57d0239b7a2dff8b3d1ebab15a331666675c46
+  data.tar.gz: 03f98c7833cee422c3fe81a2d4dc2b6fa3f59033b99a7cff3387342a24258ce90ee4f85e3574de030f2fb6775f37bc596e1c593abd428eea8532483b9282ea56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flounder (0.12.0)
+    flounder (0.12.1)
       aggregate (~> 0.2, >= 0.2.2)
       arel (~> 5, > 5.0.1)
       connection_pool (~> 2)

data/HISTORY

@@ -1,3 +1,7 @@
+
+# 0.13
+  + Expression generator (Domain#expr).
+
 # 0.12 
   + domain#stats keeps a histogram of execution times.
   + entity#fields without argument returns all fields.

data/flounder.gemspec

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

@@ -49,6 +49,12 @@ module Flounder
       end
     end
 
+    # Builds an SQL expression. 
+    #
+    def expr context=self, &block
+      Expression::Builder.new(self, context).call(&block)
+    end
+
     # Returns an aggregate of all query wall clock times. Please see 
     # https://github.com/josephruscio/aggregate for more information on this 
     # object. 

data/lib/flounder/expression.rb

@@ -0,0 +1,107 @@
+
+module Flounder::Expression
+  class Expr
+    def initialize domain
+      @domain = domain
+    end
+
+    def as name
+      Named.new(@domain, name, self)
+    end
+    def cast type
+      Cast.new(@domain, type, self)
+    end
+
+    def eval argument
+      case argument
+        when String, Symbol
+          db_quote(argument.to_s)
+        when Fixnum
+          argument
+        when Expr
+          argument.to_sql
+        when Flounder::Field
+          argument.fully_qualified_name
+      else 
+        db_quote(argument)
+      end
+    end
+
+    def db_quote something
+      @domain.with_connection do |conn|
+        conn.quote(something)
+      end
+    end
+
+    def to_sql
+      raise NotImplementedError
+    end
+    def to_immediate
+      Flounder::Immediate.new(to_sql)
+    end
+
+    include Flounder::SymbolExtensions
+  end
+
+  class Cast < Expr
+    def initialize domain, type, expr
+      super(domain)
+
+      @type = type
+      @expr = expr
+    end
+
+    def to_sql
+      @expr.to_sql << '::' << @type.to_s
+    end
+  end
+
+  class Named < Expr
+    def initialize domain, name, expr
+      super(domain)
+
+      @name = name
+      @expr = expr
+    end
+
+    def to_sql
+      @expr.to_sql << ' AS ' << @name.to_s
+    end
+  end
+
+  class FunCall < Expr
+    def initialize domain, name, arguments
+      super(domain)
+
+      @name = name
+      @arguments = arguments
+    end
+
+    def to_sql
+      @name.to_s << '(' << 
+        @arguments.map { |arg| eval(arg) }.join(', ') << ')'          
+    end
+  end
+
+  class Builder
+    def initialize domain, context
+      @domain = domain
+      @context = context
+    end
+
+    attr_accessor :domain, :context
+
+    def call &block
+      instance_eval(&block)
+    end
+
+    def respond_to? sym, include_all=false
+      true
+    end
+    def method_missing sym, *args, &block
+      raise ArgumentError, "No blocks in sql execution context." if block
+
+      FunCall.new(domain, sym, args)
+    end
+  end
+end

data/lib/flounder/{query/immediate.rb → immediate.rb}

@@ -1,5 +1,5 @@
 
-module Flounder::Query
+module Flounder
   # An immmediate string that needs to be passed around and _not_ quoted or
   # escaped when going to the database. 
   #
@@ -12,7 +12,7 @@ module Flounder::Query
     attr_reader :string
 
     def to_arel_field
-      string
+      Arel::SqlLiteral.new(string)
     end
   end
 end

data/lib/flounder/query/select.rb

@@ -189,9 +189,11 @@ module Flounder::Query
         when Symbol
           entity[field_ref]
         when String
-          Immediate.new(field_ref)
+          Flounder::Immediate.new(field_ref)
         when Flounder::Field
           field_ref
+        when Flounder::Expression::Expr
+          field_ref.to_immediate
       else
         fail Flounder::InvalidFieldReference, 
           "Cannot resolve #{field_ref.inspect} to a field."
@@ -243,7 +245,7 @@ module Flounder::Query
       
       case field
         when String
-          Immediate.new(field).to_arel_field
+          Flounder::Immediate.new(field).to_arel_field
         when Flounder::Field
           field.fully_qualified_name
         when Flounder::SymbolExtensions::Modifier

data/lib/flounder/symbol_extensions.rb

@@ -7,6 +7,8 @@ module Flounder
             entity[sym].arel_field
           when Flounder::Field
             sym.arel_field
+          when Flounder::Expression::Expr
+            sym.to_immediate.to_arel_field
         else
           fail "ASSERTION FAILURE: Unknown type in field.sym: #{field.sym.inspect}."
         end

data/lib/flounder.rb

@@ -12,8 +12,7 @@ require 'flounder/engine'
 require 'flounder/entity'
 require 'flounder/entity_alias'
 require 'flounder/field'
-
-require 'flounder/query/immediate'
+require 'flounder/immediate'
 
 require 'flounder/query/select'
 require 'flounder/query/insert'
@@ -22,6 +21,8 @@ require 'flounder/query/delete'
 
 require 'flounder/exceptions'
 
+require 'flounder/expression'
+
 module Flounder
 module_function
   def connect opts={}

data/qed/expressions.md

@@ -0,0 +1,11 @@
+
+# Flounder.expr
+
+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")
+~~~
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,114 +9,114 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: pg-hstore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: aggregate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.2
 description: "    Flounder is the missing piece between the database and your Ruby
@@ -127,14 +127,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- flounder.gemspec
 - Gemfile
 - Gemfile.lock
 - HACKING
 - HISTORY
-- LICENSE
-- README
-- flounder.gemspec
-- lib/flounder.rb
 - lib/flounder/connection.rb
 - lib/flounder/connection_pool.rb
 - lib/flounder/domain.rb
@@ -142,16 +139,19 @@ files:
 - lib/flounder/entity.rb
 - lib/flounder/entity_alias.rb
 - lib/flounder/exceptions.rb
+- lib/flounder/expression.rb
 - lib/flounder/field.rb
+- lib/flounder/immediate.rb
 - lib/flounder/postgres_utils.rb
 - lib/flounder/query/base.rb
 - lib/flounder/query/delete.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.rb
+- LICENSE
 - qed/applique/ae.rb
 - qed/applique/flounder.rb
 - qed/applique/setup_domain.rb
@@ -161,6 +161,7 @@ files:
 - qed/delete.md
 - qed/entities.md
 - qed/exceptions.md
+- qed/expressions.md
 - qed/flounder.sql
 - qed/index.md
 - qed/inserts.md
@@ -169,6 +170,7 @@ files:
 - qed/projection.md
 - qed/selects.md
 - qed/updates.md
+- README
 homepage: https://bitbucket.org/technologyastronauts/oss_flounder
 licenses:
 - MIT
@@ -179,17 +181,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Flounder is a way to write SQL simply in Ruby. It deals with everything BUT
@@ -204,6 +206,7 @@ test_files:
 - qed/delete.md
 - qed/entities.md
 - qed/exceptions.md
+- qed/expressions.md
 - qed/flounder.sql
 - qed/index.md
 - qed/inserts.md
@@ -212,4 +215,3 @@ test_files:
 - qed/projection.md
 - qed/selects.md
 - qed/updates.md
-has_rdoc: