analytics-ruby 0.6.0 → 1.0.0

data/analytics-ruby.gemspec

@@ -15,11 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/segmentio/analytics-ruby'
   spec.license = 'MIT'
 
-  spec.add_dependency 'faraday', ['>= 0.8']
-  spec.add_dependency 'faraday_middleware', ['>= 0.8', '< 0.10']
-  spec.add_dependency 'multi_json', ['~> 1.0']
-
-  # Ruby 1.8 requires json for faraday_middleware
+  # Ruby 1.8 requires json
   spec.add_dependency 'json', ['~> 1.7'] if RUBY_VERSION < "1.9"
 
   spec.add_development_dependency('rake')

data/lib/analytics-ruby/client.rb

@@ -26,11 +26,11 @@ module AnalyticsRuby
 
       @queue = Queue.new
       @secret = options[:secret]
-      @max_queue_size = options[:max_queue_size] || AnalyticsRuby::Defaults::Queue::MAX_SIZE
+      @max_queue_size = options[:max_queue_size] || Defaults::Queue::MAX_SIZE
 
       check_secret
 
-      @consumer = AnalyticsRuby::Consumer.new @queue, @secret, options
+      @consumer = Consumer.new @queue, @secret, options
       @thread = ConsumerThread.new { @consumer.run }
 
       at_exit do

data/lib/analytics-ruby/consumer.rb

@@ -23,7 +23,7 @@ module AnalyticsRuby
 
       @queue = queue
       @secret = secret
-      @batch_size = options[:batch_size] || AnalyticsRuby::Defaults::Queue::BATCH_SIZE
+      @batch_size = options[:batch_size] || Defaults::Queue::BATCH_SIZE
       @on_error = options[:on_error] || Proc.new { |status, error| }
 
       @current_batch = []
@@ -54,7 +54,7 @@ module AnalyticsRuby
         end
       }
 
