subdivision_select 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74db1c019c0d3373022175480d10aff126ce97ca
-  data.tar.gz: 43e00dd135750bbcfbaf92921b14e928395445c9
+  metadata.gz: 4ac62ce983136d23a1b1cb0e9b085a00fa0bc0b7
+  data.tar.gz: bf796d11169d49b3dfa1e7a7920e5ab7da44dfad
 SHA512:
-  metadata.gz: 3e52772a2ee3f625b75abba189d0f36c1eb24dc7da3ff0a604c6abdc74474ccdefa82391bd677ef22eda34eda202a6af29c66541db4827d1e0a4fca5d708e42c
-  data.tar.gz: 1f726bea5f2a75b3d5f87b88c1d6320669adffc8b1bf2bd832f70042165edb286768f30cdad73bc834083055952aaf7afdbd6b6a97d9bfb7d84d547586bbc203
+  metadata.gz: 98158bfb52593a7abc052a47d70b681cde23951a29e4a2a6b29198d8c701309f51870aa1eda824de372863746cf4bc702093f19d90a0122de1bc6ac76a401173
+  data.tar.gz: 89bf0c9f5767d8b26e18479b60645c76b22f0c30a4a6a0c8c47271766766beb6e33dc0f364721f34195cb0e27840da8abc85110102dddd1aee80f795d67ec9ef

data/app/assets/javascripts/subdivision_select.js

