nyara 0.0.1.pre.5 → 0.0.1.pre.6

data/lib/nyara/flash.rb

@@ -0,0 +1,23 @@
+module Nyara
+  class Flash
+    def initialize session
+      # NOTE no need to convert hash type because Session uses ParamHash for json parsing
+      @now = session.delete('flash.next') || ParamHash.new
+      session['flash.next'] = @next = ParamHash.new
+    end
+    attr_reader :now, :next
+
+    def [] key
+      @now[key]
+    end
+
+    def []= key, value
+      @next[key] = value
+    end
+
+    def clear
+      @now.clear
+      @next.clear
+    end
+  end
+end

data/lib/nyara/hashes/header_hash.rb

@@ -1,4 +1,6 @@
 module Nyara
+  # keys ignore case, and values all string<br>
+  # TODO check invalid chars in values
   class HeaderHash
     alias has_key? key?
 

data/lib/nyara/nyara.rb

@@ -1,9 +1,11 @@
+# patch core classes first
+require_relative "patches/mini_support"
+
 # master require
 require "fiber"
 require "cgi"
+require "uri"
 require "openssl"
-require "json"
-require "base64"
 require "socket"
 require "tilt"
 
@@ -16,15 +18,19 @@ require_relative "controller"
 require_relative "request"
 require_relative "cookie"
 require_relative "session"
+require_relative "flash"
 require_relative "config"
 require_relative "route"
 require_relative "route_entry"
 require_relative "view"
 require_relative "cpu_counter"
+require_relative "part"
 
 module Nyara
   HTTP_STATUS_FIRST_LINES = Hash[HTTP_STATUS_CODES.map{|k,v|[k, "HTTP/1.1 #{k} #{v}\r\n".freeze]}].freeze
 
+  HTTP_REDIRECT_STATUS = [300, 301, 302, 303, 307]
+
   # base header response for 200
   # caveat: these entries can not be deleted
   OK_RESP_HEADER = HeaderHash.new
@@ -41,6 +47,12 @@ module Nyara
       Config
     end
 
+    def setup
+      Session.init
+      Route.compile
+      View.init
+    end
+
     def start_server
       port = Config[:port] || 3000
 

data/lib/nyara/part.rb

