sensors_analytics_sdk 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47906b565b92fa888b74b24be9be5bd978fc7ef
-  data.tar.gz: 3c4d01c3bd50aaa0ee1653d75a60b9a06d5b8284
+  metadata.gz: 1501e25d8b797a68d0d55f5ffaec58d1f6cd56aa
+  data.tar.gz: 9015ac1400a459f1c44be37f096c87392d91b44a
 SHA512:
-  metadata.gz: 424d39177dcf78383f3a1d5a280195f045cd276deeafd77f3cb54a612663906ef9f20070874b8f4a2af24f6fc1801146b73428458167bba22b29ba0224bf00de
-  data.tar.gz: 3eed9b537e9d5c26d846bfc8fc922573b0387d8797ce59d97e5f77698c356c5f9db0201d86fe3a841230bf5cab2dbc899c49fc398fb2e05f9662c871de6cfe0f
+  metadata.gz: 7ed4f21334dbcd623df8542bec482c774fee745e50eaf9834706055c62050a79a896a87b595c8a133604f5e7a39cc4d22ea448e9f840a55ce00c8aca33e3d0ff
+  data.tar.gz: a5bacf8b121e34843b47dc91b48687c6bf704050ae251e52fc0f0fd416b91fca618387d09b76bf17f0e358ad1e4daf319e1651374e7c26d24ad85bf9e6e897cd

data/lib/sensors_analytics_sdk.rb

@@ -5,7 +5,7 @@ require 'zlib'
 
 module SensorsAnalytics 
   
-  VERSION = '1.3.9'
+  VERSION = '1.4.0'
 
   KEY_PATTERN = /^((?!^distinct_id$|^original_id$|^time$|^properties$|^id$|^first_id$|^second_id$|^users$|^events$|^event$|^user_id$|^date$|^datetime$)[a-zA-Z_$][a-zA-Z\\d_$]{0,99})$/
 
@@ -60,9 +60,6 @@ module SensorsAnalytics
     #
     # 当 track 的 Properties 和 Super Properties 有相同的 key 时，将采用 track 的
     def register_super_properties(properties)
-      # raise IllegalDataError
-      _assert_properties(properties)
-
       properties.each do |key, value|
         @super_properties[key] = value
       end
@@ -144,7 +141,7 @@ module SensorsAnalytics
 
       # 从事件属性中获取时间配置
       event_time = _extract_time_from_properties(properties)
-      properties.delete("$time")
+      properties.delete(:$time)
 
       event_properties = {}
       if event_type == :track || event_type == :track_signup
@@ -159,21 +156,24 @@ module SensorsAnalytics
         end
       end
 
+      lib_properties = _get_lib_properties()
+
       # Track / TrackSignup / ProfileSet / ProfileSetOne / ProfileIncrement / ProfileAppend / ProfileUnset
       event = {
-          "type" => event_type,
-          "time" => event_time,
-          "distinct_id" => distinct_id,
-          "properties" => event_properties,
+          :type => event_type,
+          :time => event_time,
+          :distinct_id => distinct_id,
+          :properties => event_properties,
+          :lib => lib_properties,
       }
 
       if event_type == :track
         # Track
-        event["event"] = event_name
+        event[:event] = event_name
       elsif event_type == :track_signup
         # TrackSignUp
-        event["event"] = event_name
-        event["original_id"] = origin_distinct_id
+        event[:event] = event_name
+        event[:original_id] = origin_distinct_id
       end
 
       @consumer.send(event)
@@ -181,16 +181,42 @@ module SensorsAnalytics
 
     def _extract_time_from_properties(properties)
       properties.each do |key, value|
-        if key == "$time" && value.is_a?(Time)
+        if (key == :$time || key == "$time") && value.is_a?(Time)
           return (value.to_f * 1000).to_i
         end
       end
       return (Time.now().to_f * 1000).to_i
     end
 
+    def _get_lib_properties()
+      lib_properties = {
+        '$lib' => 'Ruby',
+        '$lib_version' => VERSION,
+        '$lib_method' => 'code',
+      }
+
+      @super_properties.each do |key, value|
+        if key == :$app_version || key == "$app_version"
+          lib_properties[:$app_version] = value
+        end
+      end
+
+      begin
+        raise Exception
+      rescue Exception => e
+        trace = e.backtrace[3].split(':')
+        file = trace[0]
+        line = trace[1]
+        function = trace[2].split('`')[1][0..-2]
+        lib_properties[:$lib_detail] = "###{function}###{file}###{line}"
+      end
+
+      return lib_properties
+    end
+
     def _assert_key(type, key)
       unless key.instance_of?(String) || key.instance_of?(Symbol)
-        raise IllegalDataError.new("#{type} must be an instance of String.")
+        raise IllegalDataError.new("#{type} must be an instance of String / Symbol.")
       end
       unless key.length >= 1
         raise IllegalDataError.new("#{type} is empty.")
@@ -286,7 +312,7 @@ module SensorsAnalytics
         init_header[key] = value
       end
 
-      uri = URI(@server_url)
+      uri = _get_uri(@server_url)
       request = Net::HTTP::Post.new(uri.request_uri, initheader = init_header)
       request.set_form_data(form_data)
 
@@ -299,6 +325,17 @@ module SensorsAnalytics
       return [response.code, response.body]
     end
 
+    def _get_uri(url)
+      begin
+          URI.parse(url)
+      rescue URI::InvalidURIError
+          host = url.match(".+\:\/\/([^\/]+)")[1]
+          uri = URI.parse(url.sub(host, 'dummy-host'))
+          uri.instance_variable_set('@host', host)
+          uri
+      end
+    end
+
   end
 
   # 实现逐条、同步发送的 Consumer，初始化参数为 Sensors Analytics 收集数据的 URI
@@ -365,7 +402,7 @@ module SensorsAnalytics
   class DebugConsumer < SensorsAnalyticsConsumer
    
     def initialize(server_url, write_data)
-      uri = URI(server_url)
+      uri = _get_uri(server_url) 
       # 将 URL Path 替换成 Debug 模式的 '/debug'
       uri.path = '/debug'
 
@@ -397,7 +434,7 @@ module SensorsAnalytics
         raise DebugModeError.new("Could not write to Sensors Analytics, server responded with #{response_code} returning: '#{response_body}'")
       end
     end
-
+ 
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensors_analytics_sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - Yuhan ZOU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies: []
 description: This is the official Ruby SDK for Sensors Analytics.
 email: zouyuhan@sensorsdata.cn
@@ -36,7 +36,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: SensorsAnalyticsSDK