spree_wholesale 0.40.0.beta4.2 → 0.40.2.beta

data/README.md

@@ -19,7 +19,7 @@ Install from the source:
 Or install the (beta) gem:
     
     gem install spree_wholesale --pre
-    echo "gem 'spree_wholesale', '0.40.0.beta4.1'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.0.beta4.2'" >> Gemfile
     
     rake spree_wholesale:install
     rake db:migrate
@@ -32,9 +32,11 @@ If you want to generate sample wholesale prices:
 This will assume 66% wholesale discount.
 
 
-If you'd like run tests, install from the source, then run:
-  
-    cd your/spree/project/spree_wholesale
+If you'd like run tests:
+    
+    git clone git://github.com/citrus/spree_wholesale.git
+    cd spree_wholesale
+    rake test_app
     rake
 
 (TO DO: Write some more tests!)
@@ -51,7 +53,7 @@ To create a demo of SpreeWholesaleExample
     cd spree_wholesale_example
     
     echo "gem 'spree', '0.40.0'" >> Gemfile
-    echo "gem 'spree_wholesale', '0.40.0.beta4.1'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.0.beta4.2'" >> Gemfile
     rm public/index.html
     
     bundle install
@@ -65,7 +67,7 @@ To create a demo of SpreeWholesaleExample
     
 or shorthand:
     
-    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4.1'" >> Gemfile; rm public/index.html
+    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4.2'" >> Gemfile; rm public/index.html
     rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role
   
 If you want sample data:
@@ -90,7 +92,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.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4.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
+    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4.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
     
 
 To do the same as above but install from the source instead, run:

data/Rakefile

@@ -1,31 +1,27 @@
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
-require 'rake/packagetask'
+#require 'rake/testtask'
+#require 'rake/packagetask'
 require 'rake/gempackagetask'
 
 
-root = ENV["RAILS_ROOT"] || File.expand_path('../spec/test_app', __FILE__)
-
-env = File.join(root, 'config', 'environment.rb')
-
-puts "(Rails Root: #{root})"
-
-
 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
@@ -34,19 +30,8 @@ namespace :spree_wholesale do
   end
 end
 
-#
-#
-#if File.exists?(env)
-#  desc "Default Task"
-#  task :default => [ :test_extension ]
-#else
-#  desc "Default Task"
-#  task :default => []
-#  puts "environment.rb not found! Try modifying the path to your rails application."
-#end
-
 desc "Default Task"
-task :default => [ :test_extension ]
+task :default => [ "spree_wholesale:test" ]
 
 
 
@@ -56,38 +41,48 @@ 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
-  require '../spree/lib/generators/spree/test_app_generator'
-  class WishlistTestAppGenerator < Spree::Generators::TestAppGenerator
-    def tweak_gemfile
-      append_file "Gemfile" ,
-        <<-gems
-
+  
+  
+  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
-      inside "test_app" do
-        run 'rake spree_core:install'
-        run 'rake spree_auth:install'
-        run 'rake spree_wholesale:install'
+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
-
-#    def install_spree_auth
-#      inside "test_app" do
-#        run 'rake spree_auth:install'
-#      end
-#    ends
-
-    def migrate_db
-      run_migrations
-    end
+    
+    WishlistTestAppGenerator.start
+    
+    puts "spec/test_app created. "
+           
+  else
+    puts "Failed: Could not find lib/generators/spree/test_app_generator.rb"
   end
-  WishlistTestAppGenerator.start
 end
 
 namespace :test_app do

data/app/models/wholesaler_ability_decorator.rb

@@ -0,0 +1,17 @@
+class WholesalerAbilityDecorator
+  
+  include CanCan::Ability 
+  
+  def initialize(user) 
+    user ||= User.new 
+    can :index,  Wholesaler
+    can :new,    Wholesaler
+    can :create, Wholesaler
+    can :read,   Wholesaler do |resource|
+      resource.user == user
+    end    
+  end
+  
+end
+
+Ability.register_ability(WholesalerAbilityDecorator)

data/app/views/wholesalers/_fields.html.erb

@@ -10,7 +10,9 @@
 
   <fieldset>
     <legend>Company Information</legend>
+    
     <%= render "shared/error_messages", :target => @wholesaler %>
+    
     <p>
       <%= form.label :company %><br/>
       <%= form.text_field :company, :class => 'required' %><span class="req">*</span>
@@ -51,10 +53,6 @@
 </fieldset>
 
 <fieldset class="rightie">
-
-  
-  
-  <br/>
   
   <fieldset>
     <legend>Billing Address</legend>

data/lib/spree_wholesale_hooks.rb

@@ -14,6 +14,4 @@ class SpreeWholesaleHooks < Spree::ThemeSupport::HookListener
   
   insert_after :admin_tabs,  'admin/hooks/wholesale_tab'
   