@@ -0,0 +1,156 @@
+module Nyara
+  # a part in multipart<br>
+  # for an easy introduction, http://msdn.microsoft.com/en-us/library/ms526943(v=exchg.10).aspx
+  #
+  # - todo make it possible to store data into /tmp (this requires memory threshold counting)
+  # - todo nested multipart?
+  class Part < ParamHash
+    MECHANISMS = %w[base64 quoted-printable 7bit 8bit binary].freeze
+    MECHANISMS.each &:freeze
+
+    # rfc2616
+    #
+    #   token         := 1*<any CHAR except CTLs or separators>
+    #   separators    := "(" | ")" | "<" | ">" | "@"
+    #                  | "," | ";" | ":" | "\" | <">
+    #                  | "/" | "[" | "]" | "?" | "="
+    #                  | "{" | "}" | " " | "\t"
+    #   CTL           := <any US-ASCII control character
+    #                    (octets 0 - 31) and DEL (127)>
+    #
+    TOKEN = /[^\x00-\x1f\x7f()<>@,;:\\"\/\[\]?=\{\}\ \t]+/ni
+
+    # rfc5978
+    #
+    #   attr-char   := ALPHA / DIGIT ; rfc5234
+    #               / "!" / "#" / "$" / "&" / "+" / "-" / "."
+    #               / "^" / "_" / "`" / "|" / "~"
+    #
+    ATTR_CHAR = /[a-z0-9!#$&+\-\.\^_`|~]/ni
+
+    # rfc5978 (NOTE rfc2231 param continuations is not recommended)
+    #
+    #   value-chars := pct-encoded / attr-char
+    #   pct-encoded := "%" HEXDIG HEXDIG
+    #
+    EX_PARAM = /\s*;\s*(filename|name)\s*(?:
+      = \s* "((?>\\"|[^"])*)"         # quoted string - 2
+      | = \s* (#{TOKEN})              # token - 3
+      | \*= \s* ([\w\-]+)             # charset - 4
+            '[\w\-]+'                 # language
+            ((?>%\h\h|#{ATTR_CHAR})+) # value-chars - 5
+    )/xni
+
+    # analyse given +head+ and build a param hash representing the part
+    #
+    # [head]      header
+    # [mechanism] 7bit, 8bit, binary, base64, or quoted-printable
+    # [type]      mime type
+    # [data]      decoded data (incomplete before Part#final called)
+    # [filename]  basename of uploaded data
+    # [name]      param name
+    #
+    def initialize head
+      self['head'] = head
+      if mechanism = head['Content-Transfer-Encoding']
+        self['mechanism'] = mechanism.strip.downcase
+      end
+      if self['type'] = head['Content-Type']
+        self['type'] = self['type'][/.*?(?=;|$)/]
+      end
+      self['data'] = ''.force_encoding('binary')
+
+      disposition = head['Content-Disposition']
+      if disposition
+        # skip first token
+        ex_params = disposition.sub TOKEN, ''
+
+        # store values not so specific as encoded value
+        tmp_values = {}
+        ex_params.scan EX_PARAM do |name, v1, v2, enc, v3|
+          name.downcase!
+          if enc
+            # value with charset and lang is more specific
+            self[name] ||= enc_unescape enc, v3
+          else
+            tmp_values[name] ||= (v1 || (CGI.unescape(v2) rescue nil))
+          end
+        end
+        self['filename'] ||= tmp_values['filename']
+        self['name'] ||= tmp_values['name']
+      end
+      if self['filename']
+        self['filename'] = File.basename self['filename']
+      end
+      self['name'] ||= head['Content-Id']
+    end
+
+    # prereq: +raw+ in binary encoding
+    def update raw
+      case self['mechanism']
+      when 'base64'
+        # rfc2045#section-6.8
+        raw.gsub! /\s+/n, ''
+        if self['tmp']
+          raw = (self['tmp'] << raw)
+        end
+        # last part can be at most 4 bytes and 2 '='s
+        size = raw.bytesize - 6
+        if size >= 4
+          size = size / 4 * 4
+          self['data'] << raw.slice!(0...size).unpack('m').first
+        end
+        self['tmp'] = raw
+
+      when 'quoted-printable'
+        # http://en.wikipedia.org/wiki/Quoted-printable
+        if self['tmp']
+          raw = (self['tmp'] << raw)
+        end
+        if i = raw.rindex("\r\n")
+          s = raw.slice! i
+          s.gsub!(/=(?:(\h\h)|\r\n)/n) do
+            [$1].pack 'H*'
+          end
+          self['data'] << s
+        end
+        self['tmp'] = raw
+
+      else # '7bit', '8bit', 'binary', ...
+        self['data'] << raw
+      end
+    end
+
+    def final
+      case self['mechanism']
+      when 'base64'
+        if tmp = self['tmp']
+          self['data'] << tmp.unpack('m').first
+          delete 'tmp'
+        end
+
+      when 'quoted-printable'
+        if tmp = self['tmp']
+          self['data'] << tmp.gsub(/=(\h\h)|=\r\n/n) do
+            [$1].pack 'H*'
+          end
+          delete 'tmp'
+        end
+      end
+      self
+    end
+
+    # ---
+    # private
+    # +++
+
+    def enc_unescape enc, v
+      enc = (Encoding.find enc rescue nil)
+      v = CGI.unescape v
+      v.force_encoding(enc).encode!('utf-8') if enc
+      v
+    rescue
+      nil
+    end
+  end
+end

data/lib/nyara/patches/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def sum
+    inject 0, :+
+  end
+end

data/lib/nyara/patches/blank.rb

@@ -0,0 +1,128 @@
+# copied from activesupport
+
+=begin
+Copyright (c) 2005-2013 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=end
+
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, '', '   ', +nil+, [], and {} are all blank.
+  #
+  # This simplifies:
+  #
+  #   if address.nil? || address.empty?
+  #
+  # ...to:
+  #
+  #   if address.blank?
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  # An object is present if it's not <tt>blank?</tt>.
+  def present?
+    !blank?
+  end
+
+  # Returns object if it's <tt>present?</tt> otherwise returns +nil+.
+  # <tt>object.presence</tt> is equivalent to <tt>object.present? ? object : nil</tt>.
+  #
+  # This is handy for any representation of objects where blank is the same
+  # as not present at all. For example, this simplifies a common check for
+  # HTTP POST/query parameters:
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # ...becomes:
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  def presence
+    self if present?
+  end
+end
+
+class NilClass
+  # +nil+ is blank:
+  #
+  #   nil.blank? # => true
+  def blank?
+    true
+  end
+end
+
+class FalseClass
+  # +false+ is blank:
+  #
+  #   false.blank? # => true
+  def blank?
+    true
+  end
+end
+
+class TrueClass
+  # +true+ is not blank:
+  #
+  #   true.blank? # => false
+  def blank?
+    false
+  end
+end
+
+class Array
+  # An array is blank if it's empty:
+  #
+  #   [].blank?      # => true
+  #   [1,2,3].blank? # => false
+  alias_method :blank?, :empty?
+end
+
+class Hash
+  # A hash is blank if it's empty:
+  #
+  #   {}.blank?                # => true
+  #   { key: 'value' }.blank?  # => false
+  alias_method :blank?, :empty?
+end
+
+class String
+  # A string is blank if it's empty or contains whitespaces only:
+  #
+  #   ''.blank?                 # => true
+  #   '   '.blank?              # => true
+  #   '　'.blank?               # => true
+  #   ' something here '.blank? # => false
+  def blank?
+    self !~ /[^[:space:]]/
+  end
+end
+
+class Numeric #:nodoc:
+  # No number is blank:
+  #
+  #   1.blank? # => false
+  #   0.blank? # => false
+  def blank?
+    false
+  end
+end

data/lib/nyara/patches/json.rb

@@ -0,0 +1,15 @@
+require "json"
+
+# +JSON.parse '{"json_class":"MyClass"}'+ should not create object as MyClass
+JSON.load_default_options.merge! create_additions: false
+JSON::GenericObject.json_creatable = false
+
+[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].each do |klass|
+  klass.class_eval do
+    # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
+    # "</" is escaped for convenience use in javascript
+    def to_json(options = nil)
+      super(options).gsub '</', "<\\/"
+    end
+  end
+end

data/lib/nyara/patches/mini_support.rb

@@ -0,0 +1,6 @@
+require_relative "array"
+require_relative "blank"
+require_relative "json"
+require_relative "string"
+require_relative "to_query"
+# except tcp_socket

data/lib/nyara/patches/string.rb

@@ -0,0 +1,21 @@
+# patch with 2.1 methods if not defined
+class String
+  unless defined? b
+    def b
+      dup.force_encoding 'binary'
+    end
+  end
+
+  unless defined? scrub
+    # NOTE: block unsupported
+    def scrub replacement=nil
+      if replacement
+        replacement = replacement.encode 'UTF-16BE'
+      else
+        replacement = "\xFF\xFD".force_encoding 'UTF-16BE'
+      end
+      r = encode("UTF-16BE", undef: :replace, invalid: :replace, replace: replacement)
+      r.encode("UTF-8").gsub("\0".encode("UTF-8"), '')
+    end
+  end
+end

data/lib/nyara/patches/to_query.rb

@@ -0,0 +1,113 @@
+# copied from activesupport
+require "cgi"
+
+=begin
+Copyright (c) 2005-2013 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=end
+
+class Object
+  # Alias of <tt>to_s</tt>.
+  def to_param
+    to_s
+  end
+end
+
+class String
+  alias to_param to_s
+end
+
+class NilClass
+  # Returns +self+.
+  def to_param
+    self
+  end
+end
+
+class TrueClass
+  # Returns +self+.
+  def to_param
+    self
+  end
+end
+
+class FalseClass
+  # Returns +self+.
+  def to_param
+    self
+  end
+end
+
+class Array
+  # Calls <tt>to_param</tt> on all its elements and joins the result with
+  # slashes. This is used by <tt>url_for</tt> in Action Pack.
+  def to_param
+    collect { |e| e.to_param }.join '/'
+  end
+end
+
+class Hash
+  # Returns a string representation of the receiver suitable for use as a URL
+  # query string:
+  #
+  #   {name: 'David', nationality: 'Danish'}.to_param
+  #   # => "name=David&nationality=Danish"
+  #
+  # An optional namespace can be passed to enclose the param names:
+  #
+  #   {name: 'David', nationality: 'Danish'}.to_param('user')
+  #   # => "user[name]=David&user[nationality]=Danish"
+  #
+  # The string pairs "key=value" that conform the query string
+  # are sorted lexicographically in ascending order.
+  #
+  # This method is also aliased as +to_query+.
+  def to_param(namespace = nil)
+    collect do |key, value|
+      value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+    end.sort * '&'
+  end
+end
+
+class Object
+  # Converts an object into a string suitable for use as a URL query string, using the given <tt>key</tt> as the
+  # param name.
+  #
+  # Note: This method is defined as a default implementation for all Objects for Hash#to_query to work.
+  def to_query(key)
+    "#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
+  end
+end
+
+class Array
+  # Converts an array into a string suitable for use as a URL query string,
+  # using the given +key+ as the param name.
+  #
+  #   ['Rails', 'coding'].to_query('hobbies') # => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
+  def to_query(key)
+    prefix = "#{key}[]"
+    collect { |value| value.to_query(prefix) }.join '&'
+  end
+end
+
+class Hash
+  alias_method :to_query, :to_param
+end

data/lib/nyara/request.rb

@@ -4,6 +4,7 @@ module Nyara
   # request and handler
   class Request
     # c-ext: http_method, scope, path, query, path_with_query format, accept, header
+    #        cookie, session, flash
     #        status, response_content_type, response_header, response_header_extra_lines
     # todo: body, move all underline methods into Ext
 
@@ -54,7 +55,7 @@ module Nyara
         if r
           r.split(':', 2).first
         else
-          ''
+          Config['host'] || 'localhost'
         end
       end
     end
@@ -65,12 +66,19 @@ module Nyara
         if r
           r = r.split(':', 2).last
         end
-        r ? r.to_i : 80 # or server running port?
+        r ? r.to_i : (Config['port'] || 80)
       end
     end
 
-    def host
-      header['Host']
+    def host_with_port
+      header['Host'] || begin
+        p = port
+        if p == 80
+          domain
+        else
+          "#{domain}:#{p}"
+        end
+      end
     end
 
     def xhr?
@@ -121,18 +129,8 @@ module Nyara
       end
     end
 
-    def cookie
-      @cookie ||= Cookie.decode header
-    end
-
-    def session
-      @session ||= Session.decode cookie
-    end
-
-    # todo serialize the changed cookie
-
     # todo rename and move it into Ext
-    def not_found
+    def not_found # :nodoc:
       Ext.request_send_data self, "HTTP/1.1 404 Not Found\r\nConnection: close\r\nContent-Length: 0\r\n\r\n"
     end
   end