spree_address_book 0.70.0 → 1.0.0

data/.gitignore

@@ -8,5 +8,4 @@ tmp
 nbproject
 *.swp
 *.bak
-spec/test_app
-Gemfile
+spec/dummy

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format
+progress

data/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gemspec
+
+gem 'spree', '~> 1.0.0'
+gem 'sqlite3'

data/Gemfile.lock

@@ -0,0 +1,228 @@
+PATH
+  remote: .
+  specs:
+    spree_address_book (1.0.0.rc)
+      spree_auth (~> 1.0.0)
+      spree_core (~> 1.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.4)
+      actionpack (= 3.1.4)
+      mail (~> 2.3.0)
+    actionpack (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    active_utils (1.0.3)
+      activesupport (>= 2.3.11)
+      i18n
+    activemerchant (1.20.1)
+      active_utils (>= 1.0.1)
+      activesupport (>= 2.3.11)
+      braintree (>= 2.0.0)
+      builder (>= 2.0.0)
+      i18n
+      json (>= 1.5.1)
+      money (<= 3.7.1)
+    activemodel (3.1.4)
+      activesupport (= 3.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+    activesupport (3.1.4)
+      multi_json (~> 1.0)
+    acts_as_list (0.1.4)
+    arel (2.2.3)
+    bcrypt-ruby (3.0.1)
+    braintree (2.15.0)
+      builder (>= 2.0.0)
+    builder (3.0.0)
+    cancan (1.6.7)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    cocaine (0.2.1)
+    deface (0.8.0)
+      nokogiri (~> 1.5.0)
+      rails (>= 3.0.9)
+    devise (1.4.8)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    factory_girl (2.6.0)
+      activesupport (>= 2.3.9)
+    ffaker (1.12.1)
+    ffi (1.0.11)
+    highline (1.6.8)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.6)
+    json_pure (1.6.5)
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    meta_search (1.1.1)
+      actionpack (~> 3.1.0)
+      activerecord (~> 3.1.0)
+      activesupport (~> 3.1.0)
+      polyamorous (~> 0.5.0)
+    mime-types (1.18)
+    money (3.7.1)
+      i18n (~> 0.4)
+    multi_json (1.2.0)
+    nested_set (1.6.8)
+      activerecord (>= 3.0.0)
+      railties (>= 3.0.0)
+    nokogiri (1.5.2)
+    orm_adapter (0.0.7)
+    paperclip (2.5.0)
+      activerecord (>= 2.3.0)
+      activesupport (>= 2.3.2)
+      cocaine (>= 0.0.2)
+      mime-types
+    polyamorous (0.5.0)
+      activerecord (~> 3.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.4)
+      actionmailer (= 3.1.4)
+      actionpack (= 3.1.4)
+      activerecord (= 3.1.4)
+      activeresource (= 3.1.4)
+      activesupport (= 3.1.4)
+      bundler (~> 1.0)
+      railties (= 3.1.4)
+    railties (3.1.4)
+      actionpack (= 3.1.4)
+      activesupport (= 3.1.4)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.12.2)
+      childprocess (>= 0.2.1)
+      ffi (~> 1.0.9)
+      json_pure
+      rubyzip
+    spree (1.0.3)
+      spree_api (= 1.0.3)
+      spree_auth (= 1.0.3)
+      spree_cmd (= 1.0.3)
+      spree_core (= 1.0.3)
+      spree_dash (= 1.0.3)
+      spree_promo (= 1.0.3)
+      spree_sample (= 1.0.3)
+    spree_api (1.0.3)
+      spree_auth (= 1.0.3)
+      spree_core (= 1.0.3)
+    spree_auth (1.0.3)
+      cancan (= 1.6.7)
+      devise (= 1.4.8)
+      spree_core (= 1.0.3)
+    spree_cmd (1.0.3)
+    spree_core (1.0.3)
+      activemerchant (= 1.20.1)
+      acts_as_list (= 0.1.4)
+      deface (>= 0.7.2)
+      ffaker (~> 1.12.0)
+      highline (= 1.6.8)
+      jquery-rails (>= 1.0.18, <= 1.0.19)
+      kaminari (>= 0.13.0)
+      meta_search (= 1.1.1)
+      nested_set (= 1.6.8)
+      paperclip (= 2.5.0)
+      rails (>= 3.1.1, <= 3.1.4)
+      state_machine (= 1.1.1)
+      stringex (~> 1.3.0)
+    spree_dash (1.0.3)
+      spree_core (= 1.0.3)
+    spree_promo (1.0.3)
+      spree_auth (= 1.0.3)
+      spree_core (= 1.0.3)
+    spree_sample (1.0.3)
+      spree_core (= 1.0.3)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
+    state_machine (1.1.1)
+    stringex (1.3.2)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    warden (1.0.6)
+      rack (>= 1.0)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara
+  factory_girl (~> 2.6)
+  rspec-rails (~> 2.7)
+  spree (~> 1.0.0)
+  spree_address_book!
+  sqlite3

data/Rakefile

@@ -1,31 +1,18 @@
-require 'rubygems'
+# encoding: utf-8
 require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
+require 'rspec/core/rake_task'
+require 'spree/core/testing_support/common_rake'
 
-gemfile = File.expand_path('../spec/test_app/Gemfile', __FILE__)
-if File.exists?(gemfile) && (%w(spec cucumber).include?(ARGV.first.to_s) || ARGV.size == 0)
-  require 'bundler'
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  Bundler.setup
+RSpec::Core::RakeTask.new
 
-  require 'rspec'
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new
-
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new do |t|
-    t.cucumber_opts = %w{--format progress}
-  end
-end
-
-desc "Default Task"
-task :default => [:spec, :cucumber ]
+task :default => [:spec]
 
 spec = eval(File.read('spree_address_book.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
@@ -36,42 +23,8 @@ task :release => :package do
   Rake::Task['gem:push'].invoke
 end
 
-desc "Default Task"
-task :default => [ :spec ]
-
-desc "Regenerates a rails 3 app for testing"
+desc "Generates a dummy app for testing"
 task :test_app do
-  require '../spree/lib/generators/spree/test_app_generator'
-  class AddressBookTestAppGenerator < Spree::Generators::TestAppGenerator
-
-    def install_gems
-      inside "test_app" do
-        run 'rake spree_core:install'
-        run 'rake spree_auth:install'
-        run 'rake spree_address_book:install'
-      end
-    end
-
-    def migrate_db
-      run_migrations
-    end
-
-    protected
-    def full_path_for_local_gems
-      <<-gems
-gem 'spree_core', :path => \'#{File.join(File.dirname(__FILE__), "../spree/", "core")}\'
-gem 'spree_auth', :path => \'#{File.join(File.dirname(__FILE__), "../spree/", "auth")}\'
-gem 'spree_address_book', :path => \'#{File.dirname(__FILE__)}\'
-      gems
-    end
-
-  end
-  AddressBookTestAppGenerator.start
-end
-
-namespace :test_app do
-  desc 'Rebuild test and cucumber databases'
-  task :rebuild_dbs do
-    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test && rake db:drop db:migrate RAILS_ENV=cucumber")
-  end
+  ENV['LIB_NAME'] = 'spree_address_book'
+  Rake::Task['common:test_app'].invoke
 end

data/Versionfile

@@ -2,3 +2,4 @@
 "0.50.x" => { :version => "0.50.2" }
 "0.60.x" => { :version => "0.50.2" }
 "0.70.x" => { :version => "0.70.0" }
+"1.0.x"  => { :version => "1.0.0"  }

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

@@ -0,0 +1,53 @@
+(function($) {
+  $(document).ready(function(){
+    if ($(".select_address").length) {
+      $('input#order_use_billing').unbind("click");
+      $(".inner").hide();
+      $(".inner input").prop("disabled", true);
+      $(".inner select").prop("disabled", true);
+      if ($('input#order_use_billing').is(':checked')) {
+        $("#shipping .select_address").hide();
+      }
+      
+      $('input#order_use_billing').click(function() {
+        if ($(this).is(':checked')) {
+          $("#shipping .select_address").hide();
+          hide_address_form('shipping');
+        } else {
+          $("#shipping .select_address").show();
+          if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
+            show_address_form('shipping');
+          }
+        }
+      });
+
+      $("input[name='order[bill_address_id]']:radio").change(function(){
+        if ($("input[name='order[bill_address_id]']:checked").val() == '0') {
+          show_address_form('billing');
+        } else {
+          hide_address_form('billing');
+        }
+      });
+
+      $("input[name='order[ship_address_id]']:radio").change(function(){
+        if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
+          show_address_form('shipping');
+        } else {
+          hide_address_form('shipping');
+        }
+      });
+    }
+  });
+  
+  function hide_address_form(address_type){
+    $("#" + address_type + " .inner").hide();
+    $("#" + address_type + " .inner input").prop("disabled", true);
+    $("#" + address_type + " .inner select").prop("disabled", true);
+  }
+  
+  function show_address_form(address_type){
+    $("#" + address_type + " .inner").show();
+    $("#" + address_type + " .inner input").prop("disabled", false);
+    $("#" + address_type + " .inner select").prop("disabled", false);
+  }
+})(jQuery);

