chartmogul-ruby 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 977e148db4993ab3fa15baa1e33b2ed0f7eaa6678ebefa4d06a0bf825a627429
-  data.tar.gz: fec1f5f01079384a057bf590312f95be967201796840a74fbe9af23b73fb208e
+SHA1:
+  metadata.gz: 31731f1df4e34d838b148dc025e7cf1ac680ff05
+  data.tar.gz: 4bc5b8118c09794398ae8b6c0ac0a856c3a6ba72
 SHA512:
-  metadata.gz: e7c8f8d12efc748930d84b220eceaa349e1c749e92b4ecd12f367b6bd8033125de7cc4194a0279efd6ab62e3e71cb495a0bb71a28369e7dd834302647f02d9ba
-  data.tar.gz: ab77638242a73dc90b719b3c58d78af529896cbd3b114f2e3cebb0c7c3c894fdf15a1fa5ef55b70a77c8b76020afd01a1bf2d7c4bbd4ff7c45b126b7e4fa2d9c
+  metadata.gz: 5d59360584c726bc60c2073cddd222ef73963084998f289c51fc4f26fe27e42b20ffa515be5d3ce2b48d3ff3b273c286625ee2bd7558bb58b2c66339a9c32566
+  data.tar.gz: 439d8190fd2c792f13b47d036e30aa58650fcffaba927f8fff8306974d6d9f2786b9c57f8db230387bdf1cb77667b9f1ec9ff271021150c8fa673c563921319a

data/chartmogul-ruby.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'vcr', '~> 3.0'
-  spec.add_development_dependency 'pry', '~> 0.10.3'
   spec.add_development_dependency 'webmock', '~> 3.4', '>= 3.4.2'
   spec.add_development_dependency 'simplecov', '~> 0.16.0'
+  spec.add_development_dependency 'pry', '~> 0.12.2'
 end

data/fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/updates_custom_attributes.yml

@@ -75,8 +75,7 @@ http_interactions:
       - 'true'
     body:
       encoding: UTF-8
-      string: '{"custom":{"string_key":"Another String Value","integer_key":5678,"timestamp_key":"2016-02-01
-        00:00:00 UTC","boolean_key":false}}'
+      string: '{"custom":{"string_key":"Another String Value","integer_key":5678,"timestamp_key":"2016-02-01T00:00:00.000Z","boolean_key":false}}'
     http_version:
   recorded_at: Wed, 29 Jun 2016 12:47:09 GMT
 recorded_with: VCR 3.0.3

data/lib/chartmogul/customer.rb

@@ -117,23 +117,12 @@ module ChartMogul
     end
 
     def custom_attributes=(custom_attributes = {})
-      @attributes[:custom] = typecast_custom_attributes(custom_attributes)
+      @attributes[:custom] = ChartMogul::Utils::JSONParser.typecast_custom_attributes(custom_attributes)
     end
 
     def set_attributes(attributes_attributes)
       @attributes = attributes_attributes
-      @attributes[:custom] = typecast_custom_attributes(attributes_attributes[:custom])
-    end
-
-    def typecast_custom_attributes(custom_attributes)
-      return {} unless custom_attributes
-      custom_attributes.each_with_object({}) do |(key, value), hash|
-        hash[key] = value.instance_of?(String) ? (begin
-                                                    Time.parse(value)
-                                                  rescue
-                                                    value
-                                                  end) : value
-      end
+      @attributes[:custom] = ChartMogul::Utils::JSONParser.typecast_custom_attributes(attributes_attributes[:custom])
     end
   end
 

data/lib/chartmogul/enrichment/customer.rb

@@ -94,24 +94,14 @@ module ChartMogul
         @attributes[:tags] = tags
       end
 
+      # When passing timestamps, either use Time instance, or iso8601-parseable string.
       def custom_attributes=(custom_attributes = {})
-        @attributes[:custom] = typecast_custom_attributes(custom_attributes)
+        @attributes[:custom] = ChartMogul::Utils::JSONParser.typecast_custom_attributes(custom_attributes)
       end
 
       def set_attributes(attributes_attributes)
         @attributes = attributes_attributes
-        @attributes[:custom] = typecast_custom_attributes(attributes_attributes[:custom])
-      end
-
-      def typecast_custom_attributes(custom_attributes)
-        return {} unless custom_attributes
-        custom_attributes.each_with_object({}) do |(key, value), hash|
-          hash[key] = value.instance_of?(String) ? (begin
-                                                      Time.parse(value)
-                                                    rescue
-                                                      value
-                                                    end) : value
-        end
+        @attributes[:custom] = ChartMogul::Utils::JSONParser.typecast_custom_attributes(attributes_attributes[:custom])
       end
     end
 

data/lib/chartmogul/utils/json_parser.rb

@@ -1,9 +1,25 @@
 module ChartMogul
   module Utils
     class JSONParser
-      def self.parse(json_string)
-        hash = JSON.parse(json_string, symbolize_names: true)
-        HashSnakeCaser.new(hash).to_snake_keys
+      class << self
+        def parse(json_string)
+          hash = JSON.parse(json_string, symbolize_names: true)
+          HashSnakeCaser.new(hash).to_snake_keys
+        end
+
+        def typecast_custom_attributes(custom_attributes)
+          return {} unless custom_attributes
+
+          custom_attributes.each_with_object({}) do |(key, value), hash|
+            hash[key] = opt_string_to_time(value)
+          end
+        end
+
+        def opt_string_to_time(value)
+          return value unless value.instance_of?(String)
+
+          Time.iso8601(value) rescue Time.rfc2822(value) rescue value
+        end
       end
     end
   end

data/lib/chartmogul/version.rb

@@ -1,3 +1,3 @@
 module ChartMogul
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartmogul-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jason Langenauer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 description: Official Ruby client for ChartMogul's API
 email:
 - jason@chartmogul.com
@@ -281,7 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Chartmogul API Ruby Client