itunes_receipt_validator 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b77b13bb8f2873dbee2a213fd62d354f4fedbde
-  data.tar.gz: eb68ad8842b921cbbcb4f02d688db66eb7ba78f5
+  metadata.gz: 59447ec52b6230c6b2615a9a915acddf433bdb5b
+  data.tar.gz: 1dcf1d374181b0f55ac86080eea1d351061800d4
 SHA512:
-  metadata.gz: 96134027c767ab5c262377750b0f1a92e330a1917056dfba6a433b08cfabab0767c7dc39695e64cfafc02a80635555dd4f1d9ce2609ad8da9de776313d06c774
-  data.tar.gz: 3bce5284cf4ef617120923c604acd2d2dcddee596cde29bc93ba58a981117f1ef8381195ce6b80dc18107af5c5774df863129d90438f535999e972d6658a687d
+  metadata.gz: 1b3109ff7b381d1e711f32245281273a6158a1604ef1161b7ea389fdd979cca183ebd302f05933a6473a2cd67aa2cb82c838ca70362e012a4a230fca0a89f500
+  data.tar.gz: 0ac47696ebda71a9a291429a0117f2a8c930e475c30f29c3cf1c46e8ce283ea81c7c196e447a8b5d6f374eddc9d76b94fa4a70ae9bbc531f418142bab9c258b6

data/lib/itunes_receipt_validator/transaction.rb

@@ -6,6 +6,35 @@ module ItunesReceiptValidator
   ##
   # ItunesReceiptValidator::Transaction
   class Transaction
+    ATTR_MAP = {
+      id: :transaction_id,
+      original_id: :original_transaction_id,
+      product_id: :product_id,
+      quantity: :quantity,
+      web_order_line_item_id: proc do |hash|
+        hash[:web_order_line_item_id].to_s if
+          hash.fetch(:web_order_line_item_id, 0).to_i > 0
+      end,
+      trial_period: ->(hash) { hash[:is_trial_period] == 'true' },
+      purchased_at: proc do |hash|
+        parse_date(hash[:purchase_date_ms] || hash[:purchase_date])
+      end,
+      first_purchased_at: proc do |hash|
+        parse_date hash[:original_purchase_date_ms] ||
+                   hash[:original_purchase_date]
+      end,
+      cancelled_at: proc do |hash|
+        parse_date(hash[:cancelled_date_ms] || hash[:cancelled_date])
+      end,
+      expires_at: proc do |hash|
+        if hash[:bid]
+          parse_date(hash[:expires_date] || hash[:expires_date_formatted])
+        else
+          parse_date(hash[:expires_date_ms] || hash[:expires_date])
+        end
+      end
+    }
+
     attr_reader :id, :original_id, :product_id, :quantity, :first_purchased_at,
                 :purchased_at, :expires_at, :cancelled_at,
                 :web_order_line_item_id, :trial_period, :receipt
@@ -39,26 +68,29 @@ module ItunesReceiptValidator
 
     private
 
-    def convert_ms(ms)
-      return nil if ms.nil?
-      Time.at(ms.to_f / 1000).utc
-    end
+    attr_writer :id, :original_id, :product_id, :quantity,
+                :web_order_line_item_id, :trial_period, :purchased_at,
+                :first_purchased_at, :cancelled_at, :expires_at
 
     def normalize(hash)
-      @id = hash.fetch(:transaction_id)
-      @original_id = hash.fetch(:original_transaction_id)
-      @product_id = hash.fetch(:product_id)
-      @quantity = hash.fetch(:quantity)
-      @purchased_at = convert_ms hash.fetch(:purchase_date_ms)
-      @first_purchased_at = convert_ms hash.fetch(:original_purchase_date_ms)
-      @cancelled_at = convert_ms hash.fetch(:cancelled_date_ms, nil)
-      @web_order_line_item_id = hash.fetch(:web_order_line_item_id, nil)
-      @trial_period = hash.fetch(:is_trial_period, nil) == 'true'
-      if hash[:bid]
-        @expires_at = convert_ms hash.fetch(:expires_date, nil)
+      ATTR_MAP.each do |key, val|
+        if val.is_a?(Proc)
+          send("#{key}=".to_s, instance_exec(hash, &val))
+        else
+          send("#{key}=".to_s, hash[val])
+        end
+      end
+    end
+
+    def parse_date(date)
+      return nil if date.nil?
+      if date.is_a?(Integer) || (date =~ /^\d+$/) == 0
+        Time.at(date.to_f / 1000).utc
       else
-        @expires_at = convert_ms hash.fetch(:expires_date_ms, nil)
+        Time.strptime(date, '%F %T Etc/%Z').utc
       end
+    rescue StandardError => _e
+      nil
     end
   end
 end

data/lib/itunes_receipt_validator/version.rb

@@ -3,5 +3,5 @@
 module ItunesReceiptValidator
   ##
   # Gem version
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes_receipt_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - mbaasy.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itunes_receipt_decoder