amplitude-rb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8e867a1ec802a05698e732705abfbadb07a5ab7b34f631b8c654347d79299b
-  data.tar.gz: bf49743c98e8d86d3195ff5b4ed7782694278f44152d94610be622bea023a61e
+  metadata.gz: dab0df7986383948be579ce9a8f659e39176b2fc60f8ad319adad9c017f9e2d8
+  data.tar.gz: 7f06bbfdae98fafeb6aa3e09a4dd0a1fbafc491ccc3a7713a17ec296575f3cd9
 SHA512:
-  metadata.gz: 3a920cac5fdb886715ece75318afe538bdd33fa923bb8064b4bb5a6b317dad10fbe0335b8a5e09d8bc0c767d54e6f2f6e93b7d8d8f81165702bae8b425744a6f
-  data.tar.gz: b9f8ea0a55eebc01ed7345f16f1cf757c1c2de52bd8c86e451ee51a40a15808fac9e6f36b4270225d36ea9ecdd2949945996919e553c78109a9d7103abc6fda5
+  metadata.gz: eda031fca9a2527d79a9e80acc41ef740d17bb42a80adfcc9286e7573c68136681c1384ade43e5396799dc7ed73406b0bfe2f4b5821ccf6b08ee8532b5f936c2
+  data.tar.gz: 77d8e6e8fda07fa2edeb01e127caa1029f87c8a9f041c27ad3e1d3a7010581d04cf55f84e91c5bbd6fa403b7f396a2e62a5276d19c22d605c77369c071326df0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    amplitude (0.1.0)
+    amplitude-rb (0.1.1)
       httparty (~> 0.15.6)
-      multi_json (~> 1.13.1)
+      multi_json (~> 1.13)
 
 GEM
   remote: http://rubygems.org/
@@ -61,7 +61,7 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  amplitude!
+  amplitude-rb!
   pry
   rspec
   simplecov

data/README.md

@@ -14,13 +14,13 @@ Amplitude analytics service. It communicates with Amplitude over their
 Via the command-line:
 
 ```
-gem install amplitude
+gem install amplitude-rb
 ```
 
 Via a Gemfile:
 
 ```
-gem 'amplitude', '~> x.y.z'
+gem 'amplitude-rb', '~> x.y.z', require: 'amplitude'
 ```
 
 ## Configuration

data/lib/amplitude.rb

@@ -1,12 +1,18 @@
 require 'httparty'
 
-class Amplitude
+module Amplitude
   require_relative 'amplitude/errors'
 
   autoload :Config, "#{__dir__}/amplitude/config.rb"
   autoload :Event, "#{__dir__}/amplitude/event.rb"
+  autoload :Formatter, "#{__dir__}/amplitude/formatter.rb"
   autoload :HashSlicer, "#{__dir__}/amplitude/hash_slicer.rb"
 
+  module Formatters
+    autoload :Hash, "#{__dir__}/amplitude/formatters/hash.rb"
+    autoload :Time, "#{__dir__}/amplitude/formatters/time.rb"
+  end
+
   module Jobs
     autoload :Default, "#{__dir__}/amplitude/jobs/default.rb"
   end
@@ -43,8 +49,7 @@ class Amplitude
 
     def queue(data, options = {})
       raise AsyncError unless async_enabled?
-      event = Marshal.dump(create_event(data))
-      Amplitude::Jobs::Default.perform_later(event, options)
+      Amplitude::Jobs::Default.perform_later(create_event(data), options)
     end
 
     def async_enabled?

data/lib/amplitude/config.rb

@@ -34,9 +34,9 @@ class Amplitude::Config
           android_id event_properties user_properties insert_id session_id
           event_id
         ),
-        time_formatter: ->(time) { time ? (time.to_f * 1_000).to_i : nil },
-        event_prop_formatter: ->(props) { props&.to_h },
-        user_prop_formatter: ->(props) { props&.to_h },
+        time_formatter: Amplitude::Formatters::Time,
+        event_prop_formatter: Amplitude::Formatters::Hash,
+        user_prop_formatter: Amplitude::Formatters::Hash,
         iid_generator: ->() { SecureRandom.uuid }
       }
     end

data/lib/amplitude/errors.rb

@@ -1,4 +1,4 @@
-class Amplitude
+module Amplitude
   class Error < StandardError
   end
 

data/lib/amplitude/event.rb