@@ -1,4 +1,7 @@
 var SubdivisionSelect = (function() {
+  SubdivisionSelect.subdivisionSelector = "select[data-subdivision-selector]";
+  SubdivisionSelect.countrySelector = "select[id$=country]";
+
   function SubdivisionSelect(element) {
     this._countrySelect = element;
     this._subdivisionSelect = $(element).
@@ -6,9 +9,6 @@ var SubdivisionSelect = (function() {
       find(SubdivisionSelect.subdivisionSelector);
   };
 
-  SubdivisionSelect.subdivisionSelector = "select.subdivision-selector";
-  SubdivisionSelect.countrySelector = "select[id$=country]";
-
   SubdivisionSelect.init = function () {
     var klass = this;
 
@@ -19,6 +19,7 @@ var SubdivisionSelect = (function() {
 
   SubdivisionSelect.prototype.init = function() {
     var self = this;
+    self._enabledInputsBeforeSubmit();
 
     $(this._countrySelect).change(function() {
       $.ajax( {
@@ -48,6 +49,14 @@ var SubdivisionSelect = (function() {
     }
   };
 
+  // Disabling selects means they won't POST with the form.
+  // Solution: right before submiting a form, enabled them.
+  SubdivisionSelect.prototype._enabledInputsBeforeSubmit = function() {
+    $('form').bind('submit', function() {
+      $(this).find('select').removeAttr('disabled');
+    });
+  };
+
   // Not only empty the select, but:
   // if the first element is blank, add a blank element before all others
   SubdivisionSelect.prototype._clearSubdivisionSelect = function() {

data/lib/subdivision_select/engine.rb

@@ -1,5 +1,3 @@
-require "subdivision_select/subdivision_select_helper"
-
 module SubdivisionSelect
   class Engine < ::Rails::Engine
     isolate_namespace SubdivisionSelect

data/lib/subdivision_select/subdivision_select_helper.rb

@@ -7,42 +7,49 @@ module ActionView
           html_options = options
           options = country_or_options
         else
-          country = country_or_options
+          options[:country] = country_or_options
         end
 
-        options.merge!({ object: @object })
+        # I think this is taken care of in the merge below?
+        #options.merge!({ object: @object })
 
-        # Add class (that JS uses)
-        if html_options["class"].present?
-          html_options["class"] += " subdivision-selector"
-        else
-          html_options["class"] = "subdivision-selector"
-        end
-
-        subdivision_select_hidden_field(method).render + Tags::Select.new(
+        @template.subdivision_select_tag(
           @object_name,
           method,
-          @template,
-          SubdivisionSelect::SubdivisionsHelper::get_subdivisions_for_select(country),
+          objectify_options(options),
+          @default_options.merge(html_options)
+        )
+      end
+    end
+
+    module FormOptionsHelper
+      def subdivision_select_tag(object, method, options = {}, html_options = {})
+        Tags::SubdivisionSelect.new(
+          object,
+          method,
+          self,
           options,
           html_options
         ).render
       end
+    end
 
-      private
+    module Tags
+      # TODO: can we inherit from Select?
+      class SubdivisionSelect < Base
+        include ::SubdivisionSelect::TagHelper
 
-      # We want to add a hidden field, so that when this select is disabled
-      # (which happens when a country have no subdivisions), we still POST this
-      # value, as blank. Otherwise we'd keep the old value.
-      # NOTE: it has to come *before* the actual select, so that its value
-      # can be overridden by the select
-      def subdivision_select_hidden_field(method)
-        Tags::HiddenField.new(
-          @object_name,
-          method,
-          @template,
-          value: ""
-        )
+        def initialize(object_name, method_name, template_object, options, html_options)
+          @html_options = html_options
+          # Add data attribue, for selecting via JS
+          @html_options["data-subdivision-selector"] = "1"
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          select_content_tag(subdivision_option_tags, @options, @html_options)
+        end
       end
     end
   end

data/lib/subdivision_select/tag_helper.rb

@@ -0,0 +1,23 @@
+module SubdivisionSelect
+  #class CountryNotFoundError < StandardError;end
+  module TagHelper
+    def subdivision_option_tags
+      option_tags_options = {
+        selected: @options.fetch(:selected) { value(@object) },
+        disabled: @options[:disabled]
+      }
+
+      # Actual loading of subdivisions is in a View helper, since the controller
+      # needs to use it, to render the subdivisions of a country in JSON
+      subdivisions = SubdivisionsHelper::get_subdivisions_for_select(country)
+      options_for_select(subdivisions, option_tags_options)
+    end
+
+    private
+
+    def country
+      @options[:country]
+    end
+  end
+end
+

data/lib/subdivision_select/version.rb

@@ -1,3 +1,3 @@
 module SubdivisionSelect
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/subdivision_select.rb

@@ -1,3 +1,5 @@
+require "subdivision_select/tag_helper"
+require "subdivision_select/subdivision_select_helper"
 require "subdivision_select/engine"
 
 module SubdivisionSelect

data/spec/test_app/app/controllers/addresses_demo_controller.rb

@@ -6,6 +6,10 @@ class AddressesDemoController < ApplicationController
     @addresses = Address.all
   end
 
+  def tags
+    @addresses = Address.all
+  end
+
   def update
     @address = Address.find(params[:id])
 

data/spec/test_app/app/views/addresses_demo/_form.html.erb

@@ -1,26 +0,0 @@
-<%=
-  form_for(
-    address,
-    url: update_address_path(address.id),
-    html: {class: address.title.parameterize}
-  ) do |f| %>
-
-  <div class="field">
-    <%= f.label(:title) %><br />
-    <%= f.text_field(:title) %>
-  </div>
-
-  <div class="field">
-    <%= f.label(:country) %><br />
-    <%= f.country_select(:country, include_blank: true) %>
-  </div>
-
-  <div class="field">
-    <%= f.label(:subdivision, "State / Province") %><br />
-    <%= f.subdivision_select(:subdivision, address.country, include_blank: true ) %>
-  </div>
-
-  <div class="field">
-    <%= f.submit %>
-  </div>
-<% end %>

data/spec/test_app/app/views/addresses_demo/index.html.erb

@@ -1,12 +1,30 @@
-<h1>Addresses Demo</h1>
+<h1>Demo</h1>
 
 <% @addresses.each do |address| %>
   <%=
-    render(
-      partial: "form",
-      locals: {
-        address: address,
-      }
-    )
-  %>
+    form_for(
+      address,
+      url: update_address_path(address.id),
+      html: {class: address.title.parameterize}
+    ) do |f| %>
+
+    <div class="field">
+      <%= f.label(:title) %><br />
+      <%= f.text_field(:title) %>
+    </div>
+
+    <div class="field">
+      <%= f.label(:country) %><br />
+      <%= f.country_select(:country, include_blank: true) %>
+    </div>
+
+    <div class="field">
+      <%= f.label(:subdivision, "State / Province") %><br />
+      <%= f.subdivision_select(:subdivision, address.country, include_blank: true ) %>
+    </div>
+
+    <div class="field">
+      <%= f.submit %>
+    </div>
+  <% end %>
 <% end %>

data/spec/test_app/app/views/addresses_demo/tags.html.erb

@@ -0,0 +1,39 @@
+<h1>Demo, using tag helpers</h1>
+
+<% @addresses.each do |address| %>
+  <%= form_tag(update_address_path(address), method: :patch) do %>
+    <div class="field">
+      <%= label_tag(:title) %><br />
+      <%= text_field_tag("address[title]", address.title) %>
+    </div>
+
+    <div class="field">
+      <%= label_tag("address[country]", "Country") %><br />
+      <%=
+        country_select(
+          :address,
+          :country,
+          selected: address.country,
+          include_blank: true
+        )
+      %>
+    </div>
+
+    <div class="field">
+      <%= label_tag("address[subdivision]", "State / Province") %><br />
+      <%=
+        subdivision_select_tag(
+          :address,
+          :subdivision,
+          country: address.country,
+          selected: address.subdivision,
+          include_blank: true
+        )
+      %>
+    </div>
+
+    <div class="field">
+      <%= submit_tag("Update Address") %>
+    </div>
+  <% end %>
+<% end %>

data/spec/test_app/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   patch ":id", to: "addresses_demo#update", as: "update_address"
 
   root "addresses_demo#index"
+  get "tags" => "addresses_demo#tags"
 
   mount SubdivisionSelect::Engine => "/subdivisions"
 end

data/spec/test_app/db/seeds.rb

@@ -1,3 +1,5 @@
+Address.destroy_all
+
 Address.create!(
   title: "Empty"
 )