constrainable 0.3.0 → 0.3.1

data/README.markdown

@@ -70,3 +70,26 @@ What about associations?
     Post.constrain(params[:where])
     # => SELECT posts.* FROM posts LEFT OUTER JOIN authors ON authors.id = posts.author_id WHERE authors.name LIKE '%tom%'
 
+Integration with controllers, views & filter forms:
+
+    # In app/models/post.rb
+    class Post < ActiveRecord::Base
+      constrainable do
+        fields :author_id
+      end
+    end
+
+    # In app/controllers/posts_controller.rb
+    class PostsController < ApplicationController
+      respond_to :html
+
+      def index
+        @filters = Post.constrainable.fliter(params[:where])
+        @posts = Post.constrain(@filters)
+        respond_with @posts
+      end
+    end
+
+    # In app/views/posts/index.html.haml
+    = form_for @filters, :as => :where do
+      = f.collection_select :"author_id[eq]", Author.order('name'), :id, :name

data/lib/bsm/constrainable/filter_set.rb

@@ -11,13 +11,13 @@ class Bsm::Constrainable::FilterSet < Hash
     end
   end
 
-  def merge(relation)
+  def merge(scoped)
     each do |name, part|
       schema[name].each do |field|
-        relation = field.merge(relation, part)
+        scoped = field.merge(scoped, part)
       end
     end
-    relation
+    scoped
   end
 
   def respond_to?(sym, *)

data/lib/bsm/constrainable/model.rb

@@ -32,7 +32,7 @@ module Bsm::Constrainable::Model
 
     # Delegator to Relation#constrain
     def constrain(*args)
-      relation.constrain(*args)
+      scoped.constrain(*args)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: constrainable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +01:00
-default_executable: 
+date: 2011-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: abstract
@@ -91,7 +90,6 @@ files:
 - lib/bsm/constrainable/operation/collection.rb
 - lib/bsm/constrainable/operation/not_in.rb
 - lib/bsm/constrainable.rb
-has_rdoc: true
 homepage: https://github.com/bsm/constrainable
 licenses: []
 
@@ -125,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Simple filtering for ActiveRecord