@@ -1,69 +1,8 @@
 require 'multi_json'
 
 class Amplitude::Event
-  class Formatter
-    class << self
-      def call(data)
-        data = sanitize_data(data)
-        data = format_data(data)
-        add_insert_id(data)
-      end
-
-      def sanitize_data(data)
-        Amplitude::HashSlicer.call(data, Amplitude.config.whitelist)
-      end
-
-      def format_data(data)
-        format_props(format_time(data))
-      end
-
-      def format_time(data)
-        format_if_present(data, :time, time_formatter)
-      end
-
-      def format_props(data)
-        data = format_if_present(
-          data,
-          :event_properties,
-          event_prop_formatter
-        )
-        format_if_present(
-          data,
-          :user_properties,
-          user_prop_formatter
-        )
-      end
-
-      def format_if_present(data, key, formatter)
-        return data unless data[key]
-        data[key] = formatter.call(data[key])
-        data
-      end
-
-      def add_insert_id(data)
-        return data if data[:insert_id] || Amplitude.config.iid_generator.nil?
-        data[:insert_id] = Amplitude.config.iid_generator.call()
-        data
-      end
-
-      protected
-
-      def time_formatter
-        Amplitude.config.time_formatter
-      end
-
-      def event_prop_formatter
-        Amplitude.config.event_prop_formatter
-      end
-
-      def user_prop_formatter
-        Amplitude.config.user_prop_formatter
-      end
-    end
-  end
-
   def initialize(data)
-    @data = Formatter.call(data)
+    @data = Amplitude::Formatter.call(data)
   end
 
   def to_json
@@ -75,7 +14,7 @@ class Amplitude::Event
     super
   end
 
-  def respond_to?(method)
+  def respond_to_missing?(method, include_all = false)
     return true if @data.key?(method)
     super
   end

data/lib/amplitude/formatter.rb

@@ -0,0 +1,60 @@
+class Amplitude::Formatter
+  class << self
+    def call(data)
+      data = sanitize_data(data)
+      data = format_data(data)
+      add_insert_id(data)
+    end
+
+    def sanitize_data(data)
+      Amplitude::HashSlicer.call(data, Amplitude.config.whitelist)
+    end
+
+    def format_data(data)
+      format_props(format_time(data))
+    end
+
+    def format_time(data)
+      format_if_present(data, :time, time_formatter)
+    end
+
+    def format_props(data)
+      data = format_if_present(
+        data,
+        :event_properties,
+        event_prop_formatter
+      )
+      format_if_present(
+        data,
+        :user_properties,
+        user_prop_formatter
+      )
+    end
+
+    def format_if_present(data, key, formatter)
+      return data unless data[key]
+      data[key] = formatter.call(data[key])
+      data
+    end
+
+    def add_insert_id(data)
+      return data if data[:insert_id] || Amplitude.config.iid_generator.nil?
+      data[:insert_id] = Amplitude.config.iid_generator.call()
+      data
+    end
+
+    protected
+
+    def time_formatter
+      Amplitude.config.time_formatter
+    end
+
+    def event_prop_formatter
+      Amplitude.config.event_prop_formatter
+    end
+
+    def user_prop_formatter
+      Amplitude.config.user_prop_formatter
+    end
+  end
+end

data/lib/amplitude/formatters/hash.rb

@@ -0,0 +1,9 @@
+module Amplitude::Formatters
+  class Hash
+    class << self
+      def call(obj)
+        obj&.to_h
+      end
+    end
+  end
+end

data/lib/amplitude/formatters/time.rb

@@ -0,0 +1,15 @@
+module Amplitude::Formatters
+  class Time
+    class << self
+      def call(time)
+        return time if time.nil?
+        guess = time.to_i
+        ::Time.at(guess) > ::Time.now ? guess : convert_to_ms(time)
+      end
+
+      def convert_to_ms(time)
+        (time.to_f * 1_000).to_i
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amplitude-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tyler Eon
@@ -53,6 +53,9 @@ files:
 - lib/amplitude/config.rb
 - lib/amplitude/errors.rb
 - lib/amplitude/event.rb
+- lib/amplitude/formatter.rb
+- lib/amplitude/formatters/hash.rb
+- lib/amplitude/formatters/time.rb
 - lib/amplitude/hash_slicer.rb
 - lib/amplitude/jobs/default.rb
 homepage: https://gitlab.com/kolorahl/amplitude