lotus-controller 0.1.0 → 0.2.0

data/lib/lotus/controller/dsl.rb

@@ -5,9 +5,7 @@ module Lotus
     # @since 0.1.0
     module Dsl
       def self.included(base)
-        base.class_eval do
-          extend ClassMethods
-        end
+        base.extend ClassMethods
       end
 
       module ClassMethods
@@ -22,6 +20,8 @@ module Lotus
         #
         # @since 0.1.0
         #
+        # @see Lotus::Controller::Configuration#action_module
+        #
         # @example
         #   require 'lotus/controller'
         #
@@ -41,10 +41,12 @@ module Lotus
         #     end
         #   end
         def action(name, &blk)
+          config = configuration.duplicate
           const_set(name, Class.new)
 
           const_get(name).tap do |klass|
-            klass.class_eval { include ::Lotus::Action }
+            klass.class_eval { include config.action_module }
+            klass.configuration = config
             klass.class_eval(&blk)
           end
         end

data/lib/lotus/controller/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/lotus/http/status.rb

@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module Lotus
   module Http
     # An HTTP status
@@ -9,78 +11,19 @@ module Lotus
       #
       # @since 0.1.0
       # @api private
-      ALL = {
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing (WebDAV) (RFC 2518)',
+      ALL = ::Rack::Utils::HTTP_STATUS_CODES.dup.merge({
         103 => 'Checkpoint',
         122 => 'Request-URI too long',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status (WebDAV) (RFC 4918)',
-        208 => 'Already Reported (WebDAV) (RFC 5842)',
-        226 => 'IM Used (RFC 3229)',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => 'Switch Proxy',
-        307 => 'Temporary Redirect',
-        308 => 'Resume Incomplete',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot (RFC 2324)',
+        418 => 'I\'m a teapot',
         420 => 'Enhance Your Calm',
-        422 => 'Unprocessable Entity (WebDAV) (RFC 4918)',
-        423 => 'Locked (WebDAV) (RFC 4918)',
-        424 => 'Failed Dependency (WebDAV) (RFC 4918)',
-        426 => 'Upgrade Required (RFC 2817)',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
         444 => 'No Response',
         449 => 'Retry With',
         450 => 'Blocked by Windows Parental Controls',
         451 => 'Wrong Exchange server',
         499 => 'Client Closed Request',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (RFC 2295)',
-        507 => 'Insufficient Storage (WebDAV) (RFC 4918)',
-        508 => 'Loop Detected (WebDAV) (RFC 5842)',
-        509 => 'Bandwidth Limit Exceeded (Apache bw\/limited extension)',
-        510 => 'Not Extended (RFC 2774)',
-        511 => 'Network Authentication Required',
         598 => 'Network read timeout error',
         599 => 'Network connect timeout error'
-      }.freeze
+      }).freeze
 
       # Return a status for the given code
       #

data/lib/rack-patch.rb

@@ -8,13 +8,15 @@ if Rack.release <= '1.5'
     def self.best_q_match(q_value_header, available_mimes)
       values = q_values(q_value_header)
 
-      values.map do |req_mime, quality|
+      value = values.map do |req_mime, quality|
         match = available_mimes.find { |am| Rack::Mime.match?(am, req_mime) }
         next unless match
         [match, quality]
       end.compact.sort_by do |match, quality|
         (match.split('/', 2).count('*') * -10) + quality
-      end.last.first
+      end.last
+
+      value.first if value
     end
   end
 end

data/lotus-controller.gemspec

@@ -13,15 +13,15 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://lotusrb.org'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -- lib/* CHANGELOG.md LICENSE.md README.md lotus-controller.gemspec`.split($/)
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rack',        '~> 1.5'
-  spec.add_dependency 'lotus-utils', '~> 0.1'
+  spec.add_dependency 'lotus-utils', '~> 0.2'
 
-  spec.add_development_dependency 'bundler',   '~> 1.5'
+  spec.add_development_dependency 'bundler',   '~> 1.6'
   spec.add_development_dependency 'minitest',  '~> 5'
   spec.add_development_dependency 'rack-test', '~> 0.6'
   spec.add_development_dependency 'rake',      '~> 10'

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: lotus-controller
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: lotus-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
 description: Controller layer for Lotus
@@ -101,17 +101,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
-- Gemfile
-- LICENSE.txt
+- CHANGELOG.md
+- LICENSE.md
 - README.md
-- Rakefile
 - lib/lotus-controller.rb
 - lib/lotus/action.rb
 - lib/lotus/action/callable.rb
 - lib/lotus/action/callbacks.rb
+- lib/lotus/action/configurable.rb
 - lib/lotus/action/cookie_jar.rb
 - lib/lotus/action/cookies.rb
 - lib/lotus/action/exposable.rb
@@ -122,25 +119,12 @@ files:
 - lib/lotus/action/session.rb
 - lib/lotus/action/throwable.rb
 - lib/lotus/controller.rb
+- lib/lotus/controller/configuration.rb
 - lib/lotus/controller/dsl.rb
 - lib/lotus/controller/version.rb
 - lib/lotus/http/status.rb
 - lib/rack-patch.rb
 - lotus-controller.gemspec
