scoped_search 2.4.0 → 2.4.1

data/.travis.yml

@@ -19,6 +19,8 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
   exclude:
     - rvm: jruby-18mode
       gemfile: Gemfile.activerecord2

data/README.rdoc

@@ -1,4 +1,4 @@
-= Scoped search
+= Scoped search {<img src="https://secure.travis-ci.org/wvanbergen/scoped_search.png" />}[http://travis-ci.org/wvanbergen/scoped_search]
 
 The <b>scoped_search</b> Rails plugin makes it easy to search your ActiveRecord
 models. Searching is performed using a query string, which should be passed to

data/lib/scoped_search.rb

@@ -14,7 +14,7 @@ module ScopedSearch
 
   # The current scoped_search version. Do not change thisvalue by hand,
   # because it will be updated automatically by the gem release script.
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 
   # The ClassMethods module will be included into the ActiveRecord::Base class
   # to add the <tt>ActiveRecord::Base.scoped_search</tt> method and the
@@ -97,3 +97,15 @@ if defined?(ActionController)
   require "scoped_search/rails_helper"
   ActionController::Base.helper(ScopedSearch::RailsHelper)
 end
+
+#asset pipeline
+if defined?(::Sprockets)
+  require 'scoped_search/engine'
+end
+
+#Compass
+if  defined?(::Compass)
+  base = File.join(File.dirname(__FILE__), '..')
+  styles = File.join(base, 'vendor', 'assets', 'stylesheets')
+  ::Compass::Frameworks.register('scoped_search', :path => base, :stylesheets_directory => styles)
+end

data/lib/scoped_search/definition.rb

@@ -176,7 +176,7 @@ module ScopedSearch
       field = fields[name.to_sym] unless name.blank?
       if field.nil?
         dotted = name.to_s.split('.')[0]
-        field = fields[dotted.to_sym] unless dotted.nil?
+        field = fields[dotted.to_sym] unless dotted.blank?
       end
       field
     end

data/lib/scoped_search/engine.rb

@@ -0,0 +1,6 @@
+module ScopedSearch
+  module Rails
+    class Engine < ::Rails::Engine
+    end
+  end
+end

data/scoped_search.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "2.4.0"
-  s.date    = "2012-09-11"
+  s.version = "2.4.1"
+  s.date    = "2013-03-06"
 
   s.summary = "Easily search you ActiveRecord models with a simple query language using a named scope."
   s.description = <<-EOS
@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
 
   # Do not change the files and test_files fields by hand. This will be done
   # automatically by the gem release script.
-  s.files      = %w(.gitignore .infinity_test .travis.yml Gemfile Gemfile.activerecord2 Gemfile.activerecord3 LICENSE README.rdoc Rakefile init.rb lib/scoped_search.rb lib/scoped_search/auto_complete_builder.rb lib/scoped_search/definition.rb lib/scoped_search/query_builder.rb lib/scoped_search/query_language.rb lib/scoped_search/query_language/ast.rb lib/scoped_search/query_language/parser.rb lib/scoped_search/query_language/tokenizer.rb lib/scoped_search/rails_helper.rb scoped_search.gemspec spec/database.jruby.yml spec/database.ruby.yml spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/lib/database.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/spec_helper.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb tasks/github-gem.rake)
+  s.files      = %w(.gitignore .infinity_test .travis.yml Gemfile Gemfile.activerecord2 Gemfile.activerecord3 LICENSE README.rdoc Rakefile init.rb lib/scoped_search.rb lib/scoped_search/auto_complete_builder.rb lib/scoped_search/definition.rb lib/scoped_search/engine.rb lib/scoped_search/query_builder.rb lib/scoped_search/query_language.rb lib/scoped_search/query_language/ast.rb lib/scoped_search/query_language/parser.rb lib/scoped_search/query_language/tokenizer.rb lib/scoped_search/rails_helper.rb scoped_search.gemspec spec/database.jruby.yml spec/database.ruby.yml spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/lib/database.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/spec_helper.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb tasks/github-gem.rake vendor/assets/images/spinner.gif vendor/assets/javascripts/scoped_search.js vendor/assets/stylesheets/scoped_search.scss)
   s.test_files = %w(spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb)
 end

data/vendor/assets/javascripts/scoped_search.js

@@ -0,0 +1,55 @@
+//extend ui auto-complete to include categories and errors
+$.widget( "custom.catcomplete", $.ui.autocomplete, {
+  _renderMenu: function( ul, items ) {
+    var self = this, currentCategory = "";
+    $.each( items, function( index, item ) {
+      if ( item.category != undefined && item.category != currentCategory ) {
+        ul.append( "<li class='ui-autocomplete-category'>" + item.category + "</li>" );
+        currentCategory = item.category;
+      }
+      if ( item.error != undefined ) {
+        ul.append( "<li class='ui-autocomplete-error'>" + item.error + "</li>" );
+      }
+      self._renderItemData( ul, item );
+    });
+  },
+  _renderItem: function( ul, item ) {
+    return $( "<li>" )
+        .append( "<a> <i class='ui-autocomplete-completed'>" + item.completed + "</i>" + item.part + "</a>" )
+        .appendTo( ul );
+  }
+});
+
+
+  $.fn.scopedSearch = function(){
+    var options = arguments[0] || {};
+    $(this).each(function(i,el){
+      var target = $(el);
+
+      target.catcomplete({
+        source: options.source || function( request, response ) {
+          $.getJSON( target.data("url"), { search: request.term }, response );
+        },
+        minLength: options.minLength || 0,
+        delay: options.delay || 100,
+        select: function(event, ui) {
+          target.val( ui.item.value );
+        },
+        search: function(event, ui) {
+          $(".autocomplete-clear").hide();
+        },
+        response: function(event, ui) {
+          $(".autocomplete-clear").show();
+        },
+        close: function(event, ui) {
+          $(".autocomplete-input:focus").catcomplete( target.attr('id'));
+        }
+      });
+
+      target.bind("focus", function( event ){
+        $(this).catcomplete( target.attr('id'));
+      });
+      target.after('<a class="autocomplete-clear" tabindex="-1" title="Clear">&times;</a>')
+      target.next().on("click",function(){ target.val(''); })
+    })
+  };

data/vendor/assets/stylesheets/scoped_search.scss

@@ -0,0 +1,51 @@
+// Opacity
+@mixin opacity($opacity) {
+  opacity: $opacity / 100;
+  filter: alpha(opacity=$opacity);
+}
+
+.autocomplete-input {
+  width: 98%;
+  margin-right: -12px;
+}
+
+.autocomplete-clear {
+  font-size: 16px;
+  font-weight: bold;
+  color: black;
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-left: -6px;
+  margin-bottom: -5px;
+  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  @include opacity(20);
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    cursor: pointer;
+    @include opacity(40);
+  }
+}
+.ui-autocomplete-loading {
+  background: white  url('/images/spinner.gif') 98% 50% no-repeat;
+}
+.ui-autocomplete-completed {
+  color: #aaa;
+  font-weight: lighter;
+  padding: .2em .4em;
+  margin: .3em 0 .2em;
+  line-height: 1.5;
+}
+.ui-autocomplete-category {
+  font-weight: bold;
+  padding: .2em .4em;
+  margin: .3em 0 .2em;
+  line-height: 1.5;
+}
+.ui-autocomplete-error {
+  color: red;
+  padding: .2em .4em;
+  margin: .3em 0 .2em;
+  line-height: 1.5;
+}

