serviceable 0.4 → 0.4.1

data/README.md

@@ -36,3 +36,12 @@ Query Params
 
     GET /posts.json?only=id,title
     [{"id":1,"title","First post!"}]
+    
+    GET /posts.json?include=user
+    [{"id":1,"title":"First Post!","body":"Feels good to be first","created_at":"20130727T16:26:00Z","user":{"id":2,"first_name":"Jim","last_name":"Walker","display_name":"Jim W."}}]
+
+Filter Params
+-------------
+
+    GET /posts.json?where[tags][label]=Pinball
+    returns a set of posts tagged as "Pinball"

data/lib/serviceable.rb

@@ -130,24 +130,25 @@ module Serviceable
         for assoc in (params[:where].keys rescue [])
           attrs = params[:where][assoc]
           if attrs.kind_of?(Hash)
+            puts "keys: #{attrs.keys}"
             for target_column in attrs.keys
-              op = :eq if attrs[target_column].kind_of?(String)
-              op ||= attrs[target_column].keys[0].to_sym
-              value = attrs[target_column] if op==:eq
-              value ||= is_time_column?(target_column) ? Time.parse(attrs[target_column][op]) : attrs[target_column][op]
-              unless assoc.to_sym==object.to_s.pluralize.to_sym
-                @collection = @collection.includes(assoc)
-              end
-              puts "op: #{op}"
-              if op==:gt
-                @collection = @collection.where("#{assoc}.#{target_column} > ?",value)
-              elsif op==:lt
-                @collection = @collection.where("#{assoc}.#{target_column} < ?",value)
-              elsif op==:in
-                @collection = @collection.where("#{assoc}.#{target_column} IN (?)",value)
-              elsif op==:eq
-                @collection = @collection.where(assoc => { target_column => value })
-              end
+              if attrs[target_column].kind_of?(String)
+                @collection = @collection.where(assoc => { target_column => attrs[target_column] })
+              elsif attrs[target_column].kind_of?(Hash)
+                for op in attrs[target_column].keys.map(&:to_sym)
+                  value = is_time_column?(target_column) ? Time.parse(attrs[target_column][op]) : attrs[target_column][op]
+                  unless assoc.to_sym==object.to_s.pluralize.to_sym
+                    @collection = @collection.includes(assoc)
+                  end
+                  if op==:gt
+                    @collection = @collection.where("#{assoc}.#{target_column} > ?",value)
+                  elsif op==:lt
+                    @collection = @collection.where("#{assoc}.#{target_column} < ?",value)
+                  elsif op==:in
+                    @collection = @collection.where("#{assoc}.#{target_column} IN (?)",value)
+                  end
+                end
+              end  
             end
           else
             @collection = @collection.includes(assoc).where(assoc => attrs)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: serviceable
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  version: "0.4"
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Aubrey Goodman