-- test/action/callbacks_test.rb
-- test/action/params_test.rb
-- test/action_test.rb
-- test/controller_test.rb
-- test/cookies_test.rb
-- test/fixtures.rb
-- test/integration/mime_type_test.rb
-- test/integration/routing_test.rb
-- test/integration/sessions_test.rb
-- test/redirect_test.rb
-- test/session_test.rb
-- test/test_helper.rb
-- test/throw_test.rb
-- test/version_test.rb
 homepage: http://lotusrb.org
 licenses:
 - MIT
@@ -151,33 +135,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Controller layer for Lotus, compatible with Rack
-test_files:
-- test/action/callbacks_test.rb
-- test/action/params_test.rb
-- test/action_test.rb
-- test/controller_test.rb
-- test/cookies_test.rb
-- test/fixtures.rb
-- test/integration/mime_type_test.rb
-- test/integration/routing_test.rb
-- test/integration/sessions_test.rb
-- test/redirect_test.rb
-- test/session_test.rb
-- test/test_helper.rb
-- test/throw_test.rb
-- test/version_test.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,10 +0,0 @@
-.devnotes
-.greenbar
-Gemfile.lock
-tags
-.bundle
-coverage
-tmp
-doc/
-.yardoc
-lotus-controller-0.1.0.gem

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-script: 'bundle exec rake test:coverage'
-rvm:
-  - 2.0.0
-  - 2.1.0

data/.yardopts

@@ -1,4 +0,0 @@
---protected
--
-LICENSE.txt
-lib/**/*.rb

data/Gemfile

@@ -1,15 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec
-
-if !ENV['TRAVIS']
-  gem 'debugger',     require: false
-  gem 'yard',         require: false
-  gem 'lotus-utils',  require: false, path: '../lotus-utils'
-  gem 'lotus-router', require: false, path: '../lotus-router'
-else
-  gem 'lotus-router', require: false
-end
-
-gem 'simplecov', require: false
-gem 'coveralls', require: false

data/Rakefile

@@ -1,17 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'bundler/gem_tasks'
-
-Rake::TestTask.new do |t|
-  t.pattern = 'test/**/*_test.rb'
-  t.libs.push 'test'
-end
-
-namespace :test do
-  task :coverage do
-    ENV['COVERAGE'] = 'true'
-    Rake::Task['test'].invoke
-  end
-end
-
-task default: :test

data/test/action/callbacks_test.rb

@@ -1,99 +0,0 @@
-require 'test_helper'
-
-describe Lotus::Action do
-  describe '#before' do
-    it 'invokes the method(s) from the given symbol(s) before the action is run' do
-      action = BeforeMethodAction.new
-      action.call({})
-
-      action.article.must_equal 'Bonjour!'.reverse
-    end
-
-    it 'invokes the given block before the action is run' do
-      action = BeforeBlockAction.new
-      action.call({})
-
-      action.article.must_equal 'Good morning!'.reverse
-    end
-
-    it 'inherits callbacks from superclass' do
-      action = SubclassBeforeMethodAction.new
-      action.call({})
-
-      action.article.must_equal 'Bonjour!'.reverse.upcase
-    end
-
-    it 'can optionally have params in method signature' do
-      action = ParamsBeforeMethodAction.new
-      action.call(params = {bang: '!'})
-
-      action.article.must_equal 'Bonjour!!'.reverse
-      action.exposed_params.must_equal(params)
-    end
-
-    it 'yields params when the callback is a block' do
-      action   = YieldBeforeBlockAction.new
-      response = action.call(params = { twentythree: '23' })
-
-      response[0].must_equal 200
-      action.yielded_params.must_equal params
-    end
-
-    describe 'on error' do
-      it 'stops the callbacks execution and returns an HTTP 500 status' do
-        action   = ErrorBeforeMethodAction.new
-        response = action.call({})
-
-        response[0].must_equal 500
-        action.article.must_be_nil
-      end
-    end
-  end
-
-  describe '#after' do
-    it 'invokes the method(s) from the given symbol(s) after the action is run' do
-      action = AfterMethodAction.new
-      action.call({})
-
-      action.egg.must_equal 'gE!g'
-    end
-
-    it 'invokes the given block after the action is run' do
-      action = AfterBlockAction.new
-      action.call({})
-
-      action.egg.must_equal 'Coque'.reverse
-    end
-
-    it 'inherits callbacks from superclass' do
-      action = SubclassAfterMethodAction.new
-      action.call({})
-
-      action.egg.must_equal 'gE!g'.upcase
-    end
-
-    it 'can optionally have params in method signature' do
-      action = ParamsAfterMethodAction.new
-      action.call(question: '?')
-
-      action.egg.must_equal 'gE!g?'
-    end
-
-    it 'yields params when the callback is a block' do
-      action = YieldAfterBlockAction.new
-      action.call(params = { fortytwo: '42' })
-
-      action.meaning_of_life_params.must_equal params
-    end
-
-    describe 'on error' do
-      it 'stops the callbacks execution and returns an HTTP 500 status' do
-        action   = ErrorAfterMethodAction.new
-        response = action.call({})
-
-        response[0].must_equal 500
-        action.egg.must_be_nil
-      end
-    end
-  end
-end