diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..6e64999 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1 @@ +service_name: travis-ci \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 75b8dc5..64615fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 1.9.3 - - 1.9.2 + - "1.9.3" + - "1.9.2" - jruby-19mode - rbx-19mode \ No newline at end of file diff --git a/Changelog.md b/Changelog.md index 52e8556..2a37426 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,16 @@ # Change Log +### Version 0.0.5 - June 24th, 2013 + +* Testing + * Added `Minitest` gem as development dependency + * Removed `Turn` gem development dependency. + * Added Travis CI. + * Added Coveralls. + +* Documentation + * Added `/wiki/pages` directories. + ### Version 0.0.4 - June 11th, 2013 * Assertions @@ -20,7 +31,7 @@ * `:role` * `:resource` - * `:prilvilege` + * `:privilege` * `:assertion` -- _Not utilized in `.allowed?()` method._ ### Version <= 0.0.3 diff --git a/lib/rend/acl/version.rb b/lib/rend/acl/version.rb index 87d33c1..5012f6b 100644 --- a/lib/rend/acl/version.rb +++ b/lib/rend/acl/version.rb @@ -1,7 +1,7 @@ module Rend class Acl module Version - STRING = "0.0.4" + STRING = "0.0.5" end end end diff --git a/rend-acl.gemspec b/rend-acl.gemspec index 095c0af..4d6bfab 100644 --- a/rend-acl.gemspec +++ b/rend-acl.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency "rake" - spec.add_development_dependency "turn" + spec.add_development_dependency "minitest", "~> 5.0.5" dependency_gems = ['rend-core'] diff --git a/test/test_helper.rb b/test/helper.rb similarity index 52% rename from test/test_helper.rb rename to test/helper.rb index d6964c7..cd3a44f 100644 --- a/test/test_helper.rb +++ b/test/helper.rb @@ -1,6 +1,6 @@ # https://coveralls.io Integration require 'coveralls' -Coveralls.wear_merged! +Coveralls.wear! # Gem require 'rend/acl' @@ -12,8 +12,3 @@ # Autorun tests require "minitest/autorun" - -# Optionally try to use TURN gem if we're in a RUBY_VERSION >= 1.9.3 environment -if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.9.2') - begin; require 'turn/autorun'; rescue LoadError; end -end \ No newline at end of file diff --git a/test/test_acl.rb b/test/test_acl.rb index 8a8183f..cda996a 100644 --- a/test/test_acl.rb +++ b/test/test_acl.rb @@ -1,6 +1,6 @@ -require 'test_helper' +require 'helper' -class AclTest < MiniTest::Unit::TestCase +class AclTest < Minitest::Test def setup @acl = Rend::Acl.new diff --git a/test/test_wiki_pages_resources.rb b/test/test_documentation_examples.rb similarity index 76% rename from test/test_wiki_pages_resources.rb rename to test/test_documentation_examples.rb index aeffe63..0df3484 100644 --- a/test/test_wiki_pages_resources.rb +++ b/test/test_documentation_examples.rb @@ -1,12 +1,12 @@ -require 'test_helper' +require 'helper' -class WikiPagesResourcesTest < MiniTest::Unit::TestCase +class DocumentationExamplesTest < Minitest::Test - def setup - @acl = Rend::Acl.new - end + def setup + @acl = Rend::Acl.new + end - def test_resource_inheritance_example + def test_wiki_resource_inheritance_example city_resource = Rend::Acl::Resource.new("city") building_resource = Rend::Acl::Resource.new("building") diff --git a/wiki/pages/resources.md b/wiki/pages/resources.md index 55ffab6..849554a 100644 --- a/wiki/pages/resources.md +++ b/wiki/pages/resources.md @@ -1,7 +1,5 @@ -# Resources A ***Resource*** is simply an object to which access is controlled. - ## Resource Class Rend-Acl provides the `Rend::Acl::Resource` class as a basic resource implementation for developers to use and/or extend as needed. @@ -36,4 +34,4 @@ mayor_role = Rend::Acl::Role.new("mayor") @acl.allowed? :role => mayor_role, :resource => city_resource # => TRUE, via explicitly set rule. @acl.allowed? :role => mayor_role, :resource => building_resource # => TRUE, via resource rule inheritance ``` -> **Example Test:** `rend-acl/test/test_wiki_pages_resources.rb#test_resource_inheritance_example` ***PASSING*** \ No newline at end of file +> **Associated Test:** `rend-acl/test/test_documentation_examples.rb#test_wiki_resource_inheritance_example` \ No newline at end of file