rails3-jquery-autocomplete 0.7.0 → 0.7.1

data/README.markdown

@@ -272,10 +272,13 @@ You can run the integration tests with the cucumber command while on the
 integration folder:
 
     cd integration
+    rake db:migrate
     cucumber
 
 # Changelog
 
+* 0.7.1 Fixed joined scopes (Issue #43)
+* 0.7.0 Scopes
 * 0.6.6 ILIKE for postgres
 * 0.6.5 JS select event
 * 0.6.4 Use YAJL instead of JSON

data/integration/app/controllers/scoped_autocompletes_controller.rb

@@ -1,5 +1,5 @@
 class ScopedAutocompletesController < ApplicationController
-  autocomplete :brand, :name, :scope => "active"
+  autocomplete :brand, :name, :scopes => ["active", "with_address"]
 
   def new
     @product = Product.new

data/integration/app/models/address.rb

@@ -0,0 +1,2 @@
+class Address < ActiveRecord::Base
+end

data/integration/app/models/brand.rb

@@ -12,4 +12,7 @@
 
 class Brand < ActiveRecord::Base
   scope :active, where(:state => true)
+  scope :with_address, joins(:address)
+
+  belongs_to :address
 end

data/integration/db/migrate/20110512153732_create_addresses.rb

@@ -0,0 +1,13 @@
+class CreateAddresses < ActiveRecord::Migration
+  def self.up
+    create_table :addresses do |t|
+      t.string :street
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :addresses
+  end
+end

data/integration/db/migrate/20110512153811_add_address_id_to_brand.rb

@@ -0,0 +1,9 @@
+class AddAddressIdToBrand < ActiveRecord::Migration
+  def self.up
+    add_column :brands, :address_id, :integer
+  end
+
+  def self.down
+    remove_column :brands, :address_id
+  end
+end

data/integration/db/schema.rb

@@ -10,7 +10,13 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110423000347) do
+ActiveRecord::Schema.define(:version => 20110512153811) do
+
+  create_table "addresses", :force => true do |t|
+    t.string   "street"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "brands", :force => true do |t|
     t.string   "name"
@@ -18,6 +24,7 @@ ActiveRecord::Schema.define(:version => 20110423000347) do
     t.datetime "updated_at"
     t.string   "type"
     t.boolean  "state"
+    t.integer  "address_id"
   end
 
   create_table "features", :force => true do |t|

data/integration/features/autocomplete.feature

@@ -6,11 +6,11 @@ Feature: Autocomplete
   Background:
     Given the following brands exists:
       | name    | state |
-      | Alpha   | 1     |
-      | Beta    | 0     |
-      | Gamma   | 0     |
-      | Kappa   | 1     |
-      | Kappler | 0     |
+      | Alpha   | true  |
+      | Beta    | false |
+      | Gamma   | false |
+      | Kappa   | true  |
+      | Kappler | false |
     And the following features exists:
       | name  |
       | Shiny |
@@ -66,6 +66,7 @@ Feature: Autocomplete
 
   @javascript
   Scenario: Autocomplete with scope
+    Given the "Kappa" brand has an address
     Given I go to the new scoped autocomplete page
     And I fill in "Brand name" with "ka"
     And I choose "Kappa" in the autocomplete list

data/integration/features/step_definitions/autocomplete_steps.rb

@@ -7,4 +7,9 @@ And /^I send (.*) to "(.*)"$/ do |key, element|
   find_field(element).native.send_keys(key)
 end
 
+Given /^the "([^"]*)" brand has an address$/ do |brand_name|
+  brand = Brand.find_by_name(brand_name)
+  brand.address = Address.create
+  brand.save!
+end
 

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

@@ -89,10 +89,10 @@ module Rails3JQueryAutocomplete
     #   items = get_autocomplete_items(:model => get_object(object), :options => options, :term => term, :method => method)
     #
     def get_autocomplete_items(parameters)
-      model   = parameters[:model]
-      term    = parameters[:term]
-      method  = parameters[:method]
-      options = parameters[:options]
+      model      = parameters[:model]
+      term       = parameters[:term]
+      method     = parameters[:method]
+      options    = parameters[:options]
 
       is_full_search = options[:full]
       scopes         = Array(options[:scopes])
@@ -111,8 +111,9 @@ module Rails3JQueryAutocomplete
           search = (is_full_search ? '.*' : '^') + term + '.*'
           items  = model.where(method.to_sym => /#{search}/i).limit(limit).order_by(order)
         when :activerecord
-          items = items.select([:id, method] + (options[:extra_data].blank? ? [] : options[:extra_data])) unless options[:full_model]
-          items = items.where(["LOWER(#{method}) #{like_clause} ?", "#{(is_full_search ? '%' : '')}#{term.downcase}%"]) \
+          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.where(["LOWER(#{table_name}.#{method}) #{like_clause} ?", "#{(is_full_search ? '%' : '')}#{term.downcase}%"]) \
               .limit(limit).order(order)
       end
     end

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

@@ -1,3 +1,3 @@
 module Rails3JQueryAutocomplete
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-jquery-autocomplete
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - David Padilla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -05:00
+date: 2011-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - integration/app/helpers/id_elements_helper.rb
 - integration/app/helpers/layout_helper.rb
 - integration/app/helpers/sub_classes_helper.rb
+- integration/app/models/address.rb
 - integration/app/models/brand.rb
 - integration/app/models/feature.rb
 - integration/app/models/foreign_brand.rb
@@ -177,6 +178,8 @@ files:
 - integration/db/migrate/20101209053936_add_type_to_brand.rb
 - integration/db/migrate/20110209020136_create_features.rb
 - integration/db/migrate/20110423000347_add_state_to_brands.rb
+- integration/db/migrate/20110512153732_create_addresses.rb
+- integration/db/migrate/20110512153811_add_address_id_to_brand.rb
 - integration/db/schema.rb
 - integration/db/seeds.rb
 - integration/doc/README_FOR_APP