shopifydev 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 785668246d41b9b1d42b825d56301349a927c401
-  data.tar.gz: aacb6f74df0612dbdad4144a62e14813416ac5f2
+  metadata.gz: 24048d7d7f0c6fb857ade82e23a0bab4f8467d9d
+  data.tar.gz: 72f5702fadc38edbfcb7071a328fde8967d5db6c
 SHA512:
-  metadata.gz: 17abcb331fdd2ef6c990cd2a2bb799270e7c1b4dd63f37b0a7dfda03d9857e2b874a2607796ba8159ff03903a9d76829dd6b4c537f35127a4fb4765dc2f1ecbc
-  data.tar.gz: a5c99d5fc8680cc352c41564e8e073dcbb31da35bac1d5c37540f2d2489c3265180d9dbba3d21537e792ca3acdde1b463758c4ba7ff73b62243097b01de52b92
+  metadata.gz: ced6bc6eeee626d57d3c2afa71471c30992e57fd4acc8fa860a77bd9d5c3b3e8133f061c5d27aa05b0c8820514530ddccbce35b944a019c670973541edd37749
+  data.tar.gz: b40e579b8d5e39e46deebac68d4443d6397d4a5b9473ce0efd1b538bf0978bde939160ed2e56d745f451205d3f1bd89ce621af493d9677e394c8bb1441b6ad37

data/lib/shopifydev/test/order_fixture.rb

@@ -44,6 +44,7 @@ module Shopifydev
 
         if opts[:variant_id]
           variant = variants.find{|v| v.id.to_s == opts[:variant_id].to_s}
+          variant ||= product.variants.sample if product
           raise "don't know about a variant with id #{opts[:variant_id]}" if variant.nil?
         end
         variant ||= products.sample.variants.sample
@@ -73,29 +74,83 @@ module Shopifydev
         out
       end
 
-      def address_attrs
+      def us_address_attrs(opts={})
         require_relative 'valid_zip'
         place = ValidZip.valid_place
         first_name = ::Faker::Name.first_name
         last_name  = ::Faker::Name.last_name
-        {
+        attrs = {
           first_name:   first_name,
           last_name:    last_name,
-          name:         [first_name, last_name].join(' '),
           address1:     ::Faker::AddressUS.street_address,
           phone:        ::Faker::PhoneNumber.phone_number,
           city:         place[:city],
           province:     place[:state],
           country:      "US",
           zip:          place[:zip]
-        }.deep_merge(@address_defaults)
+        }.deep_merge(@address_defaults).deep_merge(opts)
+        attrs[:name] ||= [first_name, last_name].join(' ')
+        attrs
+      end
+
+      def cad_address_attrs(opts={})
+        require_relative 'valid_postal_code'
+        place = ValidPostalCode.valid_place
+        first_name = ::Faker::Name.first_name
+        last_name  = ::Faker::Name.last_name
+        attrs = {
+          first_name:   first_name,
+          last_name:    last_name,
+          address1:     ::Faker::AddressCA.street_address,
+          phone:        ::Faker::PhoneNumber.phone_number,
+          city:         place[:city],
+          province:     place[:province],
+          country:      "CA",
+          zip:          place[:postal_code]
+        }.deep_merge(@address_defaults).deep_merge(opts)
+        attrs[:name] ||= [first_name, last_name].join(' ')
+        attrs
       end
 
+      def address_attrs(opts=nil)
+        case opts
+        when 'cad', 'CAD', 'ca', 'CA', :cad
+          cad_address_opts(opts)
+        when 'us', 'US', :us
+          cad_address_opts(opts)
+        when Hash
+          country = opts[:country]
+          case country.downcase
+          when 'ca', 'cad', 'canada'
+            cad_address_attrs(opts)
+          when 'us', 'united states'
+            us_address_attrs(opts)
+          else
+            [cad_address_attrs(opts), us_address_attrs(opts)].sample
+          end
+        else
+          [cad_address_attrs, us_address_attrs].sample
+        end
+      end
+      
       def order_attrs(opts={})
+        address = opts.delete(:address)
+        address = address_attrs(address) if address
+        billing_address = opts.delete(:billing_address)
+        billing_address = address_attrs(billing_address) if billing_address
+        billing_address ||= address
+        billing_address ||= address_attrs
+        
+        shipping_address = opts.delete(:shipping_address)
+        shipping_address = address_attrs(shipping_address) if shipping_address
+        shipping_address ||= address
+        shipping_address ||= address_attrs
+
+        opts.delete(:address)
         {
           line_items: line_items_attrs(opts),
-          billing_address: address_attrs,
-          shipping_address: address_attrs,
+          billing_address: billing_address,
+          shipping_address: shipping_address,
           financial_status: 'paid',
           email: ::Faker::Internet.email
         }.deep_merge(@order_defaults).deep_merge(opts)