cartodb-rb-client 0.3.1 → 0.4.0

data/spec/fixtures/cassettes/clean_tables.yml

@@ -0,0 +1,266 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cartodb-rb-client.cartodb.com/api/v1/tables?
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - &70347547176260 !ruby/object:MIME::Type
+        content_type: application/json
+        raw_media_type: application
+        raw_sub_type: json
+        simplified: application/json
+        media_type: application
+        sub_type: json
+        extensions:
+        - json
+        encoding: 8bit
+        system: !!null 
+        registered: true
+        url:
+        - IANA
+        - RFC4627
+        obsolete: !!null 
+        docs: !!null 
+      Authorization:
+      - OAuth oauth_consumer_key="0gRpcgKQK8bpcvSzM5ED4NqaSbNQ8ivS4q0pVdJF", oauth_nonce="VEi9jwsh7M68W8emeqcxoZjaBtoeA4wLfNGy8qVj2s",
+        oauth_signature="Cz8LzmTlBslwlfEJ1bm5I7iHTgY%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1337788390", oauth_token="7PalByYmKY8Dzh76fnt05e0YPXRJino0dyqHZYCw",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 23 May 2012 15:53:10 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Status:
+      - 200 OK
+      Etag:
+      - ! '"5822de039c547528e69f48f88b4a5650"'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Set-Cookie:
+      - _cartodb_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiIlNDlmYjRmODQ0MWFjOTIwNDEyNTI5NmQ0NjU4ZGJiZWJJIiZ3YXJkZW4udXNlci5jYXJ0b2RiLXJiLWNsaWVudC5rZXkGOwBUSSIWY2FydG9kYi1yYi1jbGllbnQGOwBU--999fbd3225bcb2ead656025ec98e41895ea3b674;
+        domain=.cartodb.com; path=/; HttpOnly
+      X-Runtime:
+      - '0.025659'
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: ! '{"total_entries":4,"tables":[{"id":4724,"name":"polygon_geometry_model","privacy":"PUBLIC","tags":"","schema":[["cartodb_id","number"],["the_geom","polygon"],["updated_at","date"],["created_at","date"]],"updated_at":"2012-05-23T17:48:49+02:00","rows_counted":0},{"id":4723,"name":"custom_data_type_column_model","privacy":"PUBLIC","tags":"","schema":[["cartodb_id","number"],["the_geom","geometry","geometry","point"],["description","string"],["name","string"],["test","number"],["created_at","date"],["updated_at","date"]],"updated_at":"2012-05-23T17:48:48+02:00","rows_counted":0},{"id":4722,"name":"moto_gp_circuit","privacy":"PUBLIC","tags":"","schema":[["cartodb_id","number"],["the_geom","geometry","geometry","point"],["constructed","date"],["description","string"],["left_corners","number"],["length","string"],["longest_straight","string"],["name","string"],["right_corners","number"],["width","string"],["created_at","date"],["updated_at","date"]],"updated_at":"2012-05-23T17:48:43+02:00","rows_counted":0},{"id":4718,"name":"table_1","privacy":"PUBLIC","tags":"","schema":[["cartodb_id","number"],["the_geom","geometry","geometry","point"],["description","string"],["name","string"],["created_at","date"],["updated_at","date"]],"updated_at":"2012-05-23T17:39:39+02:00","rows_counted":0}]}'
+    http_version: '1.1'
+  recorded_at: Wed, 23 May 2012 15:53:10 GMT
+- request:
+    method: delete
+    uri: https://cartodb-rb-client.cartodb.com/api/v1/tables/polygon_geometry_model?
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - *70347547176260
+      Authorization:
+      - OAuth oauth_consumer_key="0gRpcgKQK8bpcvSzM5ED4NqaSbNQ8ivS4q0pVdJF", oauth_nonce="ln36GI7sCB4fvICNlnZYyw3QPGDyTsllbbGqgpdzU",
+        oauth_signature="UvNC9nLmY80ddXMUUfXap8EVxww%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1337788390", oauth_token="7PalByYmKY8Dzh76fnt05e0YPXRJino0dyqHZYCw",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 23 May 2012 15:53:10 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Status:
+      - 200 OK
+      Cache-Control:
+      - no-cache
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Set-Cookie:
+      - _cartodb_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiIlMDYwY2E4NWE2MGJlZmE5NDI4MjI1YzE2ZjRkMDY3MTZJIiZ3YXJkZW4udXNlci5jYXJ0b2RiLXJiLWNsaWVudC5rZXkGOwBUSSIWY2FydG9kYi1yYi1jbGllbnQGOwBU--91c56a0e50dfa569f02b89ca7a341285a18ad1e5;
+        domain=.cartodb.com; path=/; HttpOnly
+      X-Runtime:
+      - '0.190212'
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: ! ' '
+    http_version: '1.1'
+  recorded_at: Wed, 23 May 2012 15:53:10 GMT
+- request:
+    method: delete
+    uri: https://cartodb-rb-client.cartodb.com/api/v1/tables/custom_data_type_column_model?
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - *70347547176260
+      Authorization:
+      - OAuth oauth_consumer_key="0gRpcgKQK8bpcvSzM5ED4NqaSbNQ8ivS4q0pVdJF", oauth_nonce="rNWAVHzmRIM6RxJTJKfjoAfkB4SNiLsxlSaIAFKdk",
+        oauth_signature="R2S1Q6coDbFdsBItWqu1sv3s9Wg%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1337788390", oauth_token="7PalByYmKY8Dzh76fnt05e0YPXRJino0dyqHZYCw",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 23 May 2012 15:53:11 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Status:
+      - 200 OK
+      Cache-Control:
+      - no-cache
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Set-Cookie:
+      - _cartodb_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiIlNDE5Nzg1Y2FjMzZiZjExNTgyODdlZTA0MDE4YTE0MmZJIiZ3YXJkZW4udXNlci5jYXJ0b2RiLXJiLWNsaWVudC5rZXkGOwBUSSIWY2FydG9kYi1yYi1jbGllbnQGOwBU--260748fd515484011639dd2385ea317eb716df32;
+        domain=.cartodb.com; path=/; HttpOnly
+      X-Runtime:
+      - '0.216359'
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: ! ' '
+    http_version: '1.1'
+  recorded_at: Wed, 23 May 2012 15:53:11 GMT
+- request:
+    method: delete
+    uri: https://cartodb-rb-client.cartodb.com/api/v1/tables/moto_gp_circuit?
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - *70347547176260
+      Authorization:
+      - OAuth oauth_consumer_key="0gRpcgKQK8bpcvSzM5ED4NqaSbNQ8ivS4q0pVdJF", oauth_nonce="m6fXY1zPmR8pp3DVhFwDfdw5Bt95gCiJEQVvZk1Y",
+        oauth_signature="K48l97G6kcKiben9SIquhTEs75s%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1337788391", oauth_token="7PalByYmKY8Dzh76fnt05e0YPXRJino0dyqHZYCw",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 23 May 2012 15:53:11 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Status:
+      - 200 OK
+      Cache-Control:
+      - no-cache
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Set-Cookie:
+      - _cartodb_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiIlMDAyNmQ4YTcxYzVlNmFkMzlhMTVhZmY4M2U2ZDg4OTFJIiZ3YXJkZW4udXNlci5jYXJ0b2RiLXJiLWNsaWVudC5rZXkGOwBUSSIWY2FydG9kYi1yYi1jbGllbnQGOwBU--f3852a6af7a2cac08662f993c97bb4e5361ce2cf;
+        domain=.cartodb.com; path=/; HttpOnly
+      X-Runtime:
+      - '0.149254'
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: ! ' '
+    http_version: '1.1'
+  recorded_at: Wed, 23 May 2012 15:53:11 GMT
+- request:
+    method: delete
+    uri: https://cartodb-rb-client.cartodb.com/api/v1/tables/table_1?
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - *70347547176260
+      Authorization:
+      - OAuth oauth_consumer_key="0gRpcgKQK8bpcvSzM5ED4NqaSbNQ8ivS4q0pVdJF", oauth_nonce="W9qeZVUT7etENgwtN6zsPZ2IgF1dmug3qyU4qDS6M",
+        oauth_signature="zY9gsWDwRR6fw2otdtxuxHOuhaY%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1337788391", oauth_token="7PalByYmKY8Dzh76fnt05e0YPXRJino0dyqHZYCw",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 23 May 2012 15:53:11 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Status:
+      - 200 OK
+      Cache-Control:
+      - no-cache
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Set-Cookie:
+      - _cartodb_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRiIlN2JkZTQxZDhiYTFiM2IyMDkyYzMxODVhMGMyMGU2YjBJIiZ3YXJkZW4udXNlci5jYXJ0b2RiLXJiLWNsaWVudC5rZXkGOwBUSSIWY2FydG9kYi1yYi1jbGllbnQGOwBU--f0017b0d727604edaeb1a3d0c70d6d12adc50cf4;
+        domain=.cartodb.com; path=/; HttpOnly
+      X-Runtime:
+      - '0.177177'
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: ! ' '
+    http_version: '1.1'
+  recorded_at: Wed, 23 May 2012 15:53:11 GMT
+recorded_with: VCR 2.1.1

