rack-app 3.0.0.beta → 3.0.0.delta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115055ba41521d7fee618f4d2fe57b624471a39e
-  data.tar.gz: 40fab600f70f7b89622a40106e94323e19b40d67
+  metadata.gz: 9fa3133ed7bd4031d0703e2c039f4ee62c8fb59d
+  data.tar.gz: 5708b587c27a12a03536afc88e4dc6db0a75bdef
 SHA512:
-  metadata.gz: b8bb4760e69bc2815fc09664845dd7b172ade97d3723667c48166553bb8c994a534adbf430498e46f9f75f2e39320c6544cdb3238e6042fb1da43aef716181a5
-  data.tar.gz: 333055adc24a03df566b36065931f921000901fc3f217204397964f96c1169d7140dbf28fc1b047079ef76486fa3186cac07d972fe8b64cfd2247c659d80de67
+  metadata.gz: 09e480478c10196def5fb0307c248c54da46aaf852a81f5f15dfc370c16e37e47f469f748d9018f3e4741239a384fab8f3dcf9e2df9d8681da4d8610213b747e
+  data.tar.gz: dbe8e342c8997a9f76f8b7c3e58a196000f267dbec814b6b91260bb9dc24bb60be463e8d97334ae0b22f4b505ad90a2eac29abef2b6967e6bf962a7c589f7ba9

data/.rubocop.yml

@@ -0,0 +1,46 @@
+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/VERSION

@@ -1 +1 @@
-3.0.0.beta
+3.0.0.delta

data/bin/rack-app

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+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,45 @@
+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

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

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,29 +1,31 @@
-class Rack::App::Extension
-  class << self
+module Rack::App::Extension
 
-    def includes
-      @includes ||= []
-    end
+  extend self
 
-    def extends
-      @extends ||= []
-    end
+  def apply_extensions(app_class, *extension_names)
+    extension_names.each do |extension_name|
 
-    def inheritances
-      @on_inheritances ||= []
-    end
+      ext = find_extension_for(extension_name) || raise("Not registered extension name requested: #{extension_name}")
+      app_class.class_eval(&ext)
 
-    def include(endpoint_methods_module)
-      includes << endpoint_methods_module
     end
+    nil
+  end
 
-    def extend(app_class_methods_module)
-      extends << app_class_methods_module
-    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 on_inheritance(&block)
-      inheritances << block
-    end
+  protected
 
+  def extensions
+    @extensions ||= {}
   end
+
+  def find_extension_for(sym_name)
+    return extensions[sym_name.to_s.to_sym]
+  end
+
 end

data/lib/rack/app/router.rb

@@ -6,15 +6,11 @@ class Rack::App::Router
   require 'rack/app/router/not_found'
 
   def call(env)
-    response = nil
-    registered_endpoint_routers.find do |router|
-      response = router.call(env)
-    end
-    return response
+    @static.call(env) or @dynamic.call(env) or @not_found.call(env)
   end
 
   def endpoints
-    registered_endpoint_routers.map(&:endpoints).reduce([],:+)
+    [@static, @dynamic, @not_found].map(&:endpoints).reduce([], :+)
   end
 
   def show_endpoints
@@ -63,10 +59,6 @@ class Rack::App::Router
     @not_found = Rack::App::Router::NotFound.new
   end
 
-  def registered_endpoint_routers
-    [@static, @dynamic, @not_found]
-  end
-
   def router_for(request_path)
     defined_path_is_dynamic?(request_path) ? @dynamic : @static
   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

@@ -10,13 +10,15 @@ module Rack::App::SingletonMethods::Mounting
     duplication = ::Rack::App::Utils.deep_dup(api_class)
 
     duplication.on_mounted.each do |on_mount|
-      duplication.instance_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)
 
-    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,16 +24,8 @@ module Rack::App::SingletonMethods::Settings
     @headers
   end
 
-  def extensions(*extensions)
-    extensions.each do |ext|
-      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) }
-
-      end
-    end
+  def extensions(*extension_names)
+    Rack::App::Extension.apply_extensions(self,*extension_names)
   end
 
   def error(*exception_classes, &block)
@@ -39,8 +37,6 @@ module Rack::App::SingletonMethods::Settings
     return @error_handler
   end
 
-  private
-
   def middlewares(&block)
     @middlewares ||= []
     @middlewares << block unless block.nil?

data/lib/rack/app/test.rb

@@ -28,8 +28,7 @@ module Rack::App::Test
     app_class = defined?(__rack_app_class__) ? __rack_app_class__ : nil
     constructors = []
     constructors << __rack_app_constructor__ if defined?(__rack_app_constructor__) and __rack_app_constructor__.is_a?(Proc)
-    constructors << block unless block.nil?
-    Rack::App::Test::Utils.rack_app_by(app_class, constructors)
+    Rack::App::Test::Utils.rack_app_by(app_class, constructors, &block)
   end
 
 end

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

@@ -10,17 +10,13 @@ module Rack::App::Test::Utils
     properties
   end
 
