rack-app 3.0.0.gamma → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15eb9ec10fdc0e02a3cb11addc8b894951d69440
-  data.tar.gz: d5279dda2a8261405333f46e4eab83633fdaf8be
+  metadata.gz: 54ad60f95e02d3a3d1cdd12869c110ebd8936c20
+  data.tar.gz: 7acb5847ee8f8a9b12939572a316e0bd2e543b62
 SHA512:
-  metadata.gz: 72b4effba0e6198d4996c994402f920d34abedeb336addb65bacdd6a5ad1e2d8074a446800df5efbc58e4b638c6719605ee547d9a501993c32d142c2170349e5
-  data.tar.gz: 3b64ceccee914c068ffc5dc661ba8c12805853ab7c69e1165f8ba62dc7c340ad50335d76bbc1c19b2e35413d4799cec8816f0f0a8a76462a22e9a074944ef64d
+  metadata.gz: 434df103635f1c9376d83c6736652337156e685ded88130846b62371beac56a3b9dd620e730e1dbe52c5127985d7247c223a8f515061b9c097dc8625339262cf
+  data.tar.gz: 65712cce379e85a8183799f0d1aa0e37714c4e7e6642dce3005b83336812670afdaecd3f4431376d92f6f6d57d64e014a85ae7cce37a08c50da0c750a64d37c6

data/VERSION

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

data/bin/rack-app

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

data/exec/rack-app

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.join(File.dirname(File.dirname(__FILE__)),'lib'))
+require 'rack/app/cli'
+Rack::App::CLI.start(ARGV)

data/lib/rack/app.rb

@@ -7,6 +7,7 @@ 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/cli.rb

@@ -0,0 +1,48 @@
+require 'rack/app'
+require 'optparse'
+class Rack::App::CLI
+
+  require 'rack/app/cli/command'
+  require 'rack/app/cli/default_commands'
+  require 'rack/app/cli/runner'
+
+  class << self
+
+    def start(argv)
+      runner.start(argv)
+    end
+
+    def runner
+      Rack::App::CLI::Runner.new(rack_app)
+    end
+
+    def rack_app
+      @rack_app ||= lambda {
+        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]
+      }.call
+    end
+
+  end
+
+  def merge!(cli)
+    commands.merge!(cli.commands)
+    self
+  end
+
+  def commands
+    @commands ||= {}
+  end
+
+  protected
+
+  def command(name, &block)
+    command_prototype = Class.new(Rack::App::CLI::Command)
+    command_prototype.class_exec(&block)
+    commands[name.to_s.to_sym]= command_prototype.new(name.to_s.to_sym)
+  end
+
+end

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

@@ -0,0 +1,93 @@
+class Rack::App::CLI::Command
+
+  require 'optparse'
+
+  class << self
+
+    def optparse_options
+      @options_parser_options ||= []
+    end
+
+    def description(message = nil)
+      @description = message unless message.nil?
+      @description || ''
+    end
+
+    alias desc description
+
+    def option(*args, &block)
+      optparse_options << {:args => args, :block => block}
+    end
+
+    alias on option
+
+    def action(&block)
+      define_method(:action, &block)
+    end
+
+  end
+
+  attr_reader :name
+
+  def initialize(name)
+    @name = name.to_s
+    @option_parser = OptionParser.new
+    attach_definitions!
+    update_banner!
+  end
+
+  def help_message
+    @option_parser.help
+  end
+
+  def description
+    self.class.description
+  end
+
+  def start(argv)
+    @option_parser.parse!(argv)
+    action(*argv)
+  rescue ArgumentError => ex
+    $stderr.puts(ex.message)
+  end
+
+  def action(*argv)
+  end
+
+  protected
+
+  def attach_definitions!
+    self.class.optparse_options.each do |h|
+      @option_parser.on(*h[:args]) do |*args|
+        instance_exec(*args,&h[:block])
+      end
+    end
+  end
+
+  def update_banner!
+
+    banner = @option_parser.banner
+    banner.sub!('[options]', "#{@name} [options]")
+
+    # [[:req, :a], [:opt, :b], [:rest, :c], [:keyreq, :d], [:keyrest, :e]]
+    (method(:action).parameters rescue []).each do |type, keyword|
+      case type
+        when :req
+          banner.concat(" <#{keyword}>")
+
+        when :opt
+          banner.concat(" [<#{keyword}>]")
+
+        when :rest, :keyrest
+          banner.concat(" [<#{keyword}> <#{keyword}> ...]")
+
+      end
+    end
+
+    banner.concat("\n\n")
+    banner.concat(description)
+    banner.concat("\n\n")
+
+  end
+
+end

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

