pilgrim 0.1.3 → 0.1.4

data/README.rdoc

@@ -26,7 +26,7 @@ Choose countries, states and cities via Ajax
 
 
 === Controller Methods
-<tt>get_locations</tt> gets the countries, the states of the first selected country, and the cities of the first state inside of 3 collections: @countries, @states, @cities
+<tt>get_locations(country_id = 0, state_id = 0, city_id = 0)</tt> gets the countries, the states of the first selected country, and the cities of the first state inside of 3 collections: @countries, @states, @cities. The parameters are for pre-select the options in the dropdowns.
 ---
 
 

data/app/views/pilgrim/tags/_dropdown_aux.html.erb

@@ -1 +1 @@
-<%= select form_name, name, options_for_select(data.collect{ |c| [c.name, c.id] }, 1), {}, :data => {:kind => kind, :block => block, :formname => form_name, :name => name}, :class => html_class, :id => html_id %>
+<%= select form_name, name, options_for_select(data[:data].collect{ |c| [c.name, c.id] }, data[:selected]), {}, :data => {:kind => kind, :block => block, :formname => form_name, :name => name}, :class => html_class, :id => html_id %>

data/lib/pilgrim/load_methods.rb

@@ -6,7 +6,8 @@ module Pilgrim
 
 	  module InstanceMethods
 	  	def get_countries
-	  		Pilgrim::Country.get_countries
+	  		countries = Pilgrim::Country.get_countries
+	  		return countries
 	  	end
 
 	  	def get_states(country_id)
@@ -19,11 +20,24 @@ module Pilgrim
 	  		state.cities
 	  	end
 	  	
-	    def get_locations
-  			@countries = get_countries
-  			@states = get_states(@countries.first.id)
-  			@cities = get_cities(@states.first.id)
+	    def get_locations(country_id = 0, state_id = 0, city_id = 0)
+  			countries = get_countries
+
+  			country_id = countries.first.id if country_id == 0
+  			@countries = transform_result(countries, country_id)
+  			states = get_states(country_id)
+
+  			state_id = states.first.id if state_id == 0 and !states.empty?
+  			@states = transform_result(states, state_id)
+  			cities = get_cities(state_id)
+
+  			city_id = cities.first.id if city_id == 0 and !cities.empty?
+  			@cities = transform_result(cities, city_id)
 	    end	    
+
+	    def transform_result(data, selected)
+	    	{data: data, selected: selected}
+	    end
 	  end
 
   end

data/lib/pilgrim/version.rb

@@ -1,3 +1,3 @@
 module Pilgrim
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pilgrim
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails