em-riak 0.2.7 → 0.2.8

data/.gitignore

@@ -2,3 +2,4 @@ em-riak-*
 .gitignore
 OLD_README.md
 lib/example.rb
+lib/em-riak.rb

data/README.md

@@ -81,7 +81,7 @@ Here provide some options that can do with each seperate request
 	
 **Example**
 
-	EmRiak.create("member5",{:replication=>{:w=>3,dw=>4,pw=>5}},{:name=>"HandsomeGuy"})
+	EmRiak.create("member5",{:replication=>{:n_val=>3}},{:name=>"HandsomeGuy"})
 	
 **Available Options**  
 
@@ -107,7 +107,13 @@ Use it directly as following :
         			  {"reduce"=> {"language"=> "erlang", "module"=>"riak_kv_mapreduce", "function"=>"reduce_identity", "keep"=>true} }
     ]})
 
+### Contributing  
 
+* Fork it  
+* Create your feature branch (git checkout -b my-new-feature)  
+* Commit your changes (git commit -am 'Add some feature')  
+* Push to the branch (git push origin my-new-feature)  
+* Create new Pull Request  
 
 ### TO-DO
 Full Text Seacrh  

data/em-riak.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name        = 'em-riak'
-    s.version     = '0.2.7'
-    s.date        = '2012-12-27'
+    s.version     = '0.2.8'
+    s.date        = '2012-12-28'
     s.summary     = "Riak client for eventmachine"
     s.description = "An extremely fast and convenient riak client for eventmachine."
     s.authors     = ["Von"]

data/lib/em-riak/basic.rb

@@ -20,7 +20,7 @@ module EmRiak
             else
                 EmRiak.bucket=RIAKBUCKET
             end
-            EmRiak.replication={"W"=>3,"R"=>1} if EmRiak.replication.nil?
+            EmRiak.replication={"W"=>3,"R"=>1,"n_val"=>3} if EmRiak.replication.nil?
             EmRiak.debug=false if EmRiak.debug.nil?
         end
     end
@@ -89,7 +89,7 @@ module EmRiak
         data,callback=handle_callback(obj_key,"delete",opts,callback)
         operate_bucket= select_bucket(data)
         url="/buckets/#{operate_bucket}/keys/#{key_handler(obj_key)}"
-        http("put",obj_key,url,data,callback)
+        http("delete",obj_key,url,data,callback)
         key=nil
     end
 
@@ -146,20 +146,8 @@ module EmRiak
     def http(method,key,url,data,callback=nil,res=nil)
         (callback || self.async && ["delete","put","post"].index(method) && key!="mapred") ? em_http(method,key,url,data,callback) : open_http(method,key,url,data)
     end
-    def return_body_handler(string,hash_container,handle_type,handle_type_split_mapper={"hash"=>":","string"=>"=","common"=>","})
-        hash_container={} if !hash_container
-        
-        string=string.gsub("{","").gsub("}","") if handle_type!="hash"
-        split_by= hash_container.class==EmRiak::StorageObject ? "&" : ","
-        string.split(split_by).each do |vars|
-            key,value=vars.split(handle_type_split_mapper[handle_type])
-            value=return_body_handler(value,nil,"hash") if value && value.index("{")
-            value=json_decode("{#{value}}") if value && value.index(":") && value.index(",")
-            hash_container[key.to_sym]=value if value
-        end
-        hash_container
-    end
 
+    protected 
     def open_http(method,key,url,data,res={})
         has_http_instance?
         data={:body=>{},:head=>{},:query=>{}} if !data
@@ -172,7 +160,6 @@ module EmRiak
 
         res=HTTPI.request(method.to_sym,http_client)
         res=res.body if res.class==HTTPI::Response
-
         res=handle_response_string_to_object(key,res,method,data)
 
         res=nil if res && res.class!=String && res.count<1
@@ -180,34 +167,6 @@ module EmRiak
         return res
     end
 
-    def handle_response_string_to_object(key,res,method,data)
-        raise "response can't be nil" if !res
-
-        return res if key=="mapred"
-        return nil if ["2i"].index(key)
-
-        raise "data not found" if ["not found\n"].index(res)
-        raise "method is not match" if !["get","put","post"].index(method)
-        raise "data is empty" if method=="get" && res.gsub(" ","").length<1
-
-        obj=EmRiak::StorageObject.new()
-
-        if res && res!="not found\n" && 
-            if res.class==String
-                obj=return_body_handler(URI.unescape(res.force_encoding("UTF-8")).gsub("+"," ").gsub("=>",":"),obj,"string")
-            elsif res.class==Hash
-                res.each{|varkey,value| obj[varkey.to_sym]=value }
-            end
-
-            data.each{|k,v| obj[k]=v } if res.length<1
-            obj[:riak_key]=key if obj.length>0
-        end
-        return obj
-    rescue Exception=>e
-        puts "handle response error reason #{e}" if EmRiak.debug
-        return nil
-    end
-
     def em_http(method,key,url,data,async_callback)
         data[:retry]=0 if !data[:retry]
         begin
@@ -262,6 +221,46 @@ module EmRiak
         res
     end
 
+    def handle_response_string_to_object(key,res,method,data)
+        raise "response can't be nil" if !res
+        return res if key=="mapred"
+        return nil if ["2i"].index(key)
+
+        raise "data not found" if ["not found\n"].index(res)
+        raise "method is not match" if !["get","put","post"].index(method)
+        raise "data is empty" if method=="get" && res.gsub(" ","").length<1
+
+        obj=EmRiak::StorageObject.new()
+
+        if res && res!="not found\n" && 
+            if res.class==String
+                obj=return_body_handler(URI.unescape(res.force_encoding("UTF-8")).gsub("+"," ").gsub("=>",":"),obj,"string")
+            elsif res.class==Hash
+                res.each{|varkey,value| obj[varkey.to_sym]=value }
+            end
+
+            data.each{|k,v| obj[k]=v } if res.length<1
+            obj[:riak_key]=key if obj.length>0
+        end
+        return obj
+    rescue Exception=>e
+        puts "handle response error reason #{e}" if EmRiak.debug
+        return nil
+    end
+
+    def return_body_handler(string,hash_container,origin_data_type,origin_data_type_split_mapper={"hash"=>":","string"=>"=","common"=>","})
+        hash_container={} if !hash_container
+        string=string.gsub("{","").gsub("}","") if origin_data_type!="hash"
+        split_by= hash_container.class==EmRiak::StorageObject ? "&" : ","
+        string.split(split_by).each do |vars|
+            key,value=vars.split(origin_data_type_split_mapper[origin_data_type])
+            value=return_body_handler(value,nil,"hash") if value && value.index("{")
+            value=json_decode("{#{value}}") if value && value.index(":") && value.index(",")
+            hash_container[key.to_sym]=value if value
+        end
+        hash_container
+    end
+
     def handle_callback(key,method,opts,callback,data={})
         option_response=handle_options(method,opts)
         if callback 
@@ -279,11 +278,11 @@ module EmRiak
     def handle_options(action,opts,header={},query="",extra_setting={})
         #Load default header setting
         case action
-        when "save"
+        when "save","add"
             header["Content-Type"]="application/json"
         when "get"
             header["Content-Type"]="application/json"
-        when "destroy","delete"
+        when "destroy","delete","remove"
             header["Content-Type"]="application/json"
         when "add_link"
             header["Content-Type"]="application/json"
@@ -350,6 +349,7 @@ module EmRiak
             opts[:replication].each{|k,v| query+="&#{k}={v}" } if opts[:replication] && action=="get"
             opts[:query].each{|k,v| query+="&#{k}={v}" } if opts[:query]
         end
+        header=convert_params_layers(header,:to_s)
         res=[extra_setting,header,query]
         res << callback if callback
         res
@@ -371,7 +371,6 @@ module EmRiak
     def json_decode(obj,times=0)
         y=Yajl::Parser.new()
         data=y.parse(obj)
-        convert_params_layers(data,:to_sym)
     rescue Exception => e
         puts "json_decode error : #{e}" if EmRiak.debug
         obj

data/lib/em-riak/grapher.rb

@@ -5,11 +5,11 @@ module EmRiak
         class LinkWalk
             def add_link(key,*opts)
                 data={}
-                data[:head], data[:query] = EmRiak.handle_options("add_link",opts)
+                data[:head], data[:query] = EmRiak.send :handle_options, "add_link",opts
                 data[:query]= data[:query] && data[:query].length>0 ? data[:query]+"&returnbody=true" : "?returnbody=true"
                 
                 url="/buckets/#{EmRiak.bucket}/keys/#{key}"
-                        
+
                 response=open("#{RIAKHOST[rand(RIAKHOST.count)]}/buckets/#{EmRiak.bucket}/keys/#{key}?returnbody=true")
                 body,links = rehandle_link_and_params(response)
                 
@@ -22,7 +22,7 @@ module EmRiak
 
             def remove_link(key,*opts)
                 data={}
-                data[:head], data[:query] = EmRiak.handle_options("add_link",opts)
+                data[:head], data[:query] = EmRiak.send :handle_options, "add_link",opts
                 data[:query]= data[:query] && data[:query].length>0 ? data[:query]+"&returnbody=true" : "?returnbody=true"
                 
                 url="/buckets/#{EmRiak.bucket}/keys/#{key}"

data/lib/em-riak/map_reduce.rb

@@ -26,7 +26,7 @@ module EmRiak
                 submit_work=eval(submit_work)
             end
             url="/mapred"
-            map_reduce_json=EmRiak.json_encode(submit_work)
+            map_reduce_json=EmRiak.send :json_encode ,submit_work
             data={:head=>{"Content-Type"=>"application/json"},:body=>map_reduce_json}
             
             callback_proc=Proc.new{|results|  callback.call(callback_handler(results,result_handler))  } if callback
@@ -40,9 +40,12 @@ module EmRiak
         def callback_handler(res,result_handler)
             if res.class==String
                 res=EscapeUtils.unescape_url(res.encode('UTF-8').gsub("(","\(").gsub(")","\)").gsub("+","").gsub("=>",":").gsub("\"{","{").gsub("}\"","}").gsub("%20"," ").gsub("%22","@!quote!@")).gsub("@!quote!@","\\\"")
-                res=EmRiak.json_decode(res)
+                res=EmRiak.send :json_decode ,res
+                res=eval(res) if res.class==String
+            end
+            if res.class==Hash
+                res=EmRiak.send :convert_params_layers, res,:to_sym
             end
-            res=EmRiak.convert_params_layers(res,:to_sym) if res.class==Hash
             res=result_handler.call(res,{}) if result_handler 
             res
         end

data/lib/em-riak/secondary_index.rb

@@ -18,6 +18,7 @@ module EmRiak
 
         def handle_data_and_options(data_self,args)
             data={:head=>data_self[:head],:body=>data_self,:query=>{}}
+            data[:head]={"Content-Type"=>"application/json"} if !data[:head]
             data[:body].delete(:head)
             args=args[0] if args[0].class==Array
             opts={:bin=>args[0]}
@@ -27,6 +28,7 @@ module EmRiak
                                     else 
                                         args[1..args.count]
                                     end
+            opts[:secondary_index]=opts[:secondary_index].first if opts[:secondary_index].count==1 && opts.first.class==Array
             [data, opts]
         end
         def merge_tag(new_heads,old_heads,res={})
@@ -38,10 +40,10 @@ module EmRiak
         end
 
         def add_as_index(data_self,data,opts)
-            temp_head, data[:query] = EmRiak.handle_options("post",opts)
+            extra_setting, temp_head, data[:query] = EmRiak.send :handle_options, "post",opts
             data[:head]=merge_tag(temp_head,data[:head])
             data_self[:head]=data[:head]
-
+            
             url="/buckets/#{EmRiak.bucket}/keys/#{data_self[:riak_key]}"
             EmRiak.http("post","2i",url,data)
         end
@@ -62,7 +64,7 @@ module EmRiak
             old_heads
         end
         def remove_as_index(data_self,data,opts)
-            temp_head, data[:query] = EmRiak.handle_options("post",opts)
+            extra_setting, temp_head, data[:query] = EmRiak.send :handle_options ,"post",opts
             data[:head]=destroy_tag(temp_head,data[:head])
             data_self[:head]=data[:head]
             

data/lib/em-riak/utils.rb

@@ -2,13 +2,14 @@ module EmRiak
     module Util
         extend self
         def clean_bucket(bucket_name)
-            keys=EmRiak::MapReduce.submit(:clean_bucket,{"bucket"=>bucket_name})
+            keys=EmRiak::MapReduce.submit([:clean_bucket,{"bucket"=>bucket_name}])
             if keys
                 if !(keys.class==Hash && keys[:error]) 
                     keys=keys[0] if keys.class==Array && keys.count==1
                     keys.each{|key| 
-                        key=key[0].gsub("\\","\/")
+                        key=key[0].to_s.gsub("\\","\/")
                         EmRiak.destroy(URI.escape(key[0]).to_s)
+                        EmRiak.destroy(URI.escape(":#{key[0]}").to_s)
                     }
                     puts "clean done" 
                 else 

