constrainable 0.3.1 → 0.4.0

data/README.markdown

@@ -18,9 +18,9 @@ In the simplest possible case you can define a few attributes and start filterin
     end
 
     # Examle request:
-    #   GET /posts?where[id][not_eq]=1&where[author_id][eq]=2
+    #   GET /posts?where[id__not_eq]=1&where[author_id__eq]=2
     # Params:
-    #   "where" => { "id" => { "not_eq" => "1" }, "author_id" => { "eq" => "2" } }
+    #   "where" => { "id__not_eq" => "1", "author_id__eq" => "2" }
 
     Post.constrain(params[:where])
     # => SELECT posts.* FROM posts WHERE id != 1 AND author_id = 2
@@ -38,10 +38,10 @@ By default, only *eq* and *not_eq* operations are enabled, but there are plenty
 
     # Example request (various notations are accepted):
     #   GET /posts?
-    #     where[id][not_in]=1|2|3|4&
-    #     where[author_id][in][]=1&
-    #     where[author_id][in][]=2&
-    #     where[created_at][between]=2011-01-01...2011-02-01
+    #     where[id__not_in]=1|2|3|4&
+    #     where[author_id__in][]=1&
+    #     where[author_id__in][]=2&
+    #     where[created_at__between]=2011-01-01...2011-02-01
 
 Want to *alias* a column? Try this:
 
@@ -53,7 +53,7 @@ Want to *alias* a column? Try this:
 
     end
     # Example request:
-    #   GET /posts?where[created][lt]=2011-01-01
+    #   GET /posts?where[created__lt]=2011-01-01
 
 What about associations?
 
@@ -65,7 +65,7 @@ What about associations?
       end
     end
     # Example request:
-    #   GET /posts?where[author][matches]=%tom%
+    #   GET /posts?where[author__matches]=%tom%
 
     Post.constrain(params[:where])
     # => SELECT posts.* FROM posts LEFT OUTER JOIN authors ON authors.id = posts.author_id WHERE authors.name LIKE '%tom%'
@@ -92,4 +92,4 @@ Integration with controllers, views & filter forms:
 
     # In app/views/posts/index.html.haml
     = form_for @filters, :as => :where do
-      = f.collection_select :"author_id[eq]", Author.order('name'), :id, :name
+      = f.collection_select :author_id__eq, Author.order('name'), :id, :name

data/lib/bsm/constrainable/field/base.rb

@@ -35,15 +35,15 @@ class Bsm::Constrainable::Field::Base
   end
 
   # Merge params into a relation
-  def merge(relation, params)
-    params.slice(*operators).each do |operator, value|
-      operation = Bsm::Constrainable::Operation.new(operator, value, relation, self)
-      next if operation.clause.nil?
+  def merge(relation, operator, value)
+    operator = operator.to_sym
+    return relation unless operators.include?(operator)
 
-      relation = relation.instance_eval(&scope) if scope
-      relation = relation.where(operation.clause)
-    end
-    relation
+    operation = Bsm::Constrainable::Operation.new(operator, value, relation, self)
+    return relation if operation.clause.nil?
+
+    relation = relation.instance_eval(&scope) if scope
+    relation.where(operation.clause)
   end
 
   def convert(value)

data/lib/bsm/constrainable/filter_set.rb

@@ -6,41 +6,39 @@ class Bsm::Constrainable::FilterSet < Hash
   def initialize(schema, params = {})
     @schema = schema
 
-    normalized_hash(params).slice(*schema.keys).each do |name, part|
-      update name => part.symbolize_keys if part.is_a?(Hash)
+    normalized_hash(params).each do |key, value|
+      name, op = key.split('__')
+      update(key => value) if valid_operation?(name, op)
     end
   end
 
   def merge(scoped)
-    each do |name, part|
+    each do |key, value|
+      name, op = key.split('__')
       schema[name].each do |field|
-        scoped = field.merge(scoped, part)
+        scoped = field.merge(scoped, op, value)
       end
     end
     scoped
   end
 
   def respond_to?(sym, *)
-    name, operator = sym.to_s.sub(NAME_OP, ''), $1
-    super || (operator.nil? && schema.key?(name)) || valid_operator?(name, operator)
+    name, op = sym.to_s.split('__')
+    super || valid_operation?(name, op)
   end
 
   private
-    NAME_OP = /\[(\w+)\]$/.freeze
 
     def method_missing(sym, *args)
-      name, operator = sym.to_s.sub(NAME_OP, ''), $1
-
-      if (operator.nil? && schema.key?(name))
-        self[name]
-      elsif valid_operator?(name, operator)
-        self[name].try(:[], operator.to_sym)
+    name, op = sym.to_s.split('__')
+      if valid_operation?(name, op)
+        self[sym.to_s]
       else
         super
       end
     end
 
-    def valid_operator?(name, operator)
+    def valid_operation?(name, operator)
       return false unless operator.present? && schema.key?(name.to_s)
 
       schema[name].any? do |field|

data/lib/bsm/constrainable/relation.rb

@@ -3,10 +3,10 @@ module Bsm::Constrainable::Relation
 
   # Apply contraints. Example:
   #
-  #   Post.constrain("created_at" => { "lt" => "2011-01-01" }})
+  #   Post.constrain("created_at__lt" => "2011-01-01")
   #
   #   # Use "custom" constraints
-  #   Post.constrain(:custom, "created_at" => { "lt" => "2011-01-01" }})
+  #   Post.constrain(:custom, "created_at__lt" => "2011-01-01")
   #
   #   # Combine it with relations & scopes
   #   Post.archived.includes(:author).constrain(params[:where]).paginate :page => 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: constrainable
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 Z
+date: 2011-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: abstract
@@ -73,23 +73,23 @@ extra_rdoc_files: []
 
 files: 
 - README.markdown
-- lib/bsm/constrainable/field/common.rb
+- lib/bsm/constrainable.rb
+- lib/bsm/constrainable/relation.rb
 - lib/bsm/constrainable/field/base.rb
-- lib/bsm/constrainable/field.rb
+- lib/bsm/constrainable/field/common.rb
+- lib/bsm/constrainable/operation.rb
 - lib/bsm/constrainable/filter_set.rb
-- lib/bsm/constrainable/relation.rb
-- lib/bsm/constrainable/registry.rb
-- lib/bsm/constrainable/schema.rb
 - lib/bsm/constrainable/util.rb
-- lib/bsm/constrainable/operation.rb
-- lib/bsm/constrainable/model.rb
-- lib/bsm/constrainable/operation/common.rb
+- lib/bsm/constrainable/field.rb
+- lib/bsm/constrainable/operation/between.rb
+- lib/bsm/constrainable/operation/not_in.rb
 - lib/bsm/constrainable/operation/in.rb
 - lib/bsm/constrainable/operation/base.rb
-- lib/bsm/constrainable/operation/between.rb
+- lib/bsm/constrainable/operation/common.rb
 - lib/bsm/constrainable/operation/collection.rb
-- lib/bsm/constrainable/operation/not_in.rb
-- lib/bsm/constrainable.rb
+- lib/bsm/constrainable/registry.rb
+- lib/bsm/constrainable/model.rb
+- lib/bsm/constrainable/schema.rb
 homepage: https://github.com/bsm/constrainable
 licenses: []