struggle 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02424ee5858b52a0fb130dd9cf972d3482212d08
-  data.tar.gz: 1eddbe2e05520e2d9fe91408f04aa3021f5d5ab8
+  metadata.gz: 1237cd78527e3b10ce004525a8a8728305d19b07
+  data.tar.gz: b139367d384edd9df7f580a32a4fa1ad52cceb64
 SHA512:
-  metadata.gz: 9a174385cfe42e9e2d34ef15f7ff2680ff30d6d6298013af8161e2cbfe90d91483f7a7318062aaf23bddaf99672216b2999cd62bfc422efc86d396292a3772b8
-  data.tar.gz: 512e145db165b6d2c25a0dc35566180132020a4b5e5ba8d275764a3c57c7445c5d734ee88ab3930079c6f4c57e6ce897a8d41999ed4fadab8dd4f75817b44191
+  metadata.gz: 0ddf3c49504e5a54cf453633f37b9cf94e7862870555c41fb61fb5acd83bb5e952f635abf929df9c825febf881f67248c446c33a71d91f96153ce64fb0a1cfb3
+  data.tar.gz: 330c1d554a747fe8fbbf6bb643628533b69935d0fda0481a0efa107bb287c9784c95f8eef437e682e4e57de2a456a01365212a3dc56dd6f54299eb529d579553

data/lib/struggle/code.rb

@@ -1,6 +1,6 @@
 #first gem 'rmagick'
 module Struggle
-  class Code
+  class Code1
     #controller
     #def getcode
     #  code = Code.getcode
@@ -12,7 +12,7 @@ module Struggle
     #Code.getcode(90,40,24)
     #w宽，h高，fontsize字体大小
     #返回json类型
-    def self.getcode(w=90, h=40, fontsize=24)
+    def self.getcode(w=90, h=40, fontsize=24, wave=5.5)
       #创建画布
       img = Magick::Image.new(w, h) {
         self.background_color = 'white'
@@ -21,30 +21,30 @@ module Struggle
       text= Magick::Draw.new
       text.pointsize = fontsize
       text.kerning = -1
-      text.font("font/font.ttf")
-      text.font_weight(900)
+      text.font("/font/ARIALNBI.TTF")
+      text.font_weight(200)
       text.fill('blue')
-      #随机文字
+      # 随机文字
       code=""
       4.times { code << (97 + rand(26)).chr }
-      #设置文字
-      text.text(rand(w/2-5), h/2-5+ rand(h/2), code)
-      #随机直线
-      for i in 1..rand(4)
+      # 设置文字
+      text.text(rand(w/2-5), h/2 + rand(-2..2), code)
+      # 随机直线
+      for i in 1..rand(5)
         text.line(rand(w), rand(h), rand(w), rand(h)) #直线
       end
       text.fill('blue')
-      #燥点
-      # for i in 1..280
-      #   text.point(rand(w), rand(h))
-      # end
+      # 燥点
+      for i in 1..20
+        text.point(rand(w), rand(h))
+      end
       text.draw(img)
       #模糊
       # img = img.sketch(0, 10, 50)
       #扭曲
-      img = img.wave(5.5, 50)
+      img = img.wave(wave, 70)
       #返回图片数据流
       {img: img.to_blob, code: code}
     end
   end
-end
+end

data/lib/struggle/http.rb

@@ -3,7 +3,6 @@ module Struggle
     require 'net/http'
     require 'net/https'
     require 'uri'
-
     attr_reader :uri
     attr_reader :request
 
@@ -14,6 +13,9 @@ module Struggle
       @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
 
+    # get请求，params为携带的参数，header为报文头数据，两个参数都是hash类型，示例
+    # http = Struggle::Http.new("http://xxx.com/xxx")
+    # result = http.post({name: 'lily', age: 18}).body
     def get(params=nil, header=nil)
       @request = Net::HTTP::Get.new(@uri.request_uri, header)
       if !params.blank?
@@ -22,14 +24,18 @@ module Struggle
       @http.request(@request)
     end
 
+    # post请求，params为携带的参数为json类型，header为报文头数据为hash类型，示例：
+    # http = Struggle::Http.new("http://xxx.com/xxx")
+    # data = {name: 'lily', age: 18}
+    # result = http.post(data.to_json, {'Content-Type' => 'application/json'}).body
+    # eval(result)                 => {status: 200, msg: 'success'}
     def post(params=nil, header=nil)
       @request = Net::HTTP::Post.new(@uri.request_uri, header)
       if !params.blank?
-        # @request.set_form_data(params)
-        @request.body = params
+        @request.body = params   #post json must body
       end
       @http.request(@request)
     end
 
   end
-end
+end

data/lib/struggle/sms.rb

@@ -9,17 +9,4 @@ module Struggle
       return response.body=="100"
     end
   end
-  # 云讯科技
-  class SmsYx
-    URL = "http://sandbox.ytx.net"
-    require 'net/https'
-    require 'uri'
-
-    def Sms.send(accountSID, authToken, version, appid, tel, templateId, content)
-      url = "#{URL}/#{version}/sid/#{accountSID}/sms/TemplateSMS.wx"
-      data = {"action":"templateSms","mobile":tel,"appid":appid, "templateId":"#{templateId}","datas": content}
-      response = Http.post(URL, data)
-      return response.body
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - lean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iconv
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: struggle!