em-riak 0.2.5 → 0.2.7

data/README.md

@@ -73,6 +73,31 @@ Hybrid is also possible :
       }
     }
 
+#### Some options for your convenient 
+Here provide some options that can do with each seperate request  
+**Format**  
+
+	EmRiak.your_riak_action(key_name,options,values)
+	
+**Example**
+
+	EmRiak.create("member5",{:replication=>{:w=>3,dw=>4,pw=>5}},{:name=>"HandsomeGuy"})
+	
+**Available Options**  
+
+* :bucket=>String
+* :replication=>Hash  
+* :vclock=>String  
+* :sibling=>String
+* :content_type=>String
+* :etag=>String
+* :last_modified=>String
+* :returnbody=>true/false  (alias return_body)
+
+I know there are some more, but I currently need only these on my project.  
+So if you would like more options to deal with data, hack it or let me know.  
+
+
 ### Write some map-reduce
 Use it directly as following : 
 
@@ -83,15 +108,6 @@ Use it directly as following :
     ]})
 
 
-Deployment the some js & erlang source : 
-	
-	rake deploy:source:all
-	# or 
-	rake deploy:source:js
-	# or 
-	rake deploy:source:erl
-
-
 
 ### TO-DO
 Full Text Seacrh  

data/em-riak.gemspec

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

data/lib/em-riak/basic.rb

@@ -7,7 +7,7 @@ require 'httpi'
 require 'yajl'
 
 module EmRiak
-    attr_accessor :bucket, :interface, :adapter, :hosts, :cluster, :async, :http_client, :vector_lock, :replication, :debug
+    attr_accessor :bucket, :interface, :adapter, :hosts, :cluster, :async, :http_client, :vclock, :replication, :debug
     extend self
 
     # A easy interface to create connections
@@ -15,11 +15,12 @@ module EmRiak
         def initialize(*opts)
             if opts && opts.length>0
                 opts=opts.first
-                methods=[:bucket, :interface, :adapter, :hosts, :cluster, :async, :http_client, :vector_lock, :repliaction, :debug]
+                methods=[:bucket, :interface, :adapter, :hosts, :cluster, :async, :http_client, :vclock, :repliaction, :debug]
                 opts.each{|key,opt|  EmRiak.send "#{key}=".to_sym, opt if opt && methods.index(key.to_sym)   }
             else
                 EmRiak.bucket=RIAKBUCKET
             end
+            EmRiak.replication={"W"=>3,"R"=>1} if EmRiak.replication.nil?
             EmRiak.debug=false if EmRiak.debug.nil?
         end
     end
@@ -44,10 +45,17 @@ module EmRiak
     end
     def create(key,*opts,&callback)
         data={:body=>{}}
-        opts.first.each{|key,value| data[:body][key]=value}  if opts && opts.count>0
+        if opts && opts.count>0
+            if opts.count==1
+                body=opts.first
+            else
+                opts,body=opts
+            end
+            body.each{|key,value| data[:body][key]=value} 
+        end
         data,callback=handle_callback(key,"save",opts,callback,data)
-
-        url="/buckets/#{bucket}/keys/#{key_handler(key)}"
+        operate_bucket= select_bucket(data)
+        url="/buckets/#{operate_bucket}/keys/#{key_handler(key)}"
         http("put",key,url,data,callback)
     end
     def find(key,*opts,&callback)
@@ -58,23 +66,29 @@ module EmRiak
             link=data[:head][:link]
             data[:head].reject!{|o| o==:link}
         end
-        
-        url="/buckets/#{bucket}/keys/#{key_handler(key)}#{link}"
+        operate_bucket= select_bucket(data)
+        url="/buckets/#{operate_bucket}/keys/#{key_handler(key)}#{link}"
         http("get",key,url,data,callback)
     end
+
+    def select_bucket(data)
+        return EmRiak.bucket if !data[:opts]
+        return data[:opts][:bucket] ? data[:opts][:bucket] : EmRiak.bucket
+    end
+
     def save(obj,*opts,&callback)
         data={:body=>{}}
         obj.each{|key,value| data[:body][key]=value }
         data,callback=handle_callback(obj[:riak_key],"save",opts,callback,data)
-        
-        url="/buckets/#{bucket}/keys/#{obj[:riak_key]}"
+        operate_bucket= select_bucket(data)
+        url="/buckets/#{operate_bucket}/keys/#{obj[:riak_key]}"
         http("put",obj[:riak_key],url,data,callback)
     end
     def destroy(key,*opts,&callback)
         obj_key=defined?(obj) ? obj[:riak_key] :  (key.class==String ? key : key[:riak_key])
         data,callback=handle_callback(obj_key,"delete",opts,callback)
-
-        url="/buckets/#{bucket}/keys/#{key_handler(obj_key)}"
+        operate_bucket= select_bucket(data)
+        url="/buckets/#{operate_bucket}/keys/#{key_handler(obj_key)}"
         http("put",obj_key,url,data,callback)
         key=nil
     end
