rack-weixin 0.0.4.2 → 0.0.4.3

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vender
 
 # YARD artifacts
 .yardoc

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7
+  
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Gemfile

@@ -1,3 +1,4 @@
+source 'https://rubygems.org'
 source 'http://ruby.taobao.org'
 
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 微信公众平台 开放消息接口 Rack Middleware
 ========================================
 
-Latest version: v0.0.4.2, supports subscribe/unsubscribe event
+[![Build Status](https://travis-ci.org/wolfg1969/rack-weixin.png?branch=master)](https://travis-ci.org/wolfg1969/rack-weixin) [![Gem Version](https://badge.fury.io/rb/rack-weixin.png)](http://badge.fury.io/rb/rack-weixin)
 
 * 验证微信请求 with 'weixin/middleware'
 * 解析推送消息 with 'weixin/model'
@@ -32,87 +32,24 @@ configure do
 end
 
 helpers do
-  def text_parse(msg)
-    case msg.Content
-    when '我想听歌'
-      mp3 = Weixin.music(
-        '身骑白马',
-        '徐佳莹首张专辑《LALA创作专辑》的主打歌。这首歌的是由徐佳莹及其老师苏通达共同创作，其最大的特点是改编自台湾的民间剧种歌仔戏。',
-        'http://nj.baidupcs.com/file/9cbb087ece3da309a31e05a7e14003c9?xcode=70d27743259294de1c42dff2d4720c05d4c19cd5e52a44f7&fid=204864837-250528-3177081425&time=1376666534&sign=FDTAXER-DCb740ccc5511e5e8fedcff06b081203-9NqxJyKhTJYx34SlHyPnK7%2B83vY%3D&to=nb&fm=B,B,T&expires=8h&rt=sh&r=756751042&logid=2171432620&sh=1&fn=%E8%BA%AB%E9%AA%91%E7%99%BD%E9%A9%AC.mp3',
-        'http://nj.baidupcs.com/file/9cbb087ece3da309a31e05a7e14003c9?xcode=c59d095c8566efe4d948c3846269e02ed4c19cd5e52a44f7&fid=204864837-250528-3177081425&time=1376666631&sign=FDTAXER-DCb740ccc5511e5e8fedcff06b081203-yAO3TLeuAQ867emfUs0dYKgMtSE%3D&to=nb&fm=B,B,T&expires=8h&rt=sh&r=897038653&logid=4061975287&sh=1&fn=%E8%BA%AB%E9%AA%91%E7%99%BD%E9%A9%AC.mp3'
-      )
-      Weixin.music_msg(msg.ToUserName, msg.FromUserName, mp3)
-    else
-      Weixin.text_msg(msg.ToUserName, msg.FromUserName, '这件商品暂时缺货~~')
-    end
-  end
-
-  def image_parse(msg)
-    item = Weixin.item(
-      '发现一个基于sinatra的web框架padrino',
-      'gem install padrino
-      padrino g project myapp -d datamapper -b
-      cd myapp
-      padrino g admin
-      padrino rake dm:migrate seed
-      padrino start',
-      'http://www.padrinorb.com/images/screens.jpg',
-      'http://www.padrinorb.com/'
-    )
-    Weixin.news_msg(msg.ToUserName, msg.FromUserName, [item])
-  end
-
-  def location_parse(msg)
-    "http://maps.googleapis.com/maps/api/geocode/json?latlng=#{msg.Location_X},#{msg.Location_Y}"
-    Weixin.text_msg(msg.ToUserName, msg.FromUserName, "#{msg.Label} 周围没有妹子~")
-  end
-
-  def link_parse(msg)
-    # Mechanize.new.get(msg.Url) # 爬虫
-    Weixin.text_msg(msg.ToUserName, msg.FromUserName, '这件商品暂时缺货~~')
-  end
-
-  def event_parse(msg)
-    case msg.Event
-    when 'subscribe' # 订阅
-      Weixin.text_msg(msg.ToUserName, msg.FromUserName, '欢迎订阅【数字尾巴】~~')
-    when 'unsubscribe' # 退订
-      # 又少了名用户
-    when 'CLICK' # 点击菜单
-      menu_parse(msg)
-    else
-      Weixin.text_msg(msg.ToUserName, msg.FromUserName, '作为一名程序猿，表示压力山大~~')
-    end
-  end
-
-  def menu_parse(msg)
-    case msg.EventKey
-    when 'profile'
-      # ???
-      Weixin.text_msg(msg.ToUserName, msg.FromUserName, '主人您的个人信息丢失啦~')
-    else
-      Weixin.text_msg(msg.ToUserName, msg.FromUserName, '您想来点什么？')
-    end 
-  end
-
   def msg_router(msg)
     case msg.MsgType
     when 'text'
-      text_parse(msg)
+      # text message handler
     when 'image'
-      image_parse(msg)
+      # image message handler
     when 'location'
-      location_parse(msg)
+      # location message handler
     when 'link'
-      link_parse(msg)
+      # link message handler
     when 'event'
-      event_parse(msg)
+      # event messge handler
     when 'voice'
-      voice_parse(msg)
+      # voice message handler
     when 'video'
-      video_parse(msg)
+      # video message handler
     else
-      Weixin.text_msg(msg.ToUserName, msg.FromUserName, '作为一名程序猿，表示压力山大~~')
+      Weixin.text_msg(msg.ToUserName, msg.FromUserName, '未知消息类型')
     end
   end
 end
@@ -126,6 +63,8 @@ post '/your_app_root' do
 
     message = request.env[Weixin::Middleware::WEIXIN_MSG]
     logger.info "原始数据: #{request.env[Weixin::Middleware::WEIXIN_MSG_RAW]}"
+    
+    # handle the message according to your business logic
     msg_router(message) unless message.nil?
 end
 ```
@@ -145,7 +84,7 @@ end
 	use Weixin::Middleware, 'your api token', '/your_app_root' 
 
 	configure do
-    	set :wx_id, 'your_weixin_account'
+    	  set :wx_id, 'your_weixin_account'
 	end
 
 

data/lib/weixin/menu.rb

@@ -45,7 +45,7 @@ module Weixin
 
     def authenticate
       url = "#{@endpoint}/token"
-      request = Nestful.get url, { grant_type: 'client_credential', appid: @api, secret: @key } rescue nil
+      request = Nestful.get url, { :grant_type => 'client_credential', :appid => @api, :secret => @key } rescue nil
       unless request.nil?
         auth = MultiJson.load(request.body)
         unless auth.has_key?('errcode')
@@ -57,4 +57,4 @@ module Weixin
     end
   end
 
-end
+end

data/lib/weixin/version.rb

@@ -1,3 +1,3 @@
 module Weixin
-  VERSION = "0.0.4.2"
+  VERSION = "0.0.4.3"
 end

data/rack-weixin.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
 
     s.homepage = 'https://github.com/wolfg1969/rack-weixin'
     s.require_paths = %w[lib]
-end
+    s.required_ruby_version = '>= 1.8.6'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-weixin
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -146,6 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -169,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: