repertoire-faceting 0.5.5 → 0.6.0

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

@@ -2,6 +2,7 @@ module Repertoire
   module Faceting
     module Relation  # :nodoc: all
       module QueryMethods
+        extend ActiveSupport::Concern
 
         # N.B. These methods augment those defined in active_record/relation/query_methods
       
@@ -27,18 +28,30 @@ module Repertoire
           clone.tap { |f| f.minimum_value = count }
         end
 
-        def nils(value=true)
-          clone.tap { |f| f.nils_value = value }
+        def nils(include_nils=true)
+          clone.tap { |f| f.nils_value = (if include_nils then :include else :exclude end) }
         end
 
         def reorder(*args)
           clone.tap { |f| f.order_values = args.flatten }
         end
-        
+
         def refined_facets?
           !refine_value.empty?
         end
-        
+
+        private
+
+        def merge_hashes(h1={}, h2={})
+          h2.inject(h1.clone) do |hsh, (key, values)|
+            key    = key.to_sym
+            values = [values].flatten
+            hsh[key] ||= []
+            hsh[key] |= values
+            hsh
+          end
+        end
+
       end
     end
   end

data/lib/repertoire-faceting/routing.rb

@@ -15,13 +15,10 @@ module Repertoire
       # Add routes for the faceting webservices provided by the Controller mixin.
       #
       def faceting_for(*controllers)
-        options = controllers.extract_options!
-
         controllers.map!(&:to_sym)
-
         controllers.each do |ctlr|
-            match "/#{ctlr}/counts/:facet", :controller => ctlr, :action => 'counts'
-            match "/#{ctlr}/results",       :controller => ctlr, :action => 'results'
+            get "/#{ctlr}/counts/:facet", :controller => ctlr, :action => 'counts'
+            get "/#{ctlr}/results",       :controller => ctlr, :action => 'results'
         end
       end
         

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

@@ -2,11 +2,12 @@ require 'pathname'
 
 namespace :db do
   namespace :faceting do
+    namespace :extensions 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"
+      desc "Install PostgreSQL faceting extensions in the database"
+      task :install do
+        system "cd #{Repertoire::Faceting::MODULE_PATH}/ext; make; sudo make install"
+      end
     end
-    
   end
 end

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

@@ -2,11 +2,8 @@ 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
     
+    # Any client-side tasks should go here; none at current
+
   end
 end

data/lib/repertoire-faceting/version.rb

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

data/lib/repertoire-faceting.rb

@@ -1,14 +1,11 @@
 require 'active_support/dependencies'
 
-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'
       autoload :Calculations, 'repertoire-faceting/relation/calculations'
     end
@@ -22,15 +19,16 @@ module Repertoire
     autoload :Routing, 'repertoire-faceting/routing'
     autoload :Version, 'repertoire-faceting/version'
     
-    autoload :AbstractAdapter, 'repertoire-faceting/adapters/abstract_adapter'
     autoload :PostgreSQLColumn, 'repertoire-faceting/adapters/postgresql_adapter'
     autoload :PostgreSQLAdapter, 'repertoire-faceting/adapters/postgresql_adapter'
+    
   end
 end
 
 # rails hook-in code
 
 require 'repertoire-faceting/errors'
+require 'repertoire-faceting/rails/engine'
 require 'repertoire-faceting/rails/relation'
 require 'repertoire-faceting/rails/routes'
 require 'repertoire-faceting/rails/postgresql_adapter'

metadata

@@ -1,104 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: repertoire-faceting
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Christopher York
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: repertoire-assets
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
-- !ruby/object:Gem::Dependency
-  name: rep.jquery
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+        version: 3.2.11
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: rep.ajax.toolkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+        version: 3.2.11
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.11'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.11'
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.18'
 description: Repertoire-faceting adds scalable facet indexing, ajax facet widgets,
-  and extras like GIS facets to Rails 3
+  and extras like GIS facets to Rails 3 & 4
 email:
 - yorkc@mit.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- FAQ
+- INSTALL
+- LICENSE
+- README
+- TODO
 - ext/Makefile
-- ext/README.signature
+- ext/README.faceting
+- ext/bytea/bytea.sql
+- ext/bytea/faceting_bytea.control
+- ext/common/util.sql
 - ext/extconf.rb
