spree_address_book 0.70.0 → 1.0.0

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.70.0'
+  s.version     = '1.0.0'
   s.summary     = 'Adds address book for users to Spree'
   #s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'
@@ -16,6 +16,11 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency('spree_core', '~> 0.70.0')
-  s.add_dependency('spree_auth', '~> 0.70.0')
+  s.add_dependency('spree_core', '~> 1.0.0')
+  s.add_dependency('spree_auth', '~> 1.0.0')
+  
+  s.add_development_dependency('rspec-rails',  '~> 2.7')
+  s.add_development_dependency('sqlite3')
+  s.add_development_dependency('capybara')
+  s.add_development_dependency('factory_girl', '~> 2.6')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_address_book
 version: !ruby/object:Gem::Version 
-  hash: 263
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 70
   - 0
-  version: 0.70.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 Z
+date: 2012-06-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 263
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 70
         - 0
-        version: 0.70.0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,14 +41,72 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 263
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 70
         - 0
-        version: 0.70.0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  type: :development
+  version_requirements: *id006
 description: 
 email: roman@railsdog.com
 executables: []
@@ -59,23 +117,29 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - Versionfile
-- app/assets/javascripts/store/checkout.js
-- app/controllers/addresses_controller.rb
-- app/controllers/checkout_controller_decorator.rb
+- app/assets/javascripts/store/spree_address_book.js
+- app/assets/stylesheets/store/spree_address_book.scss
+- app/controllers/spree/addresses_controller.rb
+- app/controllers/spree/checkout_controller_decorator.rb
 - app/helpers/checkout_helper_decorator.rb
 - app/models/address_decorator.rb
 - app/models/order_decorator.rb
+- app/models/spree/address_ability.rb
+- app/models/spree/address_book_configuration.rb
 - app/models/user_decorator.rb
 - app/overrides/views_decorator.rb
-- app/views/addresses/_form.html.erb
-- app/views/addresses/destroy.js.erb
-- app/views/addresses/edit.html.erb
-- app/views/checkout/_address.html.erb
-- app/views/users/_addresses.html.erb
+- app/views/spree/addresses/_form.html.erb
+- app/views/spree/addresses/destroy.js.erb
+- app/views/spree/addresses/edit.html.erb
+- app/views/spree/checkout/_address.html.erb
+- app/views/spree/users/_addresses.html.erb
 - config/initializers/address_fields.rb
 - config/locales/en.yml
 - config/locales/ru.yml
@@ -85,10 +149,11 @@ files:
 - features/step_definitions/address_book_steps.rb
 - features/support/env.rb
 - features/support/paths.rb
-- lib/address_ability.rb
 - lib/generators/spree_address_book/install_generator.rb
 - lib/spree_address_book.rb
+- spec/controllers/spree/checkout_controller_spec.rb
 - spec/models/address_spec.rb
+- spec/models/order_spec.rb
 - spec/spec_helper.rb
 - spree_address_book.gemspec
 homepage: http://github.com/romul/spree_address_book
@@ -122,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds address book for users to Spree

data/app/assets/javascripts/store/checkout.js

@@ -1,73 +0,0 @@
-(function($){
-  $(document).ready(function(){
-
-    $('#checkout_form_address').validate();
-
-    var get_states = function(region){
-      var country        = $('p#' + region + 'country' + ' span#' + region + 'country :only-child').val();
-      return state_mapper[country];
-    }
-    
-    var update_state = function(region) {
-      var states         = get_states(region);
-
-      var state_select = $('span#' + region + 'state select');
-      var state_input = $('span#' + region + 'state input');
-
-      if(states) {
-        var selected = state_select.val();
-        state_select.html('');
-        var states_with_blank = [["",""]].concat(states);
-        $.each(states_with_blank, function(pos,id_nm) {
-          var opt = $(document.createElement('option'))
-                    .attr('value', id_nm[0])
-                    .html(id_nm[1]);
-          if(selected==id_nm[0]){
-            opt.attr('selected', 'selected');
-          }
-          state_select.append(opt);
-        });
-        state_select.removeAttr('disabled').show();
-        state_input.hide().attr('disabled', 'disabled');
-
-      } else {
-        state_input.removeAttr('disabled').show();
-        state_select.hide().attr('disabled', 'disabled');
-      }
-
-    };
-
-    // Show fields for the selected payment method
-    $("input[type='radio'][name='order[payments_attributes][][payment_method_id]']").click(function(){
-      $('#payment-methods li').hide();
-      if(this.checked){ $('#payment_method_'+this.value).show(); }
-    }).triggerHandler('click');
-
-    $('p#bcountry span#bcountry select').change(function() { update_state('b'); });
-    $('p#scountry span#scountry select').change(function() { update_state('s'); });
-    update_state('b');
-    update_state('s');
-
-    $('input#order_use_billing').click(function() {
-      if($(this).is(':checked')) {
-        $("#shipping .inner input").attr('disabled', 'disabled');
-        $("#shipping .inner select").attr('disabled', 'disabled');
-        $("#shipping .inner").fadeOut();
-        $("#shipping .select_address").fadeOut();
-      } else {
-        if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
-          $("#shipping .inner input").removeAttr('disabled');
-          $("#shipping .inner select").removeAttr('disabled');
-          $("#shipping .inner").fadeIn();
-        }
-        $("#shipping .select_address").fadeIn();
-      }
-    }).triggerHandler('click');
-
-    $('form.edit_checkout').submit(function() {
-      $(this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
-    });
-
-
-  });
-})(jQuery);

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

