china_region_fu 0.0.4 → 0.0.5

data/lib/china_region_fu/helpers/formtastic.rb

@@ -0,0 +1,16 @@
+require 'china_region_fu/helpers/utilities'
+
+class RegionInput < Formtastic::Inputs::SelectInput
+  include ChinaRegionFu::Utilities
+
+  def collection_from_options
+    return [] unless options.key?(:collection)
+    super
+  end
+
+  def input_html_options
+    the_options = append_region_class(super.dup)
+    the_options = set_html_options(object_name, input_name, the_options, input_options.delete(:sub_region).to_s.sub(/_id\Z/, '').foreign_key) if input_options.key?(:sub_region)
+    the_options
+  end
+end

data/lib/china_region_fu/helpers/helpers.rb

@@ -0,0 +1,70 @@
+require 'china_region_fu/exceptions'
+require 'china_region_fu/helpers/utilities'
+
+module ChinaRegionFu
+  module Helpers
+    include Utilities
+
+    def region_select_tag(names, options = {})
+      append_region_class(options)
+
+      if Array === names
+        output = ActiveSupport::SafeBuffer.new
+        names.each_with_index do |name, index|
+          if klass = to_class(name)
+            choices = index == 0 ? options_from_collection_for_select(klass.select('id, name'), "id", "name") : ''
+            next_name = names.at(index + 1)
+            set_html_options(nil, name, options, next_name)
+
+            output << content_tag(:div, select_tag(name, choices, options.merge(prompt: options.delete("#{name}_prompt".to_sym))), class: "input region #{name.to_s}")
+          else
+            raise InvalidAttributeError
+          end
+        end
+        output << js_for_region_ajax if names.size > 1
+        output
+      else
+        if klass = to_class(names)
+          select_tag(names, options_from_collection_for_select(klass.select('id, name'), "id", "name"), options)
+        else
+          raise InvalidAttributeError
+        end
+      end
+    end
+
+    def region_select(object, methods, options = {}, html_options = {})
+      options.symbolize_keys!
+      html_options.symbolize_keys!
+      append_region_class(html_options)
+
+      if Array === methods
+        output = ActiveSupport::SafeBuffer.new
+        methods.each_with_index do |method, index|
+          if klass = to_class(method)
+            choices = index == 0 ? klass.select('id, name').collect {|p| [ p.name, p.id ] } : []
+            next_method = methods.at(index + 1)
+            set_html_options(object, method, html_options, next_method)
+
+            output << content_tag(:div, select(object, method.to_s, choices, options.merge(prompt: options.delete("#{method}_prompt".to_sym)), html_options = html_options), class: "input region #{method.to_s}")
+          else
+            raise InvalidAttributeError
+          end
+        end
+        output << js_for_region_ajax if methods.size > 1
+        output
+      else
+        if klass = to_class(methods)
+          content_tag(:div, select(object, methods, klass.select('id, name').collect {|p| [ p.name, p.id ] }, options = options, html_options = html_options), class: "input region #{methods.to_s}")
+        else
+          raise InvalidAttributeError
+        end
+      end
+    end
+  end
+
+  module FormBuilder
+    def region_select(methods, options = {}, html_options = {})
+      @template.region_select(@object_name, methods, options = options, html_options = html_options)
+    end
+  end
+end

data/lib/china_region_fu/helpers/simple_form.rb

@@ -0,0 +1,23 @@
+require 'china_region_fu/helpers/utilities'
+
+module ChinaRegionFu
+  module SimpleForm
+    class RegionInput < ::SimpleForm::Inputs::CollectionInput
+      include ChinaRegionFu::Utilities
+
+      def input
+        label_method, value_method = detect_collection_methods
+        append_region_class(input_html_options)
+        set_html_options(object_name, attribute_name, input_html_options, input_options.delete(:sub_region)) if input_options.key?(:sub_region)
+        region_collection = collection
+        region_collection = [] if region_collection == ::SimpleForm::Inputs::CollectionInput.boolean_collection
+        @builder.collection_select(
+          attribute_name, region_collection, value_method, label_method,
+          input_options, input_html_options
+        )
+      end
+    end
+  end
+end
+
+::SimpleForm::FormBuilder.map_type :region, to: ChinaRegionFu::SimpleForm::RegionInput

data/lib/china_region_fu/helpers/utilities.rb