-  
-  
 end

metadata

@@ -5,10 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 40
-  - 0
-  - beta4
   - 2
-  version: 0.40.0.beta4.2
+  - beta
+  version: 0.40.2.beta
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -08:00
+date: 2011-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +29,8 @@ dependencies:
         segments: 
         - 0
         - 40
-        - 0
-        version: 0.40.0
+        - 2
+        version: 0.40.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,8 +44,8 @@ dependencies:
         segments: 
         - 0
         - 40
-        - 0
-        version: 0.40.0
+        - 2
+        version: 0.40.2
   type: :runtime
   version_requirements: *id002
 description: Spree Wholesale adds a wholesale_price field to variants and allows users with a "wholesaler" role to access these prices.
@@ -67,13 +66,11 @@ files:
 - lib/spree_wholesale_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/spree_wholesale.rake
-- lib/wholesale_products_helper.rb
 - app/controllers/admin/base_controller_decorator.rb
 - app/controllers/admin/orders_controller_decorator.rb
 - app/controllers/admin/wholesalers_controller.rb
 - app/controllers/checkout_controller_decorator.rb
 - app/controllers/wholesalers_controller.rb
-- app/models/ability.rb
 - app/models/application_helper_decorator.rb
 - app/models/country_decorator.rb
 - app/models/line_item_decorator.rb
@@ -84,6 +81,7 @@ 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

data/app/models/ability.rb

@@ -1,71 +0,0 @@
-# Implementation class for Cancan gem.  Instead of overriding this class, consider adding new permissions
-# using the special +register_ability+ method which allows extensions to add their own abilities.
-#
-# See http://github.com/ryanb/cancan for more details on cancan.
-class Ability
-  include CanCan::Ability
-
-  class_attribute :abilities
-  self.abilities = Set.new
-
-  # Allows us to go beyond the standard cancan initialize method which makes it difficult for engines to
-  # modify the default +Ability+ of an application.  The +ability+ argument must be a class that includes
-  # the +CanCan::Ability+ module.  The registered ability should behave properly as a stand-alone class
-  # and therefore should be easy to test in isolation.
-  def self.register_ability(ability)
-    self.abilities.add(ability)
-  end
-
-  def initialize(user)
-    self.clear_aliased_actions
-
-    # override cancan default aliasing (we don't want to differentiate between read and index)
-    alias_action :edit, :to => :update
-    alias_action :new, :to => :create
-    alias_action :new_action, :to => :create
-    alias_action :show, :to => :read
-
-    user ||= User.new
-    if user.has_role? 'admin'
-      can :manage, :all
-    else
-      #############################
-      can :read, User do |resource|
-        resource == user
-      end
-      can :update, User do |resource|
-        resource == user
-      end
-      can :create, User
-      #############################
-      can :read, Order do |order, token|
-        order.user == user || order.token && token == order.token
-      end
-      can :update, Order do |order, token|
-        order.user == user || order.token && token == order.token
-      end
-      can :create, Order
-      #############################
-      can :read, Product
-      can :index, Product
-      #############################
-      can :read, Taxon
-      can :index, Taxon
-      #############################
-      can :index, Wholesaler
-      can :new, Wholesaler
-      can :create, Wholesaler
-      can :read, Wholesaler do |resource|
-        resource.user == user
-      end
-      #############################
-    end
-
-    #include any abilities registered by extensions, etc.
-    Ability.abilities.each do |clazz|
-      ability = clazz.send(:new, user)
-      @can_definitions = abilities + ability.send(:abilities)
-    end
-
-  end
-end

data/lib/wholesale_products_helper.rb

@@ -1,26 +0,0 @@
-#module WholesaleProductsHelper
-#
-#  # returns the price of the product to show for display purposes
-#  def product_price(product_or_variant, options={})
-#    options.assert_valid_keys(:format_as_currency, :show_vat_text)
-#    options.reverse_merge! :format_as_currency => true, :show_vat_text => Spree::Config[:show_price_inc_vat]
-#
-#    puts "-----"
-#    puts current_user.roles.inspect
-#    
-#    if current_user.has_role?("wholesaler")
-#      _amount = product_or_variant.wholesale_price
-#      amount = _amount if 0.0 < _amount
-#    end
-#    
-#    amount ||= product_or_variant.price
-#    
-#    
-#    
-#    amount += Calculator::Vat.calculate_tax_on(product_or_variant) if Spree::Config[:show_price_inc_vat]
-#    options.delete(:format_as_currency) ? format_price(amount, options) : amount
-#  end
-#  
-#end
-#
-#ProductsHelper.send(:include, WholesaleProductsHelper)