data/app/assets/stylesheets/store/spree_address_book.scss

@@ -0,0 +1,12 @@
+div.inner {
+  input[type=text], select { width: 80%; }
+}
+
+div#checkout #checkout_form_address {
+  #billing, #shipping {
+    .select_address label { float: none; }
+    input[type=radio] { width: auto; }
+  }
+}
+
+.hidden { display: none; }

data/app/controllers/{addresses_controller.rb → spree/addresses_controller.rb}

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

data/app/controllers/{checkout_controller_decorator.rb → spree/checkout_controller_decorator.rb}

@@ -1,4 +1,4 @@
-CheckoutController.class_eval do
+Spree::CheckoutController.class_eval do
   after_filter :normalize_addresses, :only => :update
   before_filter :set_addresses, :only => :update
   
@@ -6,7 +6,7 @@ CheckoutController.class_eval do
   
   def set_addresses
     return unless params[:order] && params[:state] == "address"
-
+    
     if params[:order][:ship_address_id].to_i > 0
       params[:order].delete(:ship_address_attributes)
     else
@@ -18,12 +18,14 @@ CheckoutController.class_eval do
     else
       params[:order].delete(:bill_address_id)
     end
+    
   end
   
   def normalize_addresses
     return unless params[:state] == "address" && @order.bill_address_id && @order.ship_address_id
     @order.bill_address.reload
     @order.ship_address.reload
+    
     # ensure that there is no validation errors and addresses was saved
     return unless @order.bill_address && @order.ship_address
     

data/app/helpers/checkout_helper_decorator.rb

@@ -1,10 +1,10 @@
-CheckoutHelper.module_eval do
+Spree::CheckoutHelper.module_eval do
   def address_field(form, method, id_prefix = "b", &handler)
-    content_tag :p, :id => [id_prefix, method].join, :class => "field" do
+    content_tag :p, :id => [id_prefix, method].join('_'), :class => "field" do
       if handler
         handler.call
       else
-        is_required = Address.required_fields.include?(method)
+        is_required = Spree::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)
@@ -13,7 +13,7 @@ CheckoutHelper.module_eval do
   end
   
   def address_state(form, country)
-    country ||= Country.find(Spree::Config[:default_country_id])
+    country ||= Spree::Country.find(Spree::Config[:default_country_id])
     have_states = !country.states.empty?
     state_elements = [
       form.collection_select(:state_id, country.states.order(:name),