-      req = AnalyticsRuby::Request.new
+      req = Request.new
       res = req.post @secret, @current_batch
       @on_error.call res.status, res.error unless res.status == 200
       @mutex.synchronize {

data/lib/analytics-ruby/defaults.rb

@@ -3,9 +3,10 @@ module AnalyticsRuby
   module Defaults
 
     module Request
-      BASE_URL = 'https://api.segment.io' unless defined? AnalyticsRuby::Defaults::Request::BASE_URL
+      HOST = 'api.segment.io' unless defined? AnalyticsRuby::Defaults::Request::HOST
+      PORT = 443 unless defined? AnalyticsRuby::Defaults::Request::PORT
       PATH = '/v1/import' unless defined? AnalyticsRuby::Defaults::Request::PATH
-      SSL = { :verify => false } unless defined? AnalyticsRuby::Defaults::Request::SSL
+      SSL = true unless defined? AnalyticsRuby::Defaults::Request::SSL
       HEADERS = { :accept => 'application/json' } unless defined? AnalyticsRuby::Defaults::Request::HEADERS
       RETRIES = 4 unless defined? AnalyticsRuby::Defaults::Request::RETRIES
       BACKOFF = 30.0 unless defined? AnalyticsRuby::Defaults::Request::BACKOFF

data/lib/analytics-ruby/request.rb

@@ -1,9 +1,9 @@
 
 require 'analytics-ruby/defaults'
 require 'analytics-ruby/response'
-require 'analytics-ruby/json'
-require 'faraday'
-require 'faraday_middleware'
+require 'net/http'
+require 'net/https'
+require 'json'
 
 module AnalyticsRuby
 
@@ -12,19 +12,20 @@ module AnalyticsRuby
     # public: Creates a new request object to send analytics batch
     #
     def initialize(options = {})
-
-      options[:url] ||= AnalyticsRuby::Defaults::Request::BASE_URL
-      options[:ssl] ||= AnalyticsRuby::Defaults::Request::SSL
-      options[:headers] ||= AnalyticsRuby::Defaults::Request::HEADERS
-      @path = options[:path] || AnalyticsRuby::Defaults::Request::PATH
-      @retries = options[:retries] || AnalyticsRuby::Defaults::Request::RETRIES
-      @backoff = options[:backoff] || AnalyticsRuby::Defaults::Request::BACKOFF
-
-      @conn = Faraday.new options do |faraday|
-        faraday.request :json
-        faraday.response :json, :content_type => /\bjson$/
-        faraday.adapter Faraday.default_adapter
-      end
+      options[:host] ||= Defaults::Request::HOST
+      options[:port] ||= Defaults::Request::PORT
+      options[:ssl] ||= Defaults::Request::SSL
+      options[:headers] ||= Defaults::Request::HEADERS
+      @path = options[:path] || Defaults::Request::PATH
+      @retries = options[:retries] || Defaults::Request::RETRIES
+      @backoff = options[:backoff] || Defaults::Request::BACKOFF
+
+      http = Net::HTTP.new(options[:host], options[:port])
+      http.use_ssl = options[:ssl]
+      http.read_timeout = 8
+      http.open_timeout = 4
+
+      @http = http
     end
 
     # public: Posts the secret and batch of messages to the API.
@@ -35,27 +36,26 @@ module AnalyticsRuby
       status, error = nil, nil
       remaining_retries = @retries
       backoff = @backoff
-
+      headers = { 'Content-Type' => 'application/json', 'accept' => 'application/json' }
       begin
-        res = @conn.post do |req|
-          req.options[:timeout] = 8
-          req.options[:open_timeout] = 3
-          req.url(@path)
-          req.body = AnalyticsRuby::JSON::dump :secret => secret, :batch => batch
-        end
-        status = res.status
-        error  = res.body["error"]
+        payload = JSON.generate :secret => secret, :batch => batch
+        res = @http.request(Net::HTTP::Post.new(@path, headers), payload)
+        status = res.code.to_i
+        body = JSON.parse(res.body)
+        error = body["error"]
 
       rescue Exception => err
+        puts "err: #{err}"
         status = -1
         error = "Connection error: #{err}"
+        puts "retries: #{remaining_retries}"
         unless (remaining_retries -=1).zero?
           sleep(backoff)
           retry
         end
       end
 
-      AnalyticsRuby::Response.new status, error
+      Response.new status, error
     end
   end
 end

data/lib/analytics-ruby/version.rb

@@ -1,3 +1,3 @@
 module AnalyticsRuby
-  VERSION = '0.6.0'
+  VERSION = '1.0.0'
 end

data/spec/consumer_spec.rb

@@ -24,7 +24,7 @@ describe AnalyticsRuby::Consumer do
 
     it 'should not error if the endpoint is unreachable' do
 
-      Faraday::Connection.any_instance.stub(:post).and_raise(Exception)
+      Net::HTTP.any_instance.stub(:post).and_raise(Exception)
 
       queue = Queue.new
       queue << {}
@@ -33,7 +33,7 @@ describe AnalyticsRuby::Consumer do
 
       queue.should be_empty
 
-      Faraday::Connection.any_instance.unstub(:post)
+      Net::HTTP.any_instance.unstub(:post)
     end
 
     it 'should execute the error handler if the request is invalid' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: analytics-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,62 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,14 +49,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- analytics-ruby-0.6.0.gem
 - analytics-ruby.gemspec
 - Gemfile
-- Gemfile.lock
 - History.md
 - lib/analytics-ruby/client.rb
 - lib/analytics-ruby/consumer.rb
 - lib/analytics-ruby/defaults.rb
-- lib/analytics-ruby/json.rb
 - lib/analytics-ruby/request.rb
 - lib/analytics-ruby/response.rb
 - lib/analytics-ruby/util.rb

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    analytics-ruby (0.5.4)
-      faraday (>= 0.8)
-      faraday_middleware (>= 0.8, < 0.10)
-      multi_json (~> 1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    multi_json (1.7.7)
-    multipart-post (1.2.0)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  analytics-ruby!
-  rake
-  rspec

data/lib/analytics-ruby/json.rb

@@ -1,28 +0,0 @@
-require 'multi_json'
-
-module AnalyticsRuby
-
-  # JSON Wrapper module adapted from
-  # https://github.com/stripe/stripe-ruby/blob/master/lib/stripe/json.rb
-  #
-  # .dump was added in MultiJson 1.3
-  module JSON
-    if MultiJson.respond_to? :dump
-      def self.dump(*args)
-        MultiJson.dump(*args)
-      end
-
-      def self.load(*args)
-        MultiJson.load(*args)
-      end
-    else
-      def self.dump(*args)
-        MultiJson.encode(*args)
-      end
-
-      def self.load(*args)
-        MultiJson.decode(*args)
-      end
-    end
-  end
-end