http_status_exceptions 0.2.1 → 0.3.0

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 
+
+
 gemspec

data/Gemfile.lock

@@ -1,25 +1,56 @@
 PATH
   remote: .
   specs:
-    http_status_exceptions (0.2.0)
-      actionpack (~> 2)
+    http_status_exceptions (0.3.0)
+      actionpack (>= 3)
+      rack (>= 1.2.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (2.3.9)
-      activesupport (= 2.3.9)
-      rack (~> 1.1.0)
-    activesupport (2.3.9)
-    rack (1.1.0)
+    abstract (1.0.0)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
+    tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 2)
+  actionpack (>= 3)
   http_status_exceptions!
+  rack (>= 1.2.1)
   rake
-  rspec
+  rspec (~> 2)

data/README.rdoc

@@ -3,25 +3,21 @@
 This simple plugin will register exception classes for all HTTP status. These exceptions can then be raised from your controllers, after
 which a response will be send back to the client with the desired HTTP status, possible with some other content.
 
-You can use this plugin to access control mechanisms. You can simply raise a HTTPStatus::Forbidden if a user is not allowed to
-perform a certain action. A nice looking error page will be the result. See the example below:
+You can use this plugin to access control mechanisms. You can simply raise a <tt>HTTPStatus::Forbidden</tt> if a user is not allowed to
+perform a certain action. A nice looking error page will be the result. See the project wiki 
+(https://github.com/wvanbergen/http_status_exceptions/wiki) for additional documentation.
 
-See the project wiki (http://wiki.github.com/wvanbergen/http_status_exceptions) for additional documentation.
+This plugin only works with Rails 3. Version 0.2.1 of this plugin is compatible with Rails 2. The code for this version can be found in
+the rails2 branch: https://github.com/wvanbergen/http_status_exceptions/tree/rails2.
 
 == Installation
 
-Installation is simple. Simply add the gem to the configuration in your <tt>environment.rb</tt> or <tt>Gemfile</tt>:
-
-  # environment.rb
-  Rails::Initializer.run do |config|
-    ...
-    config.gem 'http_status_exceptions'
-  end
+Installation is simple. Simply add the gem to the configuration in your <tt>Gemfile</tt>:
 
   # Gemfile
   gem 'http_status_exceptions'
 
-Run <tt>rake gems:install</tt> to install the gem if needed.
+Run <tt>bundle install</tt> to make sure to have the gem included in your bundle.
 
 == Configuration
 

data/http_status_exceptions.gemspec

@@ -3,23 +3,24 @@ Gem::Specification.new do |s|
 
   # Do not update the version and date values by hand.
   # This will be done automatically by the gem release script.
-  s.version = "0.2.1"
-  s.date    = "2010-09-24"
+  s.version = "0.3.0"
+  s.date    = "2010-12-17"
 
   s.summary     = "A Rails plugin to use exceptions for generating HTTP status responses"
   s.description = "Clean up your controller code by raising exceptions that generate responses with different HTTP status codes."
 
-  s.add_runtime_dependency('actionpack', '~> 2')
+  s.add_runtime_dependency('rack', '>= 1.2.1')
+  s.add_runtime_dependency('actionpack', '>= 3')
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec', '~> 2')
 
-  s.authors  = ['Willem van Bergen']
-  s.email    = ['willem@vanbergen.org']
-  s.homepage = 'http://github.com/wvanbergen/http_status_exceptions/wikis'
+  s.authors  = ['Willem van Bergen', 'Jaap van der Meer', 'Jeff Pollard']
+  s.email    = 'willem@vanbergen.org'
+  s.homepage = 'http://github.com/wvanbergen/http_status_exceptions/wiki'
 
   # Do not update the files and test_files values by hand.
   # This will be done automatically by the gem release script.
-  s.files      = %w(spec/spec_helper.rb spec/http_status_exception_spec.rb http_status_exceptions.gemspec .gitignore MIT-LICENSE lib/http_status_exceptions.rb Gemfile init.rb Rakefile README.rdoc Gemfile.lock tasks/github-gem.rake)
+  s.files      = %w(.gitignore Gemfile Gemfile.lock MIT-LICENSE README.rdoc Rakefile http_status_exceptions.gemspec lib/http_status_exceptions.rb spec/http_status_exception_spec.rb spec/spec_helper.rb tasks/github-gem.rake)
   s.test_files = %w(spec/http_status_exception_spec.rb)
-end
+end

data/lib/http_status_exceptions.rb

@@ -1,3 +1,6 @@
+require 'rack/utils'
+require 'action_controller'
+
 # The HTTPStatus module is the core of the http_status_exceptions gem and
 # contains all functionality.
 #
@@ -19,7 +22,7 @@ module HTTPStatus
 
   # The current gem release version. Do not set this value by hand, it will
   # be done automatically by them gem release script.
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 
   # The Base HTTP status exception class is used as superclass for every
   # exception class that is constructed. It implements some shared
@@ -70,7 +73,7 @@ module HTTPStatus
     # The numeric status code corresponding to this exception class. Uses the
     # status symbol to code map in <tt>ActionController::StatusCodes</tt>.
     def self.status_code
-      ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE[self.status]
+      Rack::Utils::SYMBOL_TO_STATUS_CODE[self.status]
     end
 
     # The numeric status code corresponding to this exception. By default, it
@@ -115,7 +118,7 @@ module HTTPStatus
   # class should be generated.
   def self.const_missing(const)
     status_symbol = const.to_s.underscore.to_sym
-    raise "Unrecognized HTTP Status name!" unless ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE.has_key?(status_symbol)
+    raise "Unrecognized HTTP Status name!" unless Rack::Utils::SYMBOL_TO_STATUS_CODE.has_key?(status_symbol)
     klass = Class.new(HTTPStatus::Base)
     klass.cattr_accessor(:status)
     klass.status = status_symbol

data/spec/http_status_exception_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 
 describe HTTPStatus::Base, 'class inheritance' do
-  before(:all) do
-    ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE.stub!(:has_key?).with(:testing_status).and_return(true)
+
+  before do
+    Rack::Utils::SYMBOL_TO_STATUS_CODE[:testing_status] = 9000 #.stub(:has_key?).with(:testing_status).and_return(true)
     @status_exception_class = HTTPStatus::TestingStatus
   end
 
-  after(:all) do
+  after do
     HTTPStatus::Base.template_path = 'shared/http_status'
     HTTPStatus.send :remove_const, 'TestingStatus'
   end
@@ -20,7 +21,7 @@ describe HTTPStatus::Base, 'class inheritance' do
   end
 
   it "should check ActionController's status code list for the status code based on the class name" do
-    ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE.should_receive(:[]).with(:testing_status)
+    Rack::Utils::SYMBOL_TO_STATUS_CODE.should_receive(:[]).with(:testing_status)
     @status_exception_class.status_code
   end
 
@@ -66,9 +67,10 @@ describe 'HTTPStatus#http_status_exception' do
 
   it "should call :http_status_exception when an exception is raised when handling the action" do
     exception = HTTPStatus::Base.new('test')
-    @controller.stub!(:perform_action_without_rescue).and_raise(exception)
+    @controller.stub(:request).and_return(ActionDispatch::TestRequest.new)
+    @controller.stub(:test).and_raise(exception)
     @controller.should_receive(:http_status_exception).with(exception)
-    @controller.send(:perform_action)
+    @controller.send(:process_action, :test)
   end
 
   it "should call render with the correct view and correct HTTP status" do
@@ -90,8 +92,8 @@ describe 'HTTPStatus#http_status_exception' do
   end
 
   it "should call head with the correct status code if render cannot found a template" do
-    @controller.stub!(:render).and_raise(ActionView::MissingTemplate.new([], 'template.html.erb'))
+    @controller.stub!(:render).and_raise(ActionView::MissingTemplate.new([], 'template.html.erb', {}, false))
     @controller.should_receive(:head).with(:internal_server_error)
     @controller.http_status_exception(HTTPStatus::Base.new('test'))
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,19 +1,11 @@
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'rubygems'
 require 'bundler'
 
 Bundler.setup
 
-require 'spec/autorun'
-require 'action_controller'
+require 'rspec'
 require 'http_status_exceptions'
 
-# Include all files in the spec_helper directory
-Dir[File.dirname(__FILE__) + "/lib/**/*.rb"].each do |file|
-  require file
-end
-
-Spec::Runner.configure do |config|
-  # nothing special
+RSpec.configure do |config|
+  config.mock_with :rspec
 end

data/tasks/github-gem.rake

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/tasklib'
 require 'date'
-require 'git'
+require 'set'
 
 module GithubGem
 
@@ -24,7 +24,7 @@ module GithubGem
 
   class RakeTasks
 
-    attr_reader   :gemspec, :modified_files, :git
+    attr_reader   :gemspec, :modified_files
     attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
 
     # Initializes the settings, yields itself for configuration
@@ -33,7 +33,7 @@ module GithubGem
       @gemspec_file   = GithubGem.detect_gemspec_file
       @task_namespace = task_namespace
       @main_include   = GithubGem.detect_main_include
-      @modified_files = []
+      @modified_files = Set.new
       @root_dir       = Dir.pwd
       @test_pattern   = 'test/**/*_test.rb'
       @spec_pattern   = 'spec/**/*_spec.rb'
@@ -43,13 +43,16 @@ module GithubGem
 
       yield(self) if block_given?
 
-      @git = Git.open(@root_dir)
       load_gemspec!
       define_tasks!
     end
 
     protected
 
+    def git
+      @git ||= ENV['GIT'] || 'git'
+    end
+
     # Define Unit test tasks
     def define_test_tasks!
       require 'rake/testtask'
@@ -68,23 +71,23 @@ module GithubGem
 
     # Defines RSpec tasks
     def define_rspec_tasks!
-      require 'spec/rake/spectask'
+      require 'rspec/core/rake_task'
 
       namespace(:spec) do
         desc "Verify all RSpec examples for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:basic) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:basic) do |t|
+          t.pattern = spec_pattern
         end
 
         desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        Spec::Rake::SpecTask.new(:specdoc) do |t|
-          t.spec_files = FileList[spec_pattern]
-          t.spec_opts << '--format' << 'specdoc' << '--color'
+        RSpec::Core::RakeTask.new(:specdoc) do |t|
+          t.pattern = spec_pattern
+          t.rspec_opts = ['--format', 'documentation', '--color']
         end
 
         desc "Run RCov on specs for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:rcov) do |t|
+          t.pattern = spec_pattern
           t.rcov = true
           t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
         end
@@ -165,7 +168,7 @@ module GithubGem
     # in the repository and the spec/test file pattern.
     def manifest_task
       # Load all the gem's files using "git ls-files"
-      repository_files = git.ls_files.keys
+      repository_files = `#{git} ls-files`.split("\n")
       test_files       = Dir[test_pattern] + Dir[spec_pattern]
 
       update_gemspec(:files, repository_files)
@@ -180,7 +183,7 @@ module GithubGem
     end
 
     def newest_version
-      git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
     end
 
     def next_version(increment = nil)
@@ -217,72 +220,58 @@ module GithubGem
 
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
+      proposed_version = Gem::Version.new((ENV['VERSION'] || gemspec.version).dup)
       raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
     # Checks whether the current branch is not diverged from the remote branch
     def check_not_diverged_task
-      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.remote(remote).branch(remote_branch).gcommit).any?
+      raise "The current branch is diverged from the remote branch!" if `#{git} rev-list HEAD..#{remote}/#{remote_branch}`.split("\n").any?
     end
 
     # Checks whether the repository status ic clean
     def check_clean_status_task
-      raise "The current working copy contains modifications" if git.status.changed.any?
+      raise "The current working copy contains modifications" if `#{git} ls-files -m`.split("\n").any?
     end
 
     # Checks whether the current branch is correct
     def check_current_branch_task
-      raise "Currently not on #{local_branch} branch!" unless git.branch.name == local_branch.to_s
+      raise "Currently not on #{local_branch} branch!" unless `#{git} branch`.split("\n").detect { |b| /^\* / =~ b } == "* #{local_branch}"
     end
 
     # Fetches the latest updates from Github
     def fetch_origin_task
-      git.fetch('origin')
+      sh git, 'fetch', remote
     end
 
     # Commits every file that has been changed by the release task.
     def commit_modified_files_task
-      if modified_files.any?
-        modified_files.each { |file| git.add(file) }
-        git.commit("Released #{gemspec.name} gem version #{gemspec.version}")
+      really_modified = `#{git} ls-files -m #{modified_files.entries.join(' ')}`.split("\n")
+      if really_modified.any?
+        really_modified.each { |file| sh git, 'add', file }
+        sh git, 'commit', '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
       end
     end
 
     # Adds a tag for the released version
     def tag_version_task
-      git.add_tag("#{gemspec.name}-#{gemspec.version}")
+      sh git, 'tag', '-a', "#{gemspec.name}-#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
     end
 
     # Pushes the changes and tag to github
     def github_release_task
-      git.push(remote, remote_branch, true)
+      sh git, 'push', '--tags', remote, remote_branch
     end
 
-    # # Checks whether Rubyforge is configured properly
-    # def check_rubyforge_task
-    #   # Login no longer necessary when using rubyforge 2.0.0 gem
-    #   # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
-    #   output = `rubyforge names`.split("\n")
-    #   raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
-    #   raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
-    # end
-
-    # # Task to release the .gem file toRubyforge.
-    # def rubyforge_release_task
-    #   sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
-    # end
-    
     def gemcutter_release_task
-      sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
+      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
     # Gem release task.
     # All work is done by the task's dependencies, so just display a release completed message.
     def release_task
       puts
-      puts '------------------------------------------------------------'
-      puts "Released #{gemspec.name} version #{gemspec.version}"
+      puts "Release successful."
     end
 
     private
@@ -342,30 +331,35 @@ module GithubGem
 
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
+        
+        # Also mark the Gemfile.lock file as changed because of the new version.
+        modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
     end
 
     # Updates the tasks file using the latest file found on Github
     def update_tasks_task
-      require 'net/http'
-
-      server = 'github.com'
-      path   = '/wvanbergen/github-gem/raw/master/tasks/github-gem.rake'
+      require 'net/https'
+      require 'uri'
+      
+      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response = http.request(Net::HTTP::Get.new(uri.path))
 
-      Net::HTTP.start(server) do |http|
-        response = http.get(path)
+      if Net::HTTPSuccess === response
         open(__FILE__, "w") { |file| file.write(response.body) }
-      end
-
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{git.dir.path}/], '')
-      if git.status[relative_file] && git.status[relative_file].type == 'M'
-        git.add(relative_file)
-        git.commit("Updated to latest gem release management tasks.")
-        puts "Updated to latest version of gem release management tasks."
+        relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
+        if `#{git} ls-files -m #{relative_file}`.split("\n").any?
+          sh git, 'add', relative_file
+          sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        else
+          puts "Release managament tasks already are at the latest version."
+        end
       else
