juhe_ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efe5f04f612bc16d7e09e65cb6f2fb167a276f4
-  data.tar.gz: 3db3d59dfb27c9f4e02454df623567019b42db1d
+  metadata.gz: 4766f1efea1f0d704f6127b5ef27edc304dd70c4
+  data.tar.gz: 4df1c2a0657538575c8f5bb6a88c0e005043f8ec
 SHA512:
-  metadata.gz: 9ab3b545c5e844313864761184e085ec9308ee388a5f6644e7e10bc57257c70ab3f07d82199fde37fe8fc26b0c693c3a983fcae23cbf4584b1e989daf18f671f
-  data.tar.gz: 0af455ab11fa6bf67829b38a484782496113b883624ac6b403c77158ca6ef57f631e3c728f311f48af5a0c40f4efa2cd37b694bcd47f490287a6ff0a3f8c2d6c
+  metadata.gz: a5133cf400b069475481dd69ee4c57619c42f80337ca2d17f3ecb8d22db1669a79849e3f7bdada954e86f1717d3ddd655ac314bec0a49dcb7ddf83637d8b18db
+  data.tar.gz: 5cd48fc50bd968876b5253c0c4bbea956f6acee4625d8edbde14ef67955d5906a055a5de37189858f0ab9a45ba1417d36c1c4bd1050ff073683f1d7afa4540bc

data/README.md

@@ -22,11 +22,12 @@ $ gem install juhe_ruby
 ## 用法
 
 ### 常用快递查询
-目前支持的快递公司，`%w[顺丰 申通 圆通 韵达 天天 EMS 中通 汇通]`详细的请在[聚合页面](http://www.juhe.cn/docs/api/id/43/aid/103)上查询。api在第一次查询的时候也会调用支持快递公司查询借口。
+目前支持的快递公司，`%w[顺丰 申通 圆通 韵达 天天 EMS 中通 汇通]`详细的请在[聚合页面](http://www.juhe.cn/docs/api/id/43/aid/103)上查看。
+api在第一次查询时也会调用快递公司查询接口。
 
-具体用法为express_app_key一次赋值，多次查询：
+具体用法设置app_key，然后进行查询：
 ```ruby
-Juhe.express_app_key = "d85fa433fb8f30419dc1b3697b035b3d" # 注册时，聚合提供的app_key
+Juhe::Express.app_key = "d85fa433fb8f30419dc1b3697b035b3d" # 注册时，聚合提供的app_key
 Juhe::Express.search("顺丰", "575677355677")
 ```
 或者直接将app_key作为参数:
@@ -85,7 +86,7 @@ Juhe::Express.search("顺丰", "575677355677", app_key: "d85fa433fb8f30419dc1b36
 ```
 程序第一次运行会获取快递公司列表，如果想手动刷新快递公司信息：
 ```ruby
-Juhe.express_app_key = "d85fa433fb8f30419dc1b3697b035b3d"
+Juhe::Express.app_key = "d85fa433fb8f30419dc1b3697b035b3d"
 Juhe::Express.refresh_companies
 # or
 Juhe::Express.refresh_companies(app_key: "d85fa433fb8f30419dc1b3697b035b3d")

data/lib/juhe_ruby/express.rb

@@ -10,7 +10,7 @@ module Juhe
     end
 
     def self.search(company_name, number, options = nil)
-      app_key = (options[:app_key] if options) || Juhe.express_app_key
+      app_key = (options[:app_key] if options) || Juhe::Express.app_key
       url = BASE_URL \
             + "/index?key=" \
             + app_key \
@@ -31,7 +31,7 @@ module Juhe
     end
 
     def self.refresh_companies(options)
-      app_key = (options[:app_key] if options) || Juhe.express_app_key
+      app_key = (options[:app_key] if options) || Juhe::Express.app_key
       result = JSON.parse(open(BASE_URL+"/com?key="+app_key).read)
       raise result["reason"] if result["resultcode"] != "200"
       @companies = result["result"]

data/lib/juhe_ruby/version.rb

@@ -1,3 +1,3 @@
 module JuheRuby
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/juhe_ruby.rb

@@ -3,11 +3,16 @@ require "juhe_ruby/express"
 
 module Juhe
   class << self
+    # Array of module names
     modules = Juhe.constants.map{ |el| Juhe.const_get(el) }.select{ |m| m.instance_of?(Module) }
     modules.each do |mod|
       if mod.to_s =~ /\AJuhe::(.*)/
-        attr_accessor "#{$1.downcase}_app_key".to_sym
-      end
-    end
+        mod.module_eval do
+          class << self
+            attr_accessor :app_key
+          end # class << self
+        end # module_evale
+      end # if
+    end # modules.each
   end
 end

data/test/express/express_test.rb

@@ -2,12 +2,12 @@ require "test_helper"
 
 class Juhe::ExpressTest < Test::Unit::TestCase
   def setup
-    Juhe.express_app_key = "d85fa433fd8f30419dc1b3697b035b3d"
+    Juhe::Express.app_key = "d85fa433fd8f30419dc1b3697b035b3d"
   end
 
   def test_app_key
-    Juhe.express_app_key = "123456"
-    assert_equal(Juhe.express_app_key, "123456")
+    Juhe::Express.app_key = "123456"
+    assert_equal(Juhe::Express.app_key, "123456")
   end
 
   def test_company_of_name
@@ -19,7 +19,7 @@ class Juhe::ExpressTest < Test::Unit::TestCase
   end
 
   def test_search_with_app_key
-    Juhe.express_app_key = ""
+    Juhe::Express.app_key = ""
     result = Juhe::Express.search(
       "顺丰",
       "575677355677",
@@ -30,7 +30,7 @@ class Juhe::ExpressTest < Test::Unit::TestCase
 
   def test_only_the_first_company_query_uses_api
     first_time = Juhe::Express.company_code_of("申通") # => "sto"
-    Juhe::express_app_key = "wrong app key"
+    Juhe::Express.app_key = "wrong app key"
     second_time = Juhe::Express.company_code_of("申通")
     assert_equal(first_time, second_time)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: juhe_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - linuxnerd