rocketio 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac617b26c0a9352ff073f5e194202d8e09f90c4c
-  data.tar.gz: 1e9aa0b25987687e5d1b25193bfb60bf014e6fa2
+  metadata.gz: ea0d4a3075d390c8d228df3bd4325dbfedf0fa2a
+  data.tar.gz: 2036177712149f499001e173e754aedf2dbba5b3
 SHA512:
-  metadata.gz: 143b5e6041e82d762c8a55ad0d4fc759bbd05a5cbaddca814141c76cd04fabc07ae17df6e168525b3f518ec3944140ebc18ce9275be13765dfdd8f70ff363489
-  data.tar.gz: 9e087b5c7c644b4a84ac5830824537902710ea8d3203e882e08b33139184ee6802960d4a85819e173c9360fa9369be29a8dac71a2c69d0c7e204a57ca6d4566e
+  metadata.gz: 7ed5c73407168bcf5e7765fdcc23b13f3419dda752d55eaa912bcd262a6d4d770c22c99c1410ab670cce0774582aaa5a882e00368234d7fd7950bd1406ba79a4
+  data.tar.gz: fe411c3cc506dccfae0de5c0ec0d345f7f82589202ca4fed0e20fb6905558e4f8cbeb8309bceb2da98099529c5240edcd1d6c6b2ef1748755d0b14c6141af3ee

data/lib/rocketio.rb

@@ -21,9 +21,8 @@ module RocketIO
   }.freeze
 
   environment = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENVIRONMENTS.values[0]
-  unless ENVIRONMENT = ENVIRONMENTS[environment]
-    raise(StandardError, '%s environment not supported. Use one of %s' % [environment.inspect, ENVIRONMENTS.keys*', '])
-  end
+  ENVIRONMENT = ENVIRONMENTS[environment]
+  ENVIRONMENT || raise(StandardError, '%s environment not supported. Use one of %s' % [environment.inspect, ENVIRONMENTS.keys*', '])
 
   def environment
     ENVIRONMENT
@@ -33,47 +32,41 @@ module RocketIO
     define_method(env + '?') {ENVIRONMENT == env}
   end
 
-  GET    = 'GET'.freeze
-  POST   = 'POST'.freeze
-  PUT    = 'PUT'.freeze
-  DELETE = 'DELETE'.freeze
-  HEAD   = 'HEAD'.freeze
-
   REQUEST_METHODS = {
-    GET    => :get,
-    POST   => :post,
-    PUT    => :put,
-    DELETE => :delete,
-    HEAD   => :head
+    (GET    = 'GET'.freeze)    => :get,
+    (POST   = 'POST'.freeze)   => :post,
+    (PUT    = 'PUT'.freeze)    => :put,
+    (DELETE = 'DELETE'.freeze) => :delete,
+    (HEAD   = 'HEAD'.freeze)   => :head
   }.freeze
 
   INDEX_METHOD = :index
 
-  EMPTY_STRING      = ''.freeze
+  EMPTY_STRING = ''.freeze
   EMPTY_STRING_PROC = proc {RocketIO::EMPTY_STRING}
-  EMPTY_ARRAY       = [].freeze
-  EMPTY_HASH        = {}.freeze
+  EMPTY_ARRAY = [].freeze
+  EMPTY_HASH = {}.freeze
 
-  SLASH         = '/'.freeze
-  QUERY_PREFIX  = '?'.freeze
+  SLASH = '/'.freeze
+  QUERY_PREFIX = '?'.freeze
   PATH_SPLITTER = /[^\/]+/.freeze
 
-  CONTENT_TYPE             = 'Content-Type'.freeze
-  DEFAULT_CONTENT_TYPE     = 'text/html'.freeze
-  CONTENT_LENGTH           = 'Content-Length'.freeze
-  CONTENT_DISPOSITION      = 'Content-Disposition'.freeze
+  CONTENT_TYPE = 'Content-Type'.freeze
+  DEFAULT_CONTENT_TYPE = 'text/html'.freeze
+  CONTENT_LENGTH = 'Content-Length'.freeze
+  CONTENT_DISPOSITION = 'Content-Disposition'.freeze
 
   APPLICATION_OCTET_STREAM = 'application/octet-stream'.freeze
