rails3-jquery-autocomplete 0.5.0 → 0.5.1

data/README.markdown

@@ -210,6 +210,7 @@ You need to have an instance of MongoDB running on your computer or all the mong
 
 # Changelog
 
+* 0.5.1 Add STI support
 * 0.5.0 Formtastic support
 * 0.4.0 MongoID support
 * 0.3.6 Using .live() to put autocomplete on dynamic fields
@@ -218,4 +219,4 @@ You need to have an instance of MongoDB running on your computer or all the mong
 
 [Crowd Interactive](http://www.crowdint.com) is an American web design and development company that happens to work in Colima, Mexico. 
 We specialize in building and growing online retail stores. We don’t work with everyone – just companies we believe in. Call us today to see if there’s a fit.
-Find more info [here](http://www.crowdint.com)!
+Find more info [here](http://www.crowdint.com)!

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

@@ -19,9 +19,10 @@ module Rails3JQueryAutocomplete
     # Returns a symbol representing what implementation should be used to query
     # the database and raises *NotImplementedError* if ORM implementor can not be found
     def get_implementation(object) 
-      if object.superclass.to_s == 'ActiveRecord::Base'
+      ancestors_ary = object.ancestors.collect(&:to_s)
+      if ancestors_ary.include?('ActiveRecord::Base')
         :activerecord
-      elsif object.included_modules.collect(&:to_s).include?('Mongoid::Document')
+      elsif ancestors_ary.include?('Mongoid::Document')
         :mongoid
       else
         raise NotImplementedError

data/test/implementations_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+require 'test_controller'
+require 'support/mongoid'
+require 'support/active_record'
+
+class ActiveRecordControllerTest < ActionController::TestCase
+  include Rails3JQueryAutocomplete::TestCase::ActiveRecord
+  include Rails3JQueryAutocomplete::TestCase
+end
+
+class ActiveRecordSTIControllerTest < ActionController::TestCase
+  require 'support/active_record'
+  include Rails3JQueryAutocomplete::TestCase::ActiveRecord
+  include Rails3JQueryAutocomplete::TestCase
+
+  def create_models
+    @parent_movie_class = Object.const_set(:Movie, Class.new(::ActiveRecord::Base))
+    @parent_movie_class.class_eval do
+      def display_name
+        "Movie: #{name}"
+      end
+    end
+    @movie_class = Object.const_set(:HorrorMovie, Class.new(@parent_movie_class))
+  end
+
+  def destroy_models
+    Object.send(:remove_const, :Movie)
+    Object.send(:remove_const, :HorrorMovie)
+  end
+
+end
+
+class MonogidControllerTest < ActionController::TestCase
+  include Rails3JQueryAutocomplete::TestCase::Mongoid
+  include Rails3JQueryAutocomplete::TestCase
+end

data/test/support/active_record.rb

@@ -1,19 +1,5 @@
-class Actor < ActiveRecord::Base
-  belongs_to :movie
-end
-
-class Movie < ActiveRecord::Base
-  def display_name
-    "Movie: #{name}"
-  end
-end
-
-class ActorsController < ActionController::Base
-  autocomplete :movie, :name                       
-end        
-
 module Rails3JQueryAutocomplete
-  module Test
+  module TestCase
     module ActiveRecord
       def setup
         ::ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
@@ -21,23 +7,38 @@ module Rails3JQueryAutocomplete
           create_table :movies do |t|
             t.column :name, :string
           end
-
-          create_table :actors do |t|
-            t.column :movie_id, :integer
-            t.column :name, :string
-          end
         end
 
-        @movie  = Movie.create(:name => 'Alpha')
-        @movie2 = Movie.create(:name => 'Alspha')
-        @movie3 = Movie.create(:name => 'Alzpha')
+        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
         ::ActiveRecord::Base.connection.tables.each do |table|
           ::ActiveRecord::Base.connection.drop_table(table)
         end
       end
+
+      private
+      def create_models
+        @movie_class = Object.const_set(:Movie, Class.new(::ActiveRecord::Base))
+        @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/support/mongoid.rb

@@ -1,24 +1,5 @@
-class Character
-  include Mongoid::Document
-  field :name, :class => String
-  referenced_in :game
-end
-
-class Game
-  include Mongoid::Document
-  field :name, :class => String
-  references_one :character
-  def display_name
-    "Game: #{name}"
-  end
-end
-
-class GamesController < ActionController::Base
-  autocomplete :game, :name                       
-end        
-
 module Rails3JQueryAutocomplete
-  module Test
+  module TestCase
     module Mongoid
       def setup
         ::Mongoid.configure do |config|
@@ -28,14 +9,36 @@ module Rails3JQueryAutocomplete
           config.logger = nil
         end
 
-        @game = Game.create(:name => 'Alpha')
-        @game2 = Game.create(:name => 'Alspha')
-        @game3 = Game.create(:name => 'Alzpha')
+        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
         ::Mongoid.master.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, ::Mongoid::Document)
+        @movie_class.field(: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_controller.rb

@@ -0,0 +1,101 @@
+module Rails3JQueryAutocomplete
+  module TestCase
+
+    include Shoulda::InstanceMethods
+    extend Shoulda::ClassMethods
+    include Shoulda::Assertions
+    extend Shoulda::Macros
+    include Shoulda::Helpers
+
+    context "the autocomplete gem" do
+
+      should "be able to access the autocomplete action regardless of the quality of param[:term]" do
+        get :autocomplete_movie_name
+        assert_response :success
+
+        get :autocomplete_movie_name, :term => ''
+        assert_response :success
+
+        get :autocomplete_movie_name, :term => nil
+        assert_response :success
+
+        get :autocomplete_movie_name, :term => 'Al'
+        assert_response :success
+      end
+
+      should "respond with expected json" do
+        get :autocomplete_movie_name, :term => 'Al'
+        json_response = JSON.parse(@response.body)
+        assert_equal(json_response.first["label"], @movie1.name)
+        assert_equal(json_response.first["value"], @movie1.name)
+        assert_equal(json_response.first["id"].to_s, @movie1.id.to_s)
+      end
+
+      should "return results in alphabetical order by default" do
+        get :autocomplete_movie_name, :term => 'Al'
+        json_response = JSON.parse(@response.body)
+        assert_equal(json_response.first["label"], "Alpha")
+        assert_equal(json_response.last["label"], "Alzpha")
+      end
+
+      should "be able to sort in other ways if desired" do
+        @controller.class_eval do
+          autocomplete :movie, :name, {:order => "name DESC"}
+        end
+
+        get :autocomplete_movie_name, :term => 'Al'
+        json_response = JSON.parse(@response.body)
+        assert_equal(json_response.first["label"], "Alzpha")
+        assert_equal(json_response.last["label"], "Alpha")
+      end
+
+      should "be able to limit the results" do
+        @controller.class_eval do
+          autocomplete :movie, :name, {:limit => 1}
+        end
+
+        get :autocomplete_movie_name, :term => 'Al'
+        json_response = JSON.parse(@response.body)
+        assert_equal(json_response.length, 1)
+      end
+
+      should "ignore case of search term and results" do
+        @movie = @movie_class.create(:name => 'aLpHa')
+
+        @controller.class_eval do
+          autocomplete :movie, :name
+        end
+
+        get :autocomplete_movie_name, :term => 'Al'
+        json_response = JSON.parse(@response.body)
+        assert_equal(json_response.length, @movie_class.count)
+        assert_equal(json_response.last["label"], 'aLpHa')
+      end
+
+      should "match term to letters in middle of words when full-text search is on" do
+        @controller.class_eval do
+          autocomplete :movie, :name, {:full => true}
+        end
+
+        get :autocomplete_movie_name, :term => 'ph'
+        json_response = JSON.parse(@response.body)
+        assert_equal(json_response.length, @movie_class.count)
+        assert_equal(json_response.first["label"], @movie1.name)
+      end
+
+      should "be able to customize what is displayed" do
+        @controller.class_eval do
+          autocomplete :movie, :name, {:display_value => :display_name}
+        end
+
+        get :autocomplete_movie_name, :term => 'Al'
+
+        json_response = JSON.parse(@response.body)
+
+        assert_equal(@movie1.display_name, json_response.first["label"])
+        assert_equal(@movie1.display_name, json_response.first["value"])
+        assert_equal(@movie1.id.to_s, json_response.first["id"].to_s)
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -24,3 +24,6 @@ Rails3JQueryAutocomplete::Application.routes.draw do
 end
 
 ActionController::Base.send :include, Rails3JQueryAutocomplete::Application.routes.url_helpers
+
+ActorsController = Class.new(ActionController::Base)
+ActorsController.autocomplete(:movie, :name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-jquery-autocomplete
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - David Padilla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -05:00
+date: 2010-11-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,13 +54,13 @@ files:
 - lib/rails3-jquery-autocomplete/form_helper.rb
 - lib/rails3-jquery-autocomplete/formtastic_plugin.rb
 - lib/rails3-jquery-autocomplete/helpers.rb
-- test/active_record_controller_test.rb
 - test/form_helper_test.rb
 - test/generators/generator_test.rb
 - test/helpers.rb
-- test/mongoid_controller_test.rb
+- test/implementations_test.rb
 - test/support/active_record.rb
 - test/support/mongoid.rb
+- test/test_controller.rb
 - test/test_helper.rb
 - LICENSE
 has_rdoc: true
@@ -98,11 +98,11 @@ signing_key:
 specification_version: 3
 summary: Use jQuery's autocomplete plugin with Rails 3.
 test_files: 
-- test/active_record_controller_test.rb
 - test/form_helper_test.rb
 - test/generators/generator_test.rb
 - test/helpers.rb
-- test/mongoid_controller_test.rb
+- test/implementations_test.rb
 - test/support/active_record.rb
 - test/support/mongoid.rb
+- test/test_controller.rb
 - test/test_helper.rb

data/test/active_record_controller_test.rb

@@ -1,100 +0,0 @@
-require "test_helper"
-require 'support/active_record'
-
-module Rails3JQueryAutocomplete
-  module Test
-    module ActiveRecord
-  
-      class ActorsControllerTest < ActionController::TestCase
-
-        include Rails3JQueryAutocomplete::Test::ActiveRecord
-    
-        setup do
-          @controller = ActorsController.new
-        end
-
-        context "the autocomplete gem" do
-
-          should "be able to access the autocomplete action regardless of the quality of param[:term]" do
-            get :autocomplete_movie_name
-            assert_response :success
-
-            get :autocomplete_movie_name, :term => ''
-            assert_response :success
-
-            get :autocomplete_movie_name, :term => nil
-            assert_response :success
-
-            get :autocomplete_movie_name, :term => 'Al'
-            assert_response :success
-          end
-
-          should "respond with expected json" do
-            get :autocomplete_movie_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.first["label"], @movie.name)
-            assert_equal(json_response.first["value"], @movie.name)
-            assert_equal(json_response.first["id"], @movie.id)
-          end
-
-          should "return results in alphabetical order by default" do
-            get :autocomplete_movie_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.first["label"], "Alpha")
-            assert_equal(json_response.last["label"], "Alzpha")
-          end
-
-          should "be able to sort in other ways if desired" do
-            ActorsController.send(:autocomplete, :movie, :name, {:order => "name DESC"})
-
-            get :autocomplete_movie_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.first["label"], "Alzpha")
-            assert_equal(json_response.last["label"], "Alpha")
-          end
-
-          should "be able to limit the results" do
-            ActorsController.send(:autocomplete, :movie, :name, {:limit => 1})
-
-            get :autocomplete_movie_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.length, 1)
-          end
-
-          should "ignore case of search term and results" do
-            @movie = Movie.create(:name => 'aLpHa')
-
-            ActorsController.send(:autocomplete, :movie, :name)
-
-            get :autocomplete_movie_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.length, Movie.count)
-            assert_equal(json_response.last["label"], 'aLpHa')
-          end
-
-          should "match term to letters in middle of words when full-text search is on" do
-            ActorsController.send(:autocomplete, :movie, :name, {:full => true})
-
-            get :autocomplete_movie_name, :term => 'ph'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.length, Movie.count)
-            assert_equal(json_response.first["label"], @movie.name)
-          end
-
-          should "be able to customize what is displayed" do
-            ActorsController.send(:autocomplete, :movie, :name, {:display_value => :display_name})
-
-            get :autocomplete_movie_name, :term => 'Al'
-
-            json_response = JSON.parse(@response.body)
-
-            assert_equal(@movie.display_name, json_response.first["label"])
-            assert_equal(@movie.display_name, json_response.first["value"])
-            assert_equal(@movie.id, json_response.first["id"])
-          end
-        end
-      end
-
-    end
-  end
-end

