us_states_select 1.0.0 → 1.2.0

data/README.md

@@ -0,0 +1,47 @@
+us-state-select-plugin
+======================
+
+From http://svn.techno-weenie.net/projects/plugins/us_states/, updated
+to run under rails 2.2.
+
+To select "priority" states that show up at the top of the list, call
+like so:
+
+    <%= us_state_select 'child', 'state', :priority => %w(TX CA) %> 
+
+## Changing Option/Value with :show
+
+The default...
+
+    <%= us_state_select 'child', 'state'%> 
+
+...will yield this:
+
+    <option value="AK">Alaska</option>
+    
+- - -
+
+Or you can change it up...
+
+    <%= us_state_select 'child', 'state', :show => :full %> 
+
+...and get this.
+
+    <option value="Alaska">Alaska</option>
+
+- - -
+
+Options are:
+
+* :full = <option value="Alaska">Alaska</option>
+* :full_abb = <option value="AK">Alaska</option>
+* :abbreviations = <option value="AK">AK</option>
+* :abb_full_abb = <option value="AK">AK - Alaska</option>
+
+You can also pass a proc to show:
+
+    <%= us_state_select 'child', 'state', :show => Proc.new {|state| [state.first, state.first]} %> 
+    
+The array you are iterating over looks like this:
+
+    [["Alaska", "AK"], ["Alabama","AL"], ...]

data/Rakefile

@@ -9,7 +9,12 @@ begin
     s.summary = %Q{US State select Rails plugin}
     s.homepage = "http://github.com/thincloud/us-state-select-plugin"
     s.description = "US State select Rails plugin"
-    s.authors = ["Larry Sprock"]
+    s.authors = ["Rick Olson","Larry Sprock"]
+    
+    s.add_runtime_dependency "rails", '>= 1.2'
+    
+    s.files.exclude 'init.rb'
+    s.files.exclude 'us_states_select.gemspec'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.2.0

data/lib/us_states_select.rb

@@ -1,38 +1,33 @@
 module ActionView
   module Helpers
     module FormOptionsHelper
-      def us_state_options_for_select(selected = nil, us_state_options = {})
+      def us_state_options_for_select(selected = nil, options = {})
         state_options      = ""
-        priority_states    = lambda { |state| us_state_options[:priority].include?(state.last) }
-        us_state_options[:show] = :full if us_state_options[:with_abbreviation]
-        states_label = case us_state_options[:show]
+        priority_states    = lambda { |state| options[:priority].include?(state.last) }
+        options[:show] = :full if options[:with_abbreviation]
+        states_label = case options[:show]
           when :full_abb          then lambda { |state| [state.first, state.last] }
           when :full              then lambda { |state| [state.first, state.first] }
           when :abbreviations     then lambda { |state| [state.last, state.last] }
           when :abb_full_abb      then lambda { |state| ["#{state.last} - #{state.first}", state.last] }
           else                         lambda { |state| state }
         end
+        states_label = options[:show] if options[:show].is_a?(Proc)
 
-        if us_state_options[:include_blank]
-          state_options += "<option value=\"\">--</option>\n"
-        end
-
-        if us_state_options[:priority]
+        if options[:priority]
           state_options += options_for_select(US_STATES.select(&priority_states).collect(&states_label), selected)
-          state_options += "<option value=\"\">--</option>\n"
-        end
-
-        if us_state_options[:priority] && us_state_options[:priority].include?(selected)
-          state_options += options_for_select(US_STATES.reject(&priority_states).collect(&states_label), selected)
-        else
-          state_options += options_for_select(US_STATES.collect(&states_label), selected)
+          state_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+          
+          selected = nil if options[:priority].include?(selected)
         end
 
-        return state_options
+        state_options += options_for_select(US_STATES.collect(&states_label), selected)
+        state_options
       end
 
       def us_state_select(object, method, us_state_options = {}, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_us_state_select_tag(us_state_options, options, html_options)
+        options.merge!(us_state_options)
+        InstanceTag.new(object, method, self, options.delete(:object)).to_us_state_select_tag(options, html_options)
       end
 
       private
@@ -51,21 +46,10 @@ module ActionView
     end
 
     class InstanceTag #:nodoc:
-      # lets the us_states plugin handle Rails 1.1.2 AND trunk
-      def value_with_compat(object=nil)
-        if method(:value_without_compat).arity == 1
-          value_without_compat(object)
-        else
-          value_without_compat
-        end
-      end
-      alias_method :value_without_compat, :value
-      alias_method :value, :value_with_compat
-
-      def to_us_state_select_tag(us_state_options, options, html_options)
+      def to_us_state_select_tag(options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
-        content_tag("select", add_options(us_state_options_for_select(value(object), us_state_options), options, value(object)), html_options)
+        content_tag("select", add_options(us_state_options_for_select(value(object), options), options, value(object)), html_options)
       end
     end
     

metadata

@@ -1,67 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: us_states_select
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
+- Rick Olson
 - Larry Sprock
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-23 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2012-01-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2157464820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157464820
 description: US State select Rails plugin
 email: 
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-files: 
-- README
+extra_rdoc_files:
+- README.md
+files:
+- README.md
 - Rakefile
 - VERSION
-- init.rb
 - lib/us_states_select.rb
-- us_states_select.gemspec
-has_rdoc: true
 homepage: http://github.com/thincloud/us-state-select-plugin
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: US State select Rails plugin
 test_files: []
-

data/README

@@ -1,32 +0,0 @@
-UsStates
-========
-
-From http://svn.techno-weenie.net/projects/plugins/us_states/, updated
-to run under rails 2.2.
-
-To select "priority" states that show up at the top of the list, call
-like so:
-
-<%= us_state_select 'child', 'state', :priority => %w(TX CA) %> 
-
-To select the way states display option and value:
-
-this (default):
-<%= us_state_select 'child', 'state'%> 
-
-will yield this:
-<option value="AK">Alaska</option>
-______
-this:
-<%= us_state_select 'child', 'state', :show => :full %> 
-
-will yield this:
-<option value="Alaska">Alaska</option>
-
-______
-Options are:
-
-:full = <option value="Alaska">Alaska</option>
-:full_abb = <option value="AK">Alaska</option>
-:abbreviations = <option value="AK">AK</option>
-::abb_full_abb = <option value="AK">AK - Alaska</option>

data/init.rb

@@ -1 +0,0 @@
-require 'us_states_select'

data/us_states_select.gemspec

@@ -1,41 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{us_states_select}
-  s.version = "1.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Larry Sprock"]
-  s.date = %q{2010-03-23}
-  s.description = %q{US State select Rails plugin}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "README",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "lib/us_states_select.rb",
-     "us_states_select.gemspec"
-  ]
-  s.homepage = %q{http://github.com/thincloud/us-state-select-plugin}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{US State select Rails plugin}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-