-  APPLICATION_JSON         = 'application/json'.freeze
-  APPLICATION_JSON_REGEXP  = /application\/json/i
+  APPLICATION_JSON = 'application/json'.freeze
+  APPLICATION_JSON_REGEXP = /application\/json/i
 
-  DEFAULT_AUTH_REALM       = 'AccessRestricted'.freeze
+  DEFAULT_AUTH_REALM = 'AccessRestricted'.freeze
   DEFAULT_TOKEN_AUTH_REALM = 'Application'.freeze
 
   REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-  PATH_INFO      = 'PATH_INFO'.freeze
-  HTTP_ACCEPT    = 'HTTP_ACCEPT'.freeze
-  REMOTE_USER    = 'REMOTE_USER'.freeze
+  PATH_INFO = 'PATH_INFO'.freeze
+  HTTP_ACCEPT = 'HTTP_ACCEPT'.freeze
+  REMOTE_USER = 'REMOTE_USER'.freeze
 
   HTTP_CONTENT_TYPE = 'CONTENT_TYPE'.freeze
   HTTP_CONNECTION = 'HTTP_CONNECTION'.freeze
@@ -124,15 +117,18 @@ module RocketIO
   BEFORE_FORMAT = 'before_%s'.freeze
   AROUND_FORMAT = 'around_%s'.freeze
   AFTER_FORMAT  = 'after_%s'.freeze
-  ROUTE_INSPECT_FORMAT = '#<RocketIO::Route:%s>'.freeze
-  ENGINE_CONST_FORMAT  = '%sTemplate'.freeze
-  TEMPLATE_PATH_FORMAT = '%s/%s.%s'.freeze
-
-  FOUND_TEMPLATES    = {}
-  READ_TEMPLATES     = {}
-  COMPILED_TEMPLATES = {}
 
-  DEFAULT_ENGINE = [Tilt::ERBTemplate, [].freeze].freeze
+  INHERITABLE_SETUPS = [
+    :before,
+    :around,
+    :after,
+    :basic_auth,
+    :digest_auth,
+    :token_auth,
+    :error_handlers,
+    :middleware,
+    :sessions,
+  ]
 
   def controllers
     @controllers ||= []
@@ -140,7 +136,6 @@ module RocketIO
 end
 
 require 'rocketio/util'
-require 'rocketio/exceptions'
 require 'rocketio/controller'
 require 'rocketio/router'
 require 'rocketio/application'

data/lib/rocketio/application.rb

@@ -16,7 +16,7 @@ module RocketIO
         unless controller
           controller = Controller.new
           controller.instance_variable_set(:@__env__, env)
-          controller.error(404)
+          return controller.error(404)
         end
 
         controller = controller.new(method, path_params)

data/lib/rocketio/controller.rb

@@ -6,7 +6,6 @@ module RocketIO
     def_delegators :request, :session, :request_method
     def_delegators RocketIO, :environment
     def_delegators RocketIO, :indifferent_params, :indifferent_hash, :mime_type
-    def_delegators RocketIO, :engine_const, :engine_class
     def_delegators CGI, :escape_html
 
     # defining instance helpers for querying current environment like
@@ -15,9 +14,11 @@ module RocketIO
       def_delegators RocketIO, :"#{env}?"
     end
 
-    def initialize requested_method = RocketIO::INDEX_METHOD, path_params = RocketIO::EMPTY_ARRAY
+    def initialize requested_method = RocketIO::INDEX_METHOD, path_params = nil
       @__requested_method__ = requested_method.to_sym
-      @__path_params_array__ = path_params.freeze
+
+      @__path_params_array__ = path_params || RocketIO::EMPTY_ARRAY
+      @__path_params_array__.freeze
     end
 
     # call requested method
@@ -25,9 +26,8 @@ module RocketIO
     # @param  [Hash] env
     # @return [Rack::Response]
     #
-    def call env, params: nil
+    def call env
       @__env__ = env
-      @__params__ = params if params
       catch :__response__ do
 
         api[requested_method] || error(501)
@@ -141,22 +141,7 @@ module RocketIO
       base.instance_variable_set(:@__api__, self.api.dup)
 
       # new controller inherits all setups from superclass
