compensated 0.1.0.pre12 → 0.1.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd372eb0e25b2a4556c00570678711625b4bc2c0fbc03a39895eecf41773dded
-  data.tar.gz: c284ee4d7dabd693c24f4249dfa8c377541e8f96eee6d4177bd12e7f8da776af
+  metadata.gz: 1ffaeea7f175182813c34e67a329003fd5d59830fad22ba2fdee2a0431e8d471
+  data.tar.gz: 8afb60789b60155b3b905e92235f861583fdda79507d3d2e2c1c61c4e10fa71b
 SHA512:
-  metadata.gz: 932ec9c9431d968d7c27ec007abad733e6993d5028f08740cb4d785d5811d8ee0db2a831f79a89b10bce8b3708cefb10f73cf86c8b22fdabe2b270f648da7531
-  data.tar.gz: bbb5ac4795f1fdfee765a9d1417e3af6c5236b15bc51a5cc9b9fb24dd9a87be85c1085ffa55413bf396f9d639d516a74663a3b570e3c21ed54dda7bd45e1f9c5
+  metadata.gz: ee192c911a7d01c525f99ff4bb5dd9b894de9346fead72f0bdb7699dceec262ab24cd78625063de80321310bab284785a995379d6a70959603be23a36a0af7d9
+  data.tar.gz: df66cefcd2e238b646bf68f1814dc9519ddea22e9a5c0d8f50822112f640fd9bde12303ef47d308cacbd0e135c3aab9870c4435e7e20b16f3960038cde57e0e7

data/lib/compensated/stripe/event_parser.rb

@@ -1,7 +1,8 @@
 require "compensated/event_parser"
 module Compensated
   module Stripe
-    SUPPORTED_EVENTS = %w[charge.succeeded invoice.payment_succeeded invoice.payment_failed customer.subscription.deleted]
+    SUPPORTED_EVENTS = %w[charge.succeeded invoice.payment_succeeded invoice.payment_failed
+                          customer.subscription.updated customer.subscription.deleted]
     class EventParser < Compensated::EventParser
       def parses?(request)
         return false if request.nil? || request.empty?
@@ -45,13 +46,16 @@ module Compensated
       end
 
       private def products(data)
-        if invoice?(data)
-          data[:data][:object][:lines][:data].map do |line|
-            value = product(line, data)
-            next if value.nil? || value.empty?
-            value
-          end
+        key = (invoice?(data) ? :lines : :items)
+        return [] unless data[:data][:object][key]
+        items  = data[:data][:object][key][:data]
+
+        items.map do |line|
+          value = product(line, data)
+          next if value.nil? || value.empty?
+          value
         end
+
       end
 
       private def product(line, data)
@@ -61,14 +65,43 @@ module Compensated
           purchased: purchased(data),
           description: line[:description],
           quantity: line[:quantity],
-          expiration: Time.at(line[:period][:end]),
-          subscription: subscription(line),
+          # TODO: Deprecate `expiration` as it now lives on subscription!
+          #       BUT people are using `expiration` so let's figure out
+          #       a way to safely remove it.
+          expiration: period_end(line, data),
+          subscription: subscription(line, data),
           plan: plan(line)
         }.compact
       end
 
-      private def subscription(line)
-        { id: line[:subscription] }.compact
+      private def period_start(line, data)
+        return nil unless line[:period] || data[:data][:object][:current_period_start]
+        timestamp = line[:period] ? line[:period][:start] : data[:data][:object][:current_period_start]
+        Time.at(timestamp)
+      end
+      private def period_end(line, data)
+        return nil unless line[:period] || data[:data][:object][:current_period_end]
+        timestamp = line[:period] ? line[:period][:end] : data[:data][:object][:current_period_end]
+        Time.at(timestamp)
+      end
+
+      private def subscription(line, data)
+        {
+          id: line[:subscription],
+          period: {
+            start: period_start(line, data),
+            end:  period_end(line, data),
+          }.compact,
+          status: subscription_status(data)
+         }.compact
+      end
+
+      private def subscription_status(data)
+        return :ended unless data[:data][:object][:ended_at].nil?
+        return :canceled unless data[:data][:object][:canceled_at].nil?
+        return :active if data[:data][:object][:status] == "paid"
+
+        data[:data][:object][:status].to_sym
       end
 
       private def plan(line)
@@ -90,7 +123,11 @@ module Compensated
       end
 
       private def purchased(data)
-        string = data[:data][:object][:status_transitions][:paid_at]
+        string = if data[:data][:object][:created]
+            data[:data][:object][:created]
+          else
+            data[:data][:object][:status_transitions][0][:paid_at]
+          end
         return nil if string.nil?
         Time.at(string)
       end

data/lib/compensated/version.rb

@@ -1,3 +1,3 @@
 module Compensated
-  VERSION = "0.1.0.pre12"
+  VERSION = "0.1.0.pre13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compensated
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre12
+  version: 0.1.0.pre13
 platform: ruby
 authors:
 - Zee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provide value (In Ruby!). Get paid.