repertoire-faceting 0.5.1 → 0.5.2

data/FAQ

@@ -1,5 +1,14 @@
 = Repertoire Faceting FAQ =
 
+= Related questions
+
+Q. Rails 3 refuses to update schema.rb because with my fulltext index columns.
+
+A. Put the following line in environment.rb:
+
+  config.active_record.schema_format = :sql
+
+
 = About facet indexing and the signature SQL type = 
 
 Q. What's the scalability of this thing?
@@ -18,6 +27,12 @@ A. Did you remember to call expand_nesting(<facet index table>, <facet name>) af
 
 = About the ajax faceting widgets =
 
+Q. A web page from the default Rails app refuses to load the faceting widgets.
+
+A. Repertoire Faceting widgets are based on JQuery, which is incompatible with Prototype.  You should remove
+   prototype.js and rails.js from the javascripts directory, and delete the <%= javascript_include_tag :defaults %>
+	 line from application.html.erb.
+
 Q. How do I send page-specific data (for example, a search field) to the webservice with the facet widgets' data?
 
 A. If you provide a function to the facet_context plugin, it will merge the params you return before dispatching to

data/INSTALL

@@ -7,53 +7,55 @@
 
   { install native bitset extensions }
   $ bundle install
-  $ rake faceting:postgres:install   { & provide sudo your password }
-  $ createlang plpgsql <database> -U<username> 
-  $ psql -f $(pg_config --sharedir)/contrib/signature.sql -U<username> <database>
+  $ rake db:faceting:build                                   { provide sudo your password }
+  $ rake db:faceting:load
 
   { in ./app/models/some_model.rb }
   	class SomeModel
-	    include Repertoire::Faceting::Model                            // 2
-	    facet :some_column                                             // 3
+	    include Repertoire::Faceting::Model                          // 2
+	    facet :some_column                                           // 3
 	  end
 
   { in ./app/controllers/some_controller]
 		class SomeController
-		  include Repertoire::Faceting::Controller                       // 4
-		  def base; return SomeModel; end                                // 5
+		  include Repertoire::Faceting::Controller                   // 4
+		  def base; return SomeModel; end                            // 5
 		end
 		
   { in ./config/routes.rb }
     SomeApp::Application.routes.draw do
-	    faceting_for :some_model                                        // 6
+	    faceting_for :some_model                                     // 6
 	  end
 	
 	{ in ./public/javascripts/application.js }
-	  //= require <rep.faceting>                                        // 7
+	  //= require <rep.faceting>                                     // 7
 
   { in ./app/views/some_controller/index.html.erb }
     <script language="javascript">
       $().ready(function() {
-        $('#paintings').facet_context(function() { return { } });     // 8
-        $('.facet').facet();                                          // 9
-        $('#results').results();                                      // 10
+        $('#paintings').facet_context();                             // 8
+        $('.facet').facet();                                         // 9
+        $('#results').results();                                     // 10
       });
     </script>
-    <div id='paintings'>
-      <div id='genre' class='facet'></div>
-      <div id='results'></div> 
+    <div id='paintings'>                                             // 11
+      <div id='genre' class='facet'></div>                           // 12
+      <div id='results'></div>                                       // 13
     </div>
 
-	... that's a complete faceted browser in only 10 new lines of code in your app!
+	... that's a complete faceted browser in only 13 new lines of code in your app!
 
-  In production, you will want to start compressing the facet widgets:
+  In production, you will want to compress the javascript facet widgets:
 
   { in ./config/environments/production.rb }
     config.repertoire_assets.compress = true
 
-  And to add facet indexing (scalable to a million items out of the box):
+  Additionally, you may wish to index the facets.  At the console or in a migration:
 
-  $ rails generate migration add_facet_index
+  SomeModel.update_indexed_facets([:some_column])
+
+  The faceting subsystem automatically detects available facet indices and uses 
+  them when appropriate.
 
 
 == Detailed version.
@@ -64,7 +66,8 @@ Start with a working Rails 3 application with a PostgreSQL database.
 
   gem 'repertoire-faceting'
 
