uncharted 0.0.6 → 0.0.7.beta1

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+0.0.7 (2011-08-31)
+------------------
+
+New Featires:
+
+  - Country select helper
+  - Territory select helper
+
+Other Changes:
+
+  - Refactoring
+  
+0.0.6 (2011-08-31)
+------------------
+
+Project Changes:
+
+  - Test Coverage added
+  - Project Maintenance
+
 0.0.5 (2011-08-31)
 ------------------
 

data/README.md

@@ -20,6 +20,8 @@ Getting Started
 
 By default, Uncharted will define Country and Territory classes.
 
+[API Documentation](http://rubydoc.info/github/cenize/uncharted/master/frames)
+
 ....
 ....
 ....

data/Rakefile

@@ -1,4 +1,5 @@
 require "bundler/gem_tasks"
+require 'rake/clean'
 require 'rake/testtask'
 require 'yard' 
 
@@ -13,6 +14,9 @@ YARD::Rake::YardocTask.new do |t|
   t.options 
 end
 
+CLEAN.include %w(coverage doc pkg tmp .yardoc)
 
 desc "Run tests"
 task :default => :test
+
+

data/lib/uncharted/country.rb

@@ -8,7 +8,7 @@ module Uncharted
       @alpha2 = alpha2
       @alpha3 = alpha3
       @name   = name
-      self.class.countries[alpha2] = self
+      self.class.data[alpha2] = self
     end
 
     def to_s
@@ -19,13 +19,21 @@ module Uncharted
       countries.count
     end
 
-    def self.find(code)
-      countries[code]
+    def self.find(codes)
+      if codes.is_a? Array
+        return codes.collect {|c| data[c]}
+      end
+      data[codes]
     end
 
     def self.countries
-      @countries ||= {}
+      @data.values
     end
+    
+    def self.data
+      @data ||= {}
+    end
+    
 
   end
 

data/lib/uncharted/extensions/rails.rb

@@ -0,0 +1,74 @@
+# CountrySelect
+module ActionView
+  module Helpers
+    module FormOptionsHelper
+
+      # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
+      def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
+        InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
+      end
+
+      # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
+      # have it marked as the selected option tag. You can also supply an array of countries as +priority_countries+, so
+      # that they will be listed above the rest of the (long) list.
+      #
+      # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
+      def country_options_for_select(selected = nil, priority_countries = nil)
+        country_options = ""
+
+        if priority_countries
+          country_options += options_from_collection_for_select(Country.find(priority_countries), :alpha2, :name, selected)
+          country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+          # prevents selected from being included twice in the HTML which causes
+          # some browsers to select the second selected option (not priority)
+          # which makes it harder to select an alternative priority country
+          selected = nil if priority_countries.include?(selected)
+        end
+        country_options + options_from_collection_for_select(Uncharted::Country.countries, :alpha2, :name, selected)
+      end
+      
+      def territory_options_for_select(selected = nil, priority_territories = nil)
+        territory_options = ""
+
+        if priority_territories
+          territory_options += options_from_collection_for_select(Territory.find(priority_territories), :alpha2, :name, selected)
+          territory_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+          # prevents selected from being included twice in the HTML which causes
+          # some browsers to select the second selected option (not priority)
+          # which makes it harder to select an alternative priority country
+          selected = nil if priority_territories.include?(selected)
+        end
+        territory_options + options_from_collection_for_select(Uncharted::Country.territories, :alpha2, :name, selected)
+      end
+      
+    end
+
+    class InstanceTag
+
+      def to_country_select_tag(priority_countries, options, html_options)
+        html_options = html_options.stringify_keys
+        add_default_name_and_id(html_options)
+        value = value(object)
+        content_tag("select", add_options(country_options_for_select(value, priority_countries), options, value), html_options)
+      end
+      
+      def to_territory_select_tag(priority_territories, options, html_options)
+        html_options = html_options.stringify_keys
+        add_default_name_and_id(html_options)
+        value = value(object)
+        content_tag("select", add_options(territory_options_for_select(value, priority_territories), options, value), html_options)
+      end
+    end
+
+    class FormBuilder
+
+      def country_select(method, priority_countries = nil, options = {}, html_options = {})
+        @template.country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)
+      end
+      
+      def territory_select(method, priority_territories = nil, options = {}, html_options = {})
+        @template.territory_select(@object_name, method, priority_territories, options.merge(:object => @object), html_options)
+      end
+    end
+  end
+end

data/lib/uncharted/territory.rb

@@ -5,40 +5,43 @@ module Uncharted
   class Country
 
     def subdivisions
-      @subdivisions ||= {}
+      @subdivisions ||= []
     end
 
     def territories
