effective_orders 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6171edb7decb2419e845db8af7b83851a284a8f8
-  data.tar.gz: 2d4a15554d343111758486fc031159b8e2c83ff0
+  metadata.gz: 101d33deb56c39e2cb0805f69c46cdae7b11df2f
+  data.tar.gz: 164d3ac6fcef01e5c36fecafa3758df40791cf7b
 SHA512:
-  metadata.gz: 877e43822891f56644670344377ed7fa76e45fcf3b9bccab2e4170bbf814b971929e30c3fba978cca691d77236530c388fd880220df520bbc4c075e4b4d0634c
-  data.tar.gz: 306ce59d6f08dd5d8cd5faf3d765709c1ddd094d7b54d40965ea734da4561e509e1248d333e0e3f06074faa29655d57a32e1998ce6949d6c0219466e47498c69
+  metadata.gz: 8b53c1a55398129ef3d432b424735c368950f470984423cf1da2ff2201d2e64585c4d172105e726fc52fa10d65332a9604c0a82bd1d213b94b603e519baa25f0
+  data.tar.gz: 44699ee1eb34067dc7b3ace224c31ded9faa93351e1f96a19faf073af2c2eab36890d72c460861a3f57a4e8df382c5737eaf127ad3730454973da476b963aae6

data/app/models/effective/order.rb

@@ -6,7 +6,7 @@ module Effective
       acts_as_obfuscated :format => '###-####-###'
     end
 
-    acts_as_addressable :billing => {:presence => EffectiveOrders.require_billing_address, :use_full_name => true}, :shipping => {:presence => EffectiveOrders.require_shipping_address, :use_full_name => true}
+    acts_as_addressable :billing => {:singular => true, :presence => EffectiveOrders.require_billing_address, :use_full_name => true}, :shipping => {:singular => true, :presence => EffectiveOrders.require_shipping_address, :use_full_name => true}
     attr_accessor :save_billing_address, :save_shipping_address, :shipping_address_same_as_billing # save these addresses to the user if selected
 
     belongs_to :user  # This is the user who purchased the order
@@ -96,14 +96,31 @@ module Effective
     def user=(user)
       super
 
-      if user.respond_to?(:billing_address) && (billing_address.blank? || billing_address.empty?)
+      # Copy user addresses into this order if they are present
+      if user.respond_to?(:billing_address) && !user.billing_address.nil?
         self.billing_address = user.billing_address
-        self.billing_address.full_name = billing_name if billing_address.present? && billing_address.full_name.blank?
       end
 
-      if user.respond_to?(:shipping_address) && (shipping_address.blank? || shipping_address.empty?)
+      if user.respond_to?(:shipping_address) && !user.shipping_address.nil?
         self.shipping_address = user.shipping_address
-        self.shipping_address.full_name = billing_name if shipping_address.present? &&shipping_address.full_name.blank?
+      end
+
+      # If our addresses are required, make sure they exist
+      if EffectiveOrders.require_billing_address
+        self.billing_address ||= Effective::Address.new()
+      end
+
+      if EffectiveOrders.require_shipping_address
+        self.shipping_address ||= Effective::Address.new()
+      end
+
+      # Ensure the Full Name is assigned when an address exists
+      if billing_address.nil? == false && billing_address.full_name.blank?
+        self.billing_address.full_name = billing_name
+      end
+
+      if shipping_address.nil? == false && shipping_address.full_name.blank?
+        self.shipping_address.full_name = billing_name
       end
     end
 
@@ -165,17 +182,13 @@ module Effective
     end
 
     def billing_name
-      if billing_address.try(:full_name).present?
-        billing_address.full_name
-      elsif user.respond_to?(:full_name)
-        user.full_name.to_s
-      elsif user.respond_to?(:first_name) && user.respond_to?(:last_name)
-        user.first_name.to_s + ' ' + user.last_name.to_s
-      elsif user.to_s.start_with?('#<User:') == false
-        user.to_s
-      else
-        ''
-      end
+      name ||= billing_address.try(:full_name).presence
+      name ||= user.try(:full_name).presence
+      name ||= (user.try(:first_name).to_s + ' ' + user.try(:last_name).to_s).presence
+      name ||= user.try(:email).presence
+      name ||= user.to_s
+      name ||= "User #{user.try(:id)}"
+      name
     end
 
     # :validate => false, :email => false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.2.12'.freeze
+  VERSION = '1.2.13'.freeze
 end

data/spec/dummy/config/environments/production.rb

@@ -19,9 +19,6 @@ Rails.application.configure do
   # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
-
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass

data/spec/dummy/config/environments/test.rb

@@ -12,10 +12,6 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
-  config.static_cache_control = 'public, max-age=3600'
-
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/spec/dummy/log/test.log

@@ -122,3 +122,51 @@
    (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
    (0.3ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") AS max_id FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.5ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.5ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.4ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.4ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"

data/spec/models/factories_spec.rb

@@ -10,4 +10,20 @@ describe 'Factories' do
   it 'should have all valid factories' do
     factories.each { |factory| FactoryGirl.create(factory).valid?.should eq true }
   end
+
+  it 'should have created an Order with a billing_address and shipping_address' do
+    order = FactoryGirl.create(:order)
+
+    order.billing_address.present?.should eq true
+    order.shipping_address.present?.should eq true
+
+    order.billing_address.valid?.should eq true
+    order.shipping_address.valid?.should eq true
+
+    order.billing_address.full_name.present?.should eq true
+    order.shipping_address.full_name.present?.should eq true
+
+    order.save.should eq true
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: effective_obfuscation
   requirement: !ruby/object:Gem::Requirement