spree_address_book 0.50.1 → 0.50.2

data/app/helpers/checkout_helper_decorator.rb

@@ -0,0 +1,33 @@
+CheckoutHelper.module_eval do
+  def address_field(form, method, id_prefix = "b", &handler)
+    content_tag :p, :id => [id_prefix, method].join, :class => "field" do
+      if handler
+        handler.call
+      else
+        is_required = Address.required_fields.include?(method)
+        separator = is_required ? '<span class="req">*</span><br />' : '<br />' 
+        form.label(method) + separator.html_safe + 
+        form.text_field(method, :class => is_required ? 'required' : nil)
+      end
+    end
+  end
+  
+  def address_state(form, country)
+    country ||= Country.find(Spree::Config[:default_country_id])
+    have_states = !country.states.empty?
+    state_elements = [
+      form.collection_select(:state_id, country.states.order(:name),
+                            :id, :name,
+                            {:include_blank => true},
+                            {:class => have_states ? "required" : "hidden",
+                            :disabled => !have_states}) +
+      form.text_field(:state_name,
+                      :class => !have_states ? "required" : "hidden",
+                      :disabled => have_states)
+      ].join.gsub('"', "'").gsub("\n", "")
+           
+    form.label(:state, t(:state)) + '<span class="req">*</span><br />'.html_safe +
+      content_tag(:noscript, form.text_field(:state_name, :class => 'required')) +
+      javascript_tag("document.write(\"#{state_elements.html_safe}\");")
+  end
+end

data/app/models/address_decorator.rb

@@ -1,5 +1,10 @@
 Address.class_eval do
   belongs_to :user
+
+  def self.required_fields
+    validator = Address.validators.find{|v| v.kind_of?(ActiveModel::Validations::PresenceValidator)}
+    validator ? validator.attributes : []
+  end
   
   # can modify an address if it's not been used in an order 
   def editable?

data/app/views/addresses/_form.html.erb

@@ -1,46 +1,15 @@
 <% ADDRESS_FIELDS.each do |field| %>
   <p id="<%= [address_name, field].join('_') %>" class="field">
     <% if field == "country" %>
-      <%= address_form.label :country_id, t(field, :scope => [:activerecord, :attributes, :address]) %>
+      <%= address_form.label :country_id, t(field, :scope => [:activerecord, :attributes, :address]) %><span class="req">*</span><br />
       <span><%= address_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %></span>
-      <span class="req">*</span>
     <% elsif field == "state" && Spree::Config[:address_requires_state] %>
-      <%= address_form.label :state_id, t(field, :scope => [:activerecord, :attributes, :address]) %>
-      <span id="state">
-        <% have_states = !address.country.states.empty? %>
-        <noscript>
-          <%= address_form.text_field :state_name, :class => 'required' %>
-        </noscript>
-        <% state_elements = [
-           address_form.collection_select(:state_id, address.country.states,
-                              :id, :name,
-                              {:include_blank => true},
-                              {:class => have_states ? "required" : "hidden",
-                              :disabled => !have_states}) +
-            address_form.text_field(:state_name,
-                              :class => !have_states ? "required" : "hidden",
-                              :disabled => have_states)
-            ].join.gsub('"', "'").gsub("\n", "")
-        %>
-        <script type="text/javascript" language="javascript" charset="utf-8">
-        // <![CDATA[
-        document.write("<%= raw state_elements %>");
-        // ]]>
-        </script>
-      </span>
-      <span class="req">*</span>
-    <% elsif field == "address2" %>
-      <%= address_form.label field, t(field, :scope => [:activerecord, :attributes, :address]) %>
-      <%= address_form.text_field field %>
+      <%= address_field(address_form, :state, address_name) { address_state(address_form, address.country) } %>
     <% else %>
-      <%= address_form.label field, t(field, :scope => [:activerecord, :attributes, :address]) %>
-      <%= address_form.text_field field, :class => 'required' %><span class="req">*</span>
+      <%= address_field(address_form, field.to_sym, address_name) %>
     <% end %>
   </p>
 <% end %>
 <% if Spree::Config["alternative_#{address_name}_phone"] %>
-  <p id="altphone">
-    <%= address_form.label :alternative_phone, t(:alternative_phone) %>
-    <%= address_form.text_field :alternative_phone %>
-  </p>
+  <%= address_field(address_form, :alternative_phone, address_name) %>
 <% end %>

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

@@ -20,17 +20,18 @@
       </label>
     </p>
   <% end %>
-  <div class="select_address">
-    <p class="field">
+  <div class="select_address" data-role="fieldcontain">
+    <fieldset data-role="controlgroup">
       <% if @addresses.present? %>
         <% @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>
+          <%= form.radio_button "#{address_name}_id", address.id, :checked => (idx == 0) %> 
+          <%= form.label ["#{address_name}_id", address.id], address.to_s %>
+          <%= link_to t(:edit), edit_address_path(address) %><br />
         <% end %>
-        <label><%= form.radio_button "#{address_name}_id", 0 %> <%= t('other_address') %></label>
+        <%= form.radio_button "#{address_name}_id", 0 %>
+        <%= form.label ["#{address_name}_id", 0], t('other_address') %>
       <% end %>
-    </p>
+    </fieldset>
   </div>
   <%= form.fields_for address_name do |address_form| %>
     <div class="inner">

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     = '0.50.1'
+  s.version     = '0.50.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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 50
-  - 1
-  version: 0.50.1
+  - 2
+  version: 0.50.2
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +04:00
+date: 2011-06-25 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - Versionfile
 - app/controllers/addresses_controller.rb
 - app/controllers/checkout_controller_decorator.rb
+- app/helpers/checkout_helper_decorator.rb
 - app/models/address_decorator.rb
 - app/models/order_decorator.rb
 - app/models/user_decorator.rb