rack-app 3.0.0.delta → 3.0.0.gamma

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fa3133ed7bd4031d0703e2c039f4ee62c8fb59d
-  data.tar.gz: 5708b587c27a12a03536afc88e4dc6db0a75bdef
+  metadata.gz: 15eb9ec10fdc0e02a3cb11addc8b894951d69440
+  data.tar.gz: d5279dda2a8261405333f46e4eab83633fdaf8be
 SHA512:
-  metadata.gz: 09e480478c10196def5fb0307c248c54da46aaf852a81f5f15dfc370c16e37e47f469f748d9018f3e4741239a384fab8f3dcf9e2df9d8681da4d8610213b747e
-  data.tar.gz: dbe8e342c8997a9f76f8b7c3e58a196000f267dbec814b6b91260bb9dc24bb60be463e8d97334ae0b22f4b505ad90a2eac29abef2b6967e6bf962a7c589f7ba9
+  metadata.gz: 72b4effba0e6198d4996c994402f920d34abedeb336addb65bacdd6a5ad1e2d8074a446800df5efbc58e4b638c6719605ee547d9a501993c32d142c2170349e5
+  data.tar.gz: 3b64ceccee914c068ffc5dc661ba8c12805853ab7c69e1165f8ba62dc7c340ad50335d76bbc1c19b2e35413d4799cec8816f0f0a8a76462a22e9a074944ef64d

data/VERSION

@@ -1 +1 @@
-3.0.0.delta
+3.0.0.gamma

data/lib/rack/app.rb

@@ -7,7 +7,6 @@ class Rack::App
   require 'rack/app/version'
   require 'rack/app/constants'
 
-  require 'rack/app/cli'
   require 'rack/app/test'
   require 'rack/app/utils'
   require 'rack/app/params'

data/lib/rack/app/error_handler.rb

@@ -30,7 +30,7 @@ class Rack::App::ErrorHandler
   end
 
   def parent(ex)
-    handler = @handlers.find { |exception_class, _| ex.class <= exception_class }
+    handler = @handlers.find { |exception_class, handler| ex.class <= exception_class }
     return handler.nil? ? nil : handler.last
   end
 

data/lib/rack/app/extension.rb

@@ -1,31 +1,44 @@
-module Rack::App::Extension
+class Rack::App::Extension
 
-  extend self
+  require 'rack/app/extension/factory'
 
-  def apply_extensions(app_class, *extension_names)
-    extension_names.each do |extension_name|
+  class << self
 
-      ext = find_extension_for(extension_name) || raise("Not registered extension name requested: #{extension_name}")
-      app_class.class_eval(&ext)
+    def names
+      @names ||= []
+    end
 
+    def name(extension_name_alias)
+      names << extension_name_alias.to_s.to_sym
     end
-    nil
-  end
 
-  def register(extension_name, &builder_block)
-    extension_registration_name = extension_name.to_s.to_sym
-    extensions[extension_registration_name]= builder_block
-    extension_registration_name
-  end
+    def inherited(klass)
+      klass.name(Rack::App::Utils.snake_case(klass.to_s.split('::').last).to_sym)
+    end
 
-  protected
+    def includes
+      @includes ||= []
+    end
 
-  def extensions
-    @extensions ||= {}
-  end
+    def extends
+      @extends ||= []
+    end
 
-  def find_extension_for(sym_name)
-    return extensions[sym_name.to_s.to_sym]
-  end
+    def inheritances
+      @on_inheritances ||= []
+    end
+
+    def include(endpoint_methods_module)
+      includes << endpoint_methods_module
+    end
+
+    def extend(app_class_methods_module)
+      extends << app_class_methods_module
+    end
+
+    def on_inheritance(&block)
+      inheritances << block
+    end
 
+  end
 end

data/lib/rack/app/extension/factory.rb

@@ -0,0 +1,13 @@
+module Rack::App::Extension::Factory
+
+  extend self
+
+  def all
+    ObjectSpace.each_object(Class).select { |klass| klass < ::Rack::App::Extension }
+  end
+
+  def find_for(sym_name)
+    return all.find{|extension_class| extension_class.names.include?(sym_name) }
+  end
+
+end

data/lib/rack/app/singleton_methods/inheritance.rb

@@ -12,7 +12,7 @@ module Rack::App::SingletonMethods::Inheritance
 
     child.serializer(&serializer.logic)
     child.headers.merge!(headers)
