spree_store_credits 1.0.1 → 1.0.2

data/Gemfile

@@ -0,0 +1,36 @@
+source 'http://rubygems.org'
+
+gem 'rake', '~> 0.8.7'
+gem 'linecache', '0.43'
+
+group :test do
+  gem 'rspec-rails', '= 2.6.1'
+  gem 'factory_girl', '= 1.3.3'
+  gem 'factory_girl_rails', '= 1.0.1'
+  gem 'rcov'
+  gem 'shoulda'
+  gem 'faker'
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug"
+  else
+    gem "ruby-debug19"
+  end
+end
+
+group :cucumber do
+  gem 'cucumber-rails'
+  gem 'database_cleaner', '= 0.6.7'
+  gem 'nokogiri'
+  gem 'capybara', '= 0.4.1.2'
+  gem 'factory_girl', '= 1.3.3'
+  gem 'factory_girl_rails', '= 1.0.1'
+  gem 'faker'
+  gem 'launchy'
+
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug"
+  else
+    gem "ruby-debug19"
+  end
+end
+gem 'spree', :git => 'git://github.com/spree/spree.git'

data/Rakefile

@@ -2,53 +2,82 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
+require 'rake/packagetask'
+require 'rubygems/package_task'
+
+gemfile = File.expand_path('../spec/test_app/Gemfile', __FILE__)
+if File.exists?(gemfile) && (%w(spec cucumber).include?(ARGV.first.to_s) || ARGV.size == 0)
+  require 'bundler'
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  Bundler.setup
+
+  require 'rspec'
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new
+
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new do |t|
+    t.cucumber_opts = %w{--format progress}
+  end
+end
 
 desc "Default Task"
-task :default => [ :spec ]
+task :default => [:spec, :cucumber ]
+
+spec = eval(File.read('spree_store_credits.gemspec'))
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
+Gem::PackageTask.new(spec) do |p|
+  p.gem_spec = spec
+end
 
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format pretty}
+desc "Release to gemcutter"
+task :release => :package do
+  require 'rake/gemcutter'
+  Rake::Gemcutter::Tasks.new(spec).define
+  Rake::Task['gem:push'].invoke
 end
 
+desc "Default Task"
+task :default => [ :spec ]
+
 desc "Regenerates a rails 3 app for testing"
 task :test_app do
   SPREE_PATH = ENV['SPREE_PATH']
   raise "SPREE_PATH should be specified" unless SPREE_PATH
   require File.join(SPREE_PATH, 'lib/generators/spree/test_app_generator')
-  class AuthTestAppGenerator < Spree::Generators::TestAppGenerator
-    def tweak_gemfile
-      append_file 'Gemfile' do
-<<-gems
-gem 'spree_core', :path => '#{File.join(SPREE_PATH, 'core')}'
-gem 'spree_auth', :path => '#{File.join(SPREE_PATH, 'auth')}'
-gem 'spree_store_credits', :path => '#{File.dirname(__FILE__)}'
-gems
-      end
-    end
+
+  class SpreeStoreCreditTestAppGenerator < Spree::Generators::TestAppGenerator
 
     def install_gems
       inside "test_app" do
-        run 'rake spree_core:install'
-        run 'rake spree_auth:install'
+        run 'bundle exec rake spree_core:install'
+        run 'bundle exec rake spree_auth:install'
+        run 'bundle exec rake spree_promo:install'
+        generate 'spree_store_credits:install -f'
       end
-
-      generate 'spree_store_credits:install -f'
     end
 
     def migrate_db
       run_migrations
     end
+
+    protected
+    def full_path_for_local_gems
+      <<-gems
+gem 'spree_core', :path => \'#{File.join(SPREE_PATH, "core")}\'
+gem 'spree_auth', :path => \'#{File.join(SPREE_PATH, "auth")}\'
+gem 'spree_promo', :path => \'#{File.join(SPREE_PATH, "promo")}\'
+gem 'spree_store_credits', :path => \'#{File.expand_path('..', __FILE__)}\'
+      gems
+    end
+
   end
-  AuthTestAppGenerator.start
+  SpreeStoreCreditTestAppGenerator.start
 end
 
 namespace :test_app do
   desc 'Rebuild test and cucumber databases'
   task :rebuild_dbs do