-      base.import :before, from: self
-      base.import :around, from: self
-      base.import :after,  from: self
-
-      base.import :basic_auth,  from: self
-      base.import :digest_auth, from: self
-      base.import :token_auth,  from: self
-
-      base.import :error_handlers, from: self
-      base.import :middleware,     from: self
-      base.import :sessions,       from: self
-
-      base.import :engine,    from: self
-      base.import :layout,    from: self
-      base.import :layouts,   from: self
-      base.import :templates, from: self
+      RocketIO::INHERITABLE_SETUPS.each {|s| base.import(s, from: self)}
 
       # removing superclass name from new controller name
       path = RocketIO.underscore(base.name.to_s.sub(self.name.to_s + '::', '').gsub('::', '/'))
@@ -180,10 +165,10 @@ module RocketIO
     #
     # @note
     #
-    # @example make Users::Register to listen on /users/join rather than /users/register
+    # @example make Users::Register to listen on /users/join instead of /users/register
     #
     #   class Users
-    #     class Register < RocketIO
+    #     class Register < RocketIO::Controller
     #       map :join
     #
     #     end
@@ -191,9 +176,9 @@ module RocketIO
     #
     # @note if given URL starts with a slash it will ignore class name and set URL as is
     #
-    # @example make Users::Register to listen on /members/join
+    # @example make Users::Register to listen on /members/join instead of /users/register
     #
-    #   class Users < RocketIO
+    #   class Users < RocketIO::Controller
     #     class Register < self
     #       map '/members/join'
     #
@@ -215,7 +200,14 @@ module RocketIO
       end.freeze
     end
 
-    # allow controllers to serve multiple URLs
+    # allow same controller to serve multiple URLs
+    #
+    # @example Users controller will serve both /users and /members URLs
+    #
+    #   class Users < RocketIO::Controller
+    #     alias_url :members
+    #
+    #   end
     #
     # @param path [String || Symbol]
     #
@@ -296,4 +288,3 @@ require 'rocketio/controller/request'
 require 'rocketio/controller/response'
 require 'rocketio/controller/sessions'
 require 'rocketio/controller/websocket'
-require 'rocketio/controller/render'

data/lib/rocketio/controller/helpers.rb

@@ -274,9 +274,8 @@ module RocketIO
 
       last_modified(opts[:last_modified]) if opts[:last_modified]
 
-      file      = Rack::File.new(nil)
-      file.path = path
-      result    = file.serving(env)
+      file = Rack::File.new(nil)
+      result = file.serving(request, path)
       result[1].each { |k,v| headers[k] ||= v }
       headers[RocketIO::CONTENT_LENGTH] = result[1][RocketIO::CONTENT_LENGTH]
       opts[:status] &&= Integer(opts[:status])

data/lib/rocketio/router.rb

@@ -8,23 +8,23 @@ module RocketIO
 
     def initialize *controllers
       @controllers = controllers.flatten.compact.uniq
-      @controller_routes = controller_routes()
+      @routes = routes()
       freeze!
     end
 
     # fully traversing the tree and use the last matched controller
     def resolve_path path
-      controller_routes = @controller_routes
+      routes = @routes
       pieces = path_pieces(path)
       depth = -1
       controller = nil
       path_params = []
 
-      while controller_routes = controller_routes[pieces[depth += 1]]
-        # do not use `next unless controller = controller_routes[0]` here
+      while routes = routes[pieces[depth += 1]]
+        # do not use `next unless controller = routes[0]` here
         # cause this may override earlier found controller.
-        next unless controller_routes[0]
-        controller = controller_routes[0]
+        next unless routes[0]
+        controller = routes[0]
         path_params = pieces[ (depth + 1) .. -1 ]
       end
 
@@ -43,7 +43,7 @@ module RocketIO
     # split given path into an array
     #
     # @example /a/b/c
-    #   ["", a", "b", "c"]
+    #   ["", "a", "b", "c"]
     #
     # @param path [String]
     # @return [Array]
@@ -53,11 +53,11 @@ module RocketIO
       path.to_s.split(PATH_SPLITTER)
     end
 
-    # building a routing tree
+    # building routes tree
     #
     # @return [Hash]
     #
-    def controller_routes
+    def routes
       controllers.each_with_object({}) do |controller,map|
         [controller.url, *controller.aliases].each do |url|
           depth = 0

data/lib/rocketio/util.rb

@@ -59,32 +59,12 @@ module RocketIO
     end.freeze
   end
 
