qihu360 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75934d4a842a4445106351a4edc180730f4f7a41
-  data.tar.gz: 0de587d05e405d23a6046d67dbfbe443f4a7783d
+  metadata.gz: 353747a5058845779716e79a0b433d655d8bf1cc
+  data.tar.gz: 1c31e5245c86462a1f151c22de9606d37949ef47
 SHA512:
-  metadata.gz: 3b395d6b45abc7a5b133c0ffd3a340f17281f92c22218b16f01825610d4f7b7c04c3c2acd0e88ebc264e5611881a6518890b584b39db69d76ab97f871c99f3b8
-  data.tar.gz: 2c0355500aee76b999069411976d2095a663349d1fcfc790f81a3a4069e4540ba4612c16d6b710f4b8f55b7f82950f77af149e6b37e1e4516afe49af782d30a9
+  metadata.gz: 5f63e1f74749787f18a94e66f391a21e876042350a0b46ef3d57f1efb722882f1fb74448c332671092e28b9f6d548b5b0174136ae715835d538e1a2c1134c6a4
+  data.tar.gz: 133bbc01459a9e07de4e11cd6cd9761733abbe4b7592c1c7ae598777443d3b3347a8bb29433c7625dc0f0cac5223cbf7731fbe74c4ca10a12627482ae77c4d3f

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.rvmrc
 Gemfile.lock
 InstalledFiles
 _yardoc

data/lib/qihu/dianjing/api/base.rb

@@ -7,21 +7,30 @@ module Qihu
         end
 
         def method_missing(name, *args, &block)
+          require 'pp'
+
           if name.match(/_/)
             name = name.to_s.split('_').each_with_index.map{|k, i| (i > 0) ? k.capitalize : k}.join("")
           end
 
           params = {
             :format => 'json'
-          }.merge(args[0])
+          }
+          params = params.merge(args[0]) if args[0].is_a?(Hash)
 
           begin
-            method = name.match(/^get/) ? :get : :post
-            uri_path = uri_path(name)
+            allowed_methods = [:get, :post, :put, :delete]
+            if params.include?(:method)
+              mehtod = params.delete(:method).downcase.to_sym
+              method = :get unless allowed_methods.include?method
+            else
+              method = name.match(/^get/) ? :get : :post
+            end
 
+            uri_path = uri_path(name)
             @client.auth.token.request(method, uri_path, :headers => client_headers, :params => params)
-          rescue OAuth2::Error
-            raise "Invaild API: #{@client.site}/#{uri_path}"
+          rescue OAuth2::Error => e
+            raise "Invaild API: '#{@client.site}/#{uri_path}' with message:\n#{e.message}"
           end
         end
 

data/lib/qihu/version.rb

@@ -1,3 +1,3 @@
 module Qihu
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qihu360
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -131,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Qihu 360.cn OAuth2 & Dianjing API wrapper

data/.rvmrc

@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 2.0.0" > .rvmrc
-environment_id="ruby-2.0.0-p247@test"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.22.1 (master)" # 1.10.1 seems like a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | __rvm_awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  for __hook in "${rvm_path:-$HOME/.rvm}/hooks/after_use"*
-  do
-    if [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" ]]
-    then \. "${__hook}" || true
-    fi
-  done
-  unset __hook
-  if (( ${rvm_use_flag:=1} >= 2 )) # display only when forced
-  then
-    if [[ $- == *i* ]] # check for interactive shells
-    then printf "%b" "Using: \E[32m$GEM_HOME\E[0m
-" # show the user the ruby and gemset they are using in green
-    else printf "%b" "Using: $GEM_HOME
-" # don't use colors in non-interactive shells
-    fi
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS="" \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS="" \grep -vE '^Using|Your bundle is complete'
-# fi