-- ext/signature.c
-- ext/signature.o
-- ext/signature.so
-- ext/signature.sql
-- ext/signature.sql.IN
-- ext/uninstall_signature.sql
-- ext/uninstall_signature.sql.IN
-- lib/repertoire-faceting/adapters/abstract_adapter.rb
+- ext/faceting--0.6.0.sql
+- ext/faceting_bytea--0.6.0.sql
+- ext/faceting_varbit--0.6.0.sql
+- ext/signature/faceting.control
+- ext/signature/signature.c
+- ext/signature/signature.o
+- ext/signature/signature.so
+- ext/signature/signature.sql
+- ext/varbit/faceting_varbit.control
+- ext/varbit/varbit.sql
+- lib/assets/images/repertoire-faceting/proportional_symbol.png
+- lib/assets/images/repertoire-faceting/spinner_sm.gif
+- lib/assets/javascripts/rep.faceting.js
+- lib/assets/javascripts/rep.faceting/context.js
+- lib/assets/javascripts/rep.faceting/ext/earth_facet.js
+- lib/assets/javascripts/rep.faceting/facet.js
+- lib/assets/javascripts/rep.faceting/facet_widget.js
+- lib/assets/javascripts/rep.faceting/nested_facet.js
+- lib/assets/javascripts/rep.faceting/results.js
+- lib/assets/javascripts/rep.protovis-facets.js
+- lib/assets/javascripts/rep.widgets.js
+- lib/assets/javascripts/rep.widgets/events.js
+- lib/assets/javascripts/rep.widgets/global.js
+- lib/assets/javascripts/rep.widgets/model.js
+- lib/assets/javascripts/rep.widgets/widget.js
+- lib/assets/stylesheets/rep.faceting.css
+- lib/repertoire-faceting.rb
 - lib/repertoire-faceting/adapters/postgresql_adapter.rb
 - lib/repertoire-faceting/controller.rb
 - lib/repertoire-faceting/errors.rb
@@ -106,43 +117,32 @@ files:
 - lib/repertoire-faceting/facets/basic_facet.rb
 - lib/repertoire-faceting/facets/nested_facet.rb
 - lib/repertoire-faceting/model.rb
+- lib/repertoire-faceting/rails/engine.rb
 - lib/repertoire-faceting/rails/postgresql_adapter.rb
 - lib/repertoire-faceting/rails/relation.rb
 - lib/repertoire-faceting/rails/routes.rb
 - lib/repertoire-faceting/railtie.rb
 - lib/repertoire-faceting/relation/calculations.rb
 - lib/repertoire-faceting/relation/query_methods.rb
-- lib/repertoire-faceting/relation/spawn_methods.rb
 - lib/repertoire-faceting/routing.rb
 - 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
-- public/images/repertoire-faceting/spinner_sm.gif
-- public/javascripts/google-earth-extensions.js
-- public/javascripts/protovis.js
-- public/javascripts/rep.faceting/context.js
-- public/javascripts/rep.faceting/ext/earth_facet.js
-- public/javascripts/rep.faceting/facet.js
-- public/javascripts/rep.faceting/facet_widget.js
-- public/javascripts/rep.faceting/nested_facet.js
-- public/javascripts/rep.faceting/results.js
-- public/javascripts/rep.faceting.js
-- public/javascripts/rep.protovis-facets.js
-- public/stylesheets/rep.faceting.css
-- FAQ
-- INSTALL
-- LICENSE
-- README
-- TODO
+- vendor/assets/javascripts/google-earth-extensions.js
+- vendor/assets/javascripts/protovis.js
 homepage: http://github.com/repertoire/repertoire-faceting
 licenses: []
 metadata: {}
-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"
+post_install_message: |2
+    ********************************************************************************
+    If this is the first time you have installed Repertoire faceting, you need
+    to build and install the native PostgreSQL extension:
+
+      cd <my-rails-app>
+      rake db:faceting:extensions:install
+
+    See the repertoire-faceting README for details.
+    ********************************************************************************
 rdoc_options: []
 require_paths:
 - lib
@@ -150,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: repertoire-faceting
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails/Postgresql plugin for faceted indexing and browsing

data/ext/README.signature

@@ -1,33 +0,0 @@
---
---
--- In-database support for Repertoire faceting module.
---
--- This library adds scalable faceted indexing to the PostgreSQL database.
--- Basic approach is similar to other faceted browsers (Solr, Exhibit): an inverted bitmap index
--- allows fast computation of facet value counts, given a base context and prior facet refinements.
---
--- Bitsets can also be used to compute the result set of items.
---
---
--- The library consists of: 
---
---   (a) a user defined bitset datatype ('signature') for storing inverted indices
---   from facet values to items, and doing refinements and counts on items with a given
---   facet value (see signature.sql, signature.c)
---
---   (b) facilities for adding a packed (continuous) id sequence to the main item table.  packed ids
---   are used in the facet value signatures
---
---   (c) utility functions for creating/updating packed ids and facet value index tables, esp. for
---   use with Repertoire crontab support
---
---
--- Installation
---
---    (1) gem install repertoire-faceting
---    (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
---