spree_address_book 0.70.0 → 1.0.0

data/app/models/address_decorator.rb

@@ -1,18 +1,18 @@
-Address.class_eval do
+Spree::Address.class_eval do
   belongs_to :user
 
   def self.required_fields
-    validator = Address.validators.find{|v| v.kind_of?(ActiveModel::Validations::PresenceValidator)}
+    validator = Spree::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?
-    new_record? || (shipments.empty? && (Order.where("bill_address_id = ?", self.id).count + Order.where("bill_address_id = ?", self.id).count <= 1) && Order.complete.where("bill_address_id = ? OR ship_address_id = ?", self.id, self.id).count == 0)
+    new_record? || (shipments.empty? && (Spree::Order.where("bill_address_id = ?", self.id).count + Spree::Order.where("bill_address_id = ?", self.id).count <= 1) && Spree::Order.complete.where("bill_address_id = ? OR ship_address_id = ?", self.id, self.id).count == 0)
   end
   
   def can_be_deleted?
-    shipments.empty? && Order.where("bill_address_id = ? OR ship_address_id = ?", self.id, self.id).count == 0
+    shipments.empty? && Spree::Order.where("bill_address_id = ? OR ship_address_id = ?", self.id, self.id).count == 0
   end
   
   def to_s

data/app/models/order_decorator.rb

@@ -1,12 +1,12 @@
-Order.class_eval do
+Spree::Order.class_eval do
   attr_accessible :bill_address_id, :ship_address_id
-  before_validation :clone_shipping_address, :if => "Spree::Config[:disable_bill_address]"
+  before_validation :clone_shipping_address, :if => "Spree::AddressBook::Config[:disable_bill_address]"
   
   def clone_shipping_address
     if self.ship_address
       self.bill_address = self.ship_address
     end
-    true  
+    true
   end
   
   def clone_billing_address
@@ -17,7 +17,7 @@ Order.class_eval do
   end
   
   def bill_address_id=(id)
-    address = Address.find(id)
+    address = Spree::Address.where(:id => id).first
     if address && address.user_id == self.user_id
       self["bill_address_id"] = address.id
       self.bill_address.reload
@@ -31,7 +31,7 @@ Order.class_eval do
   end
 
   def ship_address_id=(id)
-    address = Address.find(id)
+    address = Spree::Address.where(:id => id).first
     if address && address.user_id == self.user_id
       self["ship_address_id"] = address.id
       self.ship_address.reload
@@ -49,7 +49,7 @@ Order.class_eval do
   def update_or_create_address(attributes)
     address = nil
     if attributes[:id]
-      address = Address.find(attributes[:id])
+      address = Spree::Address.find(attributes[:id])
       if address && address.editable?
         address.update_attributes(attributes)
       else
@@ -58,7 +58,7 @@ Order.class_eval do
     end
     
     if !attributes[:id]
-      address = Address.new(attributes)
+      address = Spree::Address.new(attributes)
       address.save
     end
     

data/{lib → app/models/spree}/address_ability.rb

@@ -1,8 +1,8 @@
-class AddressAbility
+class Spree::AddressAbility
   include CanCan::Ability
 
   def initialize(user)
-    can :manage, Address do |address|
+    can :manage, Spree::Address do |address|
       address.user == user
     end
   end

data/app/models/spree/address_book_configuration.rb

@@ -0,0 +1,8 @@
+module Spree
+  class AddressBookConfiguration < Preferences::Configuration
+    preference :disable_bill_address, :boolean, :default => false
+    preference :alternative_bill_address_phone, :boolean, :default => false
+    preference :alternative_ship_address_phone, :boolean, :default => false
+    preference :alternative_address_phone, :boolean, :default => false
+  end
+end

data/app/models/user_decorator.rb

@@ -1,3 +1,3 @@
-User.class_eval do
+Spree::User.class_eval do
   has_many :addresses, :conditions => {:deleted_at => nil}, :order => "updated_at DESC"
 end

data/app/overrides/views_decorator.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(
-  :virtual_path => "users/show",
+  :virtual_path => "spree/users/show",
   :name => "address_book_account_my_orders",
   :insert_after => "[data-hook='account_my_orders'], #account_my_orders[data-hook]",
-  :partial => "users/addresses",
+  :partial => "spree/users/addresses",
   :disabled => false)

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

