Skip to content

Commit

Permalink
Change minimum requirements to Rails >= 4 and Ruby >= 2.
Browse files Browse the repository at this point in the history
  • Loading branch information
weppos committed Aug 6, 2015
1 parent 16c14a4 commit f9775d8
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 47 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
rvm:
- 1.9.2
- 1.9.3
- 2.0.0
- 2.1.0
- 2.2.0
gemfile:
- gemfiles/3.0.gemfile
- gemfiles/3.1.gemfile
- gemfiles/3.2.gemfile
- gemfiles/4.0.gemfile
notifications:
recipients:
- [email protected]
matrix:
exclude:
- rvm: 1.9.2
gemfile: gemfiles/4.0.gemfile
18 changes: 6 additions & 12 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
appraise "3.0" do
gem "activerecord", "~> 3.0.0"
end

appraise "3.1" do
gem "activerecord", "~> 3.1.0"
end

appraise "3.2" do
gem "activerecord", "~> 3.2.0"
end

appraise "4.0" do
gem "activerecord", "~> 4.0.0"
end
appraise "4.1" do
gem "activerecord", "~> 4.1.0"
end
appraise "4.2" do
gem "activerecord", "~> 4.2.0"
end
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## master

- CHANGED: Minimum requirements Rails >= 4 and Ruby >= 2.


## Release 2.3.1

- FIXED: Using `add_breadcrumbs` did not properly pass `options` (GH-46). [Thanks @link664]
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source "http://rubygems.org"
source "https://rubygems.org"

gemspec
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ spec = Gem::Specification.new do |s|

s.author = "Simone Carletti"
s.email = "[email protected]"
s.homepage = "http://www.simonecarletti.com/code/breadcrumbs_on_rails"
s.homepage = "http://simonecarletti.com/code/breadcrumbs_on_rails/"

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.require_paths = %w( lib )

s.add_development_dependency "rails", ">= 3.0"
s.add_development_dependency "rails", ">= 4.0"
s.add_development_dependency "appraisal"
s.add_development_dependency "mocha", "~> 1.0.0"
s.add_development_dependency "mocha", ">= 1.0"
s.add_development_dependency "yard"
end

Expand Down
14 changes: 7 additions & 7 deletions breadcrumbs_on_rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.description = "BreadcrumbsOnRails is a simple Ruby on Rails plugin for creating and managing a breadcrumb navigation for a Rails project."
s.email = "[email protected]"
s.files = [".gitignore", ".ruby-gemset", ".ruby-version", ".travis.yml", "Appraisals", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "breadcrumbs_on_rails.gemspec", "gemfiles/3.0.gemfile", "gemfiles/3.1.gemfile", "gemfiles/3.2.gemfile", "gemfiles/4.0.gemfile", "init.rb", "lib/breadcrumbs_on_rails.rb", "lib/breadcrumbs_on_rails/action_controller.rb", "lib/breadcrumbs_on_rails/breadcrumbs.rb", "lib/breadcrumbs_on_rails/railtie.rb", "lib/breadcrumbs_on_rails/version.rb", "test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/builder_test.rb", "test/unit/element_test.rb", "test/unit/simple_builder_test.rb", "test/views/example/default.html.erb"]
s.homepage = "http://www.simonecarletti.com/code/breadcrumbs_on_rails"
s.homepage = "http://simonecarletti.com/code/breadcrumbs_on_rails/"
s.rubygems_version = "2.4.7"
s.summary = "A simple Ruby on Rails plugin for creating and managing a breadcrumb navigation."
s.test_files = ["test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/builder_test.rb", "test/unit/element_test.rb", "test/unit/simple_builder_test.rb", "test/views/example/default.html.erb"]
Expand All @@ -21,20 +21,20 @@ Gem::Specification.new do |s|
s.specification_version = 4

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<rails>, [">= 3.0"])
s.add_development_dependency(%q<rails>, [">= 4.0"])
s.add_development_dependency(%q<appraisal>, [">= 0"])
s.add_development_dependency(%q<mocha>, ["~> 1.0.0"])
s.add_development_dependency(%q<mocha>, [">= 1.0"])
s.add_development_dependency(%q<yard>, [">= 0"])
else
s.add_dependency(%q<rails>, [">= 3.0"])
s.add_dependency(%q<rails>, [">= 4.0"])
s.add_dependency(%q<appraisal>, [">= 0"])
s.add_dependency(%q<mocha>, ["~> 1.0.0"])
s.add_dependency(%q<mocha>, [">= 1.0"])
s.add_dependency(%q<yard>, [">= 0"])
end
else
s.add_dependency(%q<rails>, [">= 3.0"])
s.add_dependency(%q<rails>, [">= 4.0"])
s.add_dependency(%q<appraisal>, [">= 0"])
s.add_dependency(%q<mocha>, ["~> 1.0.0"])
s.add_dependency(%q<mocha>, [">= 1.0"])
s.add_dependency(%q<yard>, [">= 0"])
end
end
7 changes: 0 additions & 7 deletions gemfiles/3.2.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/3.0.gemfile → gemfiles/4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "http://rubygems.org"

gem "activerecord", "~> 3.0.0"
gem "activerecord", "~> 4.1.0"

gemspec :path=>"../"
2 changes: 1 addition & 1 deletion gemfiles/3.1.gemfile → gemfiles/4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "http://rubygems.org"

gem "activerecord", "~> 3.1.0"
gem "activerecord", "~> 4.2.0"

gemspec :path=>"../"
3 changes: 3 additions & 0 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@

$:.unshift File.expand_path('../../lib', __FILE__)
require 'breadcrumbs_on_rails'

Encoding.default_external = Encoding::UTF_8
Encoding.default_internal = Encoding::UTF_8
13 changes: 7 additions & 6 deletions test/unit/action_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_render_default
def test_render_compute_paths
get :action_compute_paths
assert_dom_equal %(<a href="/">String</a> &raquo; <a href="/?proc">Proc</a> &raquo; <a href="/?polymorphic">Polymorphic</a>),
@response.body
@response.body.to_s
end

end
Expand Down Expand Up @@ -78,14 +78,15 @@ class ClassLevelExampleControllerTest < ActionController::TestCase

def test_render_default
expected = [].tap { |links|
links << "<a href=\"/\">String</a>"
links << "<a href=\"/?proc\">Proc</a>"
links << "<a href=\"/?polymorphic\">Polymorphic</a>"
links << "<a href=\"/\" title=\"Awesome\">With options</a>"
links << '<a href="/">String</a>'
links << '<a href="/?proc">Proc</a>'
links << '<a href="/?polymorphic">Polymorphic</a>'
links << '<a title="Awesome" href="/">With options</a>'
}

get :action_default
assert_dom_equal %(#{expected.join(" &raquo; ")}), @response.body
assert_dom_equal expected.join(" &raquo; "),
@response.body.to_s
end

end
Expand Down

0 comments on commit f9775d8

Please sign in to comment.