-    child.middlewares.push(*middlewares)
+    child.__send__(:middlewares).push(*middlewares)
 
     on_inheritance.each do |block|
       block.call(self, child)

data/lib/rack/app/singleton_methods/mounting.rb

@@ -10,15 +10,13 @@ module Rack::App::SingletonMethods::Mounting
     duplication = ::Rack::App::Utils.deep_dup(api_class)
 
     duplication.on_mounted.each do |on_mount|
-      duplication.class_exec(mount_prop, &on_mount)
+      duplication.class_exec(mount_prop,&on_mount)
     end
 
-    cli.merge!(duplication.cli)
-
     merge_prop = {:namespaces => [@namespaces, mount_to_path].flatten}
     router.merge_router!(duplication.router, merge_prop)
 
-    nil
+    return nil
   end
 
   def mount_directory(directory_path, options={})

data/lib/rack/app/singleton_methods/settings.rb

@@ -1,11 +1,5 @@
 module Rack::App::SingletonMethods::Settings
 
-  def cli(&block)
-    @cli ||= Rack::App::CLI.new
-    @cli.instance_exec(&block) unless block.nil?
-    @cli
-  end
-
   protected
 
   def serializer(&definition_how_to_serialize)
@@ -24,8 +18,24 @@ module Rack::App::SingletonMethods::Settings
     @headers
   end
 
-  def extensions(*extension_names)
-    Rack::App::Extension.apply_extensions(self,*extension_names)
+  def extensions(*extensions)
+    extensions.each do |ext|
+
+      if ext.is_a?(Symbol)
+        ext = Rack::App::Extension::Factory::find_for(ext)
+      end
+
+      if ext.is_a?(::Class) && ext < ::Rack::App::Extension
+
+        ext.includes.each { |m| include(m) }
+        ext.extends.each { |m| extend(m) }
+        ext.inheritances.each { |block| on_inheritance(&block) }
+
+      else
+        raise("unsupported extension reference: #{ext.inspect}")
+      end
+
+    end
   end
 
   def error(*exception_classes, &block)
@@ -37,6 +47,8 @@ module Rack::App::SingletonMethods::Settings
     return @error_handler
   end
 
+  private
+
   def middlewares(&block)
     @middlewares ||= []
     @middlewares << block unless block.nil?

data/lib/rack/app/utils/deep_dup.rb

@@ -21,7 +21,6 @@ module Rack::App::Utils::DeepDup
 
   def dup(register, object)
 
-    return object unless registrable?(object)
     return registered(object, register) if registered(object, register)
 
     case object
@@ -38,7 +37,7 @@ module Rack::App::Utils::DeepDup
       when Struct
         dup_struct(register, object)
 
-      when NilClass, Symbol, Numeric, TrueClass, FalseClass, Method
+      when NilClass, Symbol, Numeric, TrueClass, FalseClass
         register_duplication(register, object, object)
 
       else
@@ -47,13 +46,6 @@ module Rack::App::Utils::DeepDup
     end
   end
 
-  def registrable?(object)
-    object.object_id
-    true
-  rescue NoMethodError
-    false
-  end
-
   def dup_array(register, object)
     duplication = dup_object(register, object)
     duplication.map! { |e| dup(register, e) }
@@ -81,43 +73,16 @@ module Rack::App::Utils::DeepDup
   end
 
   def dup_object(register, object)
-    dup_instance_variables(register, object, register_duplication(register, object, try_dup(object)))
+    dup_instance_variables(register, object, register_duplication(register, object, object.dup))
   end
 
-  def dup_instance_variables(register, object, duplication)
-    return duplication unless respond_to_instance_variables?(object)
-
+  def dup_instance_variables(register, object, duplicate)
     object.instance_variables.each do |instance_variable|
-      value = get_instance_variable(object, instance_variable)
-
-      set_instance_variable(duplication, instance_variable, dup(register, value))
+      value = object.instance_variable_get(instance_variable)
+      duplicate.instance_variable_set(instance_variable, dup(register, value))
     end
 
