Merge pull request #96 from theblang/several-fixes-for-records

Switch back to default Faraday encoder and change list-records call to POST

lib/airrecord/client.rb

@@ -1,5 +1,3 @@
-require 'uri'
-require_relative 'query_string'
 require_relative 'faraday_rate_limiter'
 
 module Airrecord
@@ -21,9 +19,7 @@ def connection
         headers: {
           "Authorization" => "Bearer #{api_key}",
           "User-Agent"    => "Airrecord/#{Airrecord::VERSION}",
-          "X-API-VERSION" => "0.1.0",
         },
-        request: { params_encoder: Airrecord::QueryString }
       ) do |conn|
         if Airrecord.throttle?
           conn.request :airrecord_rate_limiter, requests_per_second: AIRTABLE_RPS_LIMIT
@@ -33,7 +29,7 @@ def connection
     end
 
     def escape(*args)
-      QueryString.escape(*args)
+      CGI.escape(*args)
     end
 
     def parse(body)

lib/airrecord/table.rb

@@ -76,8 +76,8 @@ def records(filter: nil, sort: nil, view: nil, offset: nil, paginate: true, fiel
         options[:maxRecords] = max_records if max_records
         options[:pageSize] = page_size if page_size
 
-        path = "/v0/#{base_key}/#{client.escape(table_name)}"
-        response = client.connection.get(path, options)
+        path = "/v0/#{base_key}/#{client.escape(table_name)}/listRecords"
+        response = client.connection.post(path, options.to_json, { 'Content-Type' => 'application/json' })
         parsed_response = client.parse(response.body)
 
         if response.success?

test/associations_test.rb

@@ -41,7 +41,7 @@ def test_has_many_associations
       { "id" => "rec2", "Name" => "Good brew" },
       { "id" => "rec1", "Name" => "Decent brew" }
     ]
-    stub_request(brews, table: Brew)
+    stub_records_request(brews, table: Brew)
 
     assert_equal 2, tea.brews.size
     assert_kind_of Airrecord::Table, tea.brews.first
@@ -50,7 +50,7 @@ def test_has_many_associations
 
   def test_has_many_handles_empty_associations
     tea = Tea.new("Name" => "Gunpowder")
-    stub_request([{ "id" => "brew1", "Name" => "unrelated"  }], table: Brew)
+    stub_records_request([{ "id" => "brew1", "Name" => "unrelated"  }], table: Brew)
     assert_equal 0, tea.brews.size
   end
 
@@ -82,7 +82,7 @@ def test_build_association_from_strings
 
     tea.create
 
-    stub_request([{ id: "rec2" }, { id: "rec1" }], table: Brew)
+    stub_records_request([{ id: "rec2" }, { id: "rec1" }], table: Brew)
     assert_equal 2, tea.brews.count
   end
 
@@ -110,7 +110,7 @@ def test_build_has_many_association_from_setter
     tea.brews = brews
 
     brew_fields = brews.map { |brew| brew.fields.merge("id" => brew.id) }
-    stub_request(brew_fields, table: Brew)
+    stub_records_request(brew_fields, table: Brew)
 
     assert_equal 2, tea.brews.size
     assert_kind_of Airrecord::Table, tea.brews.first

test/table_test.rb

@@ -25,7 +25,7 @@ def setup
       builder.adapter :test, @stubs
     }
 
-    stub_request([{"Name" => "omg", "Notes" => "hello world"}, {"Name" => "more", "Notes" => "walrus"}])
+    stub_records_request([{"Name" => "omg", "Notes" => "hello world"}, {"Name" => "more", "Notes" => "walrus"}])
   end
 
   def test_table_overrides_key
@@ -48,41 +48,41 @@ def test_different_clients_with_different_api_keys
   end
 
   def test_filter_records
-    stub_request([{"Name" => "yes"}, {"Name" => "no"}])
+    stub_records_request([{"Name" => "yes"}, {"Name" => "no"}])
 
     records = @table.records(filter: "Name")
     assert_equal "yes", records[0]["Name"]
   end
 
   def test_sort_records
