spree_address_book 1.0.1 → 1.0.2

data/app/controllers/spree/addresses_controller.rb

@@ -1,4 +1,5 @@
 class Spree::AddressesController < Spree::BaseController
+  helper Spree::AddressesHelper
   rescue_from ActiveRecord::RecordNotFound, :with => :render_404
   load_and_authorize_resource
   

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -1,4 +1,6 @@
 Spree::CheckoutController.class_eval do
+  helper Spree::AddressesHelper
+  
   after_filter :normalize_addresses, :only => :update
   before_filter :set_addresses, :only => :update
   
@@ -20,7 +22,7 @@ Spree::CheckoutController.class_eval do
     end
     
   end
-  
+
   def normalize_addresses
     return unless params[:state] == "address" && @order.bill_address_id && @order.ship_address_id
     @order.bill_address.reload

data/app/helpers/spree/{checkout_helper_decorator.rb → addresses_helper.rb}

@@ -1,4 +1,4 @@
-Spree::CheckoutHelper.module_eval do
+module Spree::AddressesHelper
   def address_field(form, method, id_prefix = "b", &handler)
     content_tag :p, :id => [id_prefix, method].join('_'), :class => "field" do
       if handler

data/app/views/spree/checkout/_address.html.erb

@@ -13,21 +13,20 @@
       </label>
     </p>
   <% end %>
-  <div class="select_address">
-    <p class="field">
-      <% if @addresses.present? %>
+  <% if @addresses.present? %>
+    <div class="select_address">
+      <p class="field">
         <% @addresses.each_with_index do |address, idx| %>
         <span id="<%= [address_type, dom_id(address)].join('_') %>">
           <label><%= form.radio_button "#{address_name}_id", address.id, :checked => (idx == 0) %> <%= address %></label> <%= link_to t(:edit), edit_address_path(address) %><br />
         </span>
         <% end %>
         <label><%= form.radio_button "#{address_name}_id", 0 %> <%= t('other_address') %></label>
-      <% end %>
-    </p>
-  </div>
+      </p>
+    </div>
+  <% end %>
   <%= form.fields_for address_name do |address_form| %>
     <div class="inner">
-      <p class="field">&nbsp;</p>
       <%= render :partial => 'spree/addresses/form', :locals => {
         :address_name => address_name,
         :address_form => address_form,

data/lib/spree_address_book.rb

@@ -13,7 +13,7 @@ module Spree
 
       def self.activate
         Dir.glob(File.join(File.dirname(__FILE__), "../app/**/spree/*_decorator*.rb")) do |c|
-          Rails.env.production? ? require(c) : load(c)
+          Rails.application.config.cache_classes ? require(c) : load(c)
         end
         Spree::Ability.register_ability(Spree::AddressAbility)
       end

data/spree_address_book.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_address_book'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.summary     = 'Adds address book for users to Spree'
   #s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_address_book
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-16 00:00:00 Z
+date: 2012-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -128,7 +128,7 @@ files:
 - app/assets/stylesheets/store/spree_address_book.scss
 - app/controllers/spree/addresses_controller.rb
 - app/controllers/spree/checkout_controller_decorator.rb
-- app/helpers/spree/checkout_helper_decorator.rb
+- app/helpers/spree/addresses_helper.rb
 - app/models/spree/address_ability.rb
 - app/models/spree/address_book_configuration.rb
 - app/models/spree/address_decorator.rb