flounder 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3055b086d4ebfe48d6a8e0fc1f8b714dc156eea
-  data.tar.gz: 33502d671dae3850251f913ba2eb2a1a1d8e5741
+  metadata.gz: eb355b42b818e47d6d615cb550779211635fe40c
+  data.tar.gz: c7ecc8ba5b4b1bde6c8ac9213d0733f64fa169be
 SHA512:
-  metadata.gz: da8812d564ca9a540992684eb613ac6a46eeaf513cf38d04f76049afad332856f02529626b4f2fc4133b4b1aa353e5898f75abddd798b53bf5300bee2f7d0229
-  data.tar.gz: 7671211165f8c2671ff42c653b166606db434cd49a5392ba600b3e42977d160fa0c3a588870955af333d5928aae8623b2619c59d21abf7574afa88789c832c9f
+  metadata.gz: 97d33b0970b670b8f53a6785c1b15ad060fe6756f93fc5d63cfbf55cf8e5c32005c3a37eef2a46d5cff82e787e61d0a1c8af825174791bc9f1382fff1f2873e0
+  data.tar.gz: 1e9786ec35fbe6f53300f6f010051a265888d45bf3ed263d9ccf8d9be118253338f4fb787314e880d80f4f1b25f90ca965a38c2795c20f778e525c07f26f205d

data/flounder.gemspec

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

@@ -62,6 +62,9 @@ module Flounder
     def entities
       @plural.values
     end
+    def has_entity? name
+      @plural.has_key? name
+    end
 
     # Logs sql statements that are prepared for execution. 
     #

data/lib/flounder/query/base.rb

@@ -37,8 +37,8 @@ module Flounder::Query
 
       # is the first argument an entity? if yes, interpret field names relative
       # to that entity. 
-      if conditions.size > 1 && conditions.first.kind_of?(Flounder::Entity)
-        resolve_entity = conditions.shift
+      if conditions.size > 1 && entity_like?(conditions.first)
+        resolve_entity = convert_to_entity(conditions.shift)
       end
 
       # is this a hash? extract the first element
@@ -199,5 +199,20 @@ module Flounder::Query
         fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
       end
     end
+
+    def entity_like? something
+      something.kind_of?(Flounder::Entity) ||
+        something.kind_of?(Symbol) && domain.has_entity?(something)
+    end
+    def convert_to_entity something
+      case something
+        when Flounder::Entity, Flounder::EntityAlias
+          return something
+        when Symbol
+          return domain[something]
+      else
+        fail "Not entity-like - yet! (#{something.inspect})"
+      end
+    end
   end
 end

data/lib/flounder/query/select.rb

@@ -31,7 +31,7 @@ module Flounder::Query
     attr_reader :projection_prefixes
 
     def _join join_node, entity
-      entity = domain[entity] if entity.kind_of?(Symbol)
+      entity = convert_to_entity(entity)
 
       @last_join = entity
 

data/qed/index.md

@@ -68,6 +68,8 @@ By default, symbols are interpreted as field names in the entity that you start
 ~~~ruby
   users.where(posts, :id => 1).
     assert generates_sql("SELECT [fields] FROM \"users\"  WHERE \"posts\".\"id\" = 1")
+  users.where(:posts, :id => 1).
+    assert generates_sql("SELECT [fields] FROM \"users\"  WHERE \"posts\".\"id\" = 1")
 ~~~
 
 # Some JOINs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Kaspar Schiess