au_state_select 1.8 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06978561d24ac84d603d937d3139e20d689547362f676b0d56c7e8d25bfd19c
-  data.tar.gz: 34014e26cc1d069f8e59c997a2afb152a53e7eddbec521576ef0a48738d467b8
+  metadata.gz: d97a29dd6a625295a22db99687e10675b9be783d88269caf9ae30246511eaf75
+  data.tar.gz: 8de9401fdc9e66856a9acfde0f795bab2bfadb182162cffa0e9143ee3c492861
 SHA512:
-  metadata.gz: 2c19a5e6bfb5a257cb01a2c0a6a32f2a1a0d08edfd2a83915edbbad9070344525421cfb2e41aaeef99760aef717ea5ff8fe8fa76df15554123a4b56c718ccc0a
-  data.tar.gz: 1cf2de1aa13150ce5e573b320af8914307022e2355423671c373e3236d802027c4022289d30313774ea570e4290ec9808c31890c65595e1aa008f801215d482b
+  metadata.gz: 78e764f6e75ca84f62ba4b8fdd5136a7f500c349ad6e6e82861f45d06cdd01c70e44acfbdbe59ca2981f3ab82c0591572097c3e3a9cb55c1621565fc05b6f292
+  data.tar.gz: 7feea179007bb19f454dc192942597dd4034ca5d842b30a0f9a700522e5a067f4c0e60b1ccc77a8025d260c73d56c1faa7f6c4b35cbc20bc2d57d2a8727cbbac

data/README.md

@@ -1,6 +1,6 @@
 # AuStateSelect
 
-Provides a simple helper to get an HTML select list of Austraila states. Compatable with Rails 3 & 4.
+Provides a simple helper to generate HTML select list of Austraila states. Compatable with Rails 3 & 4.
 
 ## Installation
 

data/lib/au_state_select.rb

@@ -1,17 +1,5 @@
 require "au_state_select/version"
-require "au_state_select/form_helpers"
-require "au_state_select/form_tag_helper"
-require "au_state_select/instance_tag"
-require "au_state_select/form_builder"
-
-ActionView::Base.send(:include, AUStateSelect::FormHelpers)
-ActionView::Base.send(:include, AUStateSelect::FormTagHelper)
-
-if Rails::VERSION::MAJOR >= 4
-  ActionView::Helpers::Tags::Select.send(:include, AUStateSelect::InstanceTag)
-else
-  ActionView::Helpers::InstanceTag.send(:include, AUStateSelect::InstanceTag)
-end
-ActionView::Helpers::FormBuilder.send(:include, AUStateSelect::FormBuilder)
+require "au_state_select/tag_helper"
+require 'au_state_select/au_state_select_helper.rb'
 
 require 'au_state_select/railtie' if defined?(Rails) and defined?(SimpleForm)

data/lib/au_state_select/tag_helper.rb

@@ -0,0 +1,59 @@
+module AUStateSelect
+  module TagHelper
+    def state_option_tags
+      # In Rails 5.2+, `value` accepts no arguments and must also be called
+      # called with parens to avoid the local variable of the same name
+      # https://github.com/rails/rails/pull/29791
+      selected_option = @options.fetch(:selected) do
+        if self.method(:value).arity == 0
+          value()
+        else
+          value(@object)
+        end
+      end
+
+      option_tags_options = {
+        :selected => selected_option,
+        :disabled => @options[:disabled]
+      }
+      option_tags = options_for_select(state_options, option_tags_options)
+    end
+
+    private
+    def locale
+      @options[:locale]
+    end
+
+    def priority_states
+      @options[:priority_states]
+    end
+
+    def priority_countries_divider
+      @options[:priority_countries_divider] || "-"*15
+    end
+
+    def only_country_codes
+      @options[:only]
+    end
+
+    def except_country_codes
+      @options[:except]
+    end
+
+    def format
+      @options[:format] || :default
+    end
+
+    def state_options
+      if @options.key?(:short_name) && @options[:short_name]
+        ['ACT', 'NSW', 'NT', 'QLD', 'SA', 'TAS', 'VIC', 'WA']
+      else
+        [['Australian Capital Territory', 'ACT'],['New South Wales', 'NSW'],['Northern Territory', 'NT'],['Queensland', 'QLD'],['South Australia', 'SA'],['Tasmania', 'TAS'],['Victoria', 'VIC'],['Western Australia', 'WA']]
+      end
+    end
+
+    def html_safe_newline
+      "\n".html_safe
+    end
+  end
+end

data/lib/au_state_select/version.rb

@@ -1,3 +1,3 @@
 module AuStateSelect
-  VERSION = "1.8"
+  VERSION = "2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: au_state_select
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: '2.0'
 platform: ruby
 authors:
 - Ben Zhang
@@ -52,11 +52,9 @@ files:
 - Rakefile
 - au_state_select.gemspec
 - lib/au_state_select.rb
-- lib/au_state_select/form_builder.rb
-- lib/au_state_select/form_helpers.rb
-- lib/au_state_select/form_tag_helper.rb
-- lib/au_state_select/instance_tag.rb
+- lib/au_state_select/au_state_select_helper.rb
 - lib/au_state_select/railtie.rb
+- lib/au_state_select/tag_helper.rb
 - lib/au_state_select/version.rb
 homepage: ''
 licenses:

data/lib/au_state_select/form_helpers.rb

@@ -1,13 +0,0 @@
-module AUStateSelect
-  module FormHelpers
-    def state_select(object_name, method, priority_countries = nil, options = {}, html_options = {})
-      if Rails::VERSION::MAJOR >= 4
-        instance_tag = ActionView::Helpers::Tags::Select.new(object_name, method, self, [], options, html_options)
-        instance_tag.to_state_select_tag(priority_countries, html_options)
-      else
-        instance_tag = ActionView::Helpers::InstanceTag.new(object_name, method, self, options.delete(:object))
-        instance_tag.to_state_select_tag(priority_countries, html_options, options)
-      end
-    end
-  end
-end

data/lib/au_state_select/form_tag_helper.rb

@@ -1,35 +0,0 @@
-module AUStateSelect
-  module FormTagHelper
-    def state_select_tag(name, options = {}, html_options = {})
-
-      states = ""
-
-      if options.present? and (options[:include_blank] or (options[:prompt]))
-        if options[:include_blank].present?
-          option = options[:include_blank] == true ? "" : options[:include_blank]
-        elsif options[:prompt].present?
-          option = options[:prompt] == true ? "Please Select" : options[:prompt]
-        end
-        states += "<option value>#{option}</option>\n"
-      end
-
-      select_options = if options.key?(:short_name) and options[:short_name]
-        ['ACT', 'NSW', 'NT', 'QLD', 'SA', 'TAS', 'VIC', 'WA']
-      else
-        [['Australian Capital Territory', 'ACT'],['New South Wales', 'NSW'],['Northern Territory', 'NT'],['Queensland', 'QLD'],['South Australia', 'SA'],['Tasmania', 'TAS'],['Victoria', 'VIC'],['Western Australia', 'WA']]
-      end
-
-      if options.key?(:value) and options[:value]
-        states = states + options_for_select(select_options, options[:value])
-      else
-        states = states + options_for_select(select_options)
-      end
-
-      html_options = html_options.stringify_keys
-
-      attribute_id = options[:id] || name
-
-      content_tag(:select, states.html_safe, { "name" => name, "id" => sanitize_to_id(attribute_id) }.update(html_options.stringify_keys))
-    end
-  end
-end

data/lib/au_state_select/instance_tag.rb

@@ -1,45 +0,0 @@
-module AUStateSelect
-
-  module InstanceTag
-    def to_state_select_tag(priority_states, html_options = {}, options = {})
-      # Rails 4 stores options sent when creating an InstanceTag.
-      # Let's use them!
-      options = @options if defined?(@options)
-
-      state_select(priority_states, options, html_options)
-    end
-
-    def state_select(priority_states, options, html_options)
-      selected = object.send(@method_name) if object.respond_to?(@method_name)
-
-      states = ""
-
-      if options.present? and (options[:include_blank] or (options[:prompt] and !selected))
-        if options[:include_blank].present?
-          option = options[:include_blank] == true ? "" : options[:include_blank]
-        elsif options[:prompt].present?
-          option = options[:prompt] == true ? "Please Select" : options[:prompt]
-        end
-        states += "<option value>#{option}</option>\n"
-      end
-
-      if priority_states
-        states += options_for_select(priority_states, selected)
-        states += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
-      end
-
-      select_options = if options.key?(:short_name) and options[:short_name]
-        ['ACT', 'NSW', 'NT', 'QLD', 'SA', 'TAS', 'VIC', 'WA']
-      else
-        [['Australian Capital Territory', 'ACT'],['New South Wales', 'NSW'],['Northern Territory', 'NT'],['Queensland', 'QLD'],['South Australia', 'SA'],['Tasmania', 'TAS'],['Victoria', 'VIC'],['Western Australia', 'WA']]
-      end
-      states = states + options_for_select(select_options, selected)
-
-      html_options = html_options.stringify_keys
-      add_default_name_and_id(html_options)
-
-      content_tag(:select, states.html_safe, html_options)
-    end
-  end
-
-end