-* Make sure you use Rails version 3.0.2+, which adopted Arel 2.0.1.  If necessary you can pull rails, arel, and rack from git.
+* Make sure you use Rails version 3.0.2+, which adopted Arel 2.0.1.  If necessary
+  you can pull rails, arel, and rack from git.
 
   gem 'rails', :git => 'git://github.com/rails/rails.git'
   gem 'arel',  :git => 'git://github.com/rails/arel.git'
@@ -74,29 +77,31 @@ Start with a working Rails 3 application with a PostgreSQL database.
 
   $ bundle install
 
-* From your application root, build and install the repertoire-faceting native extensions to PostgreSQL.  These provide
-  a bitwise signature type used to index facets.
+* From your application root, build and install the repertoire-faceting native 
+  extensions to PostgreSQL.  These provide a bitwise signature type used to 
+  index and count facets.
 
-  $ rake faceting:postgres:install     { sudo will prompt you for your password }
+  $ rake db:faceting:build     { sudo will prompt you for your password }
 
-* Load the extension into application database.  Change depending on your postgres configuration:
+* Load the extension into your local application database.  This ensures the
+  plpgsql language is installed, and loads (or re-loads) the new bitset signature
+  type.
 
-  $ createlang plpgsql <database> -U<username> 
-  $ psql -f $(pg_config --sharedir)/contrib/signature.sql -U<username> <database>
+  $ rake db:faceting:load
 
-  You can confirm the module installed as follows.  The database server may need to be restarted first.
+  You can confirm the module is installed as follows.
 
   $ psql -c "SELECT count('101010101'::signature);" -U<username> <database>
- 
-  If the module installed correctly, psql will respond with "5".
 
-* Install the faceting mixin in your Rails model and declare a facet on an existing database column.  (See the README for complete
-  configuration options for facets.)  [ ./app/models/painting.rb ]
+* Install the faceting mixin in your Rails model and declare a facet on an 
+  existing database column.  (See the README for complete configuration options 
+  for facets.)  
 
-  class Painting
-    include Repertoire::Faceting::Model
-    facet :genre
-  end
+  { ./app/models/painting.rb }
+    class Painting
+      include Repertoire::Faceting::Model
+      facet :genre
+    end
 
 * Test doing facet count and result queries:
 
@@ -112,60 +117,71 @@ Start with a working Rails 3 application with a PostgreSQL database.
   > Painting.where(["title like ?", 'Moon%']).count(:genre)
   => {"Impressionist"=>1} 
 
-* Add faceting webservices to your controller and define base() to indicate which model to base queries on [ ./app/controllers/paintings_controller]
+* Add faceting webservices to your controller and define base() to indicate which model to base queries on 
 
-  class PaintingsController
-    include Repertoire::Faceting::Controller
+  { ./app/controllers/paintings_controller }
+    class PaintingsController
+      include Repertoire::Faceting::Controller
 
-    def base
-      search = "%#{params[:search]}%"
-      Painting.where(["title like ?", search])
+      def base
+        search = "%#{params[:search]}%"
+        Painting.where(["title like ?", search])
+      end
     end
-  end
 
-* Add faceting routes to your application.  [ ./config/routes.rb ]
+* Add faceting routes to your application.  
 
-  PaintingsApp::Application.routes.draw do
-    faceting_for :paintings         # NB must be BEFORE any resources!
-    ...
-  end
+  { ./config/routes.rb }
+
+    PaintingsApp::Application.routes.draw do
+      faceting_for :paintings         # NB must be BEFORE any resources!
+      ...
+    end
 
   Confirm they load:
 
   $ rake routes
-  ...
-                           /paintings/counts/:facet(.:format) {:controller=>"paintings", :action=>"counts"}
-  paintings_results        /paintings/results(.:format)       {:controller=>"paintings", :action=>"results"}
-  ...
+    ...
+                             /paintings/counts/:facet(.:format) {:controller=>"paintings", :action=>"counts"}
+    paintings_results        /paintings/results(.:format)       {:controller=>"paintings", :action=>"results"}
+    ...
 
