qiniu-kit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzFjM2I0MDU0MzA2ZjJmZjAwMmY0MTg5ZjY1ZTMzZTQxZWM1ZDY1ZQ==
-  data.tar.gz: !binary |-
-    ZGQwMjYyZmM4OTkyMjkxMzc2ZWE0NzJkZjkyOGI4NGVhODIyYzZhOQ==
+SHA1:
+  metadata.gz: bb6ee3c5786e37bffdd844d03bc775b536003f0d
+  data.tar.gz: 17a1c985d25594d7ccbfd9491973ae608ac1f53d
 SHA512:
-  metadata.gz: !binary |-
-    MDRkYzMyMjBjOGI4MTQ4YThhYWQ0MjY1ODgxMGViNjY5MjFhYmVlMzk0MzU5
-    NTYyYzYxNmRhYTY3MWI1ZTA3Mzc3ZjU5OWRjZjZlODdhMDYyMGYxNTY1YjI5
-    MGEzMzA3MTNhYTliMGViYmRmOWM1OGUyZTk5YzQ4YTFmZjRjNzM=
-  data.tar.gz: !binary |-
-    N2RjNTQ3YTkyY2Y5MGRjNDFlODE4MmQ0NmYxZmZhZmMyZTlmYWEzYmM1ZjM4
-    MDkxZWU5YmM1ZDg2YWEyNWIxMzA1ODY1ZmEzMjZmZTg3MzFhZDQ2YjllMDRi
-    MjVjNzBlODkwZTA3M2U4MmQzMTQ2ZjkyZGU0ZDlmYTZjMTgwNjI=
+  metadata.gz: bec12b8ca01bdc887e3bcbabe263eff0ddcef0592fd6d4c9a0ea8147938b471c8b36c7d2c464130109e16f6517bd14e6d7439e9c78d14e7dc602d74d61b55254
+  data.tar.gz: 2761b75d757fa2313f755fc4583f9cc7b1d5a9f53973ca5c83411f2b756b3e67ef596939e6b0888bb3b75e639fffd8fa86284ee4782d601b7acf5b6d7300860f

data/README.md

@@ -31,15 +31,9 @@ require 'qiniu-kit'
 Qiniu::Kit.decode_json('{"abc":"def"}')
 #=> {"abc" => "def"}
 
-Qiniu::Kit.decode_json('{"abc":"def"}', :symbolize_keys => true)
-#=> {:abc => "def"}
-
 Qiniu::Kit.encode_json({:abc => 'def'})
 # convert Ruby back to JSON
 
-Qiniu::Kit.encode_json({:abc => 'def'}, :pretty => true)
-# encoded in a pretty form (if supported by the coder)
-
 
 Qiniu::Kit.base64_url_encode("bucket:key")
 #=> "YnVja2V0OmtleQ=="

data/lib/qiniu/kit.rb

@@ -1,8 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-require "base64"
-require "multi_json"
-
+require 'base64'
+require 'json'
 
 module Qiniu
   module Kit
@@ -22,14 +21,14 @@ module Qiniu
       base64_url_encode(entry_uri)
     end
 
-    def decode_json(*args)
-      MultiJson.load(*args)
-    rescue MultiJson::LoadError
+    def decode_json(encoded)
+      JSON.parse(encoded)
+    rescue JSON::ParserError
       raise Qiniu::Errors::JSONDecodeError.new("Invalid segment encoding")
     end
 
-    def encode_json(*args)
-      MultiJson.dump(*args)
+    def encode_json(raw)
+      JSON.generate(raw)
     end
 
   end

data/lib/qiniu/kit/version.rb

@@ -2,6 +2,6 @@
 
 module Qiniu
   module Kit
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/qiniu-kit.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "multi_json", "~> 1.8"
+  spec.add_runtime_dependency "json", "~> 1.8"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.1"

data/spec/qiniu/kit_spec.rb

@@ -12,17 +12,18 @@ describe Qiniu::Kit do
 
   context '.decode_json' do
     it 'should works' do
-      Qiniu::Kit.decode_json('{"abc":"def"}').should eq({"abc" => "def"})
-      Qiniu::Kit.decode_json('{"abc":"def"}', :symbolize_keys => true).should eq({:abc => "def"})
+      Qiniu::Kit.decode_json('{"deadline":0,"scope":"my_bucket"}').should eq({"deadline"=>0, "scope"=>"my_bucket"})
     end
   end
 
   context '.encode_json' do
     it 'should works' do
-      Qiniu::Kit.encode_json({:abc => 'def'}).should eq('{"abc":"def"}')
-      if RUBY_VERSION >= "1.9"
-        Qiniu::Kit.encode_json({:abc => 'def'}, :pretty => true).should eq("{\n  \"abc\": \"def\"\n}")
-      end
+      expected_result =[
+        '{"deadline":0,"scope":"my_bucket"}',
+        '{"scope":"my_bucket","deadline":0}'
+      ]
+      result = Qiniu::Kit.encode_json({"deadline"=>0, "scope"=>"my_bucket"})
+      expected_result.include?(result).should be_true
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - why404
@@ -11,59 +11,59 @@ cert_chain: []
 date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 description: Qiniu basic for setup other libraries, also can be used independently.
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -101,12 +101,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []