flounder 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a13735f8160f9b23fb2c87b473998bfc4e146e2
-  data.tar.gz: a7e29a24118ad278bcdaecf42c0b47702924ddb6
+  metadata.gz: 76dff20170b73d435d8031c55fbfdc351a50de2e
+  data.tar.gz: fd03c13174d8f59b0d1920ab40756fc87e06be99
 SHA512:
-  metadata.gz: 39706dd19768ace33133e5f30520edcd87c455fd031fa5c012f76b44a7224f546e3b4f077413a1e12fe31410355c906481e67be1d97d42cd30ff139e89653984
-  data.tar.gz: 9db75632b66282a30b7106a58e1a8b7759b5e70fd86892d0031ac8759a41434bcfb40e51ebdbbe8240c5b86ce2185d2bc83be0ed30ca56a849e43217fbebee2d
+  metadata.gz: d48b7d9ef4003ba6d3c1a661852e21675108c918e55f540b588f087a56f04d4563bff05d2c6e1db428c377faa097993cb2ec4734e0994f39c28427ce7fc9c1c8
+  data.tar.gz: de7d5743d7ec8253d240df7b67505d52f7aa985562ce65f5f35ad30c78a4de447b44292602750924ba306765c48565daaa3680065fe67ac2af542d9e1987c125

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    flounder (0.11.1)
+    flounder (0.11.5)
       arel (~> 5, > 5.0.1)
       connection_pool (~> 2)
       hashie (~> 3, >= 3.2)
       pg (~> 0.17)
-      pg-hstore (~> 1.2.0)
+      pg-hstore (~> 1.2, >= 1.2.0)
 
 GEM
   remote: https://rubygems.org/

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.11.5'
+  s.version  = '0.11.6'
   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/query/select.rb

@@ -29,6 +29,11 @@ module Flounder::Query
     # so that they can be traced back to the entity that contributed them. 
     attr_reader :default_projection
 
+    # Set to true once #project is used. From that point on, no fields can
+    # be added through default projections. 
+    #
+    attr_reader :has_projection
+
     # Each projection has a unique prefix mapping to the entity that uses this
     # prefix during this query. 
     attr_reader :projection_prefixes
@@ -48,6 +53,10 @@ module Flounder::Query
     end
 
     def add_fields_to_default entity
+      # Don't add fields through the default method if #project was already
+      # used. 
+      return if has_projection
+
       prefix = entity.name.to_s
       table = entity.table
       
@@ -92,7 +101,7 @@ module Flounder::Query
     #
     def project *field_list
       @has_projection = true
-      @default_projection = {}
+      @default_projection = []
 
       manager.project *map_to_arel(field_list)
       self

data/qed/projection.md

@@ -17,4 +17,13 @@ When projecting, all result data will be toplevel and only the projected data is
 
   result.id.assert == nil # Not loaded.
   result.name.assert == 'John Snow'
-~~~
+~~~
+
+Otherwise a projected query can be treated like an ordinary query, including appending stuff by joining it in. 
+
+~~~ruby
+    posts.
+      project(users[:name]).
+      join(users).on(:user_id => :id).
+      first
+~~~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -9,94 +9,94 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 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
 description: "    Flounder is the missing piece between the database and your Ruby
@@ -107,14 +107,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- flounder-0.11.5.gem
+- 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
@@ -132,6 +130,8 @@ files:
 - 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
@@ -149,6 +149,7 @@ files:
 - qed/results.md
 - qed/selects.md
 - qed/updates.md
+- README
 homepage: https://bitbucket.org/technologyastronauts/oss_flounder
 licenses:
 - MIT
@@ -159,17 +160,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