spree_address_book 0.60.0 → 0.70.0

data/README.md

@@ -9,8 +9,7 @@ Installation
 
       Add `gem "spree_address_book", :git => "git://github.com/romul/spree_address_book.git"
       Run `bundle install`
-      Run `rake spree_address_book:install`
-      Run `rake db:migrate`
+      Run `rails g spree_address_book:install`
 
 
-Copyright (c) 2011 Roman Smirnov, released under the New BSD License
+Copyright (c) 2011-2012 Roman Smirnov, released under the New BSD License

data/Versionfile

@@ -1,2 +1,4 @@
-"0.40.x" => { :branch => "0-40-stable" }
-"0.50.x" => { :branch => "master" }
+"0.40.x" => { :version => "0.40.0" }
+"0.50.x" => { :version => "0.50.2" }
+"0.60.x" => { :version => "0.50.2" }
+"0.70.x" => { :version => "0.70.0" }

data/app/controllers/addresses_controller.rb

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

data/app/controllers/checkout_controller_decorator.rb

@@ -1,6 +1,4 @@
 CheckoutController.class_eval do
-  helper AddressesHelper
-  
   after_filter :normalize_addresses, :only => :update
   before_filter :set_addresses, :only => :update
   

data/app/helpers/{addresses_helper.rb → checkout_helper_decorator.rb}

@@ -1,4 +1,4 @@
-module AddressesHelper
+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

data/app/overrides/views_decorator.rb

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

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

@@ -1,9 +1,9 @@
 <% if current_user.addresses.present? %>
-<h2><%= Address.human_name(:count => 2) %></h2>
+<h2><%= Address.model_name.human(:count => 2) %></h2>
 <table class="order-summary" width="545">
   <thead>
     <tr>
-      <th><%= Address.human_name %></th>
+      <th><%= Address.model_name.human %></th>
       <th></th>
     </tr>
   </thead>

data/lib/generators/spree_address_book/install_generator.rb

@@ -0,0 +1,18 @@
+module SpreeAddressBook
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      def add_migrations
+        run 'bundle exec rake railties:install:migrations FROM=spree_address_book'
+      end
+
+      def run_migrations
+         res = ask "Would you like to run the migrations now? [Y/n]"
+         if res == "" || res.downcase == "y"
+           run 'bundle exec rake db:migrate'
+         else
+           puts "Skiping rake db:migrate, don't forget to run it!"
+         end
+      end
+    end
+  end
+end

data/lib/spree_address_book.rb

@@ -1,9 +1,9 @@
 require 'spree_core'
-require 'spree_address_book_hooks'
 
 module SpreeAddressBook
   class Engine < Rails::Engine
-
+    engine_name 'spree_address_book'
+    
     config.autoload_paths += %W(#{config.root}/lib)
 
     def self.activate

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.60.0'
+  s.version     = '0.70.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,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency('spree_core', '>= 0.50.0')
-  s.add_dependency('spree_auth', '>= 0.50.0')
+  s.add_dependency('spree_core', '~> 0.70.0')
+  s.add_dependency('spree_auth', '~> 0.70.0')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_address_book
 version: !ruby/object:Gem::Version 
-  hash: 239
+  hash: 263
   prerelease: 
   segments: 
   - 0
-  - 60
+  - 70
   - 0
-  version: 0.60.0
+  version: 0.70.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 Z
+date: 2012-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -23,14 +23,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 215
+        hash: 263
         segments: 
         - 0
-        - 50
+        - 70
         - 0
-        version: 0.50.0
+        version: 0.70.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,14 +39,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 215
+        hash: 263
         segments: 
         - 0
-        - 50
+        - 70
         - 0
-        version: 0.50.0
+        version: 0.70.0
   type: :runtime
   version_requirements: *id002
 description: 
@@ -63,12 +63,14 @@ files:
 - README.md
 - Rakefile
 - Versionfile
+- app/assets/javascripts/store/checkout.js
 - app/controllers/addresses_controller.rb
 - app/controllers/checkout_controller_decorator.rb
-- app/helpers/addresses_helper.rb
+- app/helpers/checkout_helper_decorator.rb
 - app/models/address_decorator.rb
 - app/models/order_decorator.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
@@ -84,11 +86,8 @@ files:
 - 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
-- lib/spree_address_book_hooks.rb
-- lib/tasks/install.rake
-- lib/tasks/spree_address_book.rake
-- public/javascripts/checkout.js
 - spec/models/address_spec.rb
 - spec/spec_helper.rb
 - spree_address_book.gemspec
@@ -123,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Adds address book for users to Spree

data/lib/spree_address_book_hooks.rb

@@ -1,3 +0,0 @@
-class SpreeAddressBookHooks < Spree::ThemeSupport::HookListener
-  insert_after :account_my_orders, :partial => 'users/addresses'
-end

data/lib/tasks/install.rake

@@ -1,25 +0,0 @@
-namespace :spree_address_book do
-  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
-  task :install do
-    Rake::Task['spree_address_book:install:migrations'].invoke
-    Rake::Task['spree_address_book:install:assets'].invoke
-  end
-
-  namespace :install do
-    desc "Copies all migrations (NOTE: This will be obsolete with Rails 3.1)"
-    task :migrations do
-      source = File.join(File.dirname(__FILE__), '..', '..', 'db')
-      destination = File.join(Rails.root, 'db')
-      Spree::FileUtilz.mirror_files(source, destination)
-    end
-
-    desc "Copies all assets (NOTE: This will be obsolete with Rails 3.1)"
-    task :assets do
-      source = File.join(File.dirname(__FILE__), '..', '..', 'public')
-      destination = File.join(Rails.root, 'public')
-      puts "INFO: Mirroring assets from #{source} to #{destination}"
-      Spree::FileUtilz.mirror_files(source, destination)
-    end
-  end
-
-end

data/lib/tasks/spree_address_book.rake

@@ -1 +0,0 @@
-# add custom rake tasks here