cartodb-rb-client 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/.travis.yml ADDED
@@ -0,0 +1,15 @@
1
+ language: ruby
2
+ bundler_args: --without development
3
+ script: "rspec --format=documentation spec"
4
+
5
+ rvm:
6
+ - 1.9.2
7
+ - 1.9.3
8
+ gemfile:
9
+ - Gemfile
10
+ notifications:
11
+ recipients:
12
+ - ferdev+travis@vizzuality.com
13
+ branches:
14
+ only:
15
+ - master
data/Gemfile CHANGED
@@ -4,9 +4,12 @@ source "http://rubygems.org"
4
4
  gemspec
5
5
 
6
6
  group :development do
7
- gem "rspec", "~> 2.3.0"
8
- gem "spork", "~> 0.9.0"
9
- gem "vcr"
10
7
  gem "bundler", "> 1.0.0"
11
8
  gem 'debugger'
12
9
  end
10
+
11
+ group :test do
12
+ gem "rspec", "~> 2.10.0"
13
+ gem "spork", "~> 0.9.0"
14
+ gem "vcr"
15
+ end
data/README.markdown CHANGED
@@ -1,4 +1,4 @@
1
- cartoDB Ruby Client
1
+ cartoDB Ruby Client [![Build Status](https://secure.travis-ci.org/Vizzuality/cartodb-rb-client.png)](http://travis-ci.org/Vizzuality/cartodb-rb-client)
2
2
  ===================
3
3
 
4
4
  cartoDB ruby client that allows an easy and simple interaction with the cartoDB API.
@@ -41,7 +41,7 @@ Setup
41
41
  3. Setup your cartoDB connection object:
42
42
 
43
43
  CartoDB::Init.start YAML.load_file(Rails.root.join('config/cartodb_config.yml'))
44
-
44
+
45
45
  And that's it. Now you should be able to run querys against the cartoDB servers using the CartoDB::Connection object.
46
46
 
47
47
  Note: You have to use strings instead of symbols for the configuration hash keys.
@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
29
29
  s.add_dependency 'i18n', '>= 0.5.0', '<= 0.6.0'
30
30
  s.add_dependency 'rgeo', '>= 0.3.2'
31
31
  s.add_dependency 'rgeo-geojson', '>= 0.2.1'
32
- s.add_dependency 'pg', '0.11.0' if postgresql_installed?
32
+ s.add_dependency('pg', '0.11.0') if postgresql_installed?
33
33
  s.add_dependency 'json', '>= 1.5.3'
34
34
  end
@@ -1,7 +1,7 @@
1
1
  module Cartodb
2
2
  module Rb
3
3
  module Client
4
- VERSION = "0.4.1"
4
+ VERSION = "0.4.2"
5
5
  end
6
6
  end
7
7
  end
data/spec/spec_helper.rb CHANGED
@@ -16,7 +16,18 @@ Spork.prefork do
16
16
  require 'cartodb-rb-client/cartodb'
17
17
  require 'active_support/core_ext/array/random_access.rb'
18
18
 
19
- CartoDB::Settings = YAML.load_file("#{File.dirname(__FILE__)}/support/cartodb_config.yml") unless defined? CartoDB::Settings
19
+ cartodb_config = {
20
+ 'host' => 'https://cartodb-rb-client.cartodb.com',
21
+ 'oauth_key' => ENV['CARTODB_OAUTH_KEY'],
22
+ 'oauth_secret' => ENV['CARTODB_OAUTH_SECRET'],
23
+ 'username' => ENV['CARTODB_USERNAME'],
24
+ 'password' => ENV['CARTODB_PASSWORD']
25
+ }
26
+
27
+ if File.exists?("#{File.dirname(__FILE__)}/support/cartodb_config.yml")
28
+ cartodb_config = YAML.load_file("#{File.dirname(__FILE__)}/support/cartodb_config.yml")
29
+ end
30
+ CartoDB::Settings = cartodb_config
20
31
  CartoDB::Connection = CartoDB::Client::Connection::Base.new unless defined? CartoDB::Connection
21
32
  # CartoDB::Settings = YAML.load_file("#{File.dirname(__FILE__)}/support/database.yml") unless defined? CartoDB::Settings
22
33
  # CartoDB::Connection = CartoDB::Client::Connection::Base.new unless defined? CartoDB::Connection
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cartodb-rb-client
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 11
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
- - 1
10
- version: 0.4.1
9
+ - 2
10
+ version: 0.4.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Fernando Espinosa
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-05-24 00:00:00 Z
18
+ date: 2012-05-25 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: typhoeus
@@ -180,6 +180,7 @@ extra_rdoc_files: []
180
180
  files:
181
181
  - .gitignore
182
182
  - .rvmrc
183
+ - .travis.yml
183
184
  - Gemfile
184
185
  - LICENSE
185
186
  - README.markdown