@@ -0,0 +1,13 @@
+<% ADDRESS_FIELDS.each do |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 %>
+<% end %>
+<% if Spree::AddressBook::Config["alternative_#{address_name}_phone"] %>
+  <%= address_field(address_form, :alternative_phone, address_name) %>
+<% end %>

data/app/views/{addresses → spree/addresses}/edit.html.erb

@@ -7,7 +7,7 @@
 <%= form_for @address do |f| %>
 <fieldset>
   <div class="inner">
-    <%= render :partial => 'addresses/form', :locals => {
+    <%= render :partial => 'spree/addresses/form', :locals => {
       :address_name => 'address',
       :address_form => f,
       :address => @address

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

@@ -0,0 +1,45 @@
+<% @addresses = current_user ? current_user.addresses : [] %>
+
+<% ['billing', 'shipping'].each do |address_type|
+  next if address_type == 'billing' && Spree::AddressBook::Config[:disable_bill_address]
+  address_name = "#{address_type[0...4]}_address" %>
+<div class="columns alpha six" data-hook="<%= address_type %>_fieldset_wrapper">
+<fieldset id="<%= address_type %>">
+  <legend><%= t(address_type + "_address")%></legend>
+  <% if address_type == 'shipping' && !Spree::AddressBook::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 => 'spree/addresses/form', :locals => {
+        :address_name => address_name,
+        :address_form => address_form,
+        :address => Spree::Address.default
+      } %>
+    </div>
+  <% end %>
+</fieldset>
+</div>
+<% end %>
+
+<hr class="space" />
+<div class="form-buttons">
+  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" />
+</div>

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

@@ -0,0 +1,22 @@
+<% if current_user.addresses.present? %>
+<h3><%= Spree::Address.model_name.human(:count => 2) %></h3>
+<table id="user_addresses">
+  <thead>
+    <tr>
+      <th><%= Spree::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) %>&nbsp;
+        <%= link_to t(:remove), address_path(address), :method => :delete, :confirm => t(:are_you_sure) %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+<% end %>

data/config/routes.rb

@@ -1,3 +1,3 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.prepend do
   resources :addresses, :only => [:edit, :update, :destroy]
 end

data/db/migrate/20110302102208_add_user_id_and_deleted_at_to_addresses.rb

@@ -1,15 +1,21 @@
 class AddUserIdAndDeletedAtToAddresses < ActiveRecord::Migration
   def self.up
-    change_table :addresses do |t|
+    change_table addresses_table_name do |t|
       t.integer :user_id
       t.datetime :deleted_at
     end
   end
 
   def self.down
-    change_table :addresses do |t|
+    change_table addresses_table_name do |t|
       t.remove :deleted_at
       t.remove :user_id    
     end
   end
+  
+  private
+  
+  def self.addresses_table_name
+    table_exists?('addresses') ? :addresses : :spree_addresses
+  end
 end

data/features/support/env.rb

@@ -1,22 +1,3 @@
-FEATURES_PATH = File.expand_path('../..', __FILE__)
-
-# load shared env with features
-require File.expand_path('../../../../spree/features/support/env', __FILE__)
-
-# load the rest of files for support and step definitions
-directories = [ File.expand_path('../../../../spree/features/support', __FILE__),
-                File.expand_path('../../../../spree/features/step_definitions', __FILE__),
-                File.expand_path('../../../spec/factories', __FILE__) ]
-
-files = directories.map do |dir|
-  Dir["#{dir}/**/*.rb"]
-end.flatten.uniq
-
-files.each do |path|
-  if path !~ /env.rb$/
-    fp = File.expand_path(path)
-    #puts fp
-    load(fp)
-  end
-end
-
+require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
+require 'spree/core/testing_support/factories'
+require 'spree/core/testing_support/env'

data/lib/generators/spree_address_book/install_generator.rb

@@ -1,6 +1,14 @@
 module SpreeAddressBook
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      def add_javascripts
+        append_file "app/assets/javascripts/store/all.js", "//= require store/spree_address_book\n"
+      end
+      
+      def add_stylesheets
+        inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_address_book\n", :before => /\*\//, :verbose => true
+      end
+    
       def add_migrations
         run 'bundle exec rake railties:install:migrations FROM=spree_address_book'
       end

data/lib/spree_address_book.rb

@@ -1,18 +1,24 @@
 require 'spree_core'
 
-module SpreeAddressBook
-  class Engine < Rails::Engine
-    engine_name 'spree_address_book'
-    
-    config.autoload_paths += %W(#{config.root}/lib)
+module Spree
+  module AddressBook
+    class Engine < Rails::Engine
+      engine_name 'spree_address_book'
+      
+      initializer "spree.advanced_cart.environment", :before => :load_config_initializers do |app|
+        Spree::AddressBook::Config = Spree::AddressBookConfiguration.new
+      end
+      
+      config.autoload_paths += %W(#{config.root}/lib)
 
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
+      def self.activate
+        Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
+          Rails.env.production? ? require(c) : load(c)
+        end
+        Spree::Ability.register_ability(Spree::AddressAbility)
       end
-      Ability.register_ability(AddressAbility)
-    end
 
-    config.to_prepare &method(:activate).to_proc
+      config.to_prepare &method(:activate).to_proc
+    end
   end
 end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Spree::CheckoutController do
+  
+  before(:each) do
+    user = Factory(:user)
+    @address = Factory(:address, :user => user)
+    
+    @order = Factory(:order, :bill_address_id => nil, :ship_address_id => nil)
+    @order.add_variant(Factory(:product).master, 1)
+    @order.user = user
+    @order.shipping_method = Factory(:shipping_method)
+    @address.user = @order.user
+    @order.save
+    
+    controller.stub :current_order => @order
+    controller.stub :current_user => @order.user
+  end
+  
+  describe "on address step" do
+    it "set equal address ids" do
+      put_address_to_order('bill_address_id' => @address.id, 'ship_address_id' => @address.id)
+      @order.bill_address.should be_present
+      @order.ship_address.should be_present
+      @order.bill_address_id.should == @address.id
+      @order.bill_address_id.should == @order.ship_address_id
+    end
+    
+    it "set bill_address_id and use_billing" do
+      put_address_to_order(:bill_address_id => @address.id, :use_billing => true)
+      @order.bill_address.should be_present
+      @order.ship_address.should be_present
+      @order.bill_address_id.should == @address.id
+      @order.bill_address_id.should == @order.ship_address_id
+    end
+    
+    it "set address attributes" do
+      put_address_to_order(:bill_address_attributes => @address.clone.attributes, :ship_address_attributes => @address.clone.attributes)
+      @order.bill_address_id.should_not == nil
+      @order.ship_address_id.should_not == nil
+      @order.bill_address_id.should == @order.ship_address_id
+    end
+  end
+  
+  private
+  
+  def put_address_to_order(params)
+    put :update, {:use_route => :spree, :state => "address", :order => params}
+  end
+  
+  
+end

data/spec/models/address_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
-describe Address do
+describe Spree::Address do
 
 end

data/spec/models/order_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Spree::Order do
+
+  describe "Create order with the same bill & ship addresses" do
+    it "should have equal ids when set ids" do
+      address = Factory(:address)
+      @order = Factory(:order, :bill_address_id => address.id, :ship_address_id => address.id)
+      @order.bill_address_id.should == @order.ship_address_id
+    end
+  
+    it "should have equal ids when option use_billing is active" do
+      address = Factory(:address)
+      @order  = Factory(:order, :use_billing => true,
+                        :bill_address_id => address.id, 
+                        :ship_address_id => nil)
+      @order = @order.reload
+      @order.bill_address_id.should == @order.ship_address_id
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,19 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../test_app/config/environment", __FILE__)
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+
 require 'rspec/rails'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f }
 
-require 'spree_core/testing_support/factories'
+# Requires factories defined in spree_core
+require 'spree/core/testing_support/factories'
+require 'spree/core/testing_support/env'
+
+require 'ffaker'
 
 RSpec.configure do |config|
   # == Mock Framework
@@ -20,6 +25,7 @@ RSpec.configure do |config|
   # config.mock_with :rr
   config.mock_with :rspec
 
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
   #config.include Devise::TestHelpers, :type => :controller
@@ -27,6 +33,5 @@ RSpec.configure do |config|
   # examples within a transaction, comment the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
+  
 end
-
-@configuration ||= AppConfiguration.find_or_create_by_name("Default configuration")