@@ -1,15 +0,0 @@
-<% 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]) %><span class="req">*</span><br />
-      <span><%= address_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %></span>
-    <% elsif field == "state" && Spree::Config[:address_requires_state] %>
-      <%= address_field(address_form, :state, address_name) { address_state(address_form, address.country) } %>
-    <% else %>
-      <%= address_field(address_form, field.to_sym, address_name) %>
-    <% end %>
-  </p>
-<% end %>
-<% if Spree::Config["alternative_#{address_name}_phone"] %>
-  <%= address_field(address_form, :alternative_phone, address_name) %>
-<% end %>

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

@@ -1,85 +0,0 @@
-<% @addresses = current_user ? current_user.addresses : [] %>
-<style>
-  div.inner input[type=text], div.inner select { width: 80%; }
-  .hidden { display: none; }
-  div#checkout #checkout_form_address #billing .select_address label { float:none; }
-  div#checkout #checkout_form_address #shipping .select_address label { float:none; }
-  div#checkout #checkout_form_address #billing input[type=radio] { width: auto; }
-  div#checkout #checkout_form_address #shipping input[type=radio] { width: auto; }
-</style>
-
-<% ['billing', 'shipping'].each do |address_type|
-  next if address_type == 'billing' && Spree::Config[:disable_bill_address]
-  address_name = "#{address_type[0...4]}_address" %>
-<fieldset id="<%= address_type %>">
-  <legend><%= t(address_type + "_address")%></legend>
-  <% if address_type == 'shipping' && !Spree::Config[:disable_bill_address] %>
-    <p class="field checkbox">
-      <label for="order_use_billing" id="use_billing">
-        <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t("use_billing_address") %>
-      </label>
-    </p>
-  <% end %>
-  <div class="select_address">
-    <p class="field">
-      <% 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>
-        <% end %>
-        <label><%= form.radio_button "#{address_name}_id", 0 %> <%= t('other_address') %></label>
-      <% end %>
-    </p>
-  </div>
-  <%= form.fields_for address_name do |address_form| %>
-    <div class="inner">
-      <p class="field">&nbsp;</p>
-      <%= render :partial => 'addresses/form', :locals => {
-        :address_name => address_name,
-        :address_form => address_form,
-        :address => Address.default
-      } %>    
-    </div>
-  <% end %>
-</fieldset>
-<% end %>
-
-<hr class="space" />
-<div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" />
-</div>
-<% if @addresses.present? %>
-  <%= javascript_tag do %>
-  $(document).ready(function(){
-    $(".inner input").attr('disabled', 'disabled');
-    $(".inner select").attr('disabled', 'disabled');
-    $(".inner").hide();
-    
-    $("input[name='order[bill_address_id]']:radio").change(function(){
-      if ($("input[name='order[bill_address_id]']:checked").val() == '0') {
-        $("#billing .inner input").removeAttr('disabled');
-        $("#billing .inner select").removeAttr('disabled');
-        $("#billing .inner").fadeIn();
-      } else {
-        $("#billing .inner input").attr('disabled', 'disabled');
-        $("#billing .inner select").attr('disabled', 'disabled');
-        $("#billing .inner").fadeOut();        
-      }
-    });
-    
-    $("input[name='order[ship_address_id]']:radio").change(function(){
-      if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
-        $("#shipping .inner input").removeAttr('disabled');
-        $("#shipping .inner select").removeAttr('disabled');
-        $("#shipping .inner").fadeIn();
-      } else {
-        $("#shipping .inner input").attr('disabled', 'disabled');
-        $("#shipping .inner select").attr('disabled', 'disabled');
-        $("#shipping .inner").fadeOut();        
-      }
-    });
-    
-  });
-  <% end %>
-<% end %>

data/app/views/users/_addresses.html.erb

@@ -1,20 +0,0 @@
-<% if current_user.addresses.present? %>
-<h2><%= Address.model_name.human(:count => 2) %></h2>
-<table class="order-summary" width="545">
-  <thead>
-    <tr>
-      <th><%= Address.model_name.human %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-  <% current_user.addresses.each do |address| %>
-    <tr class="<%= cycle('even', 'odd') %>">
-      <td><%= address %></td>
-      <td><%= link_to t(:edit), edit_address_path(address) %></td>
-      <td><%= link_to t(:remove), address_path(address), :method => :delete, :confirm => t(:are_you_sure) %></td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
-<% end %>