radiant-shop-extension 0.91.2 → 0.91.3

data/VERSION

@@ -1 +1 @@
-0.91.2
+0.91.3

data/lib/shop/tags/helpers.rb

@@ -207,9 +207,9 @@ module Shop
             end
           end
           
-          if tag.locals.user.present?
+          if user = Users::Tags::Helpers.current_user(tag)
             begin
-              address = tag.locals.user.send(of_type)
+              address = user.send(of_type)
               return address unless address.nil?
             rescue
               nil

data/radiant-shop-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.91.2"
+  s.version = "0.91.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]

data/spec/lib/shop/tags/helpers_spec.rb

@@ -448,6 +448,18 @@ describe Shop::Tags::Helpers do
         result.should be_nil
       end
     end
+    
+    context 'no order exists but user does' do
+      before :each do
+        @user = User.new
+        stub(@user).billing { @address }
+        mock(Users::Tags::Helpers).current_user(anything) { @user }
+      end
+      it 'should return nil' do
+        result = Shop::Tags::Helpers.current_address(@tag,'billing')
+        result.should == @address
+      end
+    end
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 375
+  hash: 373
   prerelease: false
   segments: 
   - 0
   - 91
-  - 2
-  version: 0.91.2
+  - 3
+  version: 0.91.3
 platform: ruby
 authors: 
 - Dirk Kelly