spree_wholesale 0.40.2 → 0.40.2.2

data/README.md

@@ -1,9 +1,7 @@
 Spree Wholesale
----------------
+===============
 
 
-Currently still under development! Check back soon for more details..
-
 To setup a fresh Spree store follow [these instructions](https://github.com/railsdog/spree/#readme).
 
 
@@ -18,8 +16,8 @@ Install from the source:
     
 Or install the (beta) gem:
     
-    gem install spree_wholesale --pre
-    echo "gem 'spree_wholesale', '0.40.2'" >> Gemfile
+    gem install spree_wholesale
+    echo "gem 'spree_wholesale', '0.40.2.1'" >> Gemfile
     
     rake spree_wholesale:install
     rake db:migrate
@@ -53,7 +51,7 @@ To create a demo of SpreeWholesaleExample
     cd spree_wholesale_example
     
     echo "gem 'spree', '0.40.2'" >> Gemfile
-    echo "gem 'spree_wholesale', '0.40.2'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.2.1'" >> Gemfile
     rm public/index.html
     
     bundle install
@@ -67,7 +65,7 @@ To create a demo of SpreeWholesaleExample
     
 or shorthand:
     
-    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.2'" >> Gemfile; rm public/index.html
+    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.2.1'" >> Gemfile; rm public/index.html
     rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role
   
 If you want sample data:
@@ -92,7 +90,7 @@ Then finish by booting up the rails server:
 
 All in one swoop:
   
-    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.2'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role spree_sample:install db:sample spree_wholesale:assume_wholesale_prices; echo "@import url('wholesale.css');"|cat - public/stylesheets/screen.css > /tmp/out && mv /tmp/out public/stylesheets/screen.css; rails s
+    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.2.1'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role spree_sample:install db:sample spree_wholesale:assume_wholesale_prices; echo "@import url('wholesale.css');"|cat - public/stylesheets/screen.css > /tmp/out && mv /tmp/out public/stylesheets/screen.css; rails s
     
 
 To do the same as above but install from the source instead, run:

data/Rakefile

@@ -1,102 +1,30 @@
-require 'bundler'
-#require 'rake/testtask'
-Bundler::GemHelper.install_tasks
-
-
-
-#require 'rubygems'
-#require 'rake'
-#require 'rake/testtask'
-#require 'rake/packagetask'
-#require 'rake/gempackagetask'
-
-
-#spec = eval(File.read('spree_wholesale.gemspec'))
-#Rake::GemPackageTask.new(spec) do |p|
-#  p.gem_spec = spec
-#end
-
-
-
-namespace :spree_wholesale do
-  desc "Test Spree Wholesale Extension"
-  task :test do
-
-    root = ENV["RAILS_ROOT"] || File.expand_path('../spec/test_app', __FILE__)
-    env = File.join(root, 'config', 'environment.rb')
-    puts "(Rails Root: #{root})"
-  
-    require env
-    require File.expand_path('../test/test_helper', __FILE__)
-    Dir["test/**/*.rb"].reject{|file| file.match(/test_helper/) != nil }.each do |file|
-      puts "Loading #{file}"
-      load file
-    end
-    
-  end
+# encoding: UTF-8
+require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-desc "Default Task"
-task :default => [ "spree_wholesale:test" ]
-
-
+require 'rake'
+require 'rake/rdoctask'
+require 'rake/testtask'
 
+Bundler::GemHelper.install_tasks
 
-# TODO: pull in the spree/core/Rakefile bits that set up for testing
-desc "Regenerates a Rails 3 app for testing"
-task :test_app do
-# TODO - this path requires a certain directory structure -- need
-# to think about how to refactor
-  
-  
-  files = `gem contents spree`.split("\n").select{|file| file.match("test_app_generator")}
-  if files.length == 1
-    require files.first
-    class WishlistTestAppGenerator < Spree::Generators::TestAppGenerator
-      def tweak_gemfile
-        append_file "Gemfile" ,
-          <<-gems
-gem 'activemerchant'
-gem 'spree_core', '>=0.40.0'
-gem 'spree_auth', '>=0.40.0'
-gem 'spree_wholesale', :path => "#{File.dirname(__FILE__)}"  
-          gems
-      end
-  
-      def install_spree_gems
-      
-        puts "-----------------------------------------"
-        puts "Installing gems..."
-        `bundle install --gemfile=spec/test_app/Gemfile`
-        puts "-----------------------------------------"
-      
-        inside "test_app" do
-          run 'rake spree_core:install'
-          run 'rake spree_auth:install'
-          run 'rake spree_wholesale:install'
-        end
-      end
-    
-      def migrate_db
-        run_migrations
-      end
-    end
-    
-    WishlistTestAppGenerator.start
-    
-    puts "spec/test_app created. "
-           
-  else
-    puts "Failed: Could not find lib/generators/spree/test_app_generator.rb"
-  end
-end
-
-namespace :test_app do
-  desc 'Rebuild test database'
-  task :rebuild_db do
-    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test")
-  end
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
+task :default => :test
 
-
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'SpreeWholesale'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/app/controllers/checkout_controller_decorator.rb

@@ -7,7 +7,7 @@ end
 CheckoutController.class_eval do 
 
   def get_addresses
-    return unless current_user.has_role?("wholesaler") && !current_user.wholesaler.nil?
+    return unless current_user && current_user.wholesaler? && !current_user.wholesaler.nil?
     @order.bill_address = current_user.wholesaler.bill_address
     @order.ship_address = current_user.wholesaler.ship_address
   end

data/app/models/order_decorator.rb

@@ -34,8 +34,6 @@ Order.class_eval do
       current_item = LineItem.new(:quantity => quantity)
       current_item.variant = variant
       current_item.price   = is_wholesale? ? variant.wholesale_price : variant.price
-      
-      
       self.line_items << current_item
     end
 
@@ -55,7 +53,4 @@ Order.class_eval do
     current_item
   end
   
-  
-  
-    
 end

data/app/models/products_helper_decorator.rb

@@ -1,9 +1,9 @@
 ProductsHelper.module_eval do
 
 
-  def wholesaler_signed_in?
-    current_user && current_user.has_role?("wholesaler")
-  end
+  #def wholesaler_signed_in?
+  #  current_user && current_user.has_role?("wholesaler")
+  #end
 
 
   # returns the price of the product to show for display purposes

data/app/models/spree_current_order_decorator.rb

@@ -1,35 +1,38 @@
-module Spree
-  module CurrentOrder
+Spree::CurrentOrder.module_eval do
 
-    # This should be overridden by an auth-related extension which would then have the opporutnity to associate the new order with the
-    # current user before saving.
-    def before_save_new_order
-     if current_user
-        @current_order.user ||= current_user
-        @current_order.wholesale = current_user.has_role?("wholesaler")
-      end
-    end
+  # Associate the new order with the currently authenticated user before saving
+  def before_save_new_order
+    @current_order.user ||= current_user
+    @current_order.wholesale = current_user.wholesaler? if current_user
+  end
 
-    # The current incomplete order from the session for use in cart and during checkout
-    def current_order(create_order_if_necessary = false)
-      @current_order = Order.find_by_id(session[:order_id], :include => :adjustments)
-      if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
-        @current_order = Order.new
-        before_save_new_order
-        @current_order.save!
-      end
-      
-      if current_user && @current_order
-        if current_user.has_role?("wholesaler") && !@current_order.is_wholesale?
-          @current_order.to_wholesale!
-        elsif !current_user.has_role?("wholesaler") && @current_order.is_wholesale?
-          @current_order.to_fullsale!
-        end
+  def after_save_new_order
+    # make sure the user has permission to access the order (if they are a guest)
+    return if current_user
+    session[:access_token] = @current_order.token
+  end
+
+  # The current incomplete order from the session for use in cart and during checkout
+  def current_order(create_order_if_necessary = false)
+    return @current_order if @current_order
+    @current_order ||= Order.find_by_id(session[:order_id], :include => :adjustments)
+    if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
+      @current_order = Order.new
+      before_save_new_order
+      @current_order.save!
+      after_save_new_order
+    end
+    
+    if current_user && @current_order
+      if current_user.wholesaler? && !@current_order.is_wholesale?
+        @current_order.to_wholesale!
+      elsif !current_user.wholesaler? && @current_order.is_wholesale?
+        @current_order.to_fullsale!
       end
-      
-      session[:order_id] = @current_order ? @current_order.id : nil
-      
-      @current_order
     end
+    
+    session[:order_id] = @current_order ? @current_order.id : nil
+    @current_order
   end
-end
+
+end

data/app/models/user_decorator.rb

@@ -1,5 +1,13 @@
 User.instance_eval do 
   
   has_one :wholesaler
+    
+end
+
+User.class_eval do 
+  
+  def wholesaler?
+    has_role?("wholesaler")
+  end
   
 end

data/app/models/wholesaler.rb

@@ -33,7 +33,7 @@ class Wholesaler < ActiveRecord::Base
   end
   
   def active?
-    user.has_role? "wholesaler"
+    user && user.has_role?("wholesaler")
   end
   
   private

data/lib/spree_wholesale.rb

@@ -1,25 +1,37 @@
-require 'spree_core'
-require 'spree_wholesale_hooks'
-
-module SpreeWholesale
+if ENV["RAILS_ENV"] != "production"
+  require 'spree_core'
+  require 'spree_auth'
+end
 
-  VERSION = "0.40.2"
+require 'spree_wholesale_hooks'
+require 'spree_wholesale/wholesaler_controller'
   
+
+module SpreeWholesale  
   class Engine < Rails::Engine
 
     config.autoload_paths += %W(#{config.root}/lib)
 
     initializer "static assets" do |app|
-      app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{config.root}/public"
+      app.middleware.insert_before ::Rack::Lock, ::ActionDispatch::Static, "#{config.root}/public"
     end
 
+    def self._load(c)
+      Rails.env.production? ? require(c) : load(c)
+    end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
+    
+      if 40 <= Spree.version.split(".")[1].to_i
+        _load File.expand_path("../spree_wholesale/wholesaler_ability.rb", __FILE__)
+      end
+    
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator.rb")) do |c|
+        _load(c)
       end
     end
 
     config.to_prepare &method(:activate).to_proc
+    
   end
-end
+end

data/lib/spree_wholesale/version.rb

@@ -0,0 +1,3 @@
+module SpreeWholesale
+  VERSION = "0.40.2.2"
+end

data/{app/models/wholesaler_ability_decorator.rb → lib/spree_wholesale/wholesaler_ability.rb}

@@ -1,4 +1,4 @@
-class WholesalerAbilityDecorator
+class WholesalerAbility
   
   include CanCan::Ability 
   
@@ -14,4 +14,4 @@ class WholesalerAbilityDecorator
   
 end
 
-Ability.register_ability(WholesalerAbilityDecorator)
+Ability.register_ability(WholesalerAbility)

data/lib/spree_wholesale_hooks.rb

@@ -1,5 +1,4 @@
 class SpreeWholesaleHooks < Spree::ThemeSupport::HookListener
-  # custom hooks go here
   
   replace :admin_product_form_right, 'admin/hooks/product_form_right'
   
@@ -7,11 +6,10 @@ class SpreeWholesaleHooks < Spree::ThemeSupport::HookListener
   replace :cart_item_total, 'hooks/cart_item_total'
   
   insert_before :inside_cart_form, 'hooks/wholesale_customer_id'
-    
+  
   insert_after :admin_orders_index_headers, 'admin/hooks/admin_orders_index_headers'
   insert_after :admin_orders_index_rows,    'admin/hooks/admin_orders_index_rows'
   insert_after :admin_orders_index_search,  'admin/hooks/admin_orders_index_search'
-  
   insert_after :admin_tabs,  'admin/hooks/wholesale_tab'
   
 end

data/lib/tasks/install.rake

@@ -1,6 +1,6 @@
 namespace :spree_wholesale do
 
-  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
+  desc "Copies all migrations (NOTE: This will be obsolete with Rails 3.1)"
   task :install do
     Rake::Task['spree_wholesale:install:migrations'].invoke
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spree_wholesale
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 40
-  - 2
-  version: 0.40.2
+  prerelease: 
+  version: 0.40.2.2
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -14,41 +10,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -08:00
+date: 2011-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 40
-        - 2
-        version: 0.40.2
+        version: 0.30.1
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: spree_auth
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 40
-        - 2
-        version: 0.40.2
+        version: 0.30.1
   type: :runtime
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.11.3
+  type: :development
+  prerelease: false
+  version_requirements: *id003
 description: Spree Wholesale adds a wholesale_price field to variants and allows users with a "wholesaler" role to access these prices.
-email: spencer@citrusme.com
+email: 
+- spencer@citrusme.com
 executables: []
 
 extensions: []
@@ -60,6 +60,8 @@ files:
 - LICENSE
 - config/locales/en.yml
 - config/routes.rb
+- lib/spree_wholesale/version.rb
+- lib/spree_wholesale/wholesaler_ability.rb
 - lib/spree_wholesale/wholesaler_controller.rb
 - lib/spree_wholesale.rb
 - lib/spree_wholesale_hooks.rb
@@ -71,7 +73,6 @@ files:
 - app/controllers/checkout_controller_decorator.rb
 - app/controllers/wholesalers_controller.rb
 - app/models/application_helper_decorator.rb
-- app/models/country_decorator.rb
 - app/models/line_item_decorator.rb
 - app/models/order_decorator.rb
 - app/models/product_decorator.rb
@@ -80,7 +81,6 @@ files:
 - app/models/user_decorator.rb
 - app/models/variant_decorator.rb
 - app/models/wholesaler.rb
-- app/models/wholesaler_ability_decorator.rb
 - app/views/admin/hooks/_admin_orders_index_headers.html.erb
 - app/views/admin/hooks/_admin_orders_index_rows.html.erb
 - app/views/admin/hooks/_admin_orders_index_search.html.erb
@@ -109,7 +109,7 @@ files:
 - public/stylesheets/admin/wholesalers.css
 - public/stylesheets/wholesale.css
 - Rakefile
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/citrus/spree_wholesale
 licenses: []
 
@@ -123,25 +123,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4546681846651218626
       segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4546681846651218626
       segments: 
       - 0
       version: "0"
-requirements: 
-- none
+requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Add wholesale functionality to spree
+summary: Wholesale accounts for Spree Commerce.
 test_files: []
 

data/app/models/country_decorator.rb

@@ -1,3 +0,0 @@
-Country.instance_eval do
-  has_many :states, :order => "name ASC"
-end