-    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test && rake db:drop db:migrate RAILS_ENV=cucumber")
+    system("cd spec/test_app && bundle exec rake db:drop db:migrate RAILS_ENV=test && bundle exec rake db:drop db:migrate RAILS_ENV=cucumber")
   end
 end

data/Versionfile

@@ -0,0 +1,4 @@
+"0.70.x" => { :branch => "master" }
+"0.60.x" => { :branch => "0-60-x" }
+"0.50.x" => { :branch => "0-50-x" }
+

data/app/controllers/admin/store_credits_controller.rb

@@ -1,27 +1,21 @@
-class Admin::StoreCreditsController < Admin::BaseController
-  resource_controller
+class Admin::StoreCreditsController < Admin::ResourceController
   before_filter :check_amounts, :only => [:edit, :update]
-  before_filter :set_remaining_amount, :only => [:create, :update]
-  
-  create.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
+  prepend_before_filter :set_remaining_amount, :only => [:create, :update]
 
-  update.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-  
-  destroy.success.wants.js { render_js_for_destroy }
-  
   private
   def check_amounts
-    if (object.remaining_amount < object.amount)
+    if (@store_credit.remaining_amount < @store_credit.amount)
       flash[:error] = "Can't be edit, b/c already was used."
-      redirect_to collection_url
+      redirect_to admin_store_credits_path
     end
   end
-  
+
   def set_remaining_amount
     params[:store_credit][:remaining_amount] = params[:store_credit][:amount]
   end
+
+  def collection
+    super.page(params[:page])
+  end
+
 end

data/app/controllers/users_controller_decorator.rb

@@ -4,6 +4,6 @@ UsersController.class_eval do
   private
   
   def find_orders_with_store_credit
-    @orders_with_store_credit = object.orders.joins(:adjustments).where(:adjustments => {:source_type => 'StoreCredit'})
+    @orders_with_store_credit = @user.orders.joins(:adjustments).where(:adjustments => {:source_type => 'StoreCredit'})
   end
 end

data/app/models/order_decorator.rb

@@ -1,9 +1,12 @@
 Order.class_eval do
   attr_accessible :store_credit_amount, :remove_store_credits
   attr_accessor :store_credit_amount, :remove_store_credits
-  before_save :process_store_credit, :if => "@store_credit_amount"
-  before_save :remove_store_credits
-  after_save :ensure_sufficient_credit
+  # the check for user? below is to ensure we don't break the
+  # admin app when creating a new order from the admin console
+  # In that case, we create an order before assigning a user
+  before_save :process_store_credit, :if => "self.user.present? && @store_credit_amount"
+  before_save :remove_store_credits, :if => "self.user.present?"
+  after_save :ensure_sufficient_credit, :if => "self.user.present?"
 
   has_many :store_credits, :class_name => 'StoreCreditAdjustment', :conditions => "source_type='StoreCredit'"
 

data/app/models/promotion/actions/give_store_credit.rb

@@ -0,0 +1,10 @@
+class Promotion::Actions::GiveStoreCredit < PromotionAction
+  preference :amount, :decimal, :default => 0.0
+
+  def perform(options = {})
+    if user = options[:user]
+      user.store_credits.create(:amount => preferred_amount, :remaining_amount => preferred_amount,  :reason => "Promotion: #{promotion.name}")
+    else
+    end
+  end
+end

data/app/models/user_decorator.rb

@@ -1,6 +1,10 @@
 User.class_eval do
   has_many :store_credits
-  
+
+  def has_store_credit?
+    store_credits_total > 0
+  end
+
   def store_credits_total
     store_credits.sum(:remaining_amount)
   end

data/app/overrides/views_decorator.rb