data/spec/model/data_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'model_specs_helper'
 
-describe 'CartoDB model data methods' do
+describe 'CartoDB model data methods', :vcr => true do
 
-  it "should initialize attributes of the model without persisting them into cartodb using the `new` method" do
+  it "should initialize attributes of the model without persisting them" do
 
     losail_circuit = new_circuit
 
@@ -31,7 +31,7 @@ describe 'CartoDB model data methods' do
     }.to change{CartoDB::Connection.records('moto_gp_circuit').total_rows}.from(0).to(1)
 
     record = CartoDB::Connection.row 'moto_gp_circuit', losail_circuit.cartodb_id
-    record.cartodb_id.should             be == 1
+    record.cartodb_id.should       be == 1
     record.name.should             be == 'Losail Circuit'
     record.description.should      match /The fabulous Losail International Circuit lies/
     record.latitude.should         be == 25.488840
@@ -41,8 +41,8 @@ describe 'CartoDB model data methods' do
     record.left_corners.should     be == 6
     record.right_corners.should    be == 10
     record.longest_straight.should be == '1068m'
-    record.constructed.should be == Date.new(2004, 1, 1)
-    record.modified.should    be == Date.new(2004, 1, 1)
+    record.constructed.should      be == DateTime.new(2004, 1, 1)
+    record.modified.should         be == DateTime.new(2004, 1, 1)
 
     losail_circuit.cartodb_id.should be == 1
     losail_circuit.name.should be == 'Losail Circuit'