data/test/mongoid_controller_test.rb

@@ -1,100 +0,0 @@
-require "test_helper"
-require 'support/mongoid'
-
-module Rails3JQueryAutocomplete
-  module Test
-    module Mongoid
-
-      class GamesControllerTest < ActionController::TestCase
-
-        include Rails3JQueryAutocomplete::Test::Mongoid
-      
-        setup do
-          @controller = GamesController.new
-        end
-
-        context "the autocomplete gem" do
-
-          should "be able to access the autocomplete action regardless of the quality of param[:term]" do
-            get :autocomplete_game_name
-            assert_response :success
-
-            get :autocomplete_game_name, :term => ''
-            assert_response :success
-
-            get :autocomplete_game_name, :term => nil
-            assert_response :success
-
-            get :autocomplete_game_name, :term => 'Al'
-            assert_response :success
-          end
-
-          should "respond with expected json" do
-            get :autocomplete_game_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.first["label"], @game.name)
-            assert_equal(json_response.first["value"], @game.name)
-            assert_equal(json_response.first["id"], @game.id.to_s)
-          end
-
-          should "return results in alphabetical order by default" do
-            get :autocomplete_game_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.first["label"], "Alpha")
-            assert_equal(json_response.last["label"], "Alzpha")
-          end
-
-          should "be able to sort in other ways if desired" do
-            GamesController.send(:autocomplete, :game, :name, {:order => "name DESC"})
-
-            get :autocomplete_game_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.first["label"], "Alzpha")
-            assert_equal(json_response.last["label"], "Alpha")
-          end
-
-          should "be able to limit the results" do
-            GamesController.send(:autocomplete, :game, :name, {:limit => 1})
-
-            get :autocomplete_game_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.length, 1)
-          end
-
-          should "ignore case of search term and results" do
-            @game = Game.create(:name => 'aLpHa')
-
-            GamesController.send(:autocomplete, :game, :name)
-
-            get :autocomplete_game_name, :term => 'Al'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.length, Game.count)
-            assert_equal(json_response.last["label"], 'aLpHa')
-          end
-
-          should "match term to letters in middle of words when full-text search is on" do
-            GamesController.send(:autocomplete, :game, :name, {:full => true})
-
-            get :autocomplete_game_name, :term => 'ph'
-            json_response = JSON.parse(@response.body)
-            assert_equal(json_response.length, Game.count)
-            assert_equal(json_response.first["label"], @game.name)
-          end
-
-          should "be able to customize what is displayed" do
-            GamesController.send(:autocomplete, :game, :name, {:display_value => :display_name})
-
-            get :autocomplete_game_name, :term => 'Al'
-
-            json_response = JSON.parse(@response.body)
-
-            assert_equal(@game.display_name, json_response.first["label"])
-            assert_equal(@game.display_name, json_response.first["value"])
-            assert_equal(@game.id.to_s, json_response.first["id"])
-          end
-        end
-      end
-
-    end
-  end
-end