weixin_authorize 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6979103c92161f0e5e190e4e2e3050abf5aa4a
-  data.tar.gz: ad4f77bbc0a0745f87762c500a14f23e2fc10778
+  metadata.gz: fa3f0b2aefa861605741941f844ab85f1ac94643
+  data.tar.gz: 5c03d38761626e496e6c4bddea72ad852030d393
 SHA512:
-  metadata.gz: b98d1b3412cadc32b2c62790f0c97a265ebf93120baf611fa40e261f2f477f531c328dc575fe44cda8cecbfeb1197c15d53e608df76c12bf2e8912f7b870749f
-  data.tar.gz: 79ef616a6877b6790aca143d08bf571919e47be2d41581f7aa2535690f2e588d15d07bdd32d2493d3e0dc9d68888be756781c05dc34a4df0aeea503215eb9a31
+  metadata.gz: ac931c8e944a128b00598578d642fd6a7d65ec396fa95cfa6f5b2b79fdd9be79f8604c623a6268d8d85eea01a05489e1dfd0a816f9df7693063ba2aa10f7ee49
+  data.tar.gz: 604d3424ebac5db36b727828a1155645d1354c4857e678891fe2c64f0f84bfe917f10ce07d23df271d5611bc302d4064a4b01278c144e131ea11ee08763c1c92

data/Gemfile

@@ -1,13 +1,12 @@
 source 'https://rubygems.org'
 
-gem "rspec", "~> 3.0.0.beta1"
-gem "redis-namespace", "~> 1.4.1"
-gem "rake", "~> 0.9.6"
-gem 'simplecov', '~> 0.7.1', :require => false
-gem "codeclimate-test-reporter", require: nil
-gem 'coveralls', require: false
-
-group :development do
+group :test, :development do
+  gem "rspec", "~> 3.0.0.beta1"
+  gem "redis-namespace", "~> 1.4.1"
+  gem "rake", "~> 0.9.6"
+  gem 'simplecov', '~> 0.7.1', :require => false
+  gem "codeclimate-test-reporter", require: nil
+  gem 'coveralls', require: false
   # For debugger
   gem "pry-rails", "~> 0.3.2"
 

data/lib/weixin_authorize.rb

@@ -1,5 +1,10 @@
 require "rest-client"
-require "multi_json"
+
+require "carrierwave"
+require "weixin_authorize/carrierwave/weixin_uploader"
+
+require 'yajl/json_gem'
+
 require "weixin_authorize/config"
 require "weixin_authorize/handler"
 require "weixin_authorize/api"
@@ -25,7 +30,7 @@ module WeixinAuthorize
 
     def http_post_without_token(url, payload={}, headers={}, endpoint="plain")
       post_api_url = endpoint_url(endpoint, url)
-      payload = MultiJson.dump(payload) if endpoint == "plain" # to json if invoke "plain"
+      payload = JSON.dump(payload) if endpoint == "plain" # to json if invoke "plain"
       load_json(RestClient.post(post_api_url, payload, :params => headers))
     end
 

data/lib/weixin_authorize/api/media.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
+
 module WeixinAuthorize
   module Api
     module Media
-
       # 上传多媒体文件
       # http请求方式: POST/FORM
       # http://file.api.weixin.qq.com/cgi-bin/media/upload?access_token=ACCESS_TOKEN&type=TYPE
       # 支持传路径或者文件类型
       def upload_media(media, media_type)
-        file = media.is_a?(File) ? media : File.new(media)
+        file = process_file(media)
         upload_media_url = "#{media_base_url}/upload"
         http_post(upload_media_url, {media: file}, {type: media_type}, "file")
       end
@@ -24,9 +24,67 @@ module WeixinAuthorize
 
       private
 
+        def process_file(media)
+          return media if media.is_a?(File) && jpep?(media)
+
+          media_url = media
+          uploader  = WeixinUploader.new
+
+          if http?(media_url) # remote
+            uploader.download!(media_url.to_s)
+          else # local
+            media_file = media.is_a?(File) ? media : File.new(media_url)
+            uploader.cache!(media_file)
+          end
+          file = process_media(uploader)
+          CarrierWave.clean_cached_files! # clear last one day cache
+          file
+        end
+
         def media_base_url
           "/media"
         end
+
+        def process_media(uploader)
+          uploader = covert(uploader)
+          uploader.file.to_file
+        end
+
+        # JUST ONLY FOR JPG IMAGE
+        def covert(uploader)
+          # image process
+          unless (uploader.file.content_type =~ /image/).nil?
+            if !jpep?(uploader.file)
+              require "mini_magick"
+              # covert to jpeg
+              image = MiniMagick::Image.open(uploader.path)
+              image.format("jpg")
+              uploader.cache!(File.open(image.path))
+              image.destroy! # remove /tmp from MinMagick generate
+            end
+          end
+          uploader
+        end
+
+        def http?(uri)
+          return false if !uri.is_a?(String)
+          uri = URI.parse(uri)
+          uri.scheme =~ /^https?$/
+        end
+
+        def jpep?(file)
+          content_type = if file.respond_to?(:content_type)
+              file.content_type
+            else
+              content_type(file.path)
+            end
+          !(content_type =~ /jpeg/).nil?
+        end
+
+        def content_type(media_path)
+          MIME::Types.type_for(media_path).first.content_type
+        end
+
     end
   end
 end

data/lib/weixin_authorize/api/menu.rb

@@ -20,7 +20,7 @@ module WeixinAuthorize
       # 自定义菜单创建接口
       # https://api.weixin.qq.com/cgi-bin/menu/create?access_token=ACCESS_TOKEN
       def create_menu(menu)
