Skip to content
This repository has been archived by the owner on Nov 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #89 from datasift/feature/3.8.0
Browse files Browse the repository at this point in the history
Feature/3.8.0
  • Loading branch information
dugjason authored May 23, 2017
2 parents 7c64ac6 + c22f154 commit b7e9922
Showing 368 changed files with 2,083 additions and 451 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,3 +10,4 @@ pkg/*
*.gem
.yardoc
doc/
.ruby-version
2 changes: 1 addition & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -275,7 +275,7 @@ Style/LineEndConcatenation:

# Offense count: 2
# Cop supports --auto-correct.
Style/MethodCallParentheses:
Style/MethodCallWithoutArgsParentheses:
Exclude:
- 'examples/pull.rb'
- 'examples/push_eg.rb'
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -4,14 +4,15 @@ cache: bundler
bundler_args: --without development --retry=3 --jobs=3

rvm:
- 1.9.3
- 2.0.0
- 2.1
- 2.2
- 2.3
- 2.4
- ruby-head

matrix:
allow_failures:
- 1.9
- 2.0
- ruby-head
fast_finish: true
fast_finish: true
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,14 @@ CHANGELOG
* Designed to make the most of DataSift's latest API version and features
* Designed for Ruby 2.3+. Use features like keyword parameters across the board

## v.3.8.0 (2017-05-23)
### Added
* Support for PYLON Task API
* Ads explicit support for additional HTTP response codes

### Changed
* Uses API v1.5 by default

## v.3.7.2 (2016-11-08)
### Fixes
* Uses correct timestamp params in PYLON Sample API calls. `start_time` -> `start` and `end_time` - `end`
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -7,8 +7,7 @@ group :test do
gem 'minitest', '~> 5.0'
gem 'rubocop', '>= 0.27'
gem 'simplecov', '>= 0.9'
gem 'shoulda', '>= 2.11'
gem 'vcr', '~> 2.9'
gem 'vcr', '~> 3.0'
gem 'webmock'
end

262 changes: 0 additions & 262 deletions MIGRATING_TO_V.3.0.0.md

This file was deleted.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.2
3.8.0
9 changes: 6 additions & 3 deletions datasift.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
require 'version'

Gem::Specification.new do |s|
s.name = 'datasift'
s.version = File.open('VERSION').first
s.version = DataSift::VERSION
s.authors = ['DataSift', 'Courtney Robinson', 'Jason Dugdale']
s.email = ['support@datasift.com']
s.description = %q{The official Ruby library for accessing the DataSift API. See http://datasift.com/ for full details and to sign up for an account.}
@@ -11,8 +14,8 @@ Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.required_rubygems_version = '>= 1.3.5'
s.required_ruby_version = '>= 2.0.0'
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test}/*`.split("\n")
s.files = %w(.yardopts CHANGELOG.md README.md datasift.gemspec) + Dir['lib/**/*.rb']
s.test_files = s.files.grep(%r{^(test)/})
s.require_paths = ["lib"]

s.add_runtime_dependency 'rest-client', ['>= 1.8', '< 3.0']
5 changes: 3 additions & 2 deletions examples/auth.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
class DataSiftExample
require 'datasift'
require 'json'

def initialize
@config = {
username: 'DATASIFT_USERNAME',
api_key: 'DATASIFT_API_KEY',
api_version: 'v1.3'
api_version: 'v1.5'
}
@params = {
output_type: 's3',
@@ -31,7 +32,7 @@ def initialize
@datasift = DataSift::Client.new(@config)
end

attr_reader :datasift, :params
attr_reader :datasift, :params, :pull_params

def create_push(hash, is_historics_id = false)
create_params = @params.merge ({
Loading

0 comments on commit b7e9922

Please sign in to comment.