metadata

@@ -1,71 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scoped_search
-version: !ruby/object:Gem::Version
-  version: 2.4.0
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 2
+  - 4
+  - 1
+  version: 2.4.1
 platform: ruby
-authors:
+authors: 
 - Amos Benari
 - Willem van Bergen
 - Wes Hays
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-03-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   name: activerecord
-  requirement: &70188989608520 !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
+  requirement: *id001
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70188989608520
-- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70188989607800 !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  requirement: *id002
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70188989607800
-- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70188989607000 !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   type: :development
-  prerelease: false
-  version_requirements: *70188989607000
-description: ! "    Scoped search makes it easy to search your ActiveRecord-based
-  models.\n    \n    It will create a named scope :search_for that can be called with
-  a query string. It will build an SQL query using\n    the provided query string
-  and a definition that specifies on what fields to search. Because the functionality
-  is\n    built on named_scope, the result of the search_for call can be used like
-  any other named_scope, so it can be\n    chained with another scope or combined
-  with will_paginate.\n    \n    Because it uses standard SQL, it does not require
-  any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly
-  add basic search functionality to your application with little hassle. On the other
-  hand,\n    it may not be the best choice if it is going to be used on very large
-  datasets or by a large user base.\n"
-email:
+description: "    Scoped search makes it easy to search your ActiveRecord-based models.\n    \n    It will create a named scope :search_for that can be called with a query string. It will build an SQL query using\n    the provided query string and a definition that specifies on what fields to search. Because the functionality is\n    built on named_scope, the result of the search_for call can be used like any other named_scope, so it can be\n    chained with another scope or combined with will_paginate.\n    \n    Because it uses standard SQL, it does not require any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly add basic search functionality to your application with little hassle. On the other hand,\n    it may not be the best choice if it is going to be used on very large datasets or by a large user base.\n"
+email: 
 - abenari@redhat.com
 - willem@railsdoctors.com
 - weshays@gbdev.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - .gitignore
 - .infinity_test
 - .travis.yml
@@ -79,6 +89,7 @@ files:
 - lib/scoped_search.rb
 - lib/scoped_search/auto_complete_builder.rb
 - lib/scoped_search/definition.rb
+- lib/scoped_search/engine.rb
 - lib/scoped_search/query_builder.rb
 - lib/scoped_search/query_language.rb
 - lib/scoped_search/query_language/ast.rb
@@ -107,38 +118,48 @@ files:
 - spec/unit/query_builder_spec.rb
 - spec/unit/tokenizer_spec.rb
 - tasks/github-gem.rake
+- vendor/assets/images/spinner.gif
+- vendor/assets/javascripts/scoped_search.js
+- vendor/assets/stylesheets/scoped_search.scss
 homepage: http://github.com/wvanbergen/scoped_search/wiki
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - scoped_search
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Easily search you ActiveRecord models with a simple query language using
-  a named scope.
-test_files:
+summary: Easily search you ActiveRecord models with a simple query language using a named scope.
+test_files: 
 - spec/integration/api_spec.rb
 - spec/integration/auto_complete_spec.rb
 - spec/integration/key_value_querying_spec.rb