some minor fixes

This commit is contained in:
Captain Future
2011-04-22 19:06:33 +02:00
parent eaa34e86d8
commit 0a4db498da
5 changed files with 8 additions and 214 deletions

View File

@@ -1,217 +1,8 @@
PATH
remote: /Users/Future/Sites/Rails/Projekte/spree/core
specs:
spree_core (0.60.99)
activemerchant (= 1.12.0)
acts_as_list (= 0.1.2)
faker (= 0.9.5)
highline (= 1.5.1)
jquery-rails (= 0.2.6)
meta_search (= 1.0.1)
nested_set (= 1.6.4)
paperclip (= 2.3.8)
rails (= 3.0.6)
rd_find_by_param (= 0.1.1)
rd_resource_controller
rd_unobtrusive_date_picker (= 0.1.0)
state_machine (= 0.9.4)
stringex (= 1.0.3)
will_paginate (= 3.0.pre2)
PATH
remote: .
specs:
spree_digital (0.60.99)
spree_core (>= 0.60.99)
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
actionmailer (3.0.6)
actionpack (= 3.0.6)
mail (~> 2.2.15)
actionpack (3.0.6)
activemodel (= 3.0.6)
activesupport (= 3.0.6)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemerchant (1.12.0)
activesupport (>= 2.3.8)
braintree (>= 2.0.0)
builder (>= 2.0.0)
activemodel (3.0.6)
activesupport (= 3.0.6)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.6)
activemodel (= 3.0.6)
activesupport (= 3.0.6)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
activeresource (3.0.6)
activemodel (= 3.0.6)
activesupport (= 3.0.6)
activesupport (3.0.6)
acts_as_list (0.1.2)
arel (2.0.9)
braintree (2.9.1)
builder
builder (2.1.2)
capybara (0.4.1.2)
celerity (>= 0.7.9)
culerity (>= 0.2.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.3)
celerity (0.8.9)
childprocess (0.1.8)
ffi (~> 1.0.6)
columnize (0.3.2)
configuration (1.2.0)
cucumber (0.10.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (>= 2.3.5)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
cucumber-rails (0.4.1)
cucumber (>= 0.10.1)
nokogiri (>= 1.4.4)
rack-test (>= 0.5.7)
culerity (0.2.15)
database_cleaner (0.6.7.RC)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
factory_girl (1.3.3)
factory_girl_rails (1.0.1)
factory_girl (~> 1.3)
railties (>= 3.0.0)
faker (0.9.5)
i18n (~> 0.4)
ffi (1.0.7)
rake (>= 0.8.7)
gherkin (2.3.5)
json (>= 1.4.6)
highline (1.5.1)
i18n (0.5.0)
jquery-rails (0.2.6)
rails (~> 3.0)
thor (~> 0.14.4)
json (1.5.1)
json_pure (1.5.1)
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
linecache (0.43)
mail (2.2.15)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_search (1.0.1)
actionpack (~> 3.0.2)
activerecord (~> 3.0.2)
activesupport (~> 3.0.2)
arel (~> 2.0.2)
mime-types (1.16)
nested_set (1.6.4)
activerecord (>= 3.0.0)
railties (>= 3.0.0)
nokogiri (1.4.4)
paperclip (2.3.8)
activerecord
activesupport
polyglot (0.3.1)
rack (1.2.2)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.6)
actionmailer (= 3.0.6)
actionpack (= 3.0.6)
activerecord (= 3.0.6)
activeresource (= 3.0.6)
activesupport (= 3.0.6)
bundler (~> 1.0)
railties (= 3.0.6)
railties (3.0.6)
actionpack (= 3.0.6)
activesupport (= 3.0.6)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
rcov (0.9.9)
rd_find_by_param (0.1.1)
activerecord (~> 3.0)
activesupport (~> 3.0)
rd_resource_controller (1.0.1)
rd_unobtrusive_date_picker (0.1.0)
rspec (2.5.0)
rspec-core (~> 2.5.0)
rspec-expectations (~> 2.5.0)
rspec-mocks (~> 2.5.0)
rspec-core (2.5.1)
rspec-expectations (2.5.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0)
rspec-rails (2.5.0)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.5.0)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
rubyzip (0.9.4)
selenium-webdriver (0.1.4)
childprocess (>= 0.1.7)
ffi (>= 1.0.7)
json_pure
rubyzip
shoulda (2.11.3)
sqlite3 (1.3.3)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
state_machine (0.9.4)
stringex (1.0.3)
term-ansicolor (1.0.5)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.26)
will_paginate (3.0.pre2)
xpath (0.1.3)
nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
capybara (= 0.4.1.2)
cucumber-rails
database_cleaner (= 0.6.7.RC)
factory_girl (= 1.3.3)
factory_girl_rails (= 1.0.1)
faker
launchy
nokogiri
rcov
rspec-rails (= 2.5.0)
ruby-debug
shoulda
spree_core!
spree_digital!
sqlite3-ruby

View File

@@ -14,6 +14,8 @@ The idea is simple. You attach a file to a Product (or a Variant of this Product
* The links will only work 3 times (but we tell the customer that it works only once). After 24 hours the links are deactivated. This should keep you reasonably free from complaints of people who are not capable of appropriately clicking on a link. They can try a whole day long, 3 times per link. The file should really be downloadable for weird customers. I understand that this is a little bit security by obscurity, but it's better than other solutions that I've seen.
* The file @views/order_mailer/confirm_email.text.erb@ is the only thing that should need customization. But since I assume you do that anyway, it doesn't hurt to do it when you're using spree_digital. The reason is that the download links are added to the confirmation email to the customer.
* A purchased product can be downloaded even if you disable the product immediately. You would have to remove the attached file in your admin section to prevent people from downloading purchased products.
* File are uploaded to @rails_root/private@. Make sure it's symlinked in case you're using Capistrano.
* We use send_file to send the files on download. Yes, it goes through the entire stack right now.
h2. Installation
@@ -22,7 +24,7 @@ I assume that you already have a Rails 3 Spree application up and running. If no
To make use of @digital_spree@, you need to add this line to your @Gemfile@:
<pre>
gem 'spree_social', :git => 'git://github.com/funkensturm/spree_digital.git', :branch => 'master'
gem 'spree_digital', :git => 'git://github.com/funkensturm/spree_digital.git', :branch => 'master'
</pre>
The following terminal commands will copy the file "spree_digital/db/migration/20110410134726_create_digitals.rb":http://github.com/funkensturm/spree_digital/blob/master/db/migrate/20110410134726_create_digitals.rb to the corresponding directory in your Rails application and apply the migration to your database.
@@ -87,4 +89,4 @@ h3. License
Copyright (c) 2011 funkensturm.
Released under the MIT License
See "LICENSE":LICENSE
See "http://github.com/funkensturm/spree_digital/blob/master/LICENSE":LICENSE

View File

@@ -10,7 +10,7 @@
<div id="methods">
<p class="field radios">
<% @order.rate_hash.each do |shipping_method| %>
<% next if shipping_method[:id] == @order.digital_shipping_method[:id] %>
<% next if @order.digital_shipping_method && shipping_method[:id] == @order.digital_shipping_method[:id] %>
<label>
<%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
<%= shipping_method[:name] %> <%= number_to_currency shipping_method[:cost] %>

View File

@@ -25,8 +25,9 @@ ATTENTION! Each link will only work a SINGLE TIME!
<% for item in @order.line_items %>
<% if item.digital? %>
<%= item.variant.name %>:
<%= item.digital_links.inspect %>
<% for link in item.digital_links %>
<%= digital_url :protocol => 'https', :host => "yourdomainxygoeshere.com", :secret => link.secret %>
<%= digital_url :host => Spree::Config.get(:site_url), :secret => link.secret %>
<% end %>
<% end %>

View File

@@ -7,5 +7,5 @@ Rails.application.routes.draw do
end
get '/digital/:secret', :to => 'digitals#show', :via => :get, :as => 'digital', :constraints => { :secret => /[a-zA-Z0-9]{30}/ }
end