baddr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9fbb53c49bfc330fb8b6163f2abba2f00b10fd2
-  data.tar.gz: 049018eb8c76e3e9728213597b6301f663435e35
+  metadata.gz: 624da24d1ce54ef28e7dd25bd0f4930e0af5c33e
+  data.tar.gz: a2d4b71e3152438c7e8fe638104aff83067b2ea1
 SHA512:
-  metadata.gz: 1d7afe1a4ad881124416e36ddbc4424d0017d6d91b04aae71616792bd1e1a3da092069bf8c7e76460aa36f2a77069bc0946a7fe2506b776e26a307797ed90c89
-  data.tar.gz: 10ff51913ff157aa6bb9a468058bd49d948432c01ced93ecfda90bce22004a82ee663faf72843d3dd92cc8cb960380f11d62f62d2b8e8704519d39b54d1eb28a
+  metadata.gz: 47c3bd0ab7016984e85be482cb454de81cb131df33361a41de63fdc09f64fe4bd2d5ad498ba972509c6135031601b4fd591ca605b0cf5c8c2b543d9941253ab1
+  data.tar.gz: ac5634ce02ce122a60ed7a44dc3ce35a763a6e348420f26ecccdd0949828b8a6b716055569c42a8d185666d526c31427a3811a78f7f165e1e251c32899027f8a

data/app/assets/javascripts/baddr/selects.coffee

@@ -9,4 +9,5 @@ $ ->
       citiesSelect.append(optionTag city) for city in response
       return
 
-  $("select.baddr-states").change((e) -> loadCitiesByState this).change()
+  select = $("select.baddr-states").change((e) -> loadCitiesByState this)
+  select.change() unless $("select.baddr-cities option:selected").size() > 0

data/app/helpers/baddr/tag_helper.rb

@@ -10,7 +10,7 @@ module Baddr
     def baddr_city_tag(name, value, options={})
       options[:class] = (options.with_indifferent_access[:class].presence || []) << 'baddr-cities'
       select_options = if @state_value.present?
-        options_from_collection_for_select(City.where(state: @state_value), 'id', 'name', value)
+        options_from_collection_for_select(City.for_state(@state_value), 'id', 'name', value)
       else
         ''
       end

data/app/models/city.rb

@@ -1,5 +1,6 @@
 class City < ActiveRecord::Base
-  scope :for_state, ->(state) { 
-    where state_id: State.find_by_code(state.upcase).id 
+  belongs_to :state
+  scope :for_state, ->(state) {
+    joins(:state).where('states.code' => state.upcase)
   }
 end

data/app/models/state.rb

@@ -1,2 +1,3 @@
 class State < ActiveRecord::Base
+  has_many :cities
 end

data/lib/baddr/version.rb

@@ -1,3 +1,3 @@
 module Baddr
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baddr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Carlos Eduardo da Fonseca