data/spec/model/metadata_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'model_specs_helper'
 
-describe 'CartoDB model metadata methods' do
+describe 'CartoDB model metadata methods', :vcr => true do
 
   it "should have a valid CartoDB::Client instance as a connection object" do
     model = MotoGPCircuit.new
@@ -28,6 +28,7 @@ describe 'CartoDB model metadata methods' do
   end
 
   it "should contain an array of columns" do
+
     model = MotoGPCircuit.new
 
     model.columns.should_not be_nil
@@ -47,7 +48,7 @@ describe 'CartoDB model metadata methods' do
     model.columns.should include({:name => 'modified',         :type => 'date'})
   end
 
-  it "should add more columns if the table previously exists and doesn't have all model columns" do
+  it "should add more columns if the table previously exists" do
     table = CartoDB::Connection.create_table 'moto_gp_circuit'
     table.schema.should include(["cartodb_id", "number"])
     table.schema.should include(["name", "string"])
@@ -113,4 +114,11 @@ describe 'CartoDB model metadata methods' do
     columns.should include({:name => 'test', :type => 'number'})
   end
 
+  it "should create model with polygon type geometry columns" do
+    columns = PolygonGeometryModel.data_columns
+    columns.should have(4).items
+    columns.should include({:name => 'the_geom',       :type => 'geometry', :geometry_type => 'multipolygon'})
+    columns.should include({:name => 'another_column', :type => 'string'})
+  end
+
 end