-        menu = MultiJson.load(menu) if menu.is_a?(String)
+        menu = JSON.load(menu) if menu.is_a?(String)
         create_menu_url = "#{menu_base_url}/create"
         http_post(create_menu_url, menu)
       end

data/lib/weixin_authorize/carrierwave/weixin_uploader.rb

@@ -0,0 +1,4 @@
+module WeixinAuthorize
+  class WeixinUploader < CarrierWave::Uploader::Base
+  end
+end

data/lib/weixin_authorize/version.rb

@@ -1,3 +1,3 @@
 module WeixinAuthorize
-  VERSION = "1.5.8"
+  VERSION = "1.5.9"
 end

data/spec/api/media_spec.rb

@@ -2,25 +2,71 @@ require "spec_helper"
 
 describe WeixinAuthorize::Api::Media do
 
-  let(:image_path) do
+  let(:image_jpg_path) do
     "#{File.dirname(__FILE__)}/medias/ruby-logo.jpg"
   end
 
-  let(:image_file) do
-    File.new(image_path)
+  let(:image_ico_path) do
+    "#{File.dirname(__FILE__)}/medias/favicon.ico"
   end
 
-  it "can upload a image" do
-    response = $client.upload_media(image_file, "image")
+  let(:image_jpg_file) do
+    File.new(image_jpg_path)
+  end
+
+  let(:image_ico_file) do
+    File.new(image_ico_path)
+  end
+
+  let(:remote_png_path) do
+    "http://l.ruby-china.org/user/large_avatar/273.png"
+  end
+
+  let(:remote_jpg_path) do
+    "http://g.hiphotos.baidu.com/baike/c0%3Dbaike80%2C5%2C5%2C80%2C26/sign=ce55457e4334970a537e187df4a3baad/03087bf40ad162d99455ef4d13dfa9ec8b13632762d0ed14.jpg"
+  end
+
+  it "can upload a jpg File image" do
+    response = $client.upload_media(image_jpg_file, "image")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a ico File image" do
+    response = $client.upload_media(image_ico_file, "image")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a local image" do
+    response = $client.upload_media(image_jpg_path, "image")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a local ico image" do
+    response = $client.upload_media(image_ico_path, "image")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a remote png image" do
+    response = $client.upload_media(remote_png_path, "image")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "can upload a remote jpg image" do
+    response = $client.upload_media(remote_jpg_path, "image")
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)
     expect(response.result.keys).to eq(["type", "media_id", "created_at"])
   end
 
   it "#download_media_url return a String url" do
-    image = $client.upload_media(image_file, "image")
+    image = $client.upload_media(image_ico_path, "image")
     media_id = image.result["media_id"]
-    response = $client.download_media_url(media_id)
-    expect(response.class).to eq(String)
+    image_url = $client.download_media_url(media_id)
+    expect(image_url.class).to eq(String)
   end
 
 end

data/spec/api/menu_spec.rb

@@ -5,7 +5,7 @@ describe WeixinAuthorize::Api::Menu do
 
   it "can create a menu" do
     menu = '{"button":[{"type":"click","name":"今日歌曲","key":"V1001_TODAY_MUSIC"},{"type":"click","name":"歌手简介","key":"V1001_TODAY_SINGER"},{"name":"菜单","sub_button":[{"type":"view","name":"搜索","url":"http://www.soso.com/"},{"type":"view","name":"视频","url":"http://v.qq.com/"},{"type":"click","name":"赞一下我们","key":"V1001_GOOD"}]}]}'
-    response = $client.create_menu(MultiJson.load(menu)) # or Json string
+    response = $client.create_menu(JSON.load(menu)) # or Json string
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)
   end
 

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require "rspec"
 require "weixin_authorize"
-require "multi_json"
+require 'yajl/json_gem'
 require "redis"
 require "redis-namespace"
 
@@ -23,6 +23,8 @@ require 'coveralls'
 require 'simplecov'
 require "codeclimate-test-reporter"
 
+require "pry-rails"
+
 Coveralls.wear!
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[

data/weixin_authorize.gemspec

@@ -19,9 +19,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client", ">= 1.6.7"
-  spec.add_dependency "multi_json", "~> 1.9.0"
   spec.add_dependency "redis", "~> 3.0.7"
 
+  spec.add_dependency "carrierwave", "~> 0.10.0"
+  spec.add_dependency 'mini_magick', '~> 3.7.0'
+
+  # A streaming JSON parsing and encoding library for Ruby (C bindings to yajl)
+  # https://github.com/brianmario/yajl-ruby
+  spec.add_dependency "yajl-ruby", "~> 1.2.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,33 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +134,7 @@ files:
 - lib/weixin_authorize/api/menu.rb
 - lib/weixin_authorize/api/qrcode.rb
 - lib/weixin_authorize/api/user.rb
+- lib/weixin_authorize/carrierwave/weixin_uploader.rb
 - lib/weixin_authorize/client.rb
 - lib/weixin_authorize/config.rb
 - lib/weixin_authorize/handler.rb
@@ -117,6 +146,7 @@ files:
 - spec/api/custom_spec.rb
 - spec/api/groups_spec.rb
 - spec/api/media_spec.rb
+- spec/api/medias/favicon.ico
 - spec/api/medias/ruby-logo.jpg
 - spec/api/menu_spec.rb
 - spec/api/qrcode_spec.rb
@@ -152,6 +182,7 @@ test_files:
 - spec/api/custom_spec.rb
 - spec/api/groups_spec.rb
 - spec/api/media_spec.rb
+- spec/api/medias/favicon.ico
 - spec/api/medias/ruby-logo.jpg
 - spec/api/menu_spec.rb
 - spec/api/qrcode_spec.rb