spree_core 1.1.6 → 1.2.0.rc1

data/config/routes.rb

@@ -11,23 +11,14 @@ Spree::Core::Engine.routes.draw do
   resources :states, :only => :index
 
   # non-restful checkout stuff
-  match '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout, :via => :put
-  match '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state, :via => :get
-  match '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout, :via => :get
-
-  populate_redirect = redirect do |params, request|
-    request.flash[:error] = I18n.t(:populate_get_error)
-    request.referer || '/cart'
-  end
-
-  get '/orders/populate', :via => :get, :to => populate_redirect
+  put '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
+  get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
+  get '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout
 
   resources :orders do
     post :populate, :on => :collection
 
     resources :line_items
-    resources :creditcards
-    resources :creditcard_payments
 
     resources :shipments do
       member do
@@ -51,11 +42,13 @@ Spree::Core::Engine.routes.draw do
   match '/t/*id', :to => 'taxons#show', :as => :nested_taxons
 
   namespace :admin do
+    get '/search/users', :to => "search#users", :as => :search_users
+
     resources :adjustments
     resources :zones
-    resources :users do
+    resources :banners do
       member do
-        post :dismiss_banner
+        post :dismiss
       end
     end
     resources :countries do
@@ -79,28 +72,6 @@ Spree::Core::Engine.routes.draw do
           post :update_positions
         end
       end
-      resources :option_types do
-        member do
-          get :select
-          get :remove
-        end
-        collection do
-          get :available
-          get :selected
-          post :update_positions
-        end
-      end
-      resources :taxons do
-        member do
-          get :select
-          delete :remove
-        end
-        collection do
-          post :available
-          post :batch_select
-          get  :selected
-        end
-      end
     end
 
     resources :option_types do
@@ -135,7 +106,6 @@ Spree::Core::Engine.routes.draw do
         put :fire
         get :fire
         post :resend
-        get :history
       end
 
       resource :customer, :controller => "orders/customer_details"

data/db/migrate/20090823005402_spree_zero_nine_zero.rb

@@ -344,18 +344,20 @@ class SpreeZeroNineZero < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table :users, :force => true do |t|
-      t.string   :crypted_password, :limit => 128, :default => '', :null => false
-      t.string   :salt,             :limit => 128, :default => '', :null => false
-      t.string   :email, :remember_token, :remember_token_expires_at, 
-                 :persistence_token, :single_access_token, :perishable_token
-      t.integer  :login_count,        :default => 0, :null => false
-      t.integer  :failed_login_count, :default => 0, :null => false
-      t.datetime :last_request_at, :current_login_at, :last_login_at
-      t.string   :current_login_ip, :last_login_ip, :login
-      t.integer  :ship_address_id, :bill_address_id
-
-      t.timestamps
+    unless defined?(User)
+      create_table :users, :force => true do |t|
+        t.string   :crypted_password, :limit => 128, :default => '', :null => false
+        t.string   :salt,             :limit => 128, :default => '', :null => false
+        t.string   :email, :remember_token, :remember_token_expires_at, 
+                   :persistence_token, :single_access_token, :perishable_token
+        t.integer  :login_count,        :default => 0, :null => false
+        t.integer  :failed_login_count, :default => 0, :null => false
+        t.datetime :last_request_at, :current_login_at, :last_login_at
+        t.string   :current_login_ip, :last_login_ip, :login
+        t.integer  :ship_address_id, :bill_address_id
+
+        t.timestamps
+      end
     end
 
     create_table :variants, :force => true do |t|

data/db/migrate/20091015153048_add_openid_field_to_users.rb

@@ -1,24 +1,26 @@
 class AddOpenidFieldToUsers < ActiveRecord::Migration
   def up
-    add_column :users, :openid_identifier, :string
-    add_index :users, :openid_identifier
+    unless defined?(User)
+      add_column :users, :openid_identifier, :string
+      add_index :users, :openid_identifier
 
-    change_column :users, :login, :string, :default => nil, :null => true
-    change_column :users, :crypted_password, :string, :default => nil, :null => true
-    change_column :users, :salt, :string, :default => nil, :null => true
+      change_column :users, :login, :string, :default => nil, :null => true
+      change_column :users, :crypted_password, :string, :default => nil, :null => true
+      change_column :users, :salt, :string, :default => nil, :null => true
+    end
   end
 
   def down
     remove_column :users, :openid_identifier
 
     # Due to namespacing change, temporarily set the table back to users