@@ -0,0 +1,39 @@
+Deface::Override.new(
+  :virtual_path => "admin/configurations/index",
+  :name => "store_credits_admin_configurations_menu",
+  :insert_bottom => "[data-hook='admin_configurations_menu']",
+  :text => "<%= configurations_menu_item(I18n.t('store_credits'), admin_store_credits_url, I18n.t('manage_store_credits')) %>",
+  :disabled => false)
+
+Deface::Override.new(
+  :virtual_path => "admin/users/index",
+  :name => "store_credits_admin_users_index_row_actions",
+  :insert_bottom => "[data-hook='admin_users_index_row_actions']",
+  :text => "&nbsp;<%= link_to_with_icon('add', t('add_store_credit'), new_admin_user_store_credit_url(user)) %>",
+  :disabled => false)
+
+Deface::Override.new(
+  :virtual_path => "checkout/_payment",
+  :name => "store_credits_checkout_payment_step",
+  :insert_after => "[data-hook='checkout_payment_step']",
+  :partial => "checkout/store_credits",
+  :disabled => false)
+
+Deface::Override.new(
+  :virtual_path => "users/show",
+  :name => "store_credits_account_my_orders",
+  :insert_after => "[data-hook='account_my_orders']",
+  :partial => "users/store_credits",
+  :disabled => false)
+
+Deface::Override.new(
+  :virtual_path => "shared/_order_details",
+  :name => "store_credits_order_details_adjustments",
+  :insert_after => "[data-hook='order_details_adjustments']",
+  :text => "
+  <% if @order.store_credits.present? && !@order.completed? %>
+    <tr><td colspan=\"4\">
+    <%= check_box :order, :remove_store_credits %> <%= label :order, :remove_store_credits %>
+    </td></tr>
+  <% end %>",
+  :disabled => false)

data/app/views/admin/store_credits/index.html.erb

@@ -14,7 +14,7 @@
   <tbody>
     <% @store_credits.each do |store_credit|%>
       <tr id="<%= dom_id store_credit %>">
-        <td><%= link_to store_credit.user.email, admin_user_url(store_credit.user) %></td>
+        <td><%= link_to store_credit.user.email, admin_user_url(store_credit.user) if store_credit.user.present? %></td>
         <td><%= number_to_currency store_credit.amount %></td>
         <td><%= number_to_currency store_credit.remaining_amount %></td>
         <td><%= store_credit.reason %></td>
@@ -24,7 +24,7 @@
               <%= link_to_edit store_credit %> &nbsp;
             <% else %>
               <%= t(:was_partially_used) %>
-            <% end %>       
+            <% end %>
             <%= link_to_delete store_credit %>
           <% else %>
             <%= t(:was_fully_used) %>
@@ -37,3 +37,4 @@
   </tbody>
 </table>
 
+<%= paginate @store_credits %>

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

@@ -1,3 +1,4 @@
+<% if @user.has_store_credit? %>
 <h2><%= t("store_credits") %></h2>
 <p>
 <%= t('current_store_credit') %>: <strong><%= number_to_currency @user.store_credits_total %></strong>
@@ -29,3 +30,4 @@
   </tbody>
 </table>
 <% end %>
+<% end %>

data/lib/spree_store_credits.rb

@@ -1,5 +1,5 @@
 require 'spree_core'
-require 'spree_store_credits_hooks'
+require 'spree_promo'
 
 module SpreeStoreCredits
   class Engine < Rails::Engine
@@ -8,8 +8,13 @@ module SpreeStoreCredits
         Rails.env == "production" ? require(c) : load(c)
       end
     end
