google4r-checkout 1.1.2 → 1.1.3

data/CHANGES

@@ -1,5 +1,9 @@
 =google4r-checkout Changelog
 
+== 1.1.3 (2012-07-11)
+
+* More complete Notification History API support, contributed by Ben Hutton
+
 == 1.1.2 (2012-05-31)
 
 * Added support for donation processing, contributed by Paul Schreiber

data/lib/google4r/checkout/commands.rb

@@ -168,6 +168,27 @@ module Google4R #:nodoc:
                 return RefundAmountNotification.create_from_element xml_doc.root, @frontend
             when 'chargeback-amount-notification'
                 return ChargebackAmountNotification.create_from_element xml_doc.root, @frontend
+            when 'notification-history-response'
+                next_page_token = xml_doc.root.elements['next-page-token'].try(:value)
+                notifications = xml_doc.root.elements['notifications'].elements.map do |element| 
+                  case element.name
+                    when 'new-order-notification'
+                      NewOrderNotification.create_from_element element, @frontend
+                    when 'risk-information-notification'
+                      RiskInformationNotification.create_from_element element, @frontend
+                    when 'order-state-change-notification'
+                      OrderStateChangeNotification.create_from_element element, @frontend
+                    when 'charge-amount-notification'
+                      ChargeAmountNotification.create_from_element element, @frontend
+                    when 'authorization-amount-notification'
+                      AuthorizationAmountNotification.create_from_element element, @frontend
+                    when 'refund-amount-notification'
+                      RefundAmountNotification.create_from_element element, @frontend
+                    when 'chargeback-amount-notification'
+                      ChargebackAmountNotification.create_from_element element, @frontend
+                  end
+                end
+                { :notifications => notifications, :next_page_token => next_page_token }
             else
                 raise "Unknown response:\n--\n#{xml_doc.to_s}\n--"
             end
@@ -699,12 +720,21 @@ module Google4R #:nodoc:
     # google to the notification callback URL
     class NotificationHistoryRequestCommand < Command
       
-      attr_reader :serial_number
+      attr_reader :serial_number, :start_time, :end_time, :notification_types, :order_numbers, :next_page_token
       
-      def initialize(frontend, serial_number)
+      def initialize(frontend, args)
         super frontend
-        
-        @serial_number = serial_number
+
+        if args.is_a? Hash
+          @serial_number = args[:serial_number]
+          @start_time = args[:start_time]
+          @end_time = args[:end_time]
+          @notification_types = args[:notification_types]
+          @order_numbers = args[:order_numbers]
+          @next_page_token = args[:next_page_token]
+        else
+          @serial_number = args
+        end
       end
       
       def to_xml

data/lib/google4r/checkout/xml_generation.rb

@@ -1020,22 +1020,55 @@ module Google4R #:nodoc:
         end
       end
     end
-    
+
     class NotificationHistoryReportCommandXmlGenerator < CommandXmlGenerator
-      
+
       def initialize(command)
         @command = command
       end
-      
+
       protected
-      
+
       def process_command(command)
         root = super
-        
-        sn_element = root.add_element('serial-number')
-        sn_element.text = command.serial_number
+
+        if command.serial_number
+          element = root.add_element('serial-number')
+          element.text = command.serial_number
+        end
+
+        if command.start_time
+          element = root.add_element('start-time')
+          element.text = command.start_time.xmlschema
+        end
+
+        if command.end_time
+          element = root.add_element('end-time')
+          element.text = command.end_time.xmlschema
+        end
+
+        if command.notification_types.present?
+          nt_element = root.add_element('notification-types')
+          command.notification_types.each do |notification_type|
+            element = nt_element.add_element('notification-type')
+            element.text = notification_type
+          end
+        end
+
+        if command.order_numbers.present?
+          on_element = root.add_element('order-numbers')
+          command.order_numbers.each do |order_number|
+            element = on_element.add_element('google-order-number')
+            element.text = order_number
+          end
+        end
+
+        if command.next_page_token
+          element = root.add_element('next-page-token')
+          element.text = command.next_page_token
+        end
+
       end
     end
-    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google4r-checkout
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,14 +14,15 @@ authors:
 - Chris Parrish
 - Larry Salibra
 - Paul Schreiber
+- Ben Hutton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70193619970700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -29,10 +30,15 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70193619970700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70193619970280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,10 +46,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193619970280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70193619969820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -51,10 +62,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193619969820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70193619969380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,7 +78,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193619969380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "  google4r-checkout is a lightweight, framework-agnostic Ruby library
   to access the Google Checkout service and implement \n  notification handlers. It
   exposes object-oriented wrappers for all of Google Checkout's API commands and notifications.\n"
@@ -171,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Full-featured Google Checkout library for Ruby
@@ -241,4 +262,3 @@ test_files:
 - test/unit/us_zip_area_test.rb
 - test/unit/world_area_test.rb
 - test/test_helper.rb
-has_rdoc: