shipindo 0.1.1 → 0.2.0

data/lib/shipindo/carriers.rb

@@ -4,6 +4,15 @@ module Shipindo
 
   module ClassMethods
 
+    def find_city(options)
+      options[:carrier] ||= 'jne'
+
+      klass = find_carrier(options[:carrier])
+      city = klass.new.find_city(options[:name])
+
+      options.merge(city) if city
+    end
+
     def find_rates(options)
       # jne is default for 99% Indonesia online shop..
       options[:carrier] ||= 'jne'

data/lib/shipindo/carriers/jne.rb

@@ -17,10 +17,21 @@ module Shipindo::Carrier
       end
     end
 
+    def find_city(name)
+      city = list_city(name).first
+      city unless city[:code] == " null "
+    end
+
     def find_rates(options)
       if options[:origin] && options[:destination]
-        options[:origin_code]      = list_city(options[:origin]).first[:code]
-        options[:destination_code] = list_city(options[:destination]).first[:code]
+
+        unless options[:origin_code]
+          options[:origin_code] = find_city(options[:origin])[:code]
+        end
+
+        unless options[:destination_code]
+          options[:destination_code] = find_city(options[:destination])[:code]
+        end
         # another jne server flunk, response city name is from request parameters,
         # if there isn't any eg. using only code if cities, then it's displayed as empty.
         options[:from] = options[:origin]

data/lib/shipindo/version.rb

@@ -2,8 +2,8 @@ module Shipindo
   module Version
 
     MAJOR = 0
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/test/unit/carriers_test.rb

@@ -25,6 +25,11 @@ class CarriersTest < Test::Unit::TestCase
       assert_equal 330_000,     data[:response][:rates][0][:rate]
     end
 
+    should "find city" do
+      assert_equal("UERHMTAwMDBK", Shipindo.find_city(:name => 'padang')[:code])
+      assert_nil(Shipindo.find_city(:name => 'jogjakarta'))
+    end
+
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - wynst
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +07:00
+date: 2010-07-30 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency