lotus-controller 0.2.0 → 0.3.0

data/lib/lotus/controller/version.rb

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

data/lib/lotus/http/status.rb

@@ -14,6 +14,9 @@ module Lotus
       ALL = ::Rack::Utils::HTTP_STATUS_CODES.dup.merge({
         103 => 'Checkpoint',
         122 => 'Request-URI too long',
+        413 => 'Payload Too Large',                            # Rack 1.5 compat
+        414 => 'URI Too Long',                                 # Rack 1.5 compat
+        416 => 'Range Not Satisfiable',                        # Rack 1.5 compat
         418 => 'I\'m a teapot',
         420 => 'Enhance Your Calm',
         444 => 'No Response',
@@ -21,6 +24,7 @@ module Lotus
         450 => 'Blocked by Windows Parental Controls',
         451 => 'Wrong Exchange server',
         499 => 'Client Closed Request',
+        506 => 'Variant Also Negotiates',                      # Rack 1.5 compat
         598 => 'Network read timeout error',
         599 => 'Network connect timeout error'
       }).freeze
@@ -37,7 +41,7 @@ module Lotus
       # @example
       #   require 'lotus/http/status'
       #
-      #   Lotus::Http::Status.for_code(418) # => [418, "I'm a teapot (RFC 2324)"]
+      #   Lotus::Http::Status.for_code(418) # => [418, "I'm a teapot"]
       def self.for_code(code)
         ALL.assoc(code)
       end

data/lib/rack-patch.rb

@@ -1,5 +1,6 @@
 # see https://github.com/rack/rack/pull/659
 require 'rack'
+require 'lotus/utils'
 
 if Rack.release <= '1.5'
   require 'rack/utils'
@@ -8,11 +9,16 @@ if Rack.release <= '1.5'
     def self.best_q_match(q_value_header, available_mimes)
       values = q_values(q_value_header)
 
-      value = values.map do |req_mime, quality|
+      values = 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|
+      end.compact
+
+      # See https://github.com/lotus/controller/issues/59
+      values = values.reverse if RUBY_VERSION >= '2.2.0' || Lotus::Utils.rubinius?
+
+      value  = values.sort_by do |match, quality|
         (match.split('/', 2).count('*') * -10) + quality
       end.last
 

data/lotus-controller.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Lotus::Controller::VERSION
   spec.authors       = ['Luca Guidi']
   spec.email         = ['me@lucaguidi.com']
-  spec.description   = %q{Controller layer for Lotus}
-  spec.summary       = %q{Controller layer for Lotus, compatible with Rack}
+  spec.description   = %q{Complete, fast and testable actions for Rack}
+  spec.summary       = %q{Complete, fast and testable actions for Rack and Lotus}
   spec.homepage      = 'http://lotusrb.org'
   spec.license       = 'MIT'
 
@@ -17,9 +17,11 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'rack',        '~> 1.5'
-  spec.add_dependency 'lotus-utils', '~> 0.2'
+  spec.add_dependency 'rack',              '~> 1.5'
+  spec.add_dependency 'lotus-utils',       '~> 0.3', '>= 0.3.2'
+  spec.add_dependency 'lotus-validations', '~> 0.2', '>= 0.2.1'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'
   spec.add_development_dependency 'minitest',  '~> 5'

metadata

@@ -1,100 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: lotus-controller
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-12-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.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: lotus-validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
+description: Complete, fast and testable actions for Rack
 email:
 - me@lucaguidi.com
 executables: []
@@ -106,21 +132,28 @@ files:
 - README.md
 - lib/lotus-controller.rb
 - lib/lotus/action.rb
+- lib/lotus/action/cache.rb
+- lib/lotus/action/cache/cache_control.rb
+- lib/lotus/action/cache/conditional_get.rb
+- lib/lotus/action/cache/directives.rb
+- lib/lotus/action/cache/expires.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
+- lib/lotus/action/flash.rb
+- lib/lotus/action/glue.rb
 - lib/lotus/action/mime.rb
 - lib/lotus/action/params.rb
 - lib/lotus/action/rack.rb
 - lib/lotus/action/redirect.rb
 - lib/lotus/action/session.rb
 - lib/lotus/action/throwable.rb
+- lib/lotus/action/validatable.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
@@ -135,19 +168,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Controller layer for Lotus, compatible with Rack
+summary: Complete, fast and testable actions for Rack and Lotus
 test_files: []
 has_rdoc: 

data/lib/lotus/controller/dsl.rb

@@ -1,56 +0,0 @@
-module Lotus
-  module Controller
-    # Public DSL
-    #
-    # @since 0.1.0
-    module Dsl
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-        # Define an action for the given name.
-        # It generates a concrete class for the action, for this reason the name
-        # MUST be a valid name for Ruby.
-        #
-        # @param name [String] the name of the action
-        # @param blk [Proc] the code of the action
-        #
-        # @raise TypeError when the name isn't a valid Ruby name
-        #
-        # @since 0.1.0
-        #
-        # @see Lotus::Controller::Configuration#action_module
-        #
-        # @example
-        #   require 'lotus/controller'
-        #
-        #   class ArticlesController
-        #     include Lotus::Controller
-        #
-        #     action 'Index' do
-        #       def call(params)
-        #         # ...
-        #       end
-        #     end
-        #
-        #     action 'Show' do
-        #       def call(params)
-        #         # ...
-        #       end
-        #     end
-        #   end
-        def action(name, &blk)
-          config = configuration.duplicate
-          const_set(name, Class.new)
-
-          const_get(name).tap do |klass|
-            klass.class_eval { include config.action_module }
-            klass.configuration = config
-            klass.class_eval(&blk)
-          end
-        end
-      end
-    end
-  end
-end