+
     config.to_prepare &method(:activate).to_proc
     config.autoload_paths += %W(#{config.root}/lib)
+
+    initializer "spree.promo.register.promotions.actions" do |app|
+      app.config.spree.promotions.actions.concat([Promotion::Actions::GiveStoreCredit])
+    end
   end
 end
 

data/spec/factories/store_credits_factory.rb

@@ -0,0 +1,20 @@
+# this :promotion factory is defined in spree_promo, but I can't reuse it (i believe) b/c it is in spec/factories vs. lib/....
+Factory.define :promotion, :class => Promotion, :parent => :activator do |f|
+  f.name 'Promo'
+end
+
+Factory.define :give_store_credit_action, :class => Promotion::Actions::GiveStoreCredit do |f|
+  f.association :promotion
+
+  f.after_create do |action|
+    action.set_preference(:amount, 1234.56)
+    action.save!
+  end
+end
+
+Factory.define :promotion_for_store_credits, :parent => :promotion do |f|
+  f.event_name "spree.user.signup"
+  f.after_create do |p|
+    p.promotion_actions [Factory(:give_store_credit_action, :promotion => p)]
+  end
+end

data/spec/requests/store_credits_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe "Promotion for Store Credits" do
+
+  before(:all) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean
+  end
+
+  before(:each) do
+    DatabaseCleaner.start
+  end
+
+  after(:each) do
+    DatabaseCleaner.clean
+  end
+
+  context "#new user" do
+    it "should give me a store credit when I register" do
+
+      Factory(:promotion_for_store_credits, :event_name => "spree.user.signup")
+
+      new_user = Factory.build(:user)
+
+      post user_registration_path, {"commit"=>"Create", "user"=> {"password" => new_user.password, "email" => new_user.email }}
+      new_user = User.find_by_email new_user.email
+      new_user.store_credits.size.should == 1
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,19 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../test_app/config/environment", __FILE__)
 require 'rspec/rails'
 
+require 'database_cleaner'
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+require 'spree_core/testing_support/factories'
+
+# include local factories
+Dir["#{File.dirname(__FILE__)}/factories/**/*.rb"].each { |f| require File.expand_path(f)}
+
 RSpec.configure do |config|
   # == Mock Framework
   #
@@ -23,5 +29,20 @@ RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, comment the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
+end
+
+# https://groups.google.com/forum/m/#!msg/ruby-capybara/JI6JrirL9gM/R6YiXj4gi_UJ
+
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+   @@shared_connection || retrieve_connection
+  end
 end
+
+# Forces all threads to share the same connection. This works on
+# Capybara because it starts the web server in a thread.
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection

data/spree_store_credits.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
 
   s.name        = 'spree_store_credits'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.authors     = ["Roman Smirnov", "Brian Quinn"]
   s.email       = 'roman@railsdog.com'
   s.homepage    = 'http://github.com/spree/spree-store-credits'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +03:00
+date: 2012-01-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,17 +42,21 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
+- Versionfile
 - app/controllers/admin/store_credits_controller.rb
 - app/controllers/checkout_controller_decorator.rb
 - app/controllers/users_controller_decorator.rb
 - app/models/order_decorator.rb
+- app/models/promotion/actions/give_store_credit.rb
 - app/models/store_credit.rb
 - app/models/store_credit_adjustment.rb
 - app/models/user_decorator.rb
+- app/overrides/views_decorator.rb
 - app/views/admin/store_credits/_form.html.erb
 - app/views/admin/store_credits/edit.html.erb
 - app/views/admin/store_credits/index.html.erb
@@ -66,9 +70,10 @@ files:
 - lib/generators/spree_store_credits/install_generator.rb
 - lib/generators/templates/db/migrate/20100928140217_create_store_credits.rb
 - lib/spree_store_credits.rb
-- lib/spree_store_credits_hooks.rb
+- spec/factories/store_credits_factory.rb
 - spec/models/order_spec.rb
 - spec/models/user_spec.rb
+- spec/requests/store_credits_spec.rb
 - spec/spec_helper.rb
 - spree_store_credits.gemspec
 has_rdoc: true
@@ -103,5 +108,9 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Provides store credits for a Spree store.
-test_files: []
-
+test_files: 
+- spec/factories/store_credits_factory.rb
+- spec/models/order_spec.rb
+- spec/models/user_spec.rb
+- spec/requests/store_credits_spec.rb
+- spec/spec_helper.rb

data/lib/spree_store_credits_hooks.rb

@@ -1,26 +0,0 @@
-class SpreeStaticContentHooks < Spree::ThemeSupport::HookListener
-  insert_after :admin_configurations_menu do
-    "<%= configurations_menu_item(I18n.t('store_credits'), admin_store_credits_url, I18n.t('manage_store_credits')) %>"
-  end
-  
-    
-  insert_after :admin_users_index_row_actions do
-    %(&nbsp;
-      <%= link_to_with_icon('add', t('add_store_credit'), new_admin_user_store_credit_url(user)) %>
-     )     
-  end
-  
-  insert_after :checkout_payment_step, :partial => 'checkout/store_credits'
-  
-  insert_after :account_my_orders, :partial => 'users/store_credits'
-  
-  insert_after :order_details_adjustments do
-    %(
-    <% if @order.store_credits.present? && !@order.completed? %>
-      <tr><td colspan="4">
-      <%= check_box :order, :remove_store_credits %> <%= label :order, :remove_store_credits %>
-      </td></tr>
-    <% end %>
-    )
-  end
-end