thebigdb 1.2.1 → 1.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    thebigdb (1.2.1)
+    thebigdb (1.2.2)
       rack (~> 1.4)
 
 GEM
@@ -10,26 +10,27 @@ GEM
     addressable (2.3.3)
     coderay (1.0.9)
     crack (0.3.2)
-    diff-lcs (1.2.1)
-    ffi (1.4.0)
-    guard (1.6.2)
+    diff-lcs (1.2.2)
+    ffi (1.6.0)
+    formatador (0.2.4)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-rspec (2.5.0)
+    guard-rspec (2.5.1)
       guard (>= 1.1)
       rspec (~> 2.11)
     listen (0.7.3)
-    lumberjack (1.0.2)
+    lumberjack (1.0.3)
     method_source (0.8.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rake (10.0.3)
+    rake (10.0.4)
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.3)
@@ -44,8 +45,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
     slop (3.4.4)
-    terminal-table (1.4.5)
-    thor (0.17.0)
+    thor (0.18.1)
     webmock (1.11.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)

data/lib/thebigdb/helpers.rb

@@ -1,10 +1,10 @@
 module TheBigDB
   module Helpers
 
-    # serialize_query_params({house: "bricks", animals: ["cat", "dog"], computers: {cool: true, drives: ["hard", "flash"]}})
-    # => house=bricks&animals%5B%5D=cat&animals%5B%5D=dog&computers%5Bcool%5D=true&computers%5Bdrives%5D%5B%5D=hard&computers%5Bdrives%5D%5B%5D=flash
+    # serialize_query_params({house: "brick and mortar", animals: ["cat", "dog"], computers: {cool: true, drives: ["hard", "flash"]}})
+    # => house=brick%20and%20mortar&animals%5B0%5D=cat&animals%5B1%5D=dog&computers%5Bcool%5D=true&computers%5Bdrives%5D%5B0%5D=hard&computers%5Bdrives%5D%5B1%5D=flash
     # which will be read by the server as:
-    # => house=bricks&animals[]=cat&animals[]=dog&computers[cool]=true&computers[drives][]=hard&computers[drives][]=flash
+    # => house=brick%20and%20mortar&animals[]=cat&animals[]=dog&computers[cool]=true&computers[drives][]=hard&computers[drives][]=flash
     def self.serialize_query_params(params, prefix = nil)
       ret = []
       params.each_pair do |key, value|
@@ -19,14 +19,14 @@ module TheBigDB
           end
           ret << self.serialize_query_params(sub_hash, param_key.to_s)
         else
-          ret << URI.encode_www_form_component(param_key.to_s) + "=" + URI.encode_www_form_component(value.to_s)
+          ret << URI.encode_www_form_component(param_key.to_s) + "=" + URI.encode_www_form_component(value.to_s).gsub("+", "%20")
         end
       end
       ret.join("&")
     end
 
-    # flatten_params_keys({house: "bricks", animals: ["cat", "dog"], computers: {cool: true, drives: ["hard", "flash"]}})
-    # => {"house" => "bricks", "animals[0]" => "cat", "animals[1]" => "dog", "computers[cool]" => "true", "computers[drives][0]" => "hard", "computers[drives][1]" => "flash"}
+    # flatten_params_keys({house: "brick and mortar", animals: ["cat", "dog"], computers: {cool: true, drives: ["hard", "flash"]}})
+    # => {"house" => "brick and mortar", "animals[0]" => "cat", "animals[1]" => "dog", "computers[cool]" => "true", "computers[drives][0]" => "hard", "computers[drives][1]" => "flash"}
     def self.flatten_params_keys(params)
       serialized_params = self.serialize_query_params(params)
       new_params = {}

data/lib/thebigdb/version.rb

@@ -2,7 +2,7 @@ module TheBigDB
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/spec/helpers_spec.rb