-      subdivisions[:territory] || []
+      @territories ||= find_by_type(:territory)
     end
 
     def states
-      subdivisions[:state] || []
+      @states ||= find_by_type(:state)
     end
 
     def districts
-      subdivisions[:district] || []
+      @districts ||= find_by_type(:district)
     end
     
     def self.subdivisions
-      Territory.subdivisions
+      Territory.data
+    end
+    
+    def find_by_type(type)
+      subdivisions.select {|t| t.type == type}
     end
 
   end
 
   class Territory
 
-    attr_reader :abbr, :code, :country, :country_code, :name, :division
+    attr_reader :abbr, :code, :country, :country_code, :name, :type
 
-    def initialize(code, division, name)
+    def initialize(code, type, name)
       @code = code
-      @division = division
+      @type = type
       @name = name
       @country_code, @abbr = code.split('-')
       @country = Country.find(@country_code)
-      Territory.subdivisions[code] = self
-      @country.subdivisions[@division] ||= []
-      @country.subdivisions[@division] << self
+      Territory.data[code] = self
+      @country.subdivisions << self if @country
     end
 
     def to_s
@@ -46,11 +49,11 @@ module Uncharted
     end
     
     def self.find(code)
-      subdivisions[code]
+      data[code]
     end
 
-    def self.subdivisions
-      @subdivisions ||= {}
+    def self.data
+      @data ||= {}
     end
 
   end

data/lib/uncharted/version.rb

@@ -1,4 +1,4 @@
 
 module Uncharted
-  VERSION = '0.0.6'
+  VERSION = '0.0.7.beta1'
 end

data/lib/uncharted.rb

@@ -6,7 +6,8 @@ require 'uncharted/territory'
 require 'uncharted/data/countries'
 require 'uncharted/data/br'
 
-require 'uncharted/adapters/mongoid'
+require 'uncharted/extensions/mongoid'
+require 'uncharted/extensions/rails'
 
 Country = Uncharted::Country
 Territory = Uncharted::Territory

data/test/country_test.rb

@@ -15,6 +15,11 @@ class TestCountry < MiniTest::Unit::TestCase
     assert_equal 'BRA',    @br.alpha3
     assert_equal 'Brazil', @br.name
   end
+  
+  def test_country_find
+    @us = Country.find('US')
+    assert_equal [@br, @us], Country.find([@br.alpha2, @us.alpha2])
+  end
 
   def test_to_s
     assert_equal 'BR', @br.to_s
@@ -26,13 +31,15 @@ class TestCountry < MiniTest::Unit::TestCase
   end
 
   def test_territories
-    assert_equal  1, @br.districts.count
+    df = Territory.find('BR-DF')
+    assert_equal [df], @br.districts
     assert_equal 26, @br.states.count
+    assert_equal 27, @br.subdivisions.count
     assert @br.territories.empty?
 
-    assert_equal [:district, :state], @br.subdivisions.keys.sort
     assert_equal 'Paraná', Uncharted::Territory.find('BR-PR').name
     assert_equal 'PR', Uncharted::Territory.find('BR-PR').abbr
+    assert_equal 'PR', Uncharted::Territory.find('BR-PR').to_s
   end
   
   def test_classes
@@ -41,5 +48,9 @@ class TestCountry < MiniTest::Unit::TestCase
     assert_equal Country::Field, Uncharted::Country::Field
     assert_equal Territory::Field, Uncharted::Territory::Field
   end
+  
+  def test_country_collection
+    assert_equal 247, Country.countries.count
+  end
 
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: uncharted
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Gilson Ferraz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2168615860 !ruby/object:Gem::Requirement
+  requirement: &2160168080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168615860
+  version_requirements: *2160168080
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &2168615260 !ruby/object:Gem::Requirement
+  requirement: &2160155840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168615260
+  version_requirements: *2160155840
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2168614640 !ruby/object:Gem::Requirement
+  requirement: &2160143640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168614640
+  version_requirements: *2160143640
 description: Provide ISO 3166 codes and english name for countries and their political
   divisions
 email:
@@ -60,10 +60,11 @@ files:
 - README.md
 - Rakefile
 - lib/uncharted.rb
-- lib/uncharted/adapters/mongoid.rb
 - lib/uncharted/country.rb
 - lib/uncharted/data/br.rb
 - lib/uncharted/data/countries.rb
+- lib/uncharted/extensions/mongoid.rb
+- lib/uncharted/extensions/rails.rb
 - lib/uncharted/territory.rb
 - lib/uncharted/version.rb
 - test/country_test.rb
@@ -86,9 +87,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10