lens 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f546261d6a085dbc5a3f8697d5353f90cb99ea
-  data.tar.gz: e2aa9893e2c0cf249d3924f16f376cdb8afa0b12
+  metadata.gz: a012ff1b501e256ecf5d23cd85ddbab93691ec19
+  data.tar.gz: bca5e5234778aa9affe85d7f93a40897a4b8c752
 SHA512:
-  metadata.gz: 79a3b8440a837c148818c90f34b2cf1e5899c39a15c16a7cbb728166f37c703c2a2d40f46ea76a2799612ab6cd3f5724ca850f8101534e11f49fdad9c7b2a01f
-  data.tar.gz: d5fa938e9c2b2d82c37265ac5a14e9b4479627d4043d2bf4035ecc9bf61ed02b223c4cef64b8c8eca0dce61daac699dff6a5199e4cb9871c283567327576861f
+  metadata.gz: bb648a4b48e3111a157ed48553fba8f88ca266f614d16814798c62ca3df61e3f70c1b338bc077244e0e325d029e13331ab99f5e6d08d674d5e9b492048af89ca
+  data.tar.gz: c020252259fa32e042c5654918e5d7cb3712a9d0138be712151913dfe2a7100fe0d9ee36397c28ec6afaf38755288bcf2d1b6f19aec2e04c7cc998fed780c448

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lens (0.0.1)
+    lens (0.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -67,7 +67,7 @@ GEM
       activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (0.9.6)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -106,7 +106,7 @@ DEPENDENCIES
   bundler (~> 1.6)
   lens!
   pry (~> 0.10)
-  pry-nav
+  pry-nav (~> 0)
   rails (>= 3.0)
-  rake
-  rspec (~> 3.2.0)
+  rake (~> 0)
+  rspec (~> 3.2)

data/lib/lens/configuration.rb

@@ -1,9 +1,9 @@
 module Lens
   class Configuration
-    attr_accessor :app_id, :secret, :protocol, :host, :port
+    attr_accessor :app_key, :secret, :protocol, :host, :port
 
     def protocol
-      'https'
+      @protocol || default_protocol
     end
 
     def host
@@ -21,5 +21,9 @@ module Lens
     def default_host
       'lens.coub.com'
     end
+
+    def default_protocol
+      'https'
+    end
   end
 end

data/lib/lens/core.rb

@@ -1,6 +1,7 @@
 require "lens/version"
 require "lens/configuration"
 require "lens/sender"
+require "lens/event_formatter"
 require "lens/trace"
 
 module Lens

data/lib/lens/event_formatter.rb

@@ -0,0 +1,38 @@
+module Lens
+  class EventFormatter
+    def initialize(event, records)
+      @event = event
+      @records = records
+    end
+
+    def json_formatted
+      formatted.to_json
+    end
+
+    def formatted
+      @formatted ||= { data: event_data }
+    end
+
+  private
+
+    def event_payload
+      @event_payload ||= @event.payload
+    end
+
+    def event_data
+      @event_data ||=
+      {
+        action: event_payload[:action],
+        controller: event_payload[:controller],
+        params: event_payload[:params],
+        method: event_payload[:method],
+        url: event_payload[:path],
+        records: @records,
+        duration: @event.duration,
+        meta: {
+          client_version: VERSION
+        }
+      }
+    end
+  end
+end

data/lib/lens/railtie.rb

@@ -18,12 +18,6 @@ module Lens
       Trace.current.add(event)
     end
 
-    ActiveSupport::Notifications.subscribe('net_http.request') do |*args|
-      next unless Trace.current
-      event = ActiveSupport::Notifications::Event.new(*args)
-      Trace.current.add(event)
-    end
-
     ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
       next unless Trace.current
       event = ActiveSupport::Notifications::Event.new(*args)

data/lib/lens/sender.rb

@@ -1,8 +1,9 @@
 require 'pry'
+require 'json'
 
 module Lens
   class Sender
-    NOTICES_URI = 'api/v1/record'
+    NOTICES_URI = 'api/v1/data/rec'
     HTTP_ERRORS = [Timeout::Error,
                    Errno::EINVAL,
                    Errno::ECONNRESET,
@@ -13,8 +14,7 @@ module Lens
                    Errno::ECONNREFUSED].freeze
 
     def initialize(options = {})
-      [ :app_id,
-        :secret,
+      [ :app_key,
         :protocol,
         :host,
         :port
@@ -24,11 +24,10 @@ module Lens
     end
 
     def send_to_lens(data)
-      response = send_request(url.path, data, {'X-API-Key' => secret})
+      response = send_request(url.path, data)
     end
 
-    attr_reader :app_id,
-      :secret,
+    attr_reader :app_key,
       :protocol,
       :host,
       :port
@@ -42,12 +41,12 @@ module Lens
     def setup_http_connection
       Net::HTTP.new(url.host, url.port)
     rescue => e
-      log(:error, "[Honeybadger::Sender#setup_http_connection] Failure initializing the HTTP connection.\nError: #{e.class} - #{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}")
+      log(:error, "[Lens::Sender#setup_http_connection] Failure initializing the HTTP connection.\nError: #{e.class} - #{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}")
       raise e
     end
 
     def send_request(path, data, headers = {})
-      http_connection.post(path, data, http_headers(headers))
+      http_connection.post(path, data.to_json, http_headers(headers))
     rescue *HTTP_ERRORS => e
       raise e
       nil
@@ -56,7 +55,8 @@ module Lens
     def http_headers(headers=nil)
       {}.tap do |hash|
         hash.merge!(HEADERS)
-        hash.merge!({'X-API-Key' => secret})
+        hash.merge!({'X-Auth-Token' => app_key})
+        hash.merge!({'Content-Type' =>'application/json'})
         hash.merge!(headers) if headers
       end
     end

data/lib/lens/trace.rb

@@ -2,31 +2,45 @@ require 'rails'
 
 module Lens
   class Trace
-    attr_reader :id, :duration
-
-    def self.current
-      Thread.current[:__lens_trace]
-    end
-
-    def self.create(id)
-      Thread.current[:__lens_trace] = new(id)
-    end
-
     def initialize(id)
       @id = id
-      @events = []
-      @duration = 0
+      @data = []
     end
 
     def add(event)
-      @events.push event
+      @data.push event.payload
     end
 
     def complete(event)
-      @duration = event.duration
-      Rails.logger.info "all [LENS] >>> #{@events}"
-      Rails.logger.info "last [LENS] >>> #{event}"
+      formatted_data = Lens::EventFormatter.new(event, @data).json_formatted
+      log(data)
+      send(data)
       Thread.current[:__lens_trace] = nil
     end
+
+  private
+
+    def send(data)
+      log(data)
+      Lens.sender.send_to_lens(data)
+    end
+
+    def log(data)
+      Rails.logger.info "all [LENS] >>> #{data}" if verbose?
+    end
+
+    def verbose?
+      true
+    end
+  end
+
+  class << Trace
+    def current
+      Thread.current[:__lens_trace]
+    end
+
+    def create(id)
+      Thread.current[:__lens_trace] = new(id)
+    end
   end
 end

data/lib/lens/version.rb

@@ -1,3 +1,3 @@
 module Lens
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lens/event_formatter_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Lens::EventFormatter do
+  let(:event) { double(payload: {}, duration: 2.33) }
+  let(:records) { [] }
+  let(:formatter) { Lens::EventFormatter.new(event, records) }
+
+  describe "#formatted" do
+    subject { formatter.formatted }
+
+    it "returns hash" do
+      expect(subject).to be_a(Hash)
+    end
+
+    it "has data key" do
+      expect(subject).to have_key(:data)
+    end
+
+    it "data key is not empty" do
+      expect(subject[:data]).to_not be_empty
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -2,12 +2,14 @@ module Helpers
   def stub_http(options = {})
     response = options[:response] || Net::HTTPSuccess.new('1.2', '200', 'OK')
     response.stub(:body => options[:body] || '{"id":"1234"}')
-    http = double(:post          => response,
-                :read_timeout= => nil,
-                :open_timeout= => nil,
-                :ca_file=      => nil,
-                :verify_mode=  => nil,
-                :use_ssl=      => nil)
+    http = double(
+      :post          => response,
+      :read_timeout= => nil,
+      :open_timeout= => nil,
+      :ca_file=      => nil,
+      :verify_mode=  => nil,
+      :use_ssl=      => nil
+    )
     Net::HTTP.stub(:new).and_return(http)
     http
   end
@@ -15,7 +17,7 @@ module Helpers
   def reset_config
     Lens.configuration = nil
     Lens.configure do |config|
-      config.app_id = 'app_key_123'
+      config.app_key = 'app_key_123'
       config.secret = 'abc123'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lens
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kgorin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,10 +99,12 @@ files:
 - lib/lens.rb
 - lib/lens/configuration.rb
 - lib/lens/core.rb
+- lib/lens/event_formatter.rb
 - lib/lens/railtie.rb
 - lib/lens/sender.rb
 - lib/lens/trace.rb
 - lib/lens/version.rb
+- spec/lens/event_formatter_spec.rb
 - spec/lens/sender_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
@@ -131,6 +133,7 @@ signing_key:
 specification_version: 4
 summary: Gem to send Rails request stats
 test_files:
+- spec/lens/event_formatter_spec.rb
 - spec/lens/sender_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb