sms_ctrl 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b206d958f801d49703d63ca1792cfc8ee61070a2
-  data.tar.gz: a1f8b2d3b9d783c75ac69d02cb20f14a861165af
+  metadata.gz: 7015a9855c16a7687996793accbe7940b016e327
+  data.tar.gz: 7d6ade045f42129539669634a412e9a73bafe42c
 SHA512:
-  metadata.gz: 7ae3d537666693570917ec8ce336c33ba66941a04cd4170f101192655bb4d6a88217c188a00835d2c770a9c0e425593ed6d936a5c8185b3563979555ad7f6bc7
-  data.tar.gz: 7ff016e1427398088cb8ad42328ba1f4f6698733e454f89fc3f0ed061d6fa8cadd8d1b66b648bb7336c66b111108f14a9e61e7e67e8c139b03bb760d8e43d323
+  metadata.gz: 2af2c912a9ab56c4fb2f4a2770ca9c5c25e3033803ddd64431e38f69117127002c4986639cf15d1d5681280e8954056f7309407f2271d1bbc2c050a194cf3481
+  data.tar.gz: 83fc4a4f7bccf6e4430b66f71ce85f63f32d024f7113f0496c76c8ec14fbe07adc5188dbf51bc89177b0d687dee00bbd2136d121e845a52df3058f82ecf97a40

data/README.md

@@ -24,14 +24,26 @@ Or install it yourself as:
 # confing/initializes/sms_ctrl.rb
 
 # 设置debug模式，所有验证码都是123456，不会走sender
-
 SmsCtrl.debug = true
 
 # 设置cache，需要支持 read(key), write(key, expires_in: 10)
-# SmsCtrl.cache = Rails.cache
-
-# 注册一个控制模块
-
+SmsCtrl.cache = Rails.cache
+
+# 设置默认配置，可以在case配置中覆盖
+SmsCtrl.default_options = {
+  retry_limit: 55,
+  expires_in: 30 * 60,
+  mobile_regexp: /^1[3|4|5|7|8]\d{9}$/,
+  sender: -> (mobile, code, params) { warn "No message sender set for case #{@name}" },
+}
+
+# 设置默认错误，可以在case配置中覆盖
+SmsCtrl.default_errors = {
+  illegal_mobile: '请输入正确的手机号码',
+  retry_limit: '操作太频繁，请稍后再试'
+}
+
+# 注册控制模块
 SmsCtrl.register( "register_user", {
   # retry_limit: 55,
   # expires: 30 * 60,
@@ -49,16 +61,17 @@ SmsCtrl.register( "user_reset_password", {
 })
 
 # 发送验证码
-
-SmsCtrl.send_sms(mobile, code, params)
+SmsCtrl["register_user"].send_sms(mobile, code, params)
+SmsCtrl["user_reset_password"].send_sms(mobile, code, params)
 
 # 检查验证码是否匹配
-
 SmsCtrl["register_user"].check_code "13000000000", '231232'
 SmsCtrl["user_reset_password"].check_code "13000000000", '231232'
 
-# SmsCtrl.set_default("register_user")
-# SmsCtrl.check_code "13000000000", '231232'
+# 设置默认
+SmsCtrl.set_default("register_user")
+SmsCtrl.send_sms(mobile, code, params)
+SmsCtrl.check_code "13000000000", '231232'
 
 ```
 

data/lib/sms_ctrl/case.rb

@@ -1,28 +1,11 @@
 module SmsCtrl
   class Case
     attr_accessor :retry_limit, :expires_in,
-      :mobile_regexp, :sender,
-      :errors
-
-    def default_options
-      {
-        retry_limit: 55,
-        expires_in: 30 * 60,
-        mobile_regexp: /^1[3|4|5|7|8]\d{9}$/,
-        sender: -> (mobile, code, params) { warn "No message sender set for case #{@name}" },
-      }
-    end
-
-    def default_errors
-      {
-        illegal_mobile: '请输入正确的手机号码',
-        retry_limit: '操作太频繁，请稍后再试'
-      }
-    end
+      :mobile_regexp, :sender, :errors
 
     def initialize name, options = {}
       @name = name
-      options = default_options.merge(options)
+      options = SmsCtrl.default_options.merge(options)
 
       self.retry_limit   = options[:retry_limit]
       self.expires_in    = options[:expires_in]
@@ -30,9 +13,9 @@ module SmsCtrl
       self.sender        = options[:sender]
 
       if options[:errors]
-        self.errors = default_errors.merge(options[:errors])
+        self.errors = SmsCtrl.default_errors.merge(options[:errors])
       else
-        self.errors = default_errors
+        self.errors = SmsCtrl.default_errors
       end
     end
 

data/lib/sms_ctrl/version.rb

@@ -1,3 +1,3 @@
 module SmsCtrl
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/sms_ctrl.rb

@@ -6,7 +6,7 @@ module SmsCtrl
   @cases = {}
 
   class << self
-    attr_accessor :debug, :cache
+    attr_accessor :debug, :cache, :default_options, :default_errors
 
     # 非线程安全，只应该用在单线程环境中配置，例如rails加载
     def register name, options
@@ -18,6 +18,22 @@ module SmsCtrl
       @default_case = new_case if @cases.size == 1
     end
 
+    def default_options
+      @default_options ||= {
+        retry_limit: 55,
+        expires_in: 30 * 60,
+        mobile_regexp: /^1[3|4|5|7|8]\d{9}$/,
+        sender: -> (mobile, code, params) { warn "No message sender set for case #{@name}" },
+      }
+    end
+
+    def default_errors
+      @default_errors ||= {
+        illegal_mobile: '请输入正确的手机号码',
+        retry_limit: '操作太频繁，请稍后再试'
+      }
+    end
+
     def clear
       @cases = {}
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sms_ctrl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - david
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler