WIP: spree 2.3 compat fixes

app/models/spree/address_decorator.rb

@@ -1,7 +1,6 @@
 Spree::Address.class_eval do
   belongs_to :user, :class_name => Spree.user_class.to_s
 
-  attr_accessible :user_id, :deleted_at
 
   def self.required_fields
     validator = Spree::Address.validators.find{|v| v.kind_of?(ActiveModel::Validations::PresenceValidator)}

app/models/spree/attribute_decorator.rb

@@ -0,0 +1,22 @@
+Spree::PermittedAttributes.class_eval do
+  self.user_attributes << [
+    addresses_attributes: [
+      :id,
+      :firstname,
+      :lastname,
+      :address1,
+      :address2,
+      :city,
+      :state_id,
+      :zipcode,
+      :country_id,
+      :phone,
+      :_destroy
+    ]
+  ]
+  self.checkout_attributes << [
+    :bill_address_id,
+    :ship_address_id
+  ]
+
+end

app/models/spree/order_decorator.rb

@@ -1,5 +1,5 @@
 Spree::Order.class_eval do
-  attr_accessible :bill_address_id, :ship_address_id
+  # attr_accessible :bill_address_id, :ship_address_id
   before_validation :clone_shipping_address, :if => "Spree::AddressBook::Config[:disable_bill_address]"
 
   def clone_shipping_address

app/models/spree/user_decorator.rb

@@ -1,3 +1,4 @@
 Spree.user_class.class_eval do
-  has_many :addresses, :conditions => {:deleted_at => nil}, :order => "updated_at DESC", :class_name => 'Spree::Address'
+  has_many :addresses, :class_name => 'Spree::Address'
+  accepts_nested_attributes_for :addresses, allow_destroy: true
 end

lib/generators/spree_address_book/install/install_generator.rb

@@ -5,13 +5,13 @@ class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_address_book\n"
-        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_address_book\n"
+        #append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_address_book\n"
+        #append_file 'app/assets/javascripts/admin/all.js', "//= require admin/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
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_address_book\n", :before => /\*\//, :verbose => true
+        #inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_address_book\n", :before => /\*\//, :verbose => true
+        #inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_address_book\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

lib/generators/spree_address_book/install_generator.rb

@@ -2,11 +2,11 @@ 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"
+        #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
+        #inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_address_book\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

spree_address_book.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.0.3'
+  s.add_dependency 'spree_core', '~> 2.3.0'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'