lotus-controller 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd0479963e7ea827bfca6c7b143fa941121a464
-  data.tar.gz: 44d8132a5de02253879dba5289982e79b5df3438
+  metadata.gz: 0b4c85e67bcae87918653c05af57ec2961d41900
+  data.tar.gz: e2fb00ab919ee2fbfda7de1785bd9ff38e75df9b
 SHA512:
-  metadata.gz: 7e15acf051b1ab28b61a2c9387ab36f56a4259c0f8099db6d0d87c3efcdab4953a91c6089053566c3b85237ed46487e07afe77fff33a76416e37199e731ed83c
-  data.tar.gz: 7f6ca49dafb869eaefee161ebd24bde30215e43809f8757d9891ec89ceae2351a7868e570e5d230e6758a3500a1af06e921f14733b9c6e5a0ca99d415ed1e8ff
+  metadata.gz: 18b96f037a068a7a653579991b853c586eb2b39687bde6236832c03973007adfb8f4c33966cd69511f7b498e52ee0b0f6ce5e7715c0de8ce9d4d30729cec0553
+  data.tar.gz: 18753964833666f3cca7a8091bb35425960a18fce40ce0c876c705ac57797a4ae46d360e591b4475e369047aea688a00d93adacdfb616fa2cbf165f6d5c0fe61

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Lotus::Controller
 Complete, fast and testable actions for Rack
 
+## v0.4.3 - 2015-05-22
+### Added
+- [Alfonso Uceda Pompa & Luca Guidi] Introduced `Lotus::Action#send_file`
+- [Alfonso Uceda Pompa] Set automatically `Expires` option for cookies when it's missing but `Max-Age` is present. Compatibility with old browsers.
+
 ## v0.4.2 - 2015-05-15
 ### Fixed
 - [Luca Guidi] Ensure `Lotus::Action::Params#to_h` to return `::Hash` at the top level

data/lib/lotus/action/cookie_jar.rb

@@ -98,13 +98,25 @@ module Lotus
       # @api private
       def _merge_default_values(value)
         cookies_options = if value.is_a? Hash
-          value
+          value.merge! _add_expires_option(value)
         else
           { value: value }
         end
         @default_options.merge cookies_options
       end
 
+      # Add expires option to cookies if :max_age presents
+      #
+      # @since 0.4.3
+      # @api private
+      def _add_expires_option(value)
+        if value.has_key?(:max_age) && !value.has_key?(:expires)
+          { expires: (Time.now + value[:max_age]) }
+        else
+          {}
+        end
+      end
+
       # Extract the cookies from the raw Rack env.
       #
       # This implementation is borrowed from Rack::Request#cookies.
@@ -116,6 +128,8 @@ module Lotus
         string = env[HTTP_HEADER]
 
         return hash if string == env[COOKIE_STRING_KEY]
+        # TODO Next Rack 1.6.x version will have ::Rack::Utils.parse_cookies
+        # We can then replace the following lines.
         hash.clear
 
         # According to RFC 2109:

data/lib/lotus/action/glue.rb

@@ -28,8 +28,8 @@ module Lotus
 
       # Check if the current HTTP request is renderable.
       #
-      # It verifies if the verb isn't HEAD and if the status demands to omit
-      # the body.
+      # It verifies if the verb isn't HEAD, if the status demands to omit
+      # the body and if it isn't sending a file.
       #
       # @return [TrueClass,FalseClass] the result of the check
       #
@@ -37,6 +37,7 @@ module Lotus
       # @since 0.3.2
       def renderable?
         !_requires_no_body? &&
+          !sending_file?    &&
           !ADDITIONAL_HTTP_STATUSES_WITHOUT_BODY.include?(@_status)
       end
 
@@ -51,6 +52,15 @@ module Lotus
         super
         @_env[ENV_KEY] = self
       end
+
+      # Check if the request's body is a file
+      #
+      # @return [TrueClass,FalseClass] the result of the check
+      #
+      # @since 0.4.3
+      def sending_file?
+        @_body.is_a?(::Rack::File)
+      end
     end
   end
 end

data/lib/lotus/action/mime.rb

@@ -252,7 +252,7 @@ module Lotus
       # @see Lotus::Action#finish
       def finish
         super
-        headers[CONTENT_TYPE] = content_type_with_charset
+        headers[CONTENT_TYPE] ||= content_type_with_charset
       end
 
       # Sets the given format and corresponding content type.
@@ -450,7 +450,7 @@ module Lotus
 
       # Patched version of <tt>Rack::Utils.best_q_match</tt>.
       #
-      # @since x.x.x
+      # @since 0.4.1
       # @api private
       #
       # @see http://www.rubydoc.info/gems/rack/Rack/Utils#best_q_match-class_method

data/lib/lotus/action/rack.rb

@@ -1,6 +1,7 @@
 require 'securerandom'
 require 'lotus/action/request'
 require 'lotus/action/rack/callable'
+require 'lotus/action/rack/file'
 
 module Lotus
   module Action
@@ -217,6 +218,37 @@ module Lotus
         @_body = body
       end
 
+      # Send a file as response.
+      #
+      # It automatically handle the following cases:
+      #
+      #   * <tt>Content-Type</tt> and <tt>Content-Length</tt>
+      #   * File Not found (returns a 404)
+      #   * Conditional GET (via <tt>If-Modified-Since</tt> header)
+      #   * Range requests (via <tt>Range</tt> header)
+      #
+      # @param path [String, Pathname] the body of the response
+      # @return [void]
+      #
+      # @since 0.4.3
+      #
+      # @example
+      #   require 'lotus/controller'
+      #
+      #   class Show
+      #     include Lotus::Action
+      #
+      #     def call(params)
+      #       # ...
+      #       send_file Pathname.new('path/to/file')
+      #     end
+      #   end
+      def send_file(path)
+        result = File.new(path).call(@_env)
+        headers.merge!(result[1])
+        halt result[0], result[2]
+      end
+
       # Check if the current request is a HEAD
       #
       # @return [TrueClass,FalseClass] the result of the check

data/lib/lotus/action/rack/file.rb

@@ -0,0 +1,33 @@
+require 'rack/file'
+
+module Lotus
+  module Action
+    module Rack
+      # File to be sent
+      #
+      # @since 0.4.3
+      # @api private
+      #
+      # @see Lotus::Action::Rack#send_file
+      class File
+        # @param path [String,Pathname] file path
+        #
+        # @since 0.4.3
+        # @api private
+        def initialize(path)
+          @file = ::Rack::File.new(nil)
+          @path = path
+        end
+
+        # @since 0.4.3
+        # @api private
+        def call(env)
+          @file.path = @path.to_s
+          @file.serving(env)
+        rescue Errno::ENOENT
+          [404, {}, nil]
+        end
+      end
+    end
+  end
+end

data/lib/lotus/controller/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-controller
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -146,6 +146,7 @@ files:
 - lib/lotus/action/params.rb
 - lib/lotus/action/rack.rb
 - lib/lotus/action/rack/callable.rb
+- lib/lotus/action/rack/file.rb
 - lib/lotus/action/redirect.rb
 - lib/lotus/action/request.rb
 - lib/lotus/action/session.rb