-    stub_request([{"Name" => "a"}, {"Name" => "b"}])
+    stub_records_request([{"Name" => "a"}, {"Name" => "b"}])
 
     records = @table.records(sort: { "Name" => 'asc' })
     assert_equal "a", records[0]["Name"]
     assert_equal "b", records[1]["Name"]
   end
 
   def test_view_records
-    stub_request([{"Name" => "a"}, {"Name" => "a"}])
+    stub_records_request([{"Name" => "a"}, {"Name" => "a"}])
 
     records = @table.records(view: 'A')
     assert_equal "a", records[0]["Name"]
     assert_equal "a", records[1]["Name"]
   end
 
   def test_follow_pagination_by_default
-    stub_request([{"Name" => "1"}, {"Name" => "2"}], offset: 'dasfuhiu')
-    stub_request([{"Name" => "3"}, {"Name" => "4"}], offset: 'odjafio', clear: false)
-    stub_request([{"Name" => "5"}, {"Name" => "6"}], clear: false)
+    stub_records_request([{"Name" => "1"}, {"Name" => "2"}], offset: 'dasfuhiu')
+    stub_records_request([{"Name" => "3"}, {"Name" => "4"}], offset: 'odjafio', clear: false)
+    stub_records_request([{"Name" => "5"}, {"Name" => "6"}], clear: false)
 
     records = @table.records
     assert_equal 6, records.size
   end
 
   def test_dont_follow_pagination_if_disabled
-    stub_request([{"Name" => "1"}, {"Name" => "2"}], offset: 'dasfuhiu')
-    stub_request([{"Name" => "3"}, {"Name" => "4"}], offset: 'odjafio', clear: false)
-    stub_request([{"Name" => "5"}, {"Name" => "6"}], clear: false)
+    stub_records_request([{"Name" => "1"}, {"Name" => "2"}], offset: 'dasfuhiu')
+    stub_records_request([{"Name" => "3"}, {"Name" => "4"}], offset: 'odjafio', clear: false)
+    stub_records_request([{"Name" => "5"}, {"Name" => "6"}], clear: false)
 
     records = @table.records(paginate: false)
     assert_equal 2, records.size
@@ -314,7 +314,7 @@ def test_find_many
   end
 
   def test_find_many_makes_no_network_call_when_ids_are_empty
-    stub_request([], status: 500)
+    stub_records_request([], status: 500)
 
     assert_equal([], @table.find_many([]))
   end
@@ -353,7 +353,7 @@ def test_error_handles_errors_without_body
   end
 
   def test_dates_are_not_type_casted
-    stub_request([{"Name" => "omg", "Created" => Time.now.to_s}])
+    stub_records_request([{"Name" => "omg", "Created" => Time.now.to_s}])
 
     record = first_record
     assert_instance_of String, record["Created"]

test/test_helper.rb

@@ -45,7 +45,7 @@ def stub_patch_request(record, updated_keys, table: @table, status: 200, headers
   end
 
   # TODO: Problem, can't stub on params.
-  def stub_request(records, table: @table, status: 200, headers: {}, offset: nil, clear: true)
+  def stub_records_request(records, table: @table, status: 200, headers: {}, offset: nil, clear: true)
     @stubs.instance_variable_set(:@stack, {}) if clear
 
     body = {
@@ -59,7 +59,7 @@ def stub_request(records, table: @table, status: 200, headers: {}, offset: nil,
       offset: offset,
     }.to_json
 
-    @stubs.get("/v0/#{table.base_key}/#{table.table_name}") do |env|
+    @stubs.post("/v0/#{table.base_key}/#{table.table_name}/listRecords") do |env|
       [status, headers, body]
     end
   end
@@ -87,7 +87,7 @@ def stub_error_request(type:, message:, status: 401, headers: {}, table: @table)
       }
     }.to_json
 
-    @stubs.get("/v0/#{table.base_key}/#{table.table_name}") do |env|
+    @stubs.post("/v0/#{table.base_key}/#{table.table_name}/listRecords") do |env|
       [status, headers, body]
     end
   end