@@ -190,7 +204,7 @@ module EmRiak
         end
         return obj
     rescue Exception=>e
-        puts "handle response error reason #{e}"
+        puts "handle response error reason #{e}" if EmRiak.debug
         return nil
     end
 
@@ -251,11 +265,10 @@ module EmRiak
     def handle_callback(key,method,opts,callback,data={})
         option_response=handle_options(method,opts)
         if callback 
-            data[:head], data[:query] = option_response
+            data[:opts], data[:head], data[:query] = option_response
         else 
-            data[:head], data[:query], callback = option_response
+            data[:opts], data[:head], data[:query], callback = option_response
         end
-        
         new_proc=Proc.new{|res|
             obj=handle_response_string_to_object(key,res,method,data)
             callback.call(obj)
@@ -263,7 +276,7 @@ module EmRiak
         
         [data,new_proc]
     end
-    def handle_options(action,opts,header={},query="")
+    def handle_options(action,opts,header={},query="",extra_setting={})
         #Load default header setting
         case action
         when "save"
@@ -275,9 +288,9 @@ module EmRiak
         when "add_link"
             header["Content-Type"]="application/json"
         when "remove_link"
-        # else
-        #   header["Content-Type"]="application/json"
+            header["Content-Type"]="application/json"
         end
+
         # Map & overwrite if header specisfic
         opts=opts.first if opts && opts.class==Array
 
@@ -285,48 +298,59 @@ module EmRiak
             # Map the options class
             callback=opts.reject!{|obj| obj.class==Proc}
 
-            opts.each{|k,v|
-                meta=METAMAPPER[k]  
-                if meta
-                    header[meta[:key]] = meta[:value] 
-                    opts.reject!{true}
+            # Remove some reserved name for options
+            opts.each{|k,v| 
+                if RESERVED_MAPPER.index(k)
+                    extra_setting[k]=v
+                    opts.delete(k)
                 end
             }
 
+            # Replication, available configs : w, dw, pw
+            # read more at http://docs.basho.com/riak/latest/references/apis/http/HTTP-Store-Object/
+
+            if opts[:replication]
+                opts[:replication].each{|key,value| header[key.to_s.upcase]=value.to_s} 
+                opts.delete(:replication)
+            else
+                header.merge(EmRiak.replication) if EmRiak.replication
+            end
+
+            # Handle some name different in here
+            header["x-riak-index-#{opts[:bin].to_s}_bin"]=opts[:secondary_index].join(", ") if opts[:secondary_index] # 2i
+            header["returnbody"]= "true" # returnbody
+            header["X-Riak-Vclock"]=opts[:vclock] if opts[:vclock] # vclock
+
+            # Map rest into header
+            opts.each{|k,v| 
+                meta_map_name=k.to_s.downcase.gsub("-","_").to_sym
+                header[META_MAPPER[meta_map_name][:header_name]] = v if META_MAPPER[meta_map_name]
+            }
+
             # --- Handle the rest headers
             # Link Walk
-            if opts[:links] && (["save"].index(action))
+            case 
+            when opts[:links] && (["save"].index(action))
                 links=[]
                 opts[:links].each{|link| links << %Q[</buckets/#{bucket}/keys/#{link[:target]}>; riaktag="#{link[:tag]}"] }
                 header['Link']= links.join(",")
-            elsif opts[:links] && (["add_link","remove_link"].index(action))
+            when opts[:links] && (["add_link","remove_link"].index(action))
                 links=[]
                 opts[:links].each{|link| links << %Q[</buckets/#{bucket}/keys/#{link[:target]}>; riaktag="#{link[:tag]}"] }
                 header['Link']= links
-            elsif opts[:links] && action=="get"
+            when opts[:links] && action=="get"
                 header["Content-Type"]="multipart/mixed"
                 header["Accept"]="multipart/mixed"
                 header[:link]=""
                 keep=opts[:links][:keep] ? '1' : '0' #keep the result
                 opts[:links][:tag].each{|tag| header[:link]+= "/#{bucket},#{tag},#{keep}" }
             end
-            # 2i
-            header["x-riak-index-#{opts[:bin].to_s}_bin"]=opts[:secondary_index].join(", ") if opts[:secondary_index]
 
-            # Replication, available configs : w, dw, pw
-            # read more at http://docs.basho.com/riak/latest/references/apis/http/HTTP-Store-Object/
-            replication.each{|key,value| hreader[key.to_s]=value} if replication
-
-            header["Content-Type"]=opts[:content_type] if opts[:content_type]
-            header["X-Riak-Vclock"]=opts[:vlock] if opts[:vlock]
-            header["ETag"]=opts[:etag] if opts[:etag]
-            header["Last-Modified"]=opts[:last_modified] if opts[:last_modified]
-            header["returnbody"]= "true" if !async
-            #header["unique"] = true if async=false
             query="?returnbody=true"
+            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
-        res=[header,query]
+        res=[extra_setting,header,query]
         res << callback if callback
         res
     end
@@ -346,7 +370,8 @@ module EmRiak
     end
     def json_decode(obj,times=0)
         y=Yajl::Parser.new()
-        y.parse(obj)
+        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/configurations.rb

@@ -1,4 +1,5 @@
-METAMAPPER={:sibling=>{"Accept"=>"multipart/mixed"}}
+META_MAPPER={:sibling=>{:header_name=>"",:default=>{"Accept"=>"multipart/mixed"}},:content_type=>{:header_name=>"Content-Type",:default=>"application/json"},:vclock=>{:header_name=>"X-Riak-Vclock",:default=>nil},:etag=>{:header_name=>"ETag",:default=>nil},:last_modified=>{:header_name=>"Last-Modified",:default=>nil},:return_body=>{:header_name=>"returnbody",:default=>"true"},:returnbody=>{:header_name=>"returnbody",:default=>"true"}}
+RESERVED_MAPPER=[:bucket]
 SEARCH_SUPPORT=[:secondary_index,:full_text,:map_reduce]
 RETRY_TIMES=3
 EMMAX=2000

data/lib/em-riak/secondary_index.rb

@@ -67,7 +67,6 @@ module EmRiak
             data_self[:head]=data[:head]
             
             url="/buckets/#{EmRiak.bucket}/keys/#{data_self[:riak_key]}"
-            p "remove data #{data}"
             EmRiak.http("post","2i",url,data)
         end
     end

data/lib/em-riak/version.rb

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

data/spec/unit/core.rb

@@ -13,27 +13,54 @@ require 'minitest/autorun'
 
 class TestEmRiakCoreFunctions < MiniTest::Unit::TestCase
     def setup
+        EmRiak::Connection.new({:bucket=>"test-member",:async=>false,:hosts=>TEST_RIAK_HOSTS})
+        @data={:name=>"5",:riak_key=>"member5"}
     end
     
-    def test_hosts_weight
+    def test_hosts_weight # Will be available in next release
+        assert_equal true,true
     end
 
-    def test_consist_get_and_post
+    def test_independent_bucket
+        EmRiak.bucket="test-member"
+        @member=EmRiak.find("member5",{:bucket=>"test-nil"})
+        assert_equal nil,@member
+        EmRiak.bucket="test-nil"
+        @member=EmRiak.find("member5",{:bucket=>"test-member"})
+        assert_equal @data,@member
     end
 
-    def test_vector_clock
-    end
+    def test_replication(results=[],origin={:name=>"MyJobIsToTestReplication",:duty=>"Heavyyyyyyy"})
+        EmRiak.create("member99",{:replication=>{:w=>4}},origin)
+        origin.merge!({:riak_key=>"member99"})
+        sleep(1.5) # Wait for data sync...
+        TEST_RIAK_HOSTS.each{|single_host|
+            EmRiak::Connection.new({:bucket=>"test-member",:async=>false,:hosts=>[single_host]})
+            results << EmRiak.find("member99")
+        }
+        results.each{|data| assert_equal origin,data}
 
-    def test_sibling
+        EmRiak::Connection.new({:bucket=>"test-member",:async=>false,:hosts=>TEST_RIAK_HOSTS})
+        EmRiak.destroy("member99")
     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("[欣欣]+[人帥真好]*(會寫程式)/大神")
     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)
+        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)
+        assert_equal origin,hash
     end
 end
 

data/spec/unit/secondary_index.rb

@@ -24,7 +24,6 @@ class TestSecondaryIndex < MiniTest::Unit::TestCase
     def test_add_secondary_index
         @member.add_tag(:likes,@tags)
         data=EmRiak.search(:secondary_index,{:bin=>:likes},@tags).reject{|ary| ary==[false,false]}
-        p data
         assert_operator 0, :<, data.count
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-riak
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &70203217400120 !ruby/object:Gem::Requirement
+  requirement: &70267780454580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203217400120
+  version_requirements: *70267780454580
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70203217396580 !ruby/object:Gem::Requirement
+  requirement: &70267780454100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203217396580
+  version_requirements: *70267780454100
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &70203217396160 !ruby/object:Gem::Requirement
+  requirement: &70267780447240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203217396160
+  version_requirements: *70267780447240
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70203217395540 !ruby/object:Gem::Requirement
+  requirement: &70267780446740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203217395540
+  version_requirements: *70267780446740
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70203217395000 !ruby/object:Gem::Requirement
+  requirement: &70267780446220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203217395000
+  version_requirements: *70267780446220
 description: An extremely fast and convenient riak client for eventmachine.
 email: von@vonstark.co
 executables: []