Merge pull request #33 from 5apps/square_bracket_fix
Use patched riak-ruby-client (closes #32)
This commit is contained in:
		
						commit
						af270bc27c
					
				
							
								
								
									
										2
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Gemfile
									
									
									
									
									
								
							@ -3,7 +3,7 @@ source "http://rubygems.org"
 | 
				
			|||||||
gem "sinatra"
 | 
					gem "sinatra"
 | 
				
			||||||
gem "sinatra-contrib"
 | 
					gem "sinatra-contrib"
 | 
				
			||||||
gem "activesupport"
 | 
					gem "activesupport"
 | 
				
			||||||
gem "riak-client"
 | 
					gem "riak-client", :github => "5apps/riak-ruby-client", :branch => "invalid_uri_error"
 | 
				
			||||||
gem "fog"
 | 
					gem "fog"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
group :test do
 | 
					group :test do
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										20
									
								
								Gemfile.lock
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								Gemfile.lock
									
									
									
									
									
								
							@ -1,3 +1,15 @@
 | 
				
			|||||||
 | 
					GIT
 | 
				
			||||||
 | 
					  remote: git://github.com/5apps/riak-ruby-client.git
 | 
				
			||||||
 | 
					  revision: 5f21df86b14339aeb252374851d29ad813cca1dd
 | 
				
			||||||
 | 
					  branch: invalid_uri_error
 | 
				
			||||||
 | 
					  specs:
 | 
				
			||||||
 | 
					    riak-client (1.4.0)
 | 
				
			||||||
 | 
					      beefcake (~> 0.3.7)
 | 
				
			||||||
 | 
					      builder (>= 2.1.2)
 | 
				
			||||||
 | 
					      i18n (>= 0.4.0)
 | 
				
			||||||
 | 
					      innertube (~> 1.0.2)
 | 
				
			||||||
 | 
					      multi_json (~> 1.0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GEM
 | 
					GEM
 | 
				
			||||||
  remote: http://rubygems.org/
 | 
					  remote: http://rubygems.org/
 | 
				
			||||||
  specs:
 | 
					  specs:
 | 
				
			||||||
@ -47,12 +59,6 @@ GEM
 | 
				
			|||||||
      unicorn (~> 4.1)
 | 
					      unicorn (~> 4.1)
 | 
				
			||||||
    raindrops (0.10.0)
 | 
					    raindrops (0.10.0)
 | 
				
			||||||
    rake (0.9.2.2)
 | 
					    rake (0.9.2.2)
 | 
				
			||||||
    riak-client (1.4.1)
 | 
					 | 
				
			||||||
      beefcake (~> 0.3.7)
 | 
					 | 
				
			||||||
      builder (>= 2.1.2)
 | 
					 | 
				
			||||||
      i18n (>= 0.4.0)
 | 
					 | 
				
			||||||
      innertube (~> 1.0.2)
 | 
					 | 
				
			||||||
      multi_json (~> 1.0)
 | 
					 | 
				
			||||||
    ruby-hmac (0.4.0)
 | 
					    ruby-hmac (0.4.0)
 | 
				
			||||||
    sinatra (1.4.3)
 | 
					    sinatra (1.4.3)
 | 
				
			||||||
      rack (~> 1.4)
 | 
					      rack (~> 1.4)
 | 
				
			||||||
@ -81,6 +87,6 @@ DEPENDENCIES
 | 
				
			|||||||
  purdytest
 | 
					  purdytest
 | 
				
			||||||
  rainbows
 | 
					  rainbows
 | 
				
			||||||
  rake
 | 
					  rake
 | 
				
			||||||
  riak-client
 | 
					  riak-client!
 | 
				
			||||||
  sinatra
 | 
					  sinatra
 | 
				
			||||||
  sinatra-contrib
 | 
					  sinatra-contrib
 | 
				
			||||||
 | 
				
			|||||||
@ -435,6 +435,19 @@ describe "App with Riak backend" do
 | 
				
			|||||||
        end
 | 
					        end
 | 
				
			||||||
      end
 | 
					      end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      context "escaped square brackets in key" do
 | 
				
			||||||
 | 
					        before do
 | 
				
			||||||
 | 
					          put "/jimmy/documents/gracehopper%5B1%5D.jpg", "super image"
 | 
				
			||||||
 | 
					        end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        it "delivers the data correctly" do
 | 
				
			||||||
 | 
					          header "Authorization", "Bearer 123"
 | 
				
			||||||
 | 
					          get "/jimmy/documents/gracehopper%5B1%5D.jpg"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          last_response.body.must_equal "super image"
 | 
				
			||||||
 | 
					        end
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      context "invalid JSON" do
 | 
					      context "invalid JSON" do
 | 
				
			||||||
        context "empty body" do
 | 
					        context "empty body" do
 | 
				
			||||||
          before do
 | 
					          before do
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user