@@ -7,18 +7,20 @@ describe "Helpers" do
     end
 
     it "works with more complex imbricated params" do
+      same_expected_result = "house=brick%20and%20mortar&animals%5B0%5D=cat&animals%5B1%5D=dog&computers%5Bcool%5D=true&computers%5Bdrives%5D%5B0%5D=hard&computers%5Bdrives%5D%5B1%5D=flash"
+
       TheBigDB::Helpers::serialize_query_params({
-        house: "bricks",
+        house: "brick and mortar",
         animals: ["cat", "dog"],
         computers: {cool: true, drives: ["hard", "flash"]}
-      }).should == "house=bricks&animals%5B0%5D=cat&animals%5B1%5D=dog&computers%5Bcool%5D=true&computers%5Bdrives%5D%5B0%5D=hard&computers%5Bdrives%5D%5B1%5D=flash"
+      }).should == same_expected_result
 
       # and with a hash instead of an array
       TheBigDB::Helpers::serialize_query_params({
-        house: "bricks",
+        house: "brick and mortar",
         animals: {"0" => "cat", "1" => "dog"},
         computers: {cool: true, drives: ["hard", "flash"]}
-      }).should == "house=bricks&animals%5B0%5D=cat&animals%5B1%5D=dog&computers%5Bcool%5D=true&computers%5Bdrives%5D%5B0%5D=hard&computers%5Bdrives%5D%5B1%5D=flash"
+      }).should == same_expected_result
     end
   end
 
@@ -29,11 +31,11 @@ describe "Helpers" do
 
     it "works with more complex imbricated params" do
       TheBigDB::Helpers::flatten_params_keys({
-        house: "bricks",
+        house: "brick and mortar",
         animals: ["cat", "dog"],
         computers: {cool: true, drives: ["hard", "flash"]}
       }).should == {
-        "house" => "bricks",
+        "house" => "brick and mortar",
         "animals[0]" => "cat",
         "animals[1]" => "dog",
         "computers[cool]" => "true",
@@ -43,11 +45,11 @@ describe "Helpers" do
 
       # and with a hash instead of an array
       TheBigDB::Helpers::flatten_params_keys({
-        house: "bricks",
+        house: "brick and mortar",
         animals: {"0" => "cat", "1" => "dog"},
         computers: {cool: true, drives: ["hard", "flash"]}
       }).should == {
-        "house" => "bricks",
+        "house" => "brick and mortar",
         "animals[0]" => "cat",
         "animals[1]" => "dog",
         "computers[cool]" => "true",

data/spec/resources/statement_spec.rb

@@ -5,7 +5,7 @@ describe "Statement" do
     before do
       stub_request(:get, @request_path.call("search")).to_return(:body => '{"server_says": "hello world"}')
 
-      @request = TheBigDB::Statement(:search, nodes: ["a", "b"])
+      @request = TheBigDB::Statement(:search, nodes: ["a a", "b"])
     end
 
     it "sets the correct data_sent instance variable" do
@@ -15,7 +15,7 @@ describe "Statement" do
         "port" => TheBigDB.api_port,
         "path" => "/v#{TheBigDB.api_version}/statements/search",
         "method" => "GET",
-        "params" => {"nodes" => {"0" => "a", "1" => "b"}}
+        "params" => {"nodes" => {"0" => "a a", "1" => "b"}}
       }
     end
 
@@ -33,9 +33,9 @@ describe "StatementRequest" do
   end
 
   it "makes normal requests" do
-    @search = TheBigDB.search("a", "b", {match: "blue"})
+    @search = TheBigDB.search("a a", "b", {match: "blue"})
     @search.with(page: 2)
-    @search.params.should == {"nodes" => ["a", "b", {match: "blue"}], "page" => 2}
+    @search.params.should == {"nodes" => ["a a", "b", {match: "blue"}], "page" => 2}
   end
 
   it "cache the response unless the params are modified, or asked to" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thebigdb
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack