rails3-jquery-autocomplete 0.7.2 → 0.7.3

data/.gitignore

@@ -22,4 +22,5 @@ tmp
 ## PROJECT::SPECIFIC
 .bundle
 .rvmrc
+.gemrc
 Gemfile.lock

data/README.markdown

@@ -2,7 +2,7 @@
 
 An easy way to use jQuery's autocomplete with Rails 3.
 
-Supports both ActiveRecord and [mongoid](http://github.com/mongoid/mongoid).
+Supports both ActiveRecord, [mongoid](http://github.com/mongoid/mongoid), and [MongoMapper](https://github.com/jnunemaker/mongomapper).
 
 Works with [Formtastic](http://github.com/justinfrench/formtastic)
 and [SimpleForm](https://github.com/plataformatec/simple_form)
@@ -17,6 +17,10 @@ on how to use this gem with ActiveRecord [here](http://github.com/crowdint/rails
 You can find a [detailed example](http://github.com/crowdint/rails3-jquery-autocomplete-app/tree/mongoid)
 on how to use this gem with MongoID [here](http://github.com/crowdint/rails3-jquery-autocomplete-app/tree/mongoid). (Same thing, different branch)
 
+## MongoMapper
+
+TODO
+
 ## Before you start
 
 Make sure your project is using jQuery-ui with the autocomplete widget
@@ -203,7 +207,7 @@ A javascript event named *railsAutocomplete.select* is fired on the input field
 If you are using [Formtastic](http://github.com/justinfrench/formtastic), you automatically get the *autocompleted_input* helper on *semantic_form_for*:
 
     semantic_form_for @product do |f|
-      f.autocompleted_input :brand_name, :url => autocomplete_brand_name_path
+      f.autocompleted_input :brand_name, :url => autocomplete_brand_name_products_path
     end
 
 The only difference with the original helper is that you must specify the autocomplete url using the *:url* option.
@@ -306,6 +310,7 @@ integration folder:
 
 # Changelog
 
+* 0.7.3 MongoMapper
 * 0.7.2 Steak helper
 * 0.7.1 Fixed joined scopes (Issue #43)
 * 0.7.0 Scopes

data/lib/rails3-jquery-autocomplete/helpers.rb

@@ -8,7 +8,7 @@ module Rails3JQueryAutocomplete
     # Can be overriden to show whatever you like
     # Hash also includes a key/value pair for each method in extra_data
     #
-    def json_for_autocomplete(items, method, extra_data)
+    def json_for_autocomplete(items, method, extra_data=nil)
       items.collect do |item|
         hash = {"id" => item.id.to_s, "label" => item.send(method), "value" => item.send(method)}
         extra_data.each do |datum|
@@ -35,6 +35,8 @@ module Rails3JQueryAutocomplete
         :activerecord
       elsif ancestors_ary.include?('Mongoid::Document')
         :mongoid
+      elsif ancestors_ary.include?('MongoMapper::Document')
+        :mongo_mapper  
       else
         raise NotImplementedError
       end
@@ -47,7 +49,7 @@ module Rails3JQueryAutocomplete
     end
 
     # Returns the order parameter to be used in the query created by get_items
-    def get_autocomplete_order(implementation, method, options)
+    def get_autocomplete_order(implementation, method, options, model=nil)
       order = options[:order]
 
       case implementation
@@ -60,8 +62,18 @@ module Rails3JQueryAutocomplete
           else
             [[method.to_sym, :asc]]
           end
+        when :mongo_mapper then
+          if order
+            order.split(',').collect do |fields|
+              sfields = fields.split
+              [sfields[0].downcase.to_sym, sfields[1].downcase.to_sym]
+            end
+          else
+            [[method.to_sym, :asc]]
+          end  
         when :activerecord then
-          order || "#{method} ASC"
+          table_prefix = model ? "#{model.table_name}." : ""
+          order || "#{table_prefix}#{method} ASC"
       end
     end
 
@@ -98,11 +110,11 @@ module Rails3JQueryAutocomplete
       scopes         = Array(options[:scopes])
       limit          = get_autocomplete_limit(options)
       implementation = get_implementation(model)
-      order          = get_autocomplete_order(implementation, method, options)
+      order          = get_autocomplete_order(implementation, method, options, model)
 
       like_clause = (defined?(PGconn) ? 'ILIKE' : 'LIKE')
 
-      items = model.scoped
+      implementation == :mongo_mapper ? (items = model.query) : items = model.scoped
 
       scopes.each { |scope| items = items.send(scope) } unless scopes.empty?
 
@@ -110,9 +122,12 @@ module Rails3JQueryAutocomplete
         when :mongoid
           search = (is_full_search ? '.*' : '^') + term + '.*'
           items  = model.where(method.to_sym => /#{search}/i).limit(limit).order_by(order)
+        when :mongo_mapper
+          search = (is_full_search ? '.*' : '^') + term + '.*'
+          items  = model.where(method.to_sym => /#{search}/i).limit(limit).sort(order)  
         when :activerecord
           table_name = model.table_name
-          items = items.select(["#{table_name}.id", "#{table_name}.#{method}"] + (options[:extra_data].blank? ? [] : options[:extra_data])) unless options[:full_model]
+          items = items.select(["#{table_name}.#{model.primary_key}", "#{table_name}.#{method}"] + (options[:extra_data].blank? ? [] : options[:extra_data])) unless options[:full_model]
           items = items.where(["LOWER(#{table_name}.#{method}) #{like_clause} ?", "#{(is_full_search ? '%' : '')}#{term.downcase}%"]) \
               .limit(limit).order(order)
       end

data/lib/rails3-jquery-autocomplete/version.rb

@@ -1,3 +1,3 @@
 module Rails3JQueryAutocomplete
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/rails3-jquery-autocomplete.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('sqlite3-ruby')
   s.add_development_dependency('mongoid', '>= 2.0.0')
+  s.add_development_dependency('mongo_mapper', '>= 0.9')
   s.add_development_dependency('bson_ext', '~>1.3.0')
   s.add_development_dependency('shoulda', '~>2.11.1')
 

data/test/implementations_test.rb

@@ -1,6 +1,7 @@
 require "test_helper"
 require 'test_controller'
 require 'support/mongoid'
+require 'support/mongo_mapper'
 require 'support/active_record'
 
 class ActiveRecordControllerTest < ActionController::TestCase
@@ -33,3 +34,8 @@ class MonogidControllerTest < ActionController::TestCase
   include Rails3JQueryAutocomplete::TestCase::Mongoid
   include Rails3JQueryAutocomplete::TestCase
 end
+
+class MongoMapperControllerTest < ActionController::TestCase
+  include Rails3JQueryAutocomplete::TestCase::MongoMapper
+  include Rails3JQueryAutocomplete::TestCase
+end

data/test/lib/rails3-jquery-autocomplete/helpers_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+module Rails3JQueryAutocomplete
+  module Test
+    class HelpersTest < ::Test::Unit::TestCase
+      include Rails3JQueryAutocomplete::Helpers
+
+        context 'passing a query result' do
+          should 'parse items to JSON' do
+            response = self.json_for_autocomplete([], :name)
+            assert_not_nil(response)
+          end
+        end
+    end
+  end
+end

data/test/support/mongo_mapper.rb

@@ -0,0 +1,39 @@
+module Rails3JQueryAutocomplete
+  module TestCase
+    module MongoMapper
+      def setup
+        ::MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+        ::MongoMapper.database = "rails3_jquery_autocomplete_test"
+        
+        create_models
+
+        @controller = ActorsController.new
+        @movie1 = @movie_class.create(:name => 'Alpha')
+        @movie2 = @movie_class.create(:name => 'Alspha')
+        @movie3 = @movie_class.create(:name => 'Alzpha')
+      end
+
+      def teardown
+        destroy_models
+        ::MongoMapper.database.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+      end
+
+      private
+      def create_models
+        @movie_class = Object.const_set(:Movie, Class.new)
+        @movie_class.send(:include, ::MongoMapper::Document)
+        @movie_class.key(:name, :class => String)
+        @movie_class.class_eval do
+          def display_name
+            "Movie: #{name}"
+          end
+        end
+      end
+
+      def destroy_models
+        Object.send(:remove_const, :Movie)
+      end
+
+    end
+  end
+end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ ENV["RAILS_ENV"] = "test"
 
 require 'rails/all'
 require 'mongoid'
+require 'mongo_mapper'
 require 'shoulda'
 require 'rails/test_help'
 require 'rails3-jquery-autocomplete'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-jquery-autocomplete
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - David Padilla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -05:00
+date: 2011-05-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,9 +79,24 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: mongo_mapper
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,11 +108,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,7 +124,7 @@ dependencies:
         - 1
         version: 2.11.1
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Use jQuery's autocomplete plugin with Rails 3.
 email: david.padilla@crowdint.com
 executables: []
@@ -230,7 +245,9 @@ files:
 - test/form_helper_test.rb
 - test/generators/generator_test.rb
 - test/implementations_test.rb
+- test/lib/rails3-jquery-autocomplete/helpers_test.rb
 - test/support/active_record.rb
+- test/support/mongo_mapper.rb
 - test/support/mongoid.rb
 - test/test_controller.rb
 - test/test_helper.rb
@@ -272,7 +289,9 @@ test_files:
 - test/form_helper_test.rb
 - test/generators/generator_test.rb
 - test/implementations_test.rb
+- test/lib/rails3-jquery-autocomplete/helpers_test.rb
 - test/support/active_record.rb
+- test/support/mongo_mapper.rb
 - test/support/mongoid.rb
 - test/test_controller.rb
 - test/test_helper.rb