@@ -0,0 +1,54 @@
+module ChinaRegionFu
+  module Utilities
+    def js_for_region_ajax
+      js = <<-JAVASCRIPT
+        <script type="text/javascript">
+          //<![CDATA[
+            $(function(){
+              $('body').on('change', '.region_select', function(event) {
+                var self, $targetDom;
+                self = $(event.currentTarget);
+                $targetDom = $('#' + self.data('region-target'));
+                if ($targetDom.size() > 0) {
+                  $.getJSON('/china_region_fu/fetch_options', {klass: self.data('region-target-kalss'), parent_klass: self.data('region-klass'), parent_id: self.val()}, function(data) {
+                    var options = [];
+                    $('option[value!=""]', $targetDom).remove();
+                    $.each(data, function(index, value) {
+                      options.push("<option value='" + value.id + "'>" + value.name + "</option>");
+                    });
+                    $targetDom.append(options.join(''));
+                  });
+                }
+              });
+            });
+          //]]>
+        </script>
+      JAVASCRIPT
+      js.html_safe
+    end
+
+    def set_html_options(object, method, html_options, next_region)
+      region_klass_name = method.to_s#.sub(/_id\Z/, '')
+      next_region_klass_name = next_region.to_s#.sub(/_id\Z/, '')
+      html_options[:data] ? (html_options[:data][:region_klass] = region_klass_name) : (html_options[:data] = { region_klass: region_klass_name })
+      if next_region
+        region_target = object ? "#{object}_#{next_region.to_s}" : next_region.to_s
+        html_options[:data].merge!(region_target: region_target, region_target_kalss: next_region_klass_name)
+      else
+        html_options[:data].delete(:region_target)
+        html_options[:data].delete(:region_target_kalss)
+      end
+      html_options
+    end
+
+    def to_class(str_name)
+      return nil if str_name.blank?
+      str_name.to_s.sub(/_id\Z/, '').classify.safe_constantize
+    end
+
+    def append_region_class(options)
+      options[:class] ? (options[:class].prepend('region_select ')) : (options[:class] = 'region_select')
+      options
+    end
+  end
+end

data/lib/china_region_fu/version.rb

@@ -1,3 +1,3 @@
 module ChinaRegionFu
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/generators/china_region_fu/install/install_generator.rb

@@ -6,15 +6,16 @@ module ChinaRegionFu
     def copy_migration_file
       migration_template "migration.rb", "db/migrate/create_china_region_tables.rb"
     end
-    
-    def copy_region_config_file
-      copy_file 'regions.yml', 'config/regions.yml'
+
+    desc "Download https://github.com/Xuhao/china_region_data/raw/master/regions.yml to config/regions.yml."
+    def download_region_config_file
+      get 'https://github.com/Xuhao/china_region_data/raw/master/regions.yml', 'config/regions.yml'
     end
-    
+
     def execute_migrate
       rake("db:migrate")
     end
-    
+
     def import_region_to_data
       rake('region:import')
     end

data/lib/generators/china_region_fu/models/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Copy activerecord models to app/models folder
+
+Example:
+    rails generate china_region_fu:models
+
+    This will create:
+        app/models/province.rb
+        app/models/city.rb
+        app/models/district.rb

data/lib/generators/china_region_fu/{mvc/mvc_generator.rb → models/models_generator.rb}

@@ -1,8 +1,8 @@
 module ChinaRegionFu
-  class MvcGenerator < Rails::Generators::NamedBase
+  class ModelsGenerator < Rails::Generators::Base
     source_root File.expand_path('../../../../../app', __FILE__)
 
-    def copy_model_file
+    def copy_model_files
       copy_file "models/province.rb", "app/models/province.rb"
       copy_file "models/city.rb", "app/models/city.rb"
       copy_file "models/district.rb", "app/models/district.rb"

data/lib/tasks/region.rake

@@ -10,7 +10,7 @@ namespace :region do
     load_to_db(regions)
     puts "Regions import done!"
   end
-  
+
   def cleanup_regins
     Province.delete_all
     City.delete_all
@@ -19,13 +19,13 @@ namespace :region do
 
   def load_to_db(regions)
     regions.each do |province_name, province_hash|
-      current_province = Province.create(:name => province_name, :pinyin => province_hash['pinyin'], :pinyin_abbr => province_hash['pinyin_abbr'])
+      current_province = Province.where(name: province_name, pinyin: province_hash['pinyin'], pinyin_abbr: province_hash['pinyin_abbr']).first_or_create!
       cities_hash = province_hash['cities']
       cities_hash.each do |city_name, city_hash|
-        current_city = current_province.cities.create(:name => city_name, :pinyin => city_hash['pinyin'], :pinyin_abbr => city_hash['pinyin_abbr'], :zip_code => city_hash['zip_code'], 'level' => city_hash['level'] || 4)
+        current_city = current_province.cities.where(name: city_name, pinyin: city_hash['pinyin'], pinyin_abbr: city_hash['pinyin_abbr'], zip_code: city_hash['zip_code'], level: city_hash['level'] || 4).first_or_create!
         districts_hash = city_hash['districts']
         districts_hash.each do |district_name, district_hash|
-          current_city.districts.create(:name => district_name, :pinyin => district_hash['pinyin'], :pinyin_abbr => district_hash['pinyin_abbr'])
+          current_city.districts.where(name: district_name, pinyin: district_hash['pinyin'], pinyin_abbr: district_hash['pinyin_abbr']).first_or_create!
         end
       end
     end

data/spec/china_region_fu_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe ChinaRegionFu do
+
+  it 'should have a version number' do
+    ChinaRegionFu::VERSION.should_not be_nil
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'china_region_fu'