-    return duplication
-  end
-
-  def get_instance_variable(object, instance_variable_name)
-    object.instance_variable_get(instance_variable_name)
-  rescue NoMethodError
-    object.instance_eval("#{instance_variable_name}")
-  end
-
-  def set_instance_variable(duplicate, instance_variable_name, value_to_set)
-    duplicate.instance_variable_set(instance_variable_name, value_to_set)
-  rescue NoMethodError
-    duplicate.instance_eval("#{instance_variable_name} = Marshal.load(#{Marshal.dump(value_to_set).inspect})")
-  end
-
-  def try_dup(object)
-    object.dup
-  rescue NoMethodError, TypeError
-    object
-  end
-
-  def respond_to_instance_variables?(object)
-    object.respond_to?(:instance_variables)
-  rescue NoMethodError
-    false
+    return duplicate
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 3.0.0.delta
+  version: 3.0.0.gamma
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,14 +70,12 @@ description: Your next favourite rack based micro framework that is totally addi
   free! Have a cup of awesomeness with your to performance designed framework!
 email:
 - adamluzsi@gmail.com
-executables:
-- rack-app
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -88,15 +86,13 @@ files:
 - Rakefile
 - VERSION
 - Vagrantfile
-- bin/rack-app
 - lib/rack/app.rb
-- lib/rack/app/cli.rb
-- lib/rack/app/cli/command.rb
 - lib/rack/app/constants.rb
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/not_found.rb
 - lib/rack/app/error_handler.rb
 - lib/rack/app/extension.rb
+- lib/rack/app/extension/factory.rb
 - lib/rack/app/file_server.rb
 - lib/rack/app/instance_methods.rb
 - lib/rack/app/instance_methods/core.rb

data/.rubocop.yml

@@ -1,46 +0,0 @@
-AllCops:
-  Exclude:
-    - 'vendor/**/*'
-    - 'spec/fixtures/**/*'
-    - 'tmp/**/*'
-
-Style/AndOr:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/TrailingBlankLines:
-  Enabled: false
-
-Style/SpaceAroundOperators:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
-Style/EmptyLinesAroundMethodBody:
-  Enabled: false
-
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: false
-
-Style/SpaceAroundEqualsInParameterDefault:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-#  Enabled: false
-#  Enabled: false
-#  Enabled: false
-#  Enabled: false

data/bin/rack-app

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require 'rack/app/cli'
-Rack::App::CLI.start(ARGV)

data/lib/rack/app/cli.rb

@@ -1,45 +0,0 @@
-require 'rack/app'
-require 'optparse'
-class Rack::App::CLI
-
-  require 'rack/app/cli/command'
-
-  def self.start(argv)
-    @argv = Rack::App::Utils.deep_dup(argv)
-
-    context = {}
-    Kernel.__send__(:define_method, :run) { |app, *_| context[:app]= app }
-    config_ru_file_path = Rack::App::Utils.pwd('config.ru')
-    load(config_ru_file_path) if File.exist?(config_ru_file_path)
-
-    context[:app].cli.start(argv)
-  end
-
-  def start(argv)
-    command_name = argv.shift
-    command = find_command_for(command_name)
-    command && command.start(argv)
-  end
-
-  def merge!(cli)
-    commands.push(*cli.commands)
-    self
-  end
-
-  protected
-
-  def find_command_for(command_name)
-    commands.find { |command| command.name == command_name }
-  end
-
-  def commands
-    @commands ||= []
-  end
-
-  def command(name, &block)
-    command_prototype = Rack::App::Utils.deep_dup(Rack::App::CLI::Command)
-    command_prototype.instance_exec(&block)
-    commands << command_prototype.new(name)
-  end
-
-end

data/lib/rack/app/cli/command.rb

@@ -1,48 +0,0 @@
-class Rack::App::CLI::Command
-
-  require 'optparse'
-
-  class << self
-
-    def options_parser_options
-      @options_parser_options ||= []
-    end
-
-    def description(message = nil)
-      @description = message unless message.nil?
-      @description || ''
-    end
-
-    alias desc description
-
-    def option(*args, &block)
-      options_parser_options << {:args => args, :block => block}
-    end
-
-    alias on option
-
-    def action(&block)
-      @action = block unless block.nil?
-      @action || Proc.new {}
-    end
-
-  end
-
-  attr_reader :name
-
-  def initialize(name)
-    @name = name.to_s
-    @option_parser = OptionParser.new
-    self.class.options_parser_options.each { |h| @option_parser.on(*h[:args], &h[:block]) }
-  end
-
-  def description
-    self.class.description
-  end
-
-  def start(argv)
-    @option_parser.parse!(argv)
-    instance_exec(*argv,&(self.class.action))
-  end
-
-end