@@ -0,0 +1,3 @@
+module Rack::App::CLI::DefaultCommands
+  require 'rack/app/cli/default_commands/list_commands'
+end

data/lib/rack/app/cli/default_commands/list_commands.rb

@@ -0,0 +1,29 @@
+module Rack::App::CLI::DefaultCommands::ListCommands
+
+  extend self
+
+  def get_message(known_commands)
+    puts_collection = []
+
+    add_header(puts_collection)
+
+    list_command_name = 'commands'
+    rjust = known_commands.keys.push(list_command_name).map(&:to_s).map(&:length).max + 3
+
+    puts_collection << [list_command_name.to_s.rjust(rjust), 'list all available command'].join('  ')
+    known_commands.sort_by { |name, _| name.to_s }.each do |name, command|
+      puts_collection << [name.to_s.rjust(rjust), command.description].join('  ')
+    end
+
+    puts_collection
+  end
+
+  protected
+
+  def add_header(puts_collection)
+    cmd_file_name = File.basename($0)
+    puts_collection << "Usage: #{cmd_file_name} <command> [options] <args>\n\n"
+    puts_collection << "Some useful #{cmd_file_name} commands are:"
+  end
+
+end

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

@@ -0,0 +1,50 @@
+class Rack::App::CLI::Runner
+
+  def initialize(app)
+    @cli = app.respond_to?(:cli) ? app.cli : Rack::App::CLI.new
+  end
+
+  def start(argv)
+    command_name = argv.shift
+    start_command_for(command_name,argv)
+  end
+
+  protected
+
+  def show_commands
+    $stdout.puts(Rack::App::CLI::DefaultCommands::ListCommands.get_message(commands))
+  end
+
+  def show_help_message(argv)
+    command_name = argv.shift
+    command = command_for(command_name)
+    command ? $stdout.puts(command.help_message) : show_commands
+  end
+
+  def start_command_for(command_name, argv)
+    case command_name.to_s
+
+      when 'commands'
+        show_commands
+
+      when 'help'
+        show_help_message(argv)
+
+    end
+
+    command = command_for(command_name)
+
+    command && command.start(argv)
+  end
+
+  def command_for(name)
+    return if name.nil?
+
+    commands[name.to_s.to_sym]
+  end
+
+  def commands
+    @cli.commands
+  end
+
+end

data/lib/rack/app/error_handler.rb

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

data/lib/rack/app/extension.rb

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

data/lib/rack/app/file_server.rb

@@ -32,7 +32,7 @@ class Rack::App::FileServer
 
   def clean_path_info(env)
     path_info = ::Rack::Utils.unescape(env[::Rack::PATH_INFO])
-    return clean_path_info = ::Rack::Utils.clean_path_info(path_info)
+    ::Rack::Utils.clean_path_info(path_info)
   end
 
 end

data/lib/rack/app/singleton_methods.rb

@@ -6,6 +6,7 @@ module Rack::App::SingletonMethods
   require 'rack/app/singleton_methods/rack_interface'
   require 'rack/app/singleton_methods/route_handling'
   require 'rack/app/singleton_methods/settings'
+  require 'rack/app/singleton_methods/extensions'
 
   include Rack::App::SingletonMethods::HttpMethods
   include Rack::App::SingletonMethods::Inheritance
@@ -13,5 +14,6 @@ module Rack::App::SingletonMethods
   include Rack::App::SingletonMethods::RackInterface
   include Rack::App::SingletonMethods::RouteHandling
   include Rack::App::SingletonMethods::Settings
+  include Rack::App::SingletonMethods::Extensions
 
 end

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