-  # building a constant name for given engine name.
-  # if a class given, return it as is.
-  #
-  # @example
-  #   engine_class(:Slim) #=> :SlimTemplate
-  #
-  # @param engine  name
-  # @return [Symbol, Class]
-  #
-  def engine_class engine
-    return engine if engine.is_a?(Class)
-    (RocketIO::ENGINE_CONST_FORMAT % engine).to_sym
-  end
-
-  def engine_const engine
-    return engine if engine.is_a?(Class)
-    ::Tilt.const_get(engine)
-  end
-
   def error_renderer error_code, without_layout = nil, context = {}
     response = RocketIO::ERROR_TEMPLATES[error_code].render(context)
     return response if without_layout
     RocketIO::ERROR_TEMPLATES[:layout].render(context.merge(yield: response))
   end
 
-
   def caller_to_dirname caller
     ::File.dirname(caller[0].split(/:\d+:in\s+`/)[0])
   end

data/lib/rocketio/version.rb

@@ -1,3 +1,3 @@
 module RocketIO
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/rocketio.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Slee Woo']
   spec.email         = ['mail@sleewoo.com']
   spec.summary       = [spec.name, spec.version]*'-',
-  spec.description   = 'Simple, fast, scalable web framework for Ruby'
+  spec.description   = 'Simple routing lib'
   spec.homepage      = 'https://github.com/rocketio/' + spec.name
   spec.license       = 'MIT'
 
@@ -16,12 +16,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.2'
 
-  spec.add_runtime_dependency 'rack', '~> 1.5'
+  spec.add_runtime_dependency 'rack', '~> 2'
   spec.add_runtime_dependency 'mustache', '~> 1'
-  spec.add_runtime_dependency 'tilt', '~> 2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 10.5'
   spec.add_development_dependency 'tokyo', '~> 0'
   spec.add_development_dependency 'rack-radar', '~> 0'
   spec.add_development_dependency 'pry', '~> 0'

data/test/api_test.rb

@@ -13,13 +13,6 @@ spec :api do
       after       {}
       use proc    {}
       sessions :cookies
-      engine :ERB
-      layout :main
-      define_layout(:main) {}
-      define_layout(:file, file: :file)
-      define_template(:main) {}
-      define_template(:file, file: :file)
-      define_template_var(:var) {}
     }
     assert(c.api).empty?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: tokyo
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-description: Simple, fast, scalable web framework for Ruby
+description: Simple routing lib
 email:
 - mail@sleewoo.com
 executables: []
@@ -149,8 +135,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/rocketio.rb
 - lib/rocketio/application.rb
 - lib/rocketio/controller.rb
@@ -162,12 +146,6 @@ files:
 - lib/rocketio/controller/flash.rb
 - lib/rocketio/controller/helpers.rb
 - lib/rocketio/controller/middleware.rb
-- lib/rocketio/controller/render.rb
-- lib/rocketio/controller/render/engine.rb
-- lib/rocketio/controller/render/layout.rb
-- lib/rocketio/controller/render/layouts.rb
-- lib/rocketio/controller/render/template_vars.rb
-- lib/rocketio/controller/render/templates.rb
 - lib/rocketio/controller/request.rb
 - lib/rocketio/controller/response.rb
 - lib/rocketio/controller/sessions.rb
@@ -176,7 +154,6 @@ files:
 - lib/rocketio/error_templates/404.html
 - lib/rocketio/error_templates/501.html
 - lib/rocketio/error_templates/layout.html
-- lib/rocketio/exceptions.rb
 - lib/rocketio/router.rb
 - lib/rocketio/util.rb
 - lib/rocketio/version.rb
@@ -197,22 +174,6 @@ files:
 - test/keyword_arguments.rb
 - test/middleware_test.rb
 - test/redirect_test.rb
-- test/render/b.erb
-- test/render/c.erb
-- test/render/engine_test.rb
-- test/render/index.erb
-- test/render/items.erb
-- test/render/layout.erb
-- test/render/layout_test.rb
-- test/render/layouts/master.erb
-- test/render/layouts_test.rb
-- test/render/master.erb
-- test/render/render_test.rb
-- test/render/setup.rb
-- test/render/template_vars_test.rb
-- test/render/templates/a/get.erb
-- test/render/templates/master.erb
-- test/render/templates_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/routes_test.rb
@@ -242,5 +203,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["rocketio-0.3.0", "Simple, fast, scalable web framework for Ruby"]'
+summary: '["rocketio-0.4.0", "Simple routing lib"]'
 test_files: []