From e632db25917f5ddbe07e854b2ed3418aad7ed0f1 Mon Sep 17 00:00:00 2001 From: Dominik Masur Date: Tue, 30 Nov 2010 17:59:42 +0100 Subject: [PATCH 1/5] rails3 changes --- README.markdown | 3 - Rakefile | 129 +++--------------- app/controllers/wished_products_controller.rb | 3 +- app/controllers/wishlists_controller.rb | 14 +- app/views/wishlists/_accessibility.html.erb | 2 +- app/views/wishlists/show.html.erb | 6 +- config/locales/en-US.yml | 11 ++ config/routes.rb | 12 +- lib/tasks/wishlist_extension_tasks.rake | 28 ---- public/javascripts/wishlist.js | 1 + spec/spec_helper.rb | 60 ++++---- wishlist_extension.rb | 50 ------- wishlist_hooks.rb | 11 -- 13 files changed, 85 insertions(+), 245 deletions(-) delete mode 100644 README.markdown delete mode 100644 lib/tasks/wishlist_extension_tasks.rake delete mode 100644 wishlist_extension.rb delete mode 100644 wishlist_hooks.rb diff --git a/README.markdown b/README.markdown deleted file mode 100644 index 76684b9..0000000 --- a/README.markdown +++ /dev/null @@ -1,3 +0,0 @@ -= Wishlist - -Description goes here \ No newline at end of file diff --git a/Rakefile b/Rakefile index 164c3a9..ebdaab8 100644 --- a/Rakefile +++ b/Rakefile @@ -1,120 +1,31 @@ -# I think this is the one that should be moved to the extension Rakefile template - -# In rails 1.2, plugins aren't available in the path until they're loaded. -# Check to see if the rspec plugin is installed first and require -# it if it is. If not, use the gem version. - -# Determine where the RSpec plugin is by loading the boot -unless defined? SPREE_ROOT - ENV["RAILS_ENV"] = "test" - case - when ENV["SPREE_ENV_FILE"] - require File.dirname(ENV["SPREE_ENV_FILE"]) + "/boot" - when File.dirname(__FILE__) =~ %r{vendor/SPREE/vendor/extensions} - require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot" - else - require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot" - end -end +require File.expand_path('../../config/application', __FILE__) +require 'rubygems' require 'rake' -require 'rake/rdoctask' require 'rake/testtask' +require 'rake/packagetask' +require 'rake/gempackagetask' -rspec_base = File.expand_path(SPREE_ROOT + '/vendor/plugins/rspec/lib') -$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base) -require 'spec/rake/spectask' -# require 'spec/translator' - -# Cleanup the SPREE_ROOT constant so specs will load the environment -Object.send(:remove_const, :SPREE_ROOT) - -extension_root = File.expand_path(File.dirname(__FILE__)) - -task :default => :spec -task :stats => "spec:statsetup" +spec = eval(File.read('wishlist.gemspec')) -desc "Run all specs in spec directory" -Spec::Rake::SpecTask.new(:spec) do |t| - t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] - t.spec_files = FileList["#{extension_root}/spec/**/*_spec.rb"] +Rake::GemPackageTask.new(spec) do |p| + p.gem_spec = spec end -namespace :spec do - desc "Run all specs in spec directory with RCov" - Spec::Rake::SpecTask.new(:rcov) do |t| - t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] - t.spec_files = FileList['spec/**/*_spec.rb'] - t.rcov = true - t.rcov_opts = ['--exclude', 'spec', '--rails'] - end - - desc "Print Specdoc for all specs" - Spec::Rake::SpecTask.new(:doc) do |t| - t.spec_opts = ["--format", "specdoc", "--dry-run"] - t.spec_files = FileList['spec/**/*_spec.rb'] - end - - [:models, :controllers, :views, :helpers].each do |sub| - desc "Run the specs under spec/#{sub}" - Spec::Rake::SpecTask.new(sub) do |t| - t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] - t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"] - end - end - - # Hopefully no one has written their extensions in pre-0.9 style - # desc "Translate specs from pre-0.9 to 0.9 style" - # task :translate do - # translator = ::Spec::Translator.new - # dir = RAILS_ROOT + '/spec' - # translator.translate(dir, dir) - # end - - # Setup specs for stats - task :statsetup do - require 'code_statistics' - ::STATS_DIRECTORIES << %w(Model\ specs spec/models) - ::STATS_DIRECTORIES << %w(View\ specs spec/views) - ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) - ::STATS_DIRECTORIES << %w(Helper\ specs spec/views) - ::CodeStatistics::TEST_TYPES << "Model specs" - ::CodeStatistics::TEST_TYPES << "View specs" - ::CodeStatistics::TEST_TYPES << "Controller specs" - ::CodeStatistics::TEST_TYPES << "Helper specs" - ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/} - end - - namespace :db do - namespace :fixtures do - desc "Load fixtures (from spec/fixtures) into the current environment's database. Load specific fixtures using FIXTURES=x,y" - task :load => :environment do - require 'active_record/fixtures' - ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| - Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*')) - end - end - end - end +desc "Release to gemcutter" +task :release => :package do + require 'rake/gemcutter' + Rake::Gemcutter::Tasks.new(spec).define + Rake::Task['gem:push'].invoke end -desc 'Generate documentation for the wishlist extension.' -Rake::RDocTask.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'WishlistExtension' - rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include('README') - rdoc.rdoc_files.include('lib/**/*.rb') -end +desc "Default Task" +task :default => [ :spec ] -# For extensions that are in transition -desc 'Test the wishlist extension.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' - t.verbose = true -end +require 'rspec/core/rake_task' +RSpec::Core::RakeTask.new -# Load any custom rakefiles for extension -Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f } \ No newline at end of file +# require 'cucumber/rake/task' +# Cucumber::Rake::Task.new do |t| +# t.cucumber_opts = %w{--format pretty} +# end \ No newline at end of file diff --git a/app/controllers/wished_products_controller.rb b/app/controllers/wished_products_controller.rb index 093eede..e20450e 100644 --- a/app/controllers/wished_products_controller.rb +++ b/app/controllers/wished_products_controller.rb @@ -1,6 +1,5 @@ -class WishedProductsController < ApplicationController +class WishedProductsController < Spree::BaseController resource_controller - # I'm sorry for this hack, but it is simplest way to make adding to wishlist after user logged in, # because redirect_to can not make POST requests def index diff --git a/app/controllers/wishlists_controller.rb b/app/controllers/wishlists_controller.rb index 1ebba43..13dc8c3 100644 --- a/app/controllers/wishlists_controller.rb +++ b/app/controllers/wishlists_controller.rb @@ -1,4 +1,4 @@ -class WishlistsController < ApplicationController +class WishlistsController < Spree::BaseController resource_controller helper :products @@ -11,6 +11,18 @@ class WishlistsController < ApplicationController render :js => "alert('#{t :updated_successfully}');" } + def email_to_friend + @wishlist = object + if request.post? + if params[:email].blank? + flash[:error] = t('email_address_missing') + else + WishlistMailer.email_wishlist_to_friend(current_user, @wishlist, params).deliver + flash[:notice] = t('wishlist_email_sent') + redirect_to wishlist_path(@wishlist) + end + end + end private def object diff --git a/app/views/wishlists/_accessibility.html.erb b/app/views/wishlists/_accessibility.html.erb index 5d6fb13..24d10bd 100644 --- a/app/views/wishlists/_accessibility.html.erb +++ b/app/views/wishlists/_accessibility.html.erb @@ -1,4 +1,4 @@ -<% form_for @wishlist, :html => {:class => 'ajax_form', :id => 'change_wishlist_accessibility'} do |f| %> +<%= form_for @wishlist, :html => {:class => 'ajax_form', :id => 'change_wishlist_accessibility'} do |f| %> <%= f.radio_button :is_private, true %> <%= t(:private) %> <%= f.radio_button :is_private, false %> <%= t(:public) %> <% end -%> diff --git a/app/views/wishlists/show.html.erb b/app/views/wishlists/show.html.erb index 8956445..5e689cc 100644 --- a/app/views/wishlists/show.html.erb +++ b/app/views/wishlists/show.html.erb @@ -30,12 +30,12 @@ <% if @wishlist.user == current_user %> <%= link_to t("remove_from_wishlist"), wish, :method => :delete %> - <% form_for :order, :url => orders_url do |f| %> + <%= form_for :order, :url => populate_orders_url do |f| %> <%= hidden_field_tag "variants[#{variant.id}]", 1, :size => 3 %> <%= link_to t(:add_to_cart), '#', :onclick => "$(this).parent().submit(); return false;" %> <% end -%> <%= t("move_to_another_wishlist") %>: - <% form_for wish do |f| %> + <%= form_for wish do |f| %> <%= f.select :wishlist_id, current_user.wishlists.map{|wl| [wl.name, wl.id]} %> <%= f.submit t(:move) %> <% end -%> @@ -72,7 +72,7 @@ <% end -%> -<% hook :wishlist_footer_links do %> +<%= hook :wishlist_footer_links do %>
<% if @wishlist.user == current_user %> <%= link_to t("create_new_wishlist"), new_wishlist_path %> diff --git a/config/locales/en-US.yml b/config/locales/en-US.yml index cab2d08..e4276a0 100644 --- a/config/locales/en-US.yml +++ b/config/locales/en-US.yml @@ -22,3 +22,14 @@ en: remove_from_wishlist: "Remove from wishlist" wishlist_actions: "Actions" your_wishlist_is_empty: "Your wishlist is empty" + update_quantity: "Update quantity" + item_added_to_wishlist: "Item added to wishlist" + email_to_friend: "Email to a friend" + wishlist_email_sent: 'Your wishlist was successfully sent to your friend.' + send_wishlist: Send + email_address_missing: 'Email is required.' + message: Message + wishlist_sender_name: 'Your name' + wishlist_recipients_name: 'The name of your friend' + subject: 'Subject' + diff --git a/config/routes.rb b/config/routes.rb index abbb38b..0cefaac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ -# Put your extension routes here. -map.resources :wishlists -map.resources :wished_products -map.default_wishlist '/wishlist', :controller => :wishlists, :action => 'show' +Rails.application.routes.draw do + resources :wishlists + resources :wished_products + match '/wishlist', :controller => :wishlists, :action => 'show', :as => "default_wishlist" + match '/wishlists/email_to_friend/:id', :controller => :wishlists, :action => 'email_to_friend', :as => "email_to_friend" +end + + diff --git a/lib/tasks/wishlist_extension_tasks.rake b/lib/tasks/wishlist_extension_tasks.rake deleted file mode 100644 index b3e6a65..0000000 --- a/lib/tasks/wishlist_extension_tasks.rake +++ /dev/null @@ -1,28 +0,0 @@ -namespace :db do - desc "Bootstrap your database for Spree." - task :bootstrap => :environment do - # load initial database fixtures (in db/sample/*.yml) into the current environment's database - ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) - Dir.glob(File.join(WishlistExtension.root, "db", 'sample', '*.{yml,csv}')).each do |fixture_file| - Fixtures.create_fixtures("#{WishlistExtension.root}/db/sample", File.basename(fixture_file, '.*')) - end - end -end - -namespace :spree do - namespace :extensions do - namespace :wishlist do - desc "Copies public assets of the Wishlist to the instance public/ directory." - task :update => :environment do - is_svn_git_or_dir = proc {|path| path =~ /\.svn/ || path =~ /\.git/ || File.directory?(path) } - Dir[WishlistExtension.root + "/public/**/*"].reject(&is_svn_git_or_dir).each do |file| - path = file.sub(WishlistExtension.root, '') - directory = File.dirname(path) - puts "Copying #{path}..." - mkdir_p RAILS_ROOT + directory - cp file, RAILS_ROOT + path - end - end - end - end -end \ No newline at end of file diff --git a/public/javascripts/wishlist.js b/public/javascripts/wishlist.js index ab36a5c..17b8bd5 100644 --- a/public/javascripts/wishlist.js +++ b/public/javascripts/wishlist.js @@ -9,6 +9,7 @@ $("#new_wished_product").submit(function() { $(".ajax_form").submit(function() { $.post($(this).attr("action"), $(this).serialize(), null, "script"); + alert('Wurde zur Wunschliste hinzugefügt') return false; }); diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ffde315..353fdcc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,37 +1,31 @@ -unless defined? SPREE_ROOT - ENV["RAILS_ENV"] = "test" - case - when ENV["SPREE_ENV_FILE"] - require ENV["SPREE_ENV_FILE"] - when File.dirname(__FILE__) =~ %r{vendor/SPREE/vendor/extensions} - require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment" - else - require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment" - end -end -require "#{SPREE_ROOT}/spec/spec_helper" +# 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("../../../config/environment", __FILE__) +require 'rspec/rails' +require 'fabrication' -if File.directory?(File.dirname(__FILE__) + "/scenarios") - Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios" -end -if File.directory?(File.dirname(__FILE__) + "/matchers") - Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file } -end +# Requires supporting files with custom matchers and macros, etc, +# in ./support/ and its subdirectories. +Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f} -Spec::Runner.configure do |config| - # config.use_transactional_fixtures = true - # config.use_instantiated_fixtures = false - # config.fixture_path = RAILS_ROOT + '/spec/fixtures' - - # You can declare fixtures for each behaviour like this: - # describe "...." do - # fixtures :table_a, :table_b - # - # Alternatively, if you prefer to declare them only once, you can - # do so here, like so ... +RSpec.configure do |config| + # == Mock Framework # - # config.global_fixtures = :table_a, :table_b + # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: # - # If you declare global fixtures, be aware that they will be declared - # for all of your examples, even those that don't use them. -end \ No newline at end of file + # config.mock_with :mocha + # config.mock_with :flexmock + # config.mock_with :rr + config.mock_with :rspec + + config.fixture_path = "#{::Rails.root}/spec/fixtures" + + #config.include Devise::TestHelpers, :type => :controller + # 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 +end + +@configuration ||= AppConfiguration.find_or_create_by_name("Default configuration") diff --git a/wishlist_extension.rb b/wishlist_extension.rb deleted file mode 100644 index c15bc2e..0000000 --- a/wishlist_extension.rb +++ /dev/null @@ -1,50 +0,0 @@ -# Uncomment this if you reference any of your controllers in activate -# require_dependency 'application' - -class WishlistExtension < Spree::Extension - version "1.0" - description "Describe your extension here" - url "http://yourwebsite.com/wishlist" - - # Please use wishlist/config/routes.rb instead for extension routes. - - # def self.require_gems(config) - # config.gem "gemname-goes-here", :version => '1.2.3' - # end - - def activate - - User.class_eval do - has_many :wishlists - - def wishlist - default_wishlist = self.wishlists.first(:conditions => ["is_default = ?", true]) - default_wishlist ||= self.wishlists.first - default_wishlist ||= self.wishlists.create(:name => "My wishlist", :is_default => true) - default_wishlist.update_attribute(:is_default, true) unless default_wishlist.is_default? - default_wishlist - end - end - - # Add your extension tab to the admin. - # Requires that you have defined an admin controller: - # app/controllers/admin/yourextension_controller - # and that you mapped your admin in config/routes - - #Admin::BaseController.class_eval do - # before_filter :add_yourextension_tab - # - # def add_yourextension_tab - # # add_extension_admin_tab takes an array containing the same arguments expected - # # by the tab helper method: - # # [ :extension_name, { :label => "Your Extension", :route => "/some/non/standard/route" } ] - # add_extension_admin_tab [ :yourextension ] - # end - #end - - # make your helper avaliable in all views - # Spree::BaseController.class_eval do - # helper YourHelper - # end - end -end diff --git a/wishlist_hooks.rb b/wishlist_hooks.rb deleted file mode 100644 index 8c91957..0000000 --- a/wishlist_hooks.rb +++ /dev/null @@ -1,11 +0,0 @@ -class WishlistHooks < Spree::ThemeSupport::HookListener - - insert_after :cart_form, 'products/wishlist_form' - insert_after :account_my_orders, 'users/wishlists' - insert_after :wishlist_footer_links do - %(
- <%= link_to(t('email_to_friend.send_to_friend'), email_to_friend_url('wishlist', @wishlist)) %> -
) - end - -end From adc66207dd6abf52fd89281a44c9983cdd96af62 Mon Sep 17 00:00:00 2001 From: Dominik Masur Date: Tue, 30 Nov 2010 17:59:50 +0100 Subject: [PATCH 2/5] rails3 new files --- .DS_Store | Bin 0 -> 6148 bytes LICENSE | 23 +++++++++++++++++++ README.md | 3 +++ app/.DS_Store | Bin 0 -> 6148 bytes app/models/wishlist_mailer.rb | 11 +++++++++ app/views/wishlists/email_to_friend.erb | 14 ++++++++++++ lib/.DS_Store | Bin 0 -> 6148 bytes lib/spree_wishlist.rb | 29 ++++++++++++++++++++++++ lib/spree_wishlist_hooks.rb | 9 ++++++++ lib/tasks/spree_wishlist.rake | 28 +++++++++++++++++++++++ spree_wishlist.gemspec | 22 ++++++++++++++++++ 11 files changed, 139 insertions(+) create mode 100644 .DS_Store create mode 100644 LICENSE create mode 100644 README.md create mode 100644 app/.DS_Store create mode 100644 app/models/wishlist_mailer.rb create mode 100644 app/views/wishlists/email_to_friend.erb create mode 100644 lib/.DS_Store create mode 100644 lib/spree_wishlist.rb create mode 100644 lib/spree_wishlist_hooks.rb create mode 100644 lib/tasks/spree_wishlist.rake create mode 100644 spree_wishlist.gemspec diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1030a16c1c6602b446d050eea5199cc71c7a515e GIT binary patch literal 6148 zcmeHK%TB{U3>-HBRpQbk$NdHVAgbCg;0K@yAf$*?s<`LIZ+H9vC5m$80Jh|v-C28A zJBK(1Ap6hm0oVc9(iQQg!_stLePNqmZiu31wEbxqdQNe>2wovHx56{dICqz6ev1Jg zc*Q&3rW+e{I8BKPJ!586jSJ6vK|76Gxj*StAQeajQh`+9zbT-Fnzp@j%rO;61yX?@ z1@!w+=!#9?=xCn~4%Pw?Ytm+%TQ5N@N)VgC(UA;IJeBCF5-o;!I{6ZDP2lM0>5ynX zByN`IP{eNM`NhH^jbo0fKq@d-pz`HT>;I9y(*Mtsa+M0C0)I*YsSl5bJ)ab{b@4c@ vwT1pf|2D>2I0q}mL@UKyXeqv*#1)-$zX=>2EuFlj6Z1zvbxBJFenWvPHLfLT literal 0 HcmV?d00001 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5800638 --- /dev/null +++ b/LICENSE @@ -0,0 +1,23 @@ +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the Rails Dog LLC nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..76684b9 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ += Wishlist + +Description goes here \ No newline at end of file diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4ac366dbf5860130a7701ddb20ecdb8147003e9e GIT binary patch literal 6148 zcmeHKIS#@=477m)iH4GLzrYVx2wuPk5JwjgiK9=&yLcMoqlqFU3TV(c^3JZ~+0{-F z$0DMu`*A5U7m+F4P#!i6&EA_2Y?KiN!m-CiT50f{F#F7mJCg%=XSwzG*W>lj?Ax}n z6dDzv0#twsPys6NB?YpuPG?`*kK0fID)2uF*!Q8p4QpZ-=${S@-U0w82)kkKy#%mW z09X^dKtx~~RA5jwTMP|4;wAHHViy>6(QH06PuA>E)KAC$#nVM=AV(@d1^Nn%V>!3_ zzk$E$|NA7ar~noCD+P42-mX`;Qr6bN<*e2g_zrG4Pq-Q8PQl>i80h5~3oFM9Pl~)^ YbG)yKU7*tucRG+i1Evd&3jA7u7nrgZGXMYp literal 0 HcmV?d00001 diff --git a/app/models/wishlist_mailer.rb b/app/models/wishlist_mailer.rb new file mode 100644 index 0000000..1f21484 --- /dev/null +++ b/app/models/wishlist_mailer.rb @@ -0,0 +1,11 @@ +class WishlistMailer < ActionMailer::Base + default_url_options[:host] = Spree::Config[:site_url] + default :from => Spree::Config[:mails_from] + + def email_wishlist_to_friend(user, wishlist, email) + subject = email[:subject].blank? ? 'Wishlist' : email[:subject] + @mail = email + @wishlist = wishlist + mail(:to => email[:email], :subject => subject) + end +end diff --git a/app/views/wishlists/email_to_friend.erb b/app/views/wishlists/email_to_friend.erb new file mode 100644 index 0000000..f65193a --- /dev/null +++ b/app/views/wishlists/email_to_friend.erb @@ -0,0 +1,14 @@ +

<%= t("email_to_friend") %>

+<%= form_tag do %> + <%= label_tag :email, t(:email) %>
+ <%= text_field_tag :email, params[:email] %>
+ <%= label_tag :subject, t(:subject) %>
+ <%= text_field_tag :subject, params[:subject] %>
+ <%= label_tag :wishlist_sender_name, t(:wishlist_sender_name) %>
+ <%= text_field_tag :sender_name, params[:sender_name] %>
+ <%= label_tag :wishlist_recipients_name, t(:wishlist_recipients_name) %>
+ <%= text_field_tag :recipients_name, params[:recipients_name] %>
+ <%= label_tag :message, t(:message) %>
+ <%= text_area_tag :message, params[:message], :rows => 10, :cols => 25 %>
+ <%= submit_tag t(:send_wishlist) %> +<% end -%> diff --git a/lib/.DS_Store b/lib/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b55059f728679d8666c8ecc4f22340cec824b59b GIT binary patch literal 6148 zcmeH~J&pn~427S8m5{cfq)fvBxIu*26YK?8paY3wmOe-4*>S@xH5#p+CFjLXJU?GC z83VB0{k#QM0G4!DYXGc`%vhvHMMn(PX~u+0jLY6!#Iy#f?7O5t*NamGc?QY z!Lrn%4e@-GQ%mlvsjX`-hh_6&d1v!3hGxASRv6H%hG-B05f~Ae_ju*!{}=sL|34~G zC;}qz&j{FJ|GnSwrSfe3^Lm~?WY*`6PL1sxo_+!t_))y3hjG35gj!QuS7vDX5eN(# IMBuFi9`17!p8x;= literal 0 HcmV?d00001 diff --git a/lib/spree_wishlist.rb b/lib/spree_wishlist.rb new file mode 100644 index 0000000..3f57d3f --- /dev/null +++ b/lib/spree_wishlist.rb @@ -0,0 +1,29 @@ +require 'spree_core' +require 'spree_wishlist_hooks' + +module SpreeWishlist + class Engine < Rails::Engine + + config.autoload_paths += %W(#{config.root}/lib) + + def self.activate + Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c| + Rails.env.production? ? require(c) : load(c) + end + User.class_eval do + has_many :wishlists + + def wishlist + default_wishlist = self.wishlists.first(:conditions => ["is_default = ?", true]) + default_wishlist ||= self.wishlists.first + default_wishlist ||= self.wishlists.create(:name => "My wishlist", :is_default => true) + default_wishlist.update_attribute(:is_default, true) unless default_wishlist.is_default? + default_wishlist + end + end + + end + + config.to_prepare &method(:activate).to_proc + end +end diff --git a/lib/spree_wishlist_hooks.rb b/lib/spree_wishlist_hooks.rb new file mode 100644 index 0000000..2d9d4d2 --- /dev/null +++ b/lib/spree_wishlist_hooks.rb @@ -0,0 +1,9 @@ +class SpreeWishlistHooks < Spree::ThemeSupport::HookListener + insert_after :cart_form, 'products/wishlist_form' + insert_after :account_my_orders, 'users/wishlists' + insert_after :wishlist_footer_links do + %(
+ <%= link_to(t('email_to_friend'), email_to_friend_url('wishlist', @wishlist)) %> +
) + end +end \ No newline at end of file diff --git a/lib/tasks/spree_wishlist.rake b/lib/tasks/spree_wishlist.rake new file mode 100644 index 0000000..b3e6a65 --- /dev/null +++ b/lib/tasks/spree_wishlist.rake @@ -0,0 +1,28 @@ +namespace :db do + desc "Bootstrap your database for Spree." + task :bootstrap => :environment do + # load initial database fixtures (in db/sample/*.yml) into the current environment's database + ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) + Dir.glob(File.join(WishlistExtension.root, "db", 'sample', '*.{yml,csv}')).each do |fixture_file| + Fixtures.create_fixtures("#{WishlistExtension.root}/db/sample", File.basename(fixture_file, '.*')) + end + end +end + +namespace :spree do + namespace :extensions do + namespace :wishlist do + desc "Copies public assets of the Wishlist to the instance public/ directory." + task :update => :environment do + is_svn_git_or_dir = proc {|path| path =~ /\.svn/ || path =~ /\.git/ || File.directory?(path) } + Dir[WishlistExtension.root + "/public/**/*"].reject(&is_svn_git_or_dir).each do |file| + path = file.sub(WishlistExtension.root, '') + directory = File.dirname(path) + puts "Copying #{path}..." + mkdir_p RAILS_ROOT + directory + cp file, RAILS_ROOT + path + end + end + end + end +end \ No newline at end of file diff --git a/spree_wishlist.gemspec b/spree_wishlist.gemspec new file mode 100644 index 0000000..8609810 --- /dev/null +++ b/spree_wishlist.gemspec @@ -0,0 +1,22 @@ +Gem::Specification.new do |s| + s.platform = Gem::Platform::RUBY + s.name = 'wishlist' + s.version = '1.0.0' + s.summary = 'Add gem summary here' + #s.description = 'Add (optional) gem description here' + s.required_ruby_version = '>= 1.8.7' + + # s.author = 'David Heinemeier Hansson' + # s.email = 'david@loudthinking.com' + # s.homepage = 'http://www.rubyonrails.org' + # s.rubyforge_project = 'actionmailer' + + s.files = Dir['CHANGELOG', 'README.md', 'LICENSE', 'lib/**/*', 'app/**/*'] + s.require_path = 'lib' + s.requirements << 'none' + + s.has_rdoc = true + + s.add_dependency('spree_core', '>= 0.30.1') + s.add_dependency('spree_auth', '>= 0.30.1') +end \ No newline at end of file From cd47a6a0b84efa6280a709286b513cba936f50bc Mon Sep 17 00:00:00 2001 From: Dominik Masur Date: Tue, 30 Nov 2010 20:21:55 +0100 Subject: [PATCH 3/5] de.yml --- config/locales/de.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 config/locales/de.yml diff --git a/config/locales/de.yml b/config/locales/de.yml new file mode 100644 index 0000000..12d3022 --- /dev/null +++ b/config/locales/de.yml @@ -0,0 +1,35 @@ +de: + add_to_wishlist: "Für die Wunschliste" + "Are you sure, that you want to delete this wishlist?": "Sind sie sicher, dass sie diese Wunschliste löschen wollen?" + availability: "Verfügbarkeit" + create_new_wishlist: "Neue Wunschliste erstellen" + creating_wishlist: "Wunschliste erstellen" + date_added: "Hinzugefügt am" + delete_wishlist: "Wunschliste löschen" + edit_wishlist: "Wunschliste ändern" + editing_wishlist: "Ändere Wunschliste" + in_stock: "Verfügbar" + is_default: "ist voreingstellt" + is_private: "ist privat" + item_view: "Bild" + move: "Verschieben" + move_to_another_wishlist: "Verschiebe in" + my_wishlists: "Meine Wuschlisten" + private_wishlist: "Private Wunschlisten" + private: "Privat" + public_wishlist: "Öffentliche Wunschlisten" + public: "Öffentlich" + remove_from_wishlist: "Von Wunschliste entfernen" + wishlist_actions: "" + your_wishlist_is_empty: "Deine Wunschliste ist leer" + update_quantity: "Ändere Menge" + item_added_to_wishlist: "Artikel wurde zur Wunschliste hinzugefügt" + email_to_friend: "Wunschliste an einen Freund verschicken" + wishlist_email_sent: 'Wunschliste wurde an einen Freund versand.' + send_wishlist: Senden + email_address_missing: 'Email ist erforderlich.' + message: Nachricht + wishlist_sender_name: 'Dein Name' + wishlist_recipients_name: 'Name des Freundes' + subject: 'Betreff' + quantity: 'Menge' \ No newline at end of file From b7f30dc656c4f3414499c7e237941d614b63189d Mon Sep 17 00:00:00 2001 From: Dominik Masur Date: Wed, 8 Dec 2010 22:40:52 +0100 Subject: [PATCH 4/5] = form_for --- app/views/products/_wishlist_form.html.erb | 2 +- config/routes.rb | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/views/products/_wishlist_form.html.erb b/app/views/products/_wishlist_form.html.erb index 9593b88..a16eb63 100644 --- a/app/views/products/_wishlist_form.html.erb +++ b/app/views/products/_wishlist_form.html.erb @@ -1,5 +1,5 @@
- <% form_for WishedProduct.new, :html => {:method => :get} do |f| %> + <%= form_for WishedProduct.new, :html => {:method => :get} do |f| %> <%= f.hidden_field :variant_id, :value => @product.master.id %>