data/spec/model/scopes_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'model_specs_helper'
 
-describe 'CartoDB model scopes' do
+describe 'CartoDB model scopes', :vcr => true do
   it "should return all records paginated" do
     create_random_circuits(20)
 

data/spec/model_specs_helper.rb

@@ -0,0 +1,2 @@
+require 'spec_helper'
+require "#{File.dirname(__FILE__)}/support/cartodb_models.rb"

data/spec/spec_helper.rb

@@ -23,18 +23,31 @@ Spork.prefork do
 
   RgeoFactory = ::RGeo::Geographic.spherical_factory(:srid => 4326)
 
-  # Requires supporting files with custom matchers and macros, etc,
-  # in ./support/ and its subdirectories.
-  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+  require "#{File.dirname(__FILE__)}/support/cartodb_helpers.rb"
+  require "#{File.dirname(__FILE__)}/support/cartodb_factories.rb"
+
+  require 'vcr'
+  VCR.configure do |c|
+    c.default_cassette_options = { :record => :new_episodes }
+    c.cassette_library_dir = 'spec/fixtures/cassettes'
+    c.hook_into :typhoeus
+    #c.preserve_exact_body_bytes
+    c.configure_rspec_metadata!
+  end
 
   RSpec.configure do |config|
     config.before(:each) do
-      drop_all_cartodb_tables
+      VCR.use_cassette('clean tables') do
+        drop_all_cartodb_tables
+      end
     end
 
     config.after(:all) do
-      drop_all_cartodb_tables
+      VCR.use_cassette('clean tables') do
+        drop_all_cartodb_tables
+      end
     end
+
   end
 end
 

data/spec/support/cartodb_factories.rb

@@ -24,10 +24,10 @@ module Factories
       :left_corners     => 6,
       :right_corners    => 10,
       :longest_straight => '1068m',
-      :constructed      => Date.new(2004, 1, 1),
-      :modified         => Date.new(2004, 1, 1)
+      :constructed      => DateTime.new(2004, 1, 1),
+      :modified         => DateTime.new(2004, 1, 1)
     }
   end
 end
 
-RSpec.configure{ include Factories }
+RSpec.configure{ include Factories }

data/spec/support/cartodb_helpers.rb

@@ -11,4 +11,4 @@ module CartodbHelpers
   end
 
 end
-RSpec.configuration.include CartodbHelpers
+RSpec.configuration.include CartodbHelpers

data/spec/support/cartodb_models.rb

@@ -1,22 +1,29 @@
-class MotoGPCircuit < CartoDB::Model::Base
-  field :name
-  field :description
-  field :length
-  field :width
-  field :longest_straight
-  field :left_corners,  :type => Integer
-  field :right_corners, :type => Integer
-  field :constructed,   :type => Date
-  field :modified,      :type => Date
-end
+VCR.use_cassette('cartodb spec models') do
+  class MotoGPCircuit < CartoDB::Model::Base
+    field :name
+    field :description
+    field :length
+    field :width
+    field :longest_straight
+    field :left_corners,  :type => Integer
+    field :right_corners, :type => Integer
+    field :constructed,   :type => Date
+    field :modified,      :type => Date
+  end
 
-class StandardModel < CartoDB::Model::Base
-end
+  class StandardModel < CartoDB::Model::Base
+  end
 
-class CustomTableName < CartoDB::Model::Base
-  cartodb_table_name 'my_table_with_custom_name'
-end
+  class CustomTableName < CartoDB::Model::Base
+    cartodb_table_name 'my_table_with_custom_name'
+  end
 
-class CustomDataTypeColumnModel < CartoDB::Model::Base
-  field :test, :type => 'integer'
-end
+  class CustomDataTypeColumnModel < CartoDB::Model::Base
+    field :test, :type => 'integer'
+  end
+
+  class PolygonGeometryModel < CartoDB::Model::Base
+    set_geometry_type :polygon
+    field :another_column
+  end
+end