-* Load the javascript facet widgets in your main javascript file. The repertoire-assets subsystem will locate the
-  widgets in the repertoire-faceting rubygem and load them as appropriate. 
+* Load the javascript facet widgets in your main javascript file. The 
+  repertoire-assets subsystem will locate the widgets in your application's
+  rubygems, and load them as appropriate.
 
-  [ ./public/javascripts/application.js ]
+  { ./public/javascripts/application.js }
     ...
     //= require <rep.faceting>
     ...
 
-* Add facet count and result widgets to your HTML page. The facet context div collects widgets that affect the same
-  query together. (For complete options, see the README ) 
+  N.B. Repertoire Faceting widgets are based on JQuery, which is incompatible 
+       with Prototype.  If you have not already done so, you should remove 
+       prototype.js and rails.js from the javascripts directory, and delete the 
+       "<%= javascript_include_tag :defaults %>" line from application.html.erb.
 
-  [ ./app/views/paintings/index.html.erb ]
+* Add facet count and result widgets to your HTML page. The facet context div 
+  collects widgets that affect the same query together. (For complete options, 
+  see the README ) 
 
-		<script language="javascript">
-		$().ready(function() {
-		  $('#paintings').facet_context(function() { return { } });
-		  $('.facet').facet();
-		  $('#results').results();
+  { ./app/views/paintings/index.html.erb }
+
+      <script language="javascript">
+        $().ready(function() {
+          $('#paintings').facet_context();
+          $('.facet').facet();
+          $('#results').results();
 		});
 		</script>
 	  <div id='paintings'>
-	    <div id='genre' class='facet'></div>
-	    <div id='results'></div> 
-	  </div>
+        <div id='genre' class='facet'></div>
+        <div id='results'></div> 
+      </div>
 	
-* If you don't already have one, create a partial for displaying your model in results lists.
+* If you don't already have one, create a partial for displaying your model in 
+  results lists.
 
-  [ ./app/views/paintings/_painting.html.erb ]
+  { ./app/views/paintings/_painting.html.erb }
 	
 	<div class='painting' style='width:235px; margin-bottom:5px; padding:2px; border:dotted 1px;'>
 	  <div>Title: <%= painting.title %></div>
@@ -173,29 +189,38 @@ Start with a working Rails 3 application with a PostgreSQL database.
 		<div>Genre: <%= painting.genre %></div>
 	</div>
 
-* Configure the repertoire-assets module that loads the javascript faceting widgets to compress in
-  production. [ ./config/environments/production.rb ]
+* [ Optional ] Configure the repertoire-assets module that loads the javascript 
+  faceting widgets to compress the widget code in production. 
 
-  PaintingsApp::Application.configure do
-    ...
-    config.repertoire_assets.compress = true
-    ...
-  end
+  { ./config/environments/production.rb }
 
-* [ Optional ] Add bitset indexes to some facets on your model.  The module will automatically
-  use facet indexes when they are available.
+    PaintingsApp::Application.configure do
+      ...
+      config.repertoire_assets.compress = true
+      ...
+    end
 
-	class AddFacetIndex < ActiveRecord::Migration
-	  def self.up
-	    Painting.update_indexed_facets([:genre])
-	  end
+* [ Optional ] Add bitset indexes to some facets on your model.  The module will 
+  automatically use facet indexes when they are available.  Facet indexes scale 
+  out of the box to over a million model items, and require no additional 
+  configuration.
+
+  $ rails generate migration AddFacetIndex
+  
+  { ./db/migrate/<your date>add_facet_index.rb   }
+		class AddFacetIndex < ActiveRecord::Migration
+		  def self.up
+		    Painting.update_indexed_facets([:genre])
+		  end
+
+		  def self.down
+		    Painting.update_indexed_facets
+		  end
+		end
 
-	  def self.down
-	    Painting.update_indexed_facets
-	  end
-	end
+* [ Optional ] Periodically update indexes via a crontab task. 
 
-* [ Optional ] Periodically update indexes via a crontab task. [ ./lib/tasks/update_facets.rake ]
+  { ./lib/tasks/update_facets.rake }
 
   task :reindex_facets => :environment do
 	  Painting.update_indexed_facets

data/README

@@ -1,3 +1,30 @@
+== Deployment
+
+* repertoire-assets compression
+
+* deploying native extensions to server
+
+* sub-uris
+
+* do NOT use schema.rb with repertoire-faceting
+
+
+== Running unit tests
+
+You can run the unit tests from the module's root directory.  You will need a
+local PostgreSQL superuser role with your unix username (use 'createuser -Upostgres').
+
+  $ bundle install
+  $ rake db:faceting:build				{ sudo will prompt for your password }
+  $ rake db:create
+  $ rake test
+
+
+== Known issues
+
+- Running the unit tests issues warnings about a circular require.  These can be ignored.
+
+
 == Updating Indices
 
 Depending on how frequently you need to update facet indices, there are several options.
@@ -11,7 +38,7 @@ Depending on how frequently you need to update facet indices, there are several
       Nobelist.update_indexed_facets([:degree, :discipline])
     end
   
-  Configure your system-level crontab task to run 'rake reindex' at the required interval.
+  Then configure your system-level crontab task to run 'rake reindex' at the required interval.
   
 (2) Using Repertoire's postgresql-crontab functionality
 
@@ -37,7 +64,17 @@ Depending on how frequently you need to update facet indices, there are several
   create a migration with the same calls as the rake task.  
   
   
-  
+
+== Deployment
+
+Because repertoire-faceting depends on a native shared library loaded by the 
+PostgreSQL server, the first time you deploy you will need to build and install
+the extension.
+
+<server>$ bundle install --deployment
+<server>$ export RAILS_ENV=production
+<server>$ rake db:facetinginstall
+<server>$ rake db:facetingload 
   
   
 
@@ -46,7 +83,7 @@ Rails3 documentation revisions
 
 - requires ruby 1.9.2 (ordered hashes)
 - include_root_in_json = false
-- rake faceting:postgres:install, :load
+- rake db:facetingpostgres:install, :load
 
 To cover in the README:
 
@@ -89,145 +126,6 @@ API for faceted browsing within PostgreSQL, with extensions for Merb and jquery
 - nested facet values kept as arrays
 - update facet index (a) explicitly, (b) using Repertoire's crontab sweeper, or (c) both
 
-
-===== Installation =====
-
--Proviso-.  You must already have PostgreSQL installed, and pg_config should display the correct values for the version of postgres you intend to use.
-
-1. Install the repertoire-faceting gem from source
-[ once it's released open-source, this will be possible from github or rubyforge ]
-
-2. Install Repertoire crontab support
-[ see documentation for the repertoire-devtools gem for this ]
-
-3. Load the faceting sql extensions into your project's database
-
-  - If your project shares the database with others (as in Repertoire), it's best to install by hand.
-
-  psql -Upostgres <your database> -f /opt/local/share/postgresql84/contrib/signature.sql
-
-  Note that the sql extensions are global to your entire database, since they land in the public schema.
-
-  - If your project owns the entire database, you can use a migration:
-
-		migration 1, :install_signature do
-		  sharedir = /SHAREDIR = (.*)/.match(`pg_config`)[1]			# e.g. "/opt/local/share/postgresql84"
-  
-		  up do
-		    execute File.read("#{sharedir}/contrib/signature.sql")
-		  end
-		  down do
-		    execute File.read("#{sharedir}/contrib/uninstall_signature.sql")
-		  end
-		end
-
-
-===== DataMapper extensions =====
-
-*Setup*
-
--Proviso-.  The faceting library does not yet support automigration.  The best approach is to maintain your facet indices using
-explicit migrations as your datamapper models change.
-
-Make sure the columns you wish to facet over are indexed.  For a complete description, see the section "PostgreSQL extensions."  Simple example for use in a datamapper migration:
-
-migration 5, :add_facet_indices do
-  up do
-    execute <<-SQL.compress_lines
-      INSERT INTO crontab(notice, role, task, interval) 
-	        VALUES ('Update Project facets', NULL, $$ 
-				    SELECT renumber_table('project', '_packed_id');
-				    SELECT recreate_table('_project_status_facet', 'SELECT status, signature(_packed_id) FROM project GROUP BY status');
-				    $$, '5 minutes');
-    SQL
-  end
-  down do
-    execute <<-SQL.compress_lines
-      DELETE FROM crontab WHERE notice = 'Update Project facets';
-    SQL
-  end
-end
-
-A later version of this package may include generator macros to ease the task of defining new facet indices.  However, this will 
-have to wait until DataMapper can reliably transform expressions like Project.all(:field => 'science').status into a single SQL join query (currently it issues two queries in turn).  Until then, the SQL expressions must be produced by hand.
-
-*In your model*
-
-= declaring facets:
-
-class Project
-  is :faceted, :genre,
-               :published => :nested,            # default :logic for this facet
-               :birthdate => :nested
-	  		       [ etc. ]
-end
-
-[ N.B. your facets don't have to be DataMapper properties!  they can be any SQL computed value. this merely names the facets -
-definitions belong in a database migration. ]
-
-*In your controller*
-
-= to do a facet value count [ facet indices are used automatically where available ]
-
-Film.facet_count(:location, :genre => 'tragedy', :published => [2008, 11], :title.like => '%Death%', :order => [:location, :count.desc] )
-
-# provides facet to count, facet filter selections, a base query, and order for the facet value counts.  you can also specify 
-# :minimum, :offset, :limit, :type, and :nullable.  see the specs for usage
-
-= to do a facet results query [ facet indices are used automatically where available ]
-
-Film.facet_results(:genre => 'tragedy', :published => [2008, 11], :title.like => '%Death%', :order => [:title, :author], :offset => 0, :limit => 20)
-
-# to alter the way that a facet is refined, provide :logic (options are :or, :and, :nested; default is :and)
-Film.facet_results(:genre => ['tragedy', 'comedy'], :published => [2008, 11], 
-                   :logic => { :genre => :or, :published => :nested })
-
-
-===== Merb extensions =====
-
-in controller...
-
-def counts(facet, search, filter={})
-  provides :js
-  counts = Project.facet_count(facet, :refinements => filter, :conditions => ["_fulltext @@ to_tsquery(?)", search])
-  display counts
-end
-
-def results(search, filter={})
-  provides :html
-  results = Project.facet_result(:refinements => filter, :conditions => ["_fulltext @@ to_tsquery(?)", search])
-  display results
-end
-
-in routes...
-
-match('/:controller/counts/:facet').to(:action => 'counts')
-match('/:controller/results').to(:action => 'results')
-
-in view.... (index.html.erb):  (make sure to load rep.faceting.js in your header)
-
-<script language='javascript'>
-$().ready(function() { 
-   $('#plays').facet_context();
-   $('.facet').facet();
-   $('.nested_facet').nested_facet();
-   $('#results').results();
- });
-</script>
- ...
-<div id='plays'>
-    <div id='genre' class='facet'></div>
-    <div id='published' class='nested_facet'></div>
-    <div id='results' class='facet'></div>
-</div>
-
-The facet count data is served via JSON from the URL defined by the routes and method signatures above.  The webservice URL
-is derived from the element ids (e.g. '/plays/counts/genre' above), or set via the 'url' option.
-
-For a complete description of how to use the ajax widgets, their options, and how to write new widgets that extend the base
-functionality, see the in-line documentation in rep.faceting.js and its associated FAQ.
-
-
 ===== PostgreSQL extensions =====
 
 = The following code leads you through an example of the SQL calls to set up and execute

data/TODO

@@ -1,7 +1,17 @@
 TODO
 
+- make rake tasks smarter about detecting whether to run       NOT NECESSARY
+- make rake tasks automatically choose task dep on db type     NOT TO DO
+
+- make sure example app can be set up and deployed via rake    DONE
+- fulltext indexing for citizens in migration
+
+- facet index for citizens... migration or rake task?
+- gender not getting generated right
+
 - README
-  * recipe for running tests
+  * recipe for running tests                                    DONE
+  * deployment
   * recipe for adding facets to new app                         DONE
   * declaring facets                                            DONE
   * faceting db api                                             DONE
@@ -21,7 +31,6 @@ TODO
 - get rid of annoying load warnings on test       KNOWN ISSUE
 - cannot refine on null values in facets          KNOWN ISSUE
 
-
 - integration with postgresql crontab
 - push compiled gems to gemcutter                 DONE (EXCEPT FACETING)
 

data/ext/README.signature

@@ -25,8 +25,8 @@
 -- Installation
 --
 --    (1) gem install repertoire-faceting
---    (2) rake faceting:postgres:install
---    (3) rake faceting:postgres:load
+--    (2) rake db:faceting:install
+--    (3) rake db:faceting:load
 --
 -- The bitset PostgreSQL extension follows standards for C-language extensions:
 --  http://www.postgresql.org/docs/current/static/xfunc-c.html

data/ext/signature.sql.IN

@@ -265,16 +265,20 @@ END;
 $$ LANGUAGE plpgsql;
 
 
--- Utility function to measure how many elements in a loosely-packed id column are wasted
---   returns a float between 0 (no waste) and 1.0 (all waste)
+-- Utility function to measure how many bits from a loosely-packed id column would be wasted,
+-- if they were all collected into a bitset signature. Returns a float between 0 (no waste) 
+-- and 1.0 (all waste).
 --
 CREATE OR REPLACE FUNCTION signature_wastage(tbl TEXT, col TEXT) RETURNS REAL AS $$
 DECLARE
-  histogram signature;
+  max REAL;
+  count REAL;
 BEGIN
-  EXECUTE 'SELECT signature(' || quote_ident(col) || ') FROM ' || quote_ident(tbl)
-          INTO histogram;
-  RETURN 1.0 - (count(histogram)::REAL / sig_length(histogram)::REAL);
+  EXECUTE 'SELECT count(*) FROM ' || quote_ident(tbl)
+          INTO count;
+  EXECUTE 'SELECT max(' || quote_ident(col) || ') FROM ' || quote_ident(tbl)
+          INTO max;
+  RETURN 1.0 - (count / (COALESCE(max, 0) + 1));
 END;
 $$ LANGUAGE plpgsql;
 

data/lib/repertoire-faceting/adapters/postgresql_adapter.rb

@@ -39,6 +39,18 @@ module Repertoire
         execute(sql)
       end
       
+      # Load PostgreSQL native bitset type into current database
+      def load_faceting
+        sql = File.read(Repertoire::Faceting::MODULE_PATH + '/ext/signature.sql')
+        unload_faceting
+        execute(sql)
+      end
+      
+      # Unloads PostgreSQL native bitset type
+      def unload_faceting
+        execute("DROP TYPE IF EXISTS signature CASCADE")
+      end
+      
       # Expands nested faceting for the specified table (once)
       def expand_nesting(table_name)
         sql = "SELECT expand_nesting('#{table_name}')"
@@ -76,6 +88,15 @@ module Repertoire
         "INNER JOIN members(#{exprs.join(' & ')}) AS _refinements_id ON (#{table_name}.#{faceting_id} = _refinements_id)"
       end
       
+      private
+      
+      def ignoring_db_errors(&block)
+        begin
+          yield
+        rescue
+        end
+      end
+      
     end
   end
 end

data/lib/repertoire-faceting/model.rb

@@ -174,6 +174,7 @@ module Repertoire
 
             # re-create the facet indices
             facet_names.each do |name|
+              name = name.to_sym
               raise "Unknown facet #{name}" unless facet?(name)
               facets[name].create_index('_packed_id')
             end
@@ -193,8 +194,6 @@ module Repertoire
           connection.signature_wastage(table_name, col)
         end
         
-        
-        
         def should_unpack?
           (faceting_id == '_packed_id') && (signature_wastage('id') < 0.15)
         end

data/lib/repertoire-faceting/rails/relation.rb

@@ -1,5 +1,5 @@
 require 'active_support/core_ext'
-require 'active_record/relation'
+require 'active_record'
 
 module ActiveRecord #:nodoc: all
   class Relation

data/lib/repertoire-faceting/railtie.rb

@@ -9,7 +9,8 @@ module Repertoire
       
       rake_tasks do
         dir = Pathname(__FILE__).dirname.expand_path
-        load dir + "tasks.rake"
+        load dir + "tasks/all.rake"
+        load dir + "tasks/client.rake"
       end
       
     end

data/lib/repertoire-faceting/tasks/all.rake

@@ -0,0 +1,12 @@
+require 'pathname'
+
+namespace :db do
+  namespace :faceting do
+
+    desc "Build and install PostgreSQL native bitset as shared library"
+    task :build do
+      system "cd #{Repertoire::Faceting::MODULE_PATH}/ext; make; sudo make install"
+    end
+    
+  end
+end

data/lib/repertoire-faceting/tasks/client.rake

@@ -0,0 +1,12 @@
+require 'pathname'
+
+namespace :db do
+  namespace :faceting do
+  
+    desc "Load PostgreSQL native bitset type into current database"
+    task :load => :environment do
+      ActiveRecord::Base.connection.load_faceting
+    end
+    
+  end
+end

data/lib/repertoire-faceting/version.rb

@@ -1,5 +1,5 @@
 module Repertoire
   module Faceting #:nodoc:
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/lib/repertoire-faceting.rb

@@ -5,6 +5,8 @@ require 'repertoire-assets'
 module Repertoire
   module Faceting
     
+    MODULE_PATH = File.expand_path('../../', __FILE__)
+    
     module Relation
       autoload :SpawnMethods, 'repertoire-faceting/relation/spawn_methods'
       autoload :QueryMethods, 'repertoire-faceting/relation/query_methods'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Christopher York
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +01:00
+date: 2010-10-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,7 +124,8 @@ files:
 - lib/repertoire-faceting/relation/query_methods.rb
 - lib/repertoire-faceting/relation/spawn_methods.rb
 - lib/repertoire-faceting/routing.rb
-- lib/repertoire-faceting/tasks.rake
+- lib/repertoire-faceting/tasks/all.rake
+- lib/repertoire-faceting/tasks/client.rake
 - lib/repertoire-faceting/version.rb
 - lib/repertoire-faceting.rb
 - public/images/repertoire-faceting/proportional_symbol.png
@@ -149,7 +150,7 @@ has_rdoc: true
 homepage: http://github.com/repertoire/repertoire-faceting
 licenses: []
 
-post_install_message: "  ********************************************************************************\n  If this is the first time you have installed Repertoire faceting, you need\n  to build and install the native PostgreSQL extension:\n\n    cd <my-rails-app>\n    rake faceting:postgres:install\n\n  See the repertoire-faceting README for details.\n  ********************************************************************************\n"
+post_install_message: "  ********************************************************************************\n  If this is the first time you have installed Repertoire faceting, you need\n  to build and install the native PostgreSQL extension:\n\n    cd <my-rails-app>\n    rake db:faceting:build\n    \n  See the repertoire-faceting README for details.\n  ********************************************************************************\n"
 rdoc_options: []
 
 require_paths: 

data/lib/repertoire-faceting/tasks.rake

@@ -1,29 +0,0 @@
-require 'pathname'
-
-namespace :faceting do
-
-  namespace :postgres do
-    dir = Pathname(__FILE__).dirname.expand_path + '../../ext'
-
-    desc "Load bitset functions into a specific database"
-    task :load => :install do
-      puts "\nDatabase name?"
-      db_name = $stdin.gets.chomp
-      sharedir = `pg_config --sharedir`.chomp
-      system "psql -Upostgres -f #{sharedir}/contrib/signature.sql #{db_name}"
-    end
-    
-    desc "Build and install PostgreSQL native bitset type"
-    task :install => :build do
-      puts "Installing native extensions..."
-      system "cd #{dir}; sudo make install"
-    end
-    
-    task :build do
-      puts "Building native extensions..."
-      system "cd #{dir}; sudo make"
-    end
-    
-  end
-  
-end