data/lib/em-riak/version.rb

@@ -1,3 +1,3 @@
 module EmRiak
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
 end

data/spec/unit/basic.rb

@@ -10,7 +10,6 @@ require File.expand_path('../../../lib/em-riak', __FILE__)
 gem 'minitest'
 require 'minitest/autorun'
 
-
 class TestDirectCRUD < MiniTest::Unit::TestCase
     def setup
         EmRiak::Connection.new({:bucket=>"test-member",:async=>false,:hosts=>TEST_RIAK_HOSTS})
@@ -70,8 +69,8 @@ class TestAsyncCRUD < MiniTest::Unit::TestCase
 
     def test_async_destroy
         EM.run do 
-            EmRiak.destroy("member5",@data){|member|
-                assert_equal nil,member 
+            EmRiak.destroy("member5"){|member|
+                assert_equal nil,member
                 member=EmRiak.find("member5")
                 assert_equal nil,member
                 EM.stop

data/spec/unit/core.rb

@@ -25,6 +25,8 @@ class TestEmRiakCoreFunctions < MiniTest::Unit::TestCase
         EmRiak.bucket="test-member"
         @member=EmRiak.find("member5",{:bucket=>"test-nil"})
         assert_equal nil,@member
+
+        @member=EmRiak.create("member5",@data)
         EmRiak.bucket="test-nil"
         @member=EmRiak.find("member5",{:bucket=>"test-member"})
         assert_equal @data,@member
@@ -45,23 +47,33 @@ class TestEmRiakCoreFunctions < MiniTest::Unit::TestCase
     end
 
     def test_key_handler
-        assert_equal "%E5%A4%A9%E5%A4%A9%E5%AF%AB%E7%A8%8B%E5%BC%8F%E6%9C%83%E8%AE%8A%E5%A4%A7%E7%A5%9E",EmRiak.key_handler("天天寫程式會變大神")
-        assert_equal "%5B%E6%AC%A3%E6%AC%A3%5D%2B%5B%E4%BA%BA%E5%B8%A5%E7%9C%9F%E5%A5%BD%5D%2A%28%E6%9C%83%E5%AF%AB%E7%A8%8B%E5%BC%8F%29%2F%E5%A4%A7%E7%A5%9E",EmRiak.key_handler("[欣欣]+[人帥真好]*(會寫程式)/大神")
+        data=EmRiak.send :key_handler, "天天寫程式會變大神"
+        assert_equal "%E5%A4%A9%E5%A4%A9%E5%AF%AB%E7%A8%8B%E5%BC%8F%E6%9C%83%E8%AE%8A%E5%A4%A7%E7%A5%9E",data
+        data=EmRiak.send :key_handler, "[欣欣]+[人帥真好]*(會寫程式)/大神"
+        assert_equal "%5B%E6%AC%A3%E6%AC%A3%5D%2B%5B%E4%BA%BA%E5%B8%A5%E7%9C%9F%E5%A5%BD%5D%2A%28%E6%9C%83%E5%AF%AB%E7%A8%8B%E5%BC%8F%29%2F%E5%A4%A7%E7%A5%9E",data
     end
 
     def test_convert_params_layers
         origin={:name=>"Von",:likes=>["ruby","text"]}
-        string_collect=EmRiak.convert_params_layers(origin,:to_s)
-        symbol_collect=EmRiak.convert_params_layers(string_collect,:to_sym)
+        string_collect=EmRiak.send :convert_params_layers, origin,:to_s
+        symbol_collect=EmRiak.send :convert_params_layers, string_collect,:to_sym
         assert_equal origin,symbol_collect
     end
 
     def test_json_coder
         origin={:name=>"Von",:gender=>"male"}
-        json=EmRiak.json_encode(origin)
-        hash=EmRiak.json_decode(json)
+        json=EmRiak.send :json_encode, origin
+        hash=EmRiak.send :json_decode, json
+        hash=EmRiak.send :convert_params_layers ,hash,:to_sym
         assert_equal origin,hash
     end
+
+    def test_return_body_handler
+        origin="name=5&riak_key=member5&head={\"x-riak-index-likes_bin\":\"cool, ruby, social, 天天開心, 寫程式好Happy\", \"returnbody\":\"true\"}"
+        data=EmRiak.send :return_body_handler, origin, EmRiak::StorageObject.new(),"string"
+        should_be_data={:name=>"5",:riak_key=>"member5",:head=>{"x-riak-index-likes_bin"=>"cool, ruby, social, 天天開心, 寫程式好Happy","returnbody"=>"true"}}
+        assert_equal should_be_data,data
+    end
 end
 
 class TestEmRiakStorageObjcetFunctionality < MiniTest::Unit::TestCase

data/spec/unit/map_reduce.rb

@@ -5,7 +5,7 @@ require 'em-http-request'
 require 'httpi'
 require 'yajl'
 require 'em-riak'
-TEST_RIAK_HOSTS=["http://127.0.0.1:8091","http://127.0.0.1:8092","http://127.0.0.1:8093","http://127.0.0.1:8094"]
+TEST_RIAK_HOSTS=["http://127.0.0.1:8091"]
 require File.expand_path('../../../lib/em-riak', __FILE__)
 gem 'minitest'
 require 'minitest/autorun'
@@ -18,6 +18,8 @@ class TestMapReduce < MiniTest::Unit::TestCase
                             {"reduce"=> {"language"=> "erlang", "module"=>"riak_kv_mapreduce", "function"=>"reduce_set_union", "keep"=>true} }
                             ]
                 }