metadata

@@ -1,30 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: china_region_fu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Xuhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: China region Ruby on rails interface
@@ -35,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -47,37 +102,44 @@ files:
 - config/routes.rb
 - lib/china_region_fu.rb
 - lib/china_region_fu/engine.rb
-- lib/china_region_fu/helper.rb
+- lib/china_region_fu/exceptions.rb
+- lib/china_region_fu/helpers/formtastic.rb
+- lib/china_region_fu/helpers/helpers.rb
+- lib/china_region_fu/helpers/simple_form.rb
+- lib/china_region_fu/helpers/utilities.rb
 - lib/china_region_fu/version.rb
 - lib/generators/china_region_fu/install/USAGE
 - lib/generators/china_region_fu/install/install_generator.rb
 - lib/generators/china_region_fu/install/templates/migration.rb
-- lib/generators/china_region_fu/install/templates/regions.yml
-- lib/generators/china_region_fu/mvc/USAGE
-- lib/generators/china_region_fu/mvc/mvc_generator.rb
+- lib/generators/china_region_fu/models/USAGE
+- lib/generators/china_region_fu/models/models_generator.rb
 - lib/tasks/region.rake
-homepage: http://rubyfans.com
-licenses: []
+- spec/china_region_fu_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/Xuhao/china_region_fu
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: China region Ruby on rails interface
-test_files: []
+test_files:
+- spec/china_region_fu_spec.rb
+- spec/spec_helper.rb

data/lib/china_region_fu/helper.rb

@@ -1,97 +0,0 @@
-# -*- encoding: utf-8 -*-
-module ChinaRegionFu
-  module Helper
-    
-    module FormHelper
-      def region_select(object, methods, options = {}, html_options = {})
-        output = ''
-        
-        html_options[:class] ? (html_options[:class].prepend('region_select ')) : (html_options[:class] = 'region_select')
-        if Array === methods
-          methods.each_with_index do |method, index|
-            if klass = method.to_s.classify.safe_constantize
-              choices = index == 0 ? klass.all.collect {|p| [ p.name, p.id ] } : []
-              next_method = methods.at(index + 1)
-              
-              set_options(method, options, klass)
-              set_html_options(object, method, html_options, next_method)
-              
-              output << select(object, "#{method.to_s}_id", choices, options = options, html_options = html_options)
-            else
-              raise "Method '#{method}' is not a vaild attribute of #{object}"
-            end
-          end
-        else
-          if klass = methods.to_s.classify.safe_constantize
-            options[:prompt] = region_prompt(klass)
-            output << select(object, methods, klass.all.collect {|p| [ p.name, p.id ] }, options = options, html_options = html_options)
-          else
-            raise "Method '#{method}' is not a vaild attribute of #{object}"
-          end
-        end
-        
-        output << javascript_tag(js_output)
-        output.html_safe
-      end
-    
-    
-      private
-      
-      def set_options(method, options, region_klass)
-        if respond_to?("#{method}_select_prompt")
-          options[:prompt] = __send__("#{method}_select_prompt")
-        else
-          options[:prompt] = region_prompt(region_klass)
-        end
-      end
-      
-      def set_html_options(object, method, html_options, next_region)
-        html_options[:data] ? (html_options[:data][:region_klass] = "#{method.to_s}") : (html_options[:data] = { region_klass: "#{method.to_s}" })
-        if next_region
-          html_options[:data].merge!(region_target: "#{object}_#{next_region.to_s}_id", region_target_kalss: next_region.to_s)
-        else
-          html_options[:data].delete(:region_target)
-          html_options[:data].delete(:region_target_kalss)
-        end
-      end
-        
-      def region_prompt(region_klass)
-        human_name = region_klass.model_name.human
-        "请选择#{human_name}"
-      end
-      
-      def js_output
-        %~
-          $(function(){
-            $('body').on('change', '.region_select', function(event) {
-              var self, targetDom;
-              self = $(event.currentTarget);
-              targetDom = $('#' + self.data('region-target'));
-              if (targetDom.size() > 0) {
-                $.getJSON('/china_region_fu/fetch_options', {klass: self.data('region-target-kalss'), parent_klass: self.data('region-klass'), parent_id: self.val()}, function(data) {
-                  $('option[value!=""]', targetDom).remove();
-                  $.each(data, function(index, value) {
-                    targetDom.append("<option value='" + value.id + "'>" + value.name + "</option>");
-                  });
-                })
-              }
-            });
-          });
-        ~
-      end
-  
-    end
-    
-    
-    module FormBuilder
-      def region_select(methods, options = {}, html_options = {})
-        @template.region_select(@object_name, methods, options = options, html_options = html_options)
-      end
-    end
-    
-  end
-end
-
-
-ActionView::Base.send :include, ChinaRegionFu::Helper::FormHelper
-ActionView::Helpers::FormBuilder.send :include, ChinaRegionFu::Helper::FormBuilder