@@ -0,0 +1,18 @@
+module Rack::App::SingletonMethods::Extensions
+
+  protected
+
+  def applied_extensions
+    @applied_extensions ||= []
+  end
+
+  def apply_extensions(*extension_names)
+    Rack::App::Extension.apply_extensions(self,applied_extensions,extension_names)
+  end
+
+  def extensions(*extensions_names)
+    apply_extensions(*extensions_names)
+    applied_extensions
+  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.__send__(:middlewares).push(*middlewares)
+    child.middlewares.push(*middlewares)
 
     on_inheritance.each do |block|
       block.call(self, child)

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

@@ -1,22 +1,20 @@
 module Rack::App::SingletonMethods::Mounting
 
-  def mount(api_class, mount_prop={})
-    mount_to_path = ::Rack::App::Utils.deep_dup(mount_prop[:to])
-
+  def mount(api_class, properties={})
     unless api_class.is_a?(Class) and api_class <= Rack::App
       raise(ArgumentError, 'Invalid class given for mount, must be a Rack::App')
     end
 
     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(::Rack::App::Utils.deep_dup(properties), &on_mount)
     end
 
-    merge_prop = {:namespaces => [@namespaces, mount_to_path].flatten}
+    cli.merge!(duplication.cli)
+    merge_prop = {:namespaces => [@namespaces, properties[:to]].flatten}
     router.merge_router!(duplication.router, merge_prop)
 
-    return nil
+    nil
   end
 
   def mount_directory(directory_path, options={})

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

@@ -1,5 +1,11 @@
 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)
@@ -18,26 +24,6 @@ module Rack::App::SingletonMethods::Settings
     @headers
   end
 
-  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)
     @error_handler ||= Rack::App::ErrorHandler.new
     unless block.nil?
@@ -47,8 +33,6 @@ 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,6 +21,7 @@ module Rack::App::Utils::DeepDup
 
   def dup(register, object)
 
+    return object unless registrable?(object)
     return registered(object, register) if registered(object, register)
 
     case object
@@ -37,7 +38,7 @@ module Rack::App::Utils::DeepDup
       when Struct
         dup_struct(register, object)
 
-      when NilClass, Symbol, Numeric, TrueClass, FalseClass
+      when NilClass, Symbol, Numeric, TrueClass, FalseClass, Method
         register_duplication(register, object, object)
 
       else
@@ -46,6 +47,13 @@ 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) }
@@ -73,16 +81,43 @@ module Rack::App::Utils::DeepDup
   end
 
   def dup_object(register, object)
-    dup_instance_variables(register, object, register_duplication(register, object, object.dup))
+    dup_instance_variables(register, object, register_duplication(register, object, try_dup(object)))
   end
 
-  def dup_instance_variables(register, object, duplicate)
+  def dup_instance_variables(register, object, duplication)
+    return duplication unless respond_to_instance_variables?(object)
+
     object.instance_variables.each do |instance_variable|
-      value = object.instance_variable_get(instance_variable)
-      duplicate.instance_variable_set(instance_variable, dup(register, value))
+      value = get_instance_variable(object, instance_variable)
+
+      set_instance_variable(duplication, instance_variable, dup(register, value))
     end
 
-    return duplicate
+    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
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 3.0.0.gamma
+  version: 3.0.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,7 +70,8 @@ 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: []
+executables:
+- rack-app
 extensions: []
 extra_rdoc_files: []
 files:
@@ -86,13 +87,19 @@ files:
 - Rakefile
 - VERSION
 - Vagrantfile
+- bin/rack-app
+- exec/rack-app
 - lib/rack/app.rb
+- lib/rack/app/cli.rb
+- lib/rack/app/cli/command.rb
+- lib/rack/app/cli/default_commands.rb
+- lib/rack/app/cli/default_commands/list_commands.rb
+- lib/rack/app/cli/runner.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
@@ -109,6 +116,7 @@ files:
 - lib/rack/app/router/static.rb
 - lib/rack/app/serializer.rb
 - lib/rack/app/singleton_methods.rb
+- lib/rack/app/singleton_methods/extensions.rb
 - lib/rack/app/singleton_methods/http_methods.rb
 - lib/rack/app/singleton_methods/inheritance.rb
 - lib/rack/app/singleton_methods/mounting.rb
@@ -137,9 +145,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

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

@@ -1,13 +0,0 @@
-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