-    Spree::User.table_name = 'users'
+    Spree::LegacyUser.table_name = 'users'
 
     [:login, :crypted_password, :salt].each do |field|
       Spree::User.where(field => nil).each { |user| user.update_column(field, '') if user.send(field).nil? }
       change_column :users, field, :string, :default => '', :null => false
     end
 
-    Spree::User.table_name = 'spree_users'
+    Spree::LegacyUser.table_name = 'spree_users'
   end
 end

data/db/migrate/20100209144531_polymorphic_payments.rb

@@ -12,17 +12,17 @@ class PolymorphicPayments < ActiveRecord::Migration
     end
     execute "UPDATE payments SET payable_type = 'Order'"
 
-    Spree::Creditcard.table_name = 'creditcards'
+    Spree::CreditCard.table_name = 'creditcards'
 
-    Spree::Creditcard.all.each do |creditcard|
-      if checkout = Checkout.find_by_id(creditcard.checkout_id) and checkout.order
+    Spree::CreditCard.all.each do |credit_card|
+      if checkout = Checkout.find_by_id(credit_card.checkout_id) && checkout.order
         if payment = checkout.order.payments.first
-          execute "UPDATE payments SET source_type = 'Creditcard', source_id = #{creditcard.id} WHERE id = #{payment.id}"
+          execute "UPDATE payments SET source_type = 'CreditCard', source_id = #{credit_card.id} WHERE id = #{payment.id}"
         end
       end
     end
 
-    Spree::Creditcard.table_name = 'spree_creditcards'
+    Spree::CreditCard.table_name = 'spree_creditcards'
 
     remove_column :creditcards, :checkout_id
   end

data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb

@@ -3,15 +3,15 @@ class AssignCreditcardTxnsToPayment < ActiveRecord::Migration
     add_column :creditcard_txns, :payment_id, :integer
 
     # Temporarily set back to creditcards
-    Spree::Creditcard.table_name = 'creditcards'
+    Spree::CreditCard.table_name = 'creditcards'
 
     ActiveRecord::Base.connection.select_all('SELECT * FROM creditcard_txns').each do |txn_attrs|
-      if creditcard = Spree::Creditcard.find_by_id(txn_attrs['creditcard_id']) and creditcard.payments.first
-        execute "UPDATE creditcard_txns SET payment_id = #{creditcard.payments.first.id} WHERE id = #{txn_attrs['id']}"
+      if credit_card = Spree::CreditCard.find_by_id(txn_attrs['creditcard_id']) && credit_card.payments.first
+        execute "UPDATE creditcard_txns SET payment_id = #{credit_card.payments.first.id} WHERE id = #{txn_attrs['id']}"
       end
     end
 
-    Spree::Creditcard.table_name = 'spree_creditcards'
+    Spree::CreditCard.table_name = 'spree_creditcards'
 
     remove_column :creditcard_txns, :creditcard_payment_id
   end

data/db/migrate/20100528185820_add_index_on_users_persistence_token.rb

@@ -1,5 +1,7 @@
 class AddIndexOnUsersPersistenceToken < ActiveRecord::Migration
   def change
-    add_index :users, :persistence_token
+    unless defined?(User)
+      add_index :users, :persistence_token
+    end
   end
 end

data/db/migrate/20100811163637_add_guest_flag.rb

@@ -1,5 +1,7 @@
 class AddGuestFlag < ActiveRecord::Migration
   def change
-    add_column :users, :guest, :boolean
+    unless defined?(User)
+      add_column :users, :guest, :boolean
+    end
   end
 end

data/db/migrate/20100901171814_change_guest_flag_to_anonymous.rb

@@ -1,5 +1,7 @@
 class ChangeGuestFlagToAnonymous < ActiveRecord::Migration
   def change
-    rename_column :users, :guest, :anonymous
+    unless defined?(User)
+      rename_column :users, :guest, :anonymous
+    end
   end
 end

data/db/migrate/20101026184959_generate_anonymous_users.rb

@@ -1,9 +1,9 @@
 class GenerateAnonymousUsers < ActiveRecord::Migration
   def up
-    Spree::User.table_name = 'users'
+    Spree::LegacyUser.table_name = 'users'
     Spree::Order.table_name = 'orders'
 
-    Spree::User.reset_column_information
+    Spree::LegacyUser.reset_column_information
     Spree::Order.where(:user_id => nil).each do |order|
       user = Spree::User.anonymous!
       user.email ||= order.email
@@ -11,7 +11,7 @@ class GenerateAnonymousUsers < ActiveRecord::Migration
       order.save!
     end
 
-    Spree::User.table_name = 'spree_users'
+    Spree::LegacyUser.table_name = 'spree_users'
     Spree::Order.table_name = 'spree_orders'
   end
 

data/db/migrate/20101103212716_drop_anonymous_field_for_user.rb

@@ -1,6 +1,8 @@
 class DropAnonymousFieldForUser < ActiveRecord::Migration
   def up
-    remove_column :users, :anonymous
+    unless defined?(User)
+      remove_column :users, :anonymous
+    end
   end
 
   def down

data/db/migrate/20111007143030_namespace_top_level_models.rb

@@ -41,9 +41,26 @@ class NamespaceTopLevelModels < ActiveRecord::Migration
     rename_table :taxons,                  :spree_taxons
     rename_table :taxonomies,              :spree_taxonomies
     rename_table :trackers,                :spree_trackers
-    rename_table :users,                   :spree_users
+    unless defined?(User) || table_exists?(:spree_users)
+      rename_table :users,                   :spree_users
+    end
     rename_table :variants,                :spree_variants
     rename_table :zones,                   :spree_zones
     rename_table :zone_members,            :spree_zone_members
+
+    rename_index :spree_configurations, 'index_configurations_on_name_and_type', 'index_spree_configurations_on_name_and_type'
+    rename_index :spree_line_items, 'index_line_items_on_order_id', 'index_spree_line_items_on_order_id'
+    rename_index :spree_line_items, 'index_line_items_on_variant_id', 'index_spree_line_items_on_variant_id'
+    rename_index :spree_option_values_variants, 'index_option_values_variants_on_variant_id', 'index_spree_option_values_variants_on_variant_id'
+    rename_index :spree_orders, 'index_orders_on_number', 'index_spree_orders_on_number'
+    rename_index :spree_products, 'index_products_on_available_on', 'index_spree_products_on_available_on'
+    rename_index :spree_products, 'index_products_on_deleted_at', 'index_spree_products_on_deleted_at'
+    rename_index :spree_products, 'index_products_on_name', 'index_spree_products_on_name'
+    rename_index :spree_products, 'index_products_on_permalink', 'index_spree_products_on_permalink'
+    rename_index :spree_products_taxons, 'index_products_taxons_on_product_id', 'index_spree_products_taxons_on_product_id'
+    rename_index :spree_products_taxons, 'index_products_taxons_on_taxon_id', 'index_spree_products_taxons_on_taxon_id'
+    rename_index :spree_roles_users, 'index_roles_users_on_role_id', 'index_spree_roles_users_on_role_id'
+    rename_index :spree_roles_users, 'index_roles_users_on_user_id', 'index_spree_roles_users_on_user_id'
+    rename_index :spree_variants, 'index_variants_on_product_id', 'index_spree_variants_on_product_id'
   end
 end

data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb

@@ -1,8 +1,9 @@
 class MigrateImagesFromProductsToVariants < ActiveRecord::Migration
   def up
     images = select_all("SELECT spree_assets.* FROM spree_assets
-                         WHERE spree_assets.type IN ('Spree::Image')
-                         AND spree_assets.viewable_type = 'Spree::Product'")
+                         WHERE spree_assets.type = 'Spree::Image'
+                         AND spree_assets.viewable_type = 'Spree::Product'
+                         AND spree_assets.viewable_id IS NOT NULL")
 
     images.each do |image|
       master_variant_id = select_value("SELECT id FROM spree_variants
@@ -19,8 +20,9 @@ class MigrateImagesFromProductsToVariants < ActiveRecord::Migration
                          JOIN spree_variants
                          ON spree_variants.id = spree_assets.viewable_id
                          AND spree_variants.is_master = #{quoted_true}
-                         WHERE spree_assets.type IN ('Spree::Image')
-                         AND spree_assets.viewable_type = 'Spree::Variant'")
+                         WHERE spree_assets.type = 'Spree::Image'
+                         AND spree_assets.viewable_type = 'Spree::Variant'
+                         AND spree_assets.viewable_id IS NOT NULL")
 
     images.each do |image|
       product_id = select_value("SELECT spree_products.id FROM spree_products

data/db/migrate/20120509055454_create_tokenized_permissions_table.rb

@@ -0,0 +1,16 @@
+class CreateTokenizedPermissionsTable < ActiveRecord::Migration
+  def change
+    unless Spree::TokenizedPermission.table_exists?
+      create_table :spree_tokenized_permissions do |t|
+        t.integer :permissable_id
+        t.string  :permissable_type
+        t.string  :token
+
+        t.timestamps
+      end
+
+      add_index :spree_tokenized_permissions, [:permissable_id, :permissable_type], :name => 'index_tokenized_name_and_type'
+    end
+  end
+end
+

data/db/migrate/20120530012000_rename_creditcards_to_credit_cards.rb

@@ -0,0 +1,11 @@
+class RenameCreditcardsToCreditCards < ActiveRecord::Migration
+  def change
+    rename_table :spree_creditcards, :spree_credit_cards
+    execute("UPDATE spree_payments SET source_type = 'Spree::CreditCard' WHERE source_type = 'Spree::Creditcard'")
+  end
+
+  def down
+    execute("UPDATE spree_payments SET source_type = 'Spree::Creditcard' WHERE source_type = 'Spree::CreditCard'")
+    rename_table :spree_credit_cards, :spree_creditcards
+  end
+end

data/db/migrate/20120604203654_remove_credit_total_from_orders.rb

@@ -0,0 +1,5 @@
+class RemoveCreditTotalFromOrders < ActiveRecord::Migration
+  def change
+    remove_column :spree_orders, :credit_total
+  end
+end

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -0,0 +1,53 @@
+module Spree
+  class CustomUserGenerator < Rails::Generators::NamedBase
+    include Rails::Generators::ResourceHelpers
+    include Rails::Generators::Migration
+    
+
+    desc "Set up a Spree installation with a custom User class"
+
+    def self.source_paths
+      paths = self.superclass.source_paths
+      paths << File.expand_path('../templates', __FILE__)
+      paths.flatten
+    end
+
+    def check_for_constant
+      begin
+        klass
+      rescue NameError
+        @shell.say "Couldn't find #{class_name}. Are you sure that this class exists within your application and is loaded?", :red
+        exit(1)
+      end
+    end
+
+    def generate
+      migration_template 'migration.rb.tt', "db/migrate/add_spree_fields_to_custom_user_table.rb"
+      template 'authentication_helpers.rb.tt', "lib/spree/authentication_helpers.rb"
+
+      file_action = File.exist?('config/initializers/spree.rb') ? :append_file : :create_file
+      send(file_action, 'config/initializers/spree.rb') do
+        %Q{require 'spree/authentication_helpers'\n}
+      end
+    end
+
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        sleep 1 # make sure to get a different migration every time
+        Time.new.utc.strftime("%Y%m%d%H%M%S")
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+
+    def klass
+      class_name.constantize
+    end
+
+    def table_name
+      klass.table_name
+    end
+
+  end
+end
+

data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt

@@ -0,0 +1,28 @@
+module Spree
+  module AuthenticationHelpers
+    def self.included(receiver)
+      receiver.send :helper_method, :spree_login_path
+      receiver.send :helper_method, :spree_signup_path
+      receiver.send :helper_method, :spree_logout_path
+      receiver.send :helper_method, :spree_current_user
+    end
+
+    def spree_current_user
+      current_user
+    end
+
+    def spree_login_path
+      main_app.login_path
+    end
+
+    def spree_signup_path
+      main_app.signup_path
+    end
+
+    def spree_logout_path
+      main_app.logout_path
+    end
+  end
+end
+
+ApplicationController.send :include, Spree::AuthenticationHelpers

data/lib/generators/spree/custom_user/templates/initializer.rb.tt

@@ -0,0 +1 @@
+Spree.user_class = "<%= class_name %>"

data/lib/generators/spree/custom_user/templates/migration.rb.tt

@@ -0,0 +1,7 @@
+class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration
+  def up
+    add_column <%= table_name.inspect %>, :spree_api_key, :string, :limit => 48
+    add_column <%= table_name.inspect %>, :ship_address_id, :integer
+    add_column <%= table_name.inspect %>, :bill_address_id, :integer
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -42,6 +42,7 @@ module Spree
       template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", :force => true
+      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", :force => true
     end
 
     def test_dummy_clean
@@ -51,11 +52,13 @@ module Spree
         remove_file "Gemfile"
         remove_file "lib/tasks"
         remove_file "app/assets/images/rails.png"
+        remove_file "app/assets/javascripts/application.js"
         remove_file "public/index.html"
         remove_file "public/robots.txt"
         remove_file "README"
         remove_file "test"
         remove_file "vendor"
+        remove_file "spec"
       end
     end