-  def rack_app_by(rack_app_class, constructors)
-    subject_app = nil
-
-    if constructors.empty?
-      subject_app = rack_app_class
-    else
-      subject_app = Class.new(rack_app_class || ::Rack::App)
-      constructors.each { |constructor| subject_app.class_eval(&constructor) }
-    end
+  def rack_app_by(subject_class, constructors, &block)
+
+    app_class = subject_class.respond_to?(:call) ? subject_class : Rack::App
+    app = Rack::App::Utils.deep_dup(app_class)
+    constructors.each { |constructor| app.class_eval(&constructor) }
 
-    subject_app
+    block.is_a?(Proc) ? app.instance_exec(&block) : app
   end
 
   def env_by(properties)

data/lib/rack/app/utils.rb

@@ -20,9 +20,7 @@ module Rack::App::Utils
     path
   end
 
-  # Based on ActiveSupport, removed inflections.
-  # https://github.com/rails/rails/blob/v4.1.0.rc1/activesupport/lib/active_support/inflector/methods.rb
-  def underscore(camel_cased_word)
+  def snake_case(camel_cased_word)
     word = camel_cased_word.to_s.gsub('::', '/')
     word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
     word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
@@ -31,6 +29,10 @@ module Rack::App::Utils
     word
   end
 
+  def camel_case(snake_case)
+    snake_case.to_s.split('_').collect(&:capitalize).join
+  end
+
   def pwd(*path_parts)
 
     root_folder = if ENV['BUNDLE_GEMFILE']
@@ -79,7 +81,7 @@ module Rack::App::Utils
 
 
   def deep_dup(object)
-    ::Rack::App::Utils::DeepDup.new(object).to_dup
+    ::Rack::App::Utils::DeepDup.duplicate(object)
   end
 
   def deep_merge(hash,oth_hash)

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

@@ -1,90 +1,123 @@
-class Rack::App::Utils::DeepDup
+module Rack::App::Utils::DeepDup
 
-  def initialize(object)
-    @object = object
-  end
+  extend self
 
-  def to_dup
-    @register = {}
+  def duplicate(object)
+    register = {}
 
-    dup(@object)
+    dup(register, object)
   end
 
   protected
 
-  def registration(object, duplicate)
-    @register[object.object_id]= duplicate
-    duplicate
+  def registered(object, register)
+    register[object.object_id]
   end
 
-  def registered(object)
-    @register[object.object_id]
+  def register_duplication(register, object, duplicate)
+    register[object.object_id]= duplicate
+    duplicate
   end
 
-  def dup(object)
+  def dup(register, object)
 
-    return registered(object) if registered(object)
+    return object unless registrable?(object)
+    return registered(object, register) if registered(object, register)
 
     case object
 
       when Array
-        dup_array(object)
+        dup_array(register, object)
 
       when Hash
-        dup_hash(object)
+        dup_hash(register, object)
 
       when Range
-        dup_range(object)
+        dup_range(register, object)
 
       when Struct
-        dup_struct(object)
+        dup_struct(register, object)
 
-      when NilClass, Symbol, Numeric, TrueClass, FalseClass
-        registration(object, object)
+      when NilClass, Symbol, Numeric, TrueClass, FalseClass, Method
+        register_duplication(register, object, object)
 
       else
-        dup_object(object)
+        dup_object(register, object)
 
     end
   end
 
-  def dup_array(object)
-    duplication = dup_object(object)
-    duplication.map!{ |e| dup(e) }
+  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) }
   end
 
-  def dup_hash(object)
-    duplication = dup_object(object)
-    object.reduce(duplication) { |hash, (k, v)| hash.merge!(dup(k) => dup(v)) }
+  def dup_hash(register, object)
+    duplication = dup_object(register, object)
+    object.reduce(duplication) { |hash, (k, v)| hash.merge!(dup(register, k) => dup(register, v)) }
   end
 
-  def dup_range(range)
-    registration(range, range.class.new(dup(range.first), dup(range.last)))
+  def dup_range(register, range)
+    register_duplication(register, range, range.class.new(dup(register, range.first), dup(register, range.last)))
   rescue
-    registration(range, range.dup)
+    register_duplication(register, range, range.dup)
   end
 
-  def dup_struct(struct)
-    duplication = registration(struct, struct.dup)
+  def dup_struct(register, struct)
+    duplication = register_duplication(register, struct, struct.dup)
 
     struct.each_pair do |attr, value|
-      duplication.__send__("#{attr}=", dup(value))
+      duplication.__send__("#{attr}=", dup(register, value))
     end
 
     duplication
   end
 
-  def dup_object(object)
-    dup_instance_variables(object, registration(object, object.dup))
+  def dup_object(register, object)
+    dup_instance_variables(register, object, register_duplication(register, object, try_dup(object)))
   end
 
-  def dup_instance_variables(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(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

data/rack-app.gemspec

@@ -1,8 +1,4 @@
 # coding: utf-8
-# lib = File.expand_path('../lib', __FILE__)
-# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-# require 'rack/app/version'
-
 Gem::Specification.new do |spec|
 
   spec.name          = "rack-app"
@@ -16,10 +12,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://www.rack-app.com/'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+
   spec.license       = 'Apache License 2.0'
 
   spec.add_development_dependency "bundler"
@@ -28,4 +25,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rack"
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta
+  version: 3.0.0.delta
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,12 +70,14 @@ 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:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -86,7 +88,10 @@ 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