Skip to content

Commit

Permalink
Upgradded to support spree 0.70.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mscottford committed Jan 11, 2012
1 parent 6a97fb4 commit 491c391
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 37 deletions.
2 changes: 2 additions & 0 deletions Versionfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
# "0.40.x" => { :tag => "v1.0.0", :version => "1.0.0" }


"0.60.x" => { :tag => "v0.60.0", :version => "0.60.0" }
"0.70.x" => { :branch => "master" }
5 changes: 5 additions & 0 deletions app/overrides/add_cities_to_admin_configuration_index.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Deface::Override.new(
:name => "add_cities_to_admin_configuration_index",
:virtual_path => "admin/configuration/index",
:insert_bottom => "[data-hook='admin_configurations_menu']",
:partial => "shared/cities_admin_configurations_menu")
5 changes: 4 additions & 1 deletion lib/spree_city_zones.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'spree_core'
require 'spree_city_zones_hooks'

module SpreeCityZones
class Engine < Rails::Engine
Expand All @@ -10,6 +9,10 @@ def self.activate
Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
Rails.env.production? ? require(c) : load(c)
end

Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/**/*.rb")) do |c|
Rails.env.production? ? require(c) : load(c)
end
end

config.to_prepare &method(:activate).to_proc
Expand Down
4 changes: 0 additions & 4 deletions lib/spree_city_zones_hooks.rb

This file was deleted.

25 changes: 0 additions & 25 deletions lib/tasks/install.rake

This file was deleted.

1 change: 0 additions & 1 deletion lib/tasks/spree_city_zones.rake

This file was deleted.

11 changes: 5 additions & 6 deletions spree_city_zones.gemspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.name = 'spree_city_zones'
s.version = '0.60.0'
s.summary = 'Add gem summary here'
s.description = 'Add (optional) gem description here'
s.version = '0.70.0'
s.summary = 'Spree extension providing tax zones based on city name'
s.description = 'This spree extension helps with setting up tax zones based on city name. It should be useful for setting up the different tax zones as mandated by Calinfornia state law in the United States.'
s.required_ruby_version = '>= 1.8.7'

s.author = 'Mark Linn'
s.email = '[email protected]'
# s.homepage = 'http://www.rubyonrails.org'
# s.rubyforge_project = 'actionmailer'

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.require_path = 'lib'
s.requirements << 'none'

s.add_dependency('spree_core', '>= 0.60.0')
s.add_dependency('spree_core', '~> 0.70.0')
s.add_dependency('rails', '~> 3.1.1')
end

0 comments on commit 491c391

Please sign in to comment.