+        @member=EmRiak.create("member8",{:name=>"Tester"})
+        @member.add_tag(:likes,["cool","ruby","social","天天開心","寫程式好Happy"])
     end
 
     def test_sumbit_map_reduce

data/spec/unit/secondary_index.rb

@@ -5,7 +5,7 @@ require 'em-http-request'
 require 'httpi'
 require 'yajl'
 require 'em-riak'
-TEST_RIAK_HOSTS=["http://127.0.0.1:8091","http://127.0.0.1:8092","http://127.0.0.1:8093","http://127.0.0.1:8094"]
+TEST_RIAK_HOSTS=["http://127.0.0.1:8091"]
 require File.expand_path('../../../lib/em-riak', __FILE__)
 gem 'minitest'
 require 'minitest/autorun'
@@ -23,12 +23,14 @@ class TestSecondaryIndex < MiniTest::Unit::TestCase
 
     def test_add_secondary_index
         @member.add_tag(:likes,@tags)
+        @member=EmRiak.find("member5")
         data=EmRiak.search(:secondary_index,{:bin=>:likes},@tags).reject{|ary| ary==[false,false]}
         assert_operator 0, :<, data.count
     end
 
     def test_show_secondary_index
         @member.add_tag(:likes,@tags)
+        @member=EmRiak.find("member5")
         data=EmRiak.search(:secondary_index,{:bin=>:likes},@tags).reject{|ary| ary==[false,false]}
         assert_operator 0, :<, data.count 
 
@@ -38,8 +40,12 @@ class TestSecondaryIndex < MiniTest::Unit::TestCase
     end
 
     def test_remove_secondary_index
+        @member=EmRiak.find("member5")
         @member.remove_tag(:likes,@tags)
+        @member=EmRiak.find("member8")
+        @member.remove_tag(:likes,@tags)
+
         data=EmRiak.search(:secondary_index,{:bin=>:likes},@tags).reject{|ary| ary==[false,false]}
-        assert_operator 1, :>, data.count 
+        assert_operator 1, :>, data.count
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-riak
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000Z
+date: 2012-12-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &70267780454580 !ruby/object:Gem::Requirement
+  requirement: &70274801323780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267780454580
+  version_requirements: *70274801323780
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70267780454100 !ruby/object:Gem::Requirement
+  requirement: &70274801322140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267780454100
+  version_requirements: *70274801322140
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &70267780447240 !ruby/object:Gem::Requirement
+  requirement: &70274801321400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267780447240
+  version_requirements: *70274801321400
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70267780446740 !ruby/object:Gem::Requirement
+  requirement: &70274801320120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267780446740
+  version_requirements: *70274801320120
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70267780446220 !ruby/object:Gem::Requirement
+  requirement: &70274801319460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70267780446220
+  version_requirements: *70274801319460
 description: An extremely fast and convenient riak client for eventmachine.
 email: von@vonstark.co
 executables: []