-        puts "Release managament tasks already are at the latest version."
+        raise "Download failed with HTTP status #{response.code}!"
       end
     end
-
   end
 end

metadata

@@ -1,55 +1,60 @@
 --- !ruby/object:Gem::Specification 
 name: http_status_exceptions
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Willem van Bergen
+- Jaap van der Meer
+- Jeff Pollard
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +02:00
+date: 2010-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rack
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 29
         segments: 
+        - 1
         - 2
-        version: "2"
-  type: :runtime
-  version_requirements: *id001
+        - 1
+        version: 1.2.1
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: actionpack
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
+        - 3
+        version: "3"
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,11 +63,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  requirement: *id004
 description: Clean up your controller code by raising exceptions that generate responses with different HTTP status codes.
-email: 
-- willem@vanbergen.org
+email: willem@vanbergen.org
 executables: []
 
 extensions: []
@@ -70,20 +87,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- spec/spec_helper.rb
-- spec/http_status_exception_spec.rb
-- http_status_exceptions.gemspec
 - .gitignore
-- MIT-LICENSE
-- lib/http_status_exceptions.rb
 - Gemfile
-- init.rb
-- Rakefile
-- README.rdoc
 - Gemfile.lock
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- http_status_exceptions.gemspec
+- lib/http_status_exceptions.rb
+- spec/http_status_exception_spec.rb
+- spec/spec_helper.rb
 - tasks/github-gem.rake
 has_rdoc: true
-homepage: http://github.com/wvanbergen/http_status_exceptions/wikis
+homepage: http://github.com/wvanbergen/http_status_exceptions/wiki
 licenses: []
 
 post_install_message: 

data/init.rb

@@ -1 +0,0 @@
-require 'http_status_exceptions.rb'