ku6vms_sdk 0.1.6 → 0.1.7

data/Gemfile

@@ -7,4 +7,6 @@ gem 'eventmachine'
 gem 'em-http-request'
 gem 'rspec'
 gem 'mocha'
+gem 'nokogiri'
+gem 'nori'
 gem 'debugger'

data/Gemfile.lock

@@ -26,6 +26,8 @@ GEM
     mocha (0.12.3)
       metaclass (~> 0.0.1)
     multipart_body (0.2.1)
+    nokogiri (1.5.10)
+    nori (2.3.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -44,4 +46,6 @@ DEPENDENCIES
   eventmachine
   mocha
   multipart_body
+  nokogiri
+  nori
   rspec

data/lib/grand_cloud/base.rb

@@ -23,7 +23,7 @@ module GrandCloud
         request_params = {}
         request_params.merge!(options[:timeout]) if options[:timeout]
 
-        params = {:head => {:Accept => options[:header_accept] || 'application/json'}}
+        params = {:head => {:Accept => options[:header_accept] || 'application/xml'}}
         params.merge!(options[:request_params]) if options[:request_params]
         EM::HttpRequest.new(url, request_params).send((options[:method] && options[:method].downcase) || "get", params)
       end

data/lib/grand_cloud/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module GrandCloud
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/grand_cloud/video.rb

@@ -9,7 +9,7 @@ module GrandCloud
       json = common_request do
         Base.send_request({:method => 'get', :uri => "/video/#{id}"})
       end
-      wrap_object(json['video'])
+      wrap_object(json['DetailVideoResponse']['video'])
     rescue Error::ResponseError => e
       GrandCloud.logger.error(e)
       return nil
@@ -29,7 +29,7 @@ module GrandCloud
           :BypassEncoding => pass_encoding
         }
       })
-      creation.callback { block.call(JSON.parse(creation.response)) }
+      creation.callback { block.call(GrandCloud.nori.parse(creation.response)['CreateVideoResponse']) }
 
       creation.errback do 
         GrandCloud.logger.error("Error is: #{creation.error}, requesting error...")
@@ -117,7 +117,7 @@ module GrandCloud
           }
         })
       end
-      json['returnValue']
+      json['ModifyVideoResponse']['return']
     rescue Error::ResponseError => e
       GrandCloud.logger.error(e)
       return false
@@ -130,7 +130,7 @@ module GrandCloud
           :uri => "/videos/#{id}"
         })
       end
-      json['returnValue']
+      json['RemoveVideosResponse']['return']
     rescue Error::ResponseError => e
       GrandCloud.logger.error(e)
       return false
@@ -140,7 +140,7 @@ module GrandCloud
       json = common_request do
         Base.send_request({:method => 'get', :uri => "/videos"})
       end
-      json['videoSet'].map{|v| wrap_object(v) }
+      json['ListVideoResponse']['videoSet']['item'].map{|v| wrap_object(v) }
     rescue Error::ResponseError => e
       GrandCloud.logger.error(e)
       return []
@@ -196,7 +196,7 @@ module GrandCloud
     def get_default_program_id
       programs = get_programs 
       unless programs.empty?
-        result = programs['programSet'].select{|a| a['programName'] == '默认方案'}
+        result = programs['ListProgramsResponse']['programSet'].select{|a| a['programName'] == '默认方案'}
         result.empty? ? nil : result[0]['programId']
       else
         nil
@@ -211,13 +211,15 @@ module GrandCloud
     def callback req, func=nil, additional_attributes=nil
       response = EM::DefaultDeferrable.new
       req.callback do
-        rep = req.response.blank? ? {'code' => req.response_header.status} : JSON.parse(req.response)
-        if rep['errors']
+        rep = req.response.blank? ? {'code' => req.response_header.status} : GrandCloud.nori.parse(req.response)
+        rep = JSON.parse(req.response) if rep.blank?
+        if (rep['Response'] && rep['Response']['errors']) || rep['HR']
           response.fail(rep)
         else
           response.succeed(additional_attributes ? rep.merge!(additional_attributes) : rep)
         end
-        raise Error::ResponseError.new(rep['errors'][0]) if rep['errors']
+        raise Error::ResponseError.new(rep['Response']['errors']['message']) if rep['Response'] && ['Response']['errors']
+        raise Error::ResponseError.new('Ku6vms Internal error ...') if rep['HR']
         func.call(rep) if func
         EM.stop
       end

data/lib/grandcloud.rb

@@ -16,17 +16,22 @@ require 'grand_cloud/authentication'
 require 'grand_cloud/base'
 require 'grand_cloud/video'
 require 'grand_cloud/version'
+require 'nokogiri'
+require 'nori'
 require 'debugger'
 
 module GrandCloud
 
   DEFAULT_HOST_URL = "api.ku6vms.com"
 
-  attr_reader :logger
+  attr_reader :logger, :nori
 
   def self.logger
     @logger || (@logger = Logger.new(STDOUT))
   end
 
+  def self.nori
+    @nori || Nori.new
+  end
 
 end

data/spec/grand_cloud/video_spec.rb

@@ -26,7 +26,6 @@ module GrandCloud
           @video.run do
             @video.pull_by_vms('spec_pull_video', 'http://storage-huadong-1.sdcloud.cn/images.jiaoxuebang.com/MOV_0399.mp4?SNDAAccessKeyId=BH297OBMKFV0T2LO9MC189P2J&Expires=1377147099&Signature=JpbNOKlBc7SD4%2FYKIiPz8HJDHf4%3D'){ |rep|
               puts rep
-              debugger
               rep['code'].should == 202
             }
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ku6vms_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request