spree_core 1.0.0.rc1 → 1.0.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- data/LICENSE +1 -1
- data/app/assets/javascripts/admin/shipping_methods.js +14 -0
- data/app/assets/stylesheets/store/reset.css +1 -1
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +1 -1
- data/app/controllers/spree/admin/resource_controller.rb +1 -1
- data/app/controllers/spree/admin/shipping_methods_controller.rb +9 -0
- data/app/controllers/spree/admin/users_controller.rb +7 -0
- data/app/helpers/spree/admin/base_helper.rb +4 -3
- data/app/helpers/spree/admin/navigation_helper.rb +3 -1
- data/app/models/spree/order.rb +3 -3
- data/app/models/spree/preferences/preferable.rb +9 -0
- data/app/models/spree/product.rb +2 -2
- data/app/models/spree/shipment.rb +1 -1
- data/app/models/spree/shipping_category.rb +2 -0
- data/app/models/spree/shipping_method.rb +17 -1
- data/app/models/spree/tax_rate.rb +3 -1
- data/app/models/spree/variant.rb +1 -1
- data/app/models/spree/zone.rb +9 -9
- data/app/views/spree/admin/adjustments/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/_form.html.erb +1 -1
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
- data/app/views/spree/admin/payment_methods/edit.html.erb +1 -1
- data/app/views/spree/admin/product_properties/index.html.erb +1 -1
- data/app/views/spree/admin/products/edit.html.erb +1 -1
- data/app/views/spree/admin/shared/_destroy.js.erb +1 -1
- data/app/views/spree/admin/shipments/edit.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +15 -0
- data/app/views/spree/admin/taxons/edit.html.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +4 -5
- data/app/views/spree/checkout/edit.html.erb +1 -1
- data/app/views/spree/checkout/registration.html.erb +1 -1
- data/app/views/spree/orders/new.html.erb +1 -1
- data/app/views/spree/shared/_filters.html.erb +1 -1
- data/config/locales/en.yml +9 -2
- data/config/routes.rb +1 -0
- data/db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb +7 -0
- data/db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb +7 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +1 -0
- data/lib/generators/spree/dummy/templates/rails/script/rails +6 -0
- data/lib/generators/spree/install/install_generator.rb +167 -0
- data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js +15 -0
- data/lib/generators/spree/install/templates/app/assets/javascripts/store/all.js +15 -0
- data/lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css +16 -0
- data/lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css +16 -0
- data/lib/generators/spree/install/templates/config/initializers/spree.rb +9 -0
- data/lib/spree/core.rb +2 -2
- data/lib/spree/core/controller_helpers.rb +6 -0
- data/lib/spree/core/engine.rb +1 -1
- data/lib/spree/core/middleware/seo_assist.rb +2 -1
- data/lib/spree/core/ssl_requirement.rb +2 -2
- data/lib/spree/core/testing_support/common_rake.rb +1 -1
- data/lib/spree/core/testing_support/factories/shipping_method_factory.rb +10 -0
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/product_filters.rb +9 -7
- metadata +125 -242
- data/lib/generators/spree/extension/extension_generator.rb +0 -25
- data/lib/generators/spree/extension/templates/Gemfile +0 -13
- data/lib/generators/spree/extension/templates/LICENSE +0 -26
- data/lib/generators/spree/extension/templates/README.md +0 -21
- data/lib/generators/spree/extension/templates/Rakefile +0 -29
- data/lib/generators/spree/extension/templates/Versionfile +0 -9
- data/lib/generators/spree/extension/templates/app/assets/javascripts/admin/%file_name%.js +0 -1
- data/lib/generators/spree/extension/templates/app/assets/javascripts/store/%file_name%.js +0 -1
- data/lib/generators/spree/extension/templates/app/assets/stylesheets/admin/%file_name%.css +0 -3
- data/lib/generators/spree/extension/templates/app/assets/stylesheets/store/%file_name%.css +0 -3
- data/lib/generators/spree/extension/templates/config/locales/en.yml +0 -5
- data/lib/generators/spree/extension/templates/config/routes.rb +0 -3
- data/lib/generators/spree/extension/templates/extension.gemspec +0 -26
- data/lib/generators/spree/extension/templates/gitignore +0 -10
- data/lib/generators/spree/extension/templates/lib/%file_name%.rb.tt +0 -2
- data/lib/generators/spree/extension/templates/lib/%file_name%/engine.rb.tt +0 -20
- data/lib/generators/spree/extension/templates/lib/generators/%file_name%/install/install_generator.rb.tt +0 -29
- data/lib/generators/spree/extension/templates/rspec +0 -1
- data/lib/generators/spree/extension/templates/script/rails.tt +0 -5
- data/lib/generators/spree/extension/templates/spec/spec_helper.rb.tt +0 -32
@@ -1,25 +0,0 @@
|
|
1
|
-
require 'rails/generators'
|
2
|
-
module Spree
|
3
|
-
class ExtensionGenerator < Rails::Generators::NamedBase
|
4
|
-
source_root File.expand_path('../templates', __FILE__)
|
5
|
-
|
6
|
-
def generate
|
7
|
-
directory "app", "#{file_name}/app"
|
8
|
-
directory "lib", "#{file_name}/lib"
|
9
|
-
directory "script", "#{file_name}/script"
|
10
|
-
|
11
|
-
template "extension.gemspec", "#{file_name}.gemspec"
|
12
|
-
template "Gemfile", "#{file_name}/Gemfile"
|
13
|
-
template "gitignore", "#{file_name}/.gitignore"
|
14
|
-
template "LICENSE", "#{file_name}/LICENSE"
|
15
|
-
template "Rakefile", "#{file_name}/Rakefile"
|
16
|
-
template "README.md", "#{file_name}/README.md"
|
17
|
-
template "config/routes.rb", "#{file_name}/config/routes.rb"
|
18
|
-
template "config/locales/en.yml", "#{file_name}/config/locales/en.yml"
|
19
|
-
template "rspec", "#{file_name}/.rspec"
|
20
|
-
template "spec/spec_helper.rb.tt", "#{file_name}/spec/spec_helper.rb"
|
21
|
-
template "Versionfile", "#{file_name}/Versionfile"
|
22
|
-
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
@@ -1,26 +0,0 @@
|
|
1
|
-
Copyright (c) <%= Date.today.year %> [name of plugin creator]
|
2
|
-
All rights reserved.
|
3
|
-
|
4
|
-
Redistribution and use in source and binary forms, with or without modification,
|
5
|
-
are permitted provided that the following conditions are met:
|
6
|
-
|
7
|
-
* Redistributions of source code must retain the above copyright notice,
|
8
|
-
this list of conditions and the following disclaimer.
|
9
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
10
|
-
this list of conditions and the following disclaimer in the documentation
|
11
|
-
and/or other materials provided with the distribution.
|
12
|
-
* Neither the name Spree nor the names of its contributors may be used to
|
13
|
-
endorse or promote products derived from this software without specific
|
14
|
-
prior written permission.
|
15
|
-
|
16
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
17
|
-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
18
|
-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
19
|
-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
20
|
-
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
21
|
-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
22
|
-
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
23
|
-
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
24
|
-
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
25
|
-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
26
|
-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
@@ -1,21 +0,0 @@
|
|
1
|
-
<%= class_name %>
|
2
|
-
<%= "=" * class_name.size %>
|
3
|
-
|
4
|
-
Introduction goes here.
|
5
|
-
|
6
|
-
|
7
|
-
Example
|
8
|
-
=======
|
9
|
-
|
10
|
-
Example goes here.
|
11
|
-
|
12
|
-
Testing
|
13
|
-
-------
|
14
|
-
|
15
|
-
Be sure to bundle your dependencies and then create a dummy test app for the specs to run against.
|
16
|
-
|
17
|
-
$ bundle
|
18
|
-
$ bundle exec rake test app
|
19
|
-
$ bundle exec rspec spec
|
20
|
-
|
21
|
-
Copyright (c) <%= Date.today.year %> [name of extension creator], released under the New BSD License
|
@@ -1,29 +0,0 @@
|
|
1
|
-
require 'rake'
|
2
|
-
require 'rake/testtask'
|
3
|
-
require 'rake/packagetask'
|
4
|
-
require 'rubygems/package_task'
|
5
|
-
require 'rspec/core/rake_task'
|
6
|
-
require 'spree/core/testing_support/common_rake'
|
7
|
-
|
8
|
-
RSpec::Core::RakeTask.new
|
9
|
-
|
10
|
-
task :default => [:spec]
|
11
|
-
|
12
|
-
spec = eval(File.read('<%=file_name%>.gemspec'))
|
13
|
-
|
14
|
-
Gem::PackageTask.new(spec) do |p|
|
15
|
-
p.gem_spec = spec
|
16
|
-
end
|
17
|
-
|
18
|
-
desc "Release to gemcutter"
|
19
|
-
task :release => :package do
|
20
|
-
require 'rake/gemcutter'
|
21
|
-
Rake::Gemcutter::Tasks.new(spec).define
|
22
|
-
Rake::Task['gem:push'].invoke
|
23
|
-
end
|
24
|
-
|
25
|
-
desc "Generates a dummy app for testing"
|
26
|
-
task :test_app do
|
27
|
-
ENV['LIB_NAME'] = '<%=file_name%>'
|
28
|
-
Rake::Task['common:test_app'].invoke
|
29
|
-
end
|
@@ -1,9 +0,0 @@
|
|
1
|
-
# This file is used to designate compatibilty with different versions of Spree
|
2
|
-
# Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details
|
3
|
-
|
4
|
-
# Examples
|
5
|
-
#
|
6
|
-
# "0.70.x" => { :branch => "master"}
|
7
|
-
# "0.60.x" => { :branch => "0-60-stable" }
|
8
|
-
# "0.40.x" => { :tag => "v1.0.0", :version => "1.0.0" }
|
9
|
-
|
@@ -1 +0,0 @@
|
|
1
|
-
//= require admin/spree_core
|
@@ -1 +0,0 @@
|
|
1
|
-
//= require store/spree_core
|
@@ -1,26 +0,0 @@
|
|
1
|
-
# encoding: UTF-8
|
2
|
-
Gem::Specification.new do |s|
|
3
|
-
s.platform = Gem::Platform::RUBY
|
4
|
-
s.name = '<%= file_name %>'
|
5
|
-
s.version = '<%= Spree.version %>'
|
6
|
-
s.summary = 'TODO: Add gem summary here'
|
7
|
-
s.description = 'TODO: Add (optional) gem description here'
|
8
|
-
s.required_ruby_version = '>= 1.8.7'
|
9
|
-
|
10
|
-
# s.author = 'You'
|
11
|
-
# s.email = 'you@example.com'
|
12
|
-
# s.homepage = 'http://www.spreecommerce.com'
|
13
|
-
|
14
|
-
#s.files = `git ls-files`.split("\n")
|
15
|
-
#s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
16
|
-
s.require_path = 'lib'
|
17
|
-
s.requirements << 'none'
|
18
|
-
|
19
|
-
s.add_dependency 'spree_core', '>= <%= Spree.version %>'
|
20
|
-
|
21
|
-
s.add_development_dependency 'capybara', '1.0.1'
|
22
|
-
s.add_development_dependency 'factory_girl'
|
23
|
-
s.add_development_dependency 'ffaker'
|
24
|
-
s.add_development_dependency 'rspec-rails', '~> 2.7'
|
25
|
-
s.add_development_dependency 'sqlite3'
|
26
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
module <%= class_name %>
|
2
|
-
class Engine < Rails::Engine
|
3
|
-
engine_name '<%= file_name %>'
|
4
|
-
|
5
|
-
config.autoload_paths += %W(#{config.root}/lib)
|
6
|
-
|
7
|
-
# use rspec for tests
|
8
|
-
config.generators do |g|
|
9
|
-
g.test_framework :rspec
|
10
|
-
end
|
11
|
-
|
12
|
-
def self.activate
|
13
|
-
Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
|
14
|
-
Rails.configuration.cache_classes ? require(c) : load(c)
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
config.to_prepare &method(:activate).to_proc
|
19
|
-
end
|
20
|
-
end
|
@@ -1,29 +0,0 @@
|
|
1
|
-
module <%= class_name %>
|
2
|
-
module Generators
|
3
|
-
class InstallGenerator < Rails::Generators::Base
|
4
|
-
|
5
|
-
def add_javascripts
|
6
|
-
append_file "app/assets/javascripts/store/all.js", "//= require store/<%= file_name %>\n"
|
7
|
-
append_file "app/assets/javascripts/admin/all.js", "//= require admin/<%= file_name %>\n"
|
8
|
-
end
|
9
|
-
|
10
|
-
def add_stylesheets
|
11
|
-
inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/<%= file_name %>\n", :before => /\*\//, :verbose => true
|
12
|
-
inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/<%= file_name %>\n", :before => /\*\//, :verbose => true
|
13
|
-
end
|
14
|
-
|
15
|
-
def add_migrations
|
16
|
-
run 'bundle exec rake railties:install:migrations FROM=<%= file_name %>'
|
17
|
-
end
|
18
|
-
|
19
|
-
def run_migrations
|
20
|
-
res = ask "Would you like to run the migrations now? [Y/n]"
|
21
|
-
if res == "" || res.downcase == "y"
|
22
|
-
run 'bundle exec rake db:migrate'
|
23
|
-
else
|
24
|
-
puts "Skiping rake db:migrate, don't forget to run it!"
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
@@ -1 +0,0 @@
|
|
1
|
-
--colour
|
@@ -1,32 +0,0 @@
|
|
1
|
-
# Configure Rails Environment
|
2
|
-
ENV["RAILS_ENV"] = "test"
|
3
|
-
|
4
|
-
require File.expand_path("../dummy/config/environment.rb", __FILE__)
|
5
|
-
|
6
|
-
require 'rspec/rails'
|
7
|
-
|
8
|
-
# Requires supporting ruby files with custom matchers and macros, etc,
|
9
|
-
# in spec/support/ and its subdirectories.
|
10
|
-
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
11
|
-
|
12
|
-
# Requires factories defined in spree_core
|
13
|
-
require 'spree/core/testing_support/factories'
|
14
|
-
|
15
|
-
RSpec.configure do |config|
|
16
|
-
# == Mock Framework
|
17
|
-
#
|
18
|
-
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
|
19
|
-
#
|
20
|
-
# config.mock_with :mocha
|
21
|
-
# config.mock_with :flexmock
|
22
|
-
# config.mock_with :rr
|
23
|
-
config.mock_with :rspec
|
24
|
-
|
25
|
-
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
|
26
|
-
config.fixture_path = "#{::Rails.root}/spec/fixtures"
|
27
|
-
|
28
|
-
# If you're not using ActiveRecord, or you'd prefer not to run each of your
|
29
|
-
# examples within a transaction, remove the following line or assign false
|
30
|
-
# instead of true.
|
31
|
-
config.use_transactional_fixtures = true
|
32
|
-
end
|