miron 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c04dafa4abf1207f7cd2fa1fc8ffd280d67040f
-  data.tar.gz: c2072ce7cac097d879d82aa31f20decb6e9210d2
+  metadata.gz: 0cb072267bfc059dd87476db6a6beeef482d146b
+  data.tar.gz: 88d977829876a1ac2c3065b6c077a3dfc5d3cea6
 SHA512:
-  metadata.gz: 6f804660f7d397e908d60d0ba7eb252c77b3acd7a85892a081404494d57990a3d83cf4fd324aa590aba8f651c1765ea097c4b2576a8ee46110beb25d4906599a
-  data.tar.gz: 72654931ca42ee95eb5fddd399e55ec26fa3de7d033f6669c012a1581a7f9cf19ff60588b4f022ac34b329ecdea33d8a9fee722711258fe78667cdf35f2f1a4f
+  metadata.gz: 6bcf690d497f18ed1a5c5ea21a934150c09d0e07ae6ef0d63fe05bde31204bb672ce8408a0b9d4037777a62cbdfe148646c04391dfef85441e8ec738c9959129
+  data.tar.gz: b73d71624ae079a8fa61d1ca5f3e842dd7a0451b0405b077b37469d9dda83428a0b04ba88d84f34ef1994a81d5e599561e140b538c3d2408f32bb92363ada9f3

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/rack_stuff

data/.rubocop.yml

@@ -1 +1,6 @@
+AllCops:
+  Exclude:
+    - rack_stuff/**/*
+    - tmp/**/*
+
 inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -4,6 +4,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/LineLength:
   Max: 120
+Metrics/MethodLength:
+  Max: 15
 Style/BracesAroundHashParameters:
   Enabled: false
 Style/Documentation:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
-### 0.0.1 - Next Release
+### 0.0.2 - Next Release
+* Add `Miron::Auth::Basic` middleware to allow HTTP Basic authentication - [@maclover7](https://github.com/maclover7).
+* Add `use` to Mironfile.rb to allow adding of middleware - [@maclover7](https://github.com/maclover7).
+* Add Puma HTTP handler - [@maclover7](https://github.com/maclover7).
+* Add Unicorn HTTP handler - [@maclover7](https://github.com/maclover7).
+* Add Thin HTTP handler - [@maclover7](https://github.com/maclover7).
 
+### 0.0.1 (9/21/2015)
 * Initial public release - [@maclover7](https://github.com/maclover7).
 * Add WEBrick HTTP Handler - [@maclover7](https://github.com/maclover7).
-* Your contribution here.

data/lib/miron/auth/basic.rb

@@ -0,0 +1,50 @@
+module Miron
+  module Auth
+    class Basic
+      attr_reader :request
+
+      def self.call(request)
+        @request = request
+        return unauthorized if authorization_key.nil?
+        check_auth
+      end
+
+      def self.auth_cleared
+        true
+      end
+
+      def self.authorization_key
+        authorization_keys = ['HTTP_AUTHORIZATION', 'HTTP_X-HTTP_AUTHORIZATION', 'HTTP_X_HTTP_AUTHORIZATION']
+        @authorization_key ||= authorization_keys.detect { |key| @request.key?(key) } || nil
+      end
+
+      def self.bad_request
+        Miron::Response.new(400, { 'Content-Type' => 'text/plain', 'Content-Length' => '0' }, '')
+      end
+
+      def self.check_auth
+        # Get Auth Scheme and encoded username/password
+        auth_key = @request[authorization_key].split(' ', 2)
+        scheme = auth_key.first && auth_key.first.downcase
+        return bad_request if scheme != 'basic'
+
+        # Validate credentials
+        decrypted_auth_key = auth_key.last.unpack('m*').first.split(/:/, 2)
+        if [ENV['MIRON_BAUTH_USERNAME'], ENV['MIRON_BAUTH_PWD']] == decrypted_auth_key
+          return auth_cleared
+        else
+          return unauthorized
+        end
+      end
+
+      def self.unauthorized
+        Miron::Response.new(401,
+                            { 'Content-Type' => 'text/plain',
+                              'Content-Length' => '0',
+                              'WWW-Authenticate' => 'Basic realm="Login"'
+                            },
+                            '')
+      end
+    end
+  end
+end

data/lib/miron/command/init.rb

@@ -7,7 +7,7 @@ module Miron
       ]
 
       def initialize(argv)
-        @mironfile_path = Pathname.pwd + 'Mironfile'
+        @mironfile_path = Pathname.pwd + 'Mironfile.rb'
         super
       end
 

data/lib/miron/command/server.rb

@@ -12,10 +12,11 @@ module Miron
       end
 
       def initialize(argv)
-        @app = Miron::Mironfile.from_dir(Pathname.pwd).app
+        @mironfile = Miron::Mironfile.from_dir(Pathname.pwd)
         @options = {}
-        @options['port'] = argv.option('port') || '9290'
-        @options['server'] = argv.option('server')
+        @options['port'] = argv.option('port') || 9290
+        @options['handler'] = argv.option('handler')
+        @options['mironfile_path'] = Pathname.pwd + 'Mironfile'
         super
       end
 
@@ -25,7 +26,7 @@ module Miron
       end
 
       def run
-        server = Miron::Server.new(@app, @options)
+        server = Miron::Server.new(@mironfile, @options)
         server.start
       end
     end

data/lib/miron/handlers/puma.rb

@@ -0,0 +1,55 @@
+require 'puma'
+
+module Miron
+  class Handler
+    class Puma
+      def self.run(mironfile, options = {})
+        Puma::Proxy.new(mironfile, options)
+      end
+
+      def initialize(mironfile)
+        @mironfile = mironfile
+      end
+
+      def call(env)
+        # Get response
+        miron_request = env
+        miron_response = Miron::Request.new(miron_request, @mironfile).fetch_response
+        # Process response
+        response_http_status = miron_response.http_status
+        # Add cookies to headers
+        miron_response.cookies.each do |k, v|
+          miron_response.headers['Set-Cookie'] = "#{k}=#{v}"
+        end
+        response_body = [miron_response.body]
+        [response_http_status, miron_response.headers, response_body]
+      end
+
+      class Proxy
+        def initialize(mironfile, options)
+          @mironfile = mironfile
+          @options = options
+          @serv = ::Puma::Server.new(Puma.new(@mironfile))
+          listen(@options['host'], @options['port'].to_i)
+        end
+
+        def stop
+          @serv.stop
+        end
+
+        def listen(address, port)
+          @serv.add_tcp_listener(address, port)
+          @serv.run
+          puts "Puma #{::Puma::Const::PUMA_VERSION} starting..."
+          puts "* Environment: #{@options['environment']}"
+          puts "* Listening on #{@options['host']}:#{@options['port']}"
+          begin
+            sleep
+          rescue Interrupt
+            puts '* Shutting down...'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/miron/handlers/thin.rb

@@ -0,0 +1,53 @@
+require 'thin'
+
+module Miron
+  class Handler
+    class Thin < Thin::Server
+      def self.run(mironfile, options = {})
+        Thin::Proxy.new(mironfile, options)
+      end
+
+      def initialize(mironfile, *args)
+        @mironfile = mironfile
+        super
+      end
+
+      def call(env)
+        # Get response
+        miron_request = env
+        miron_response = Miron::Request.new(miron_request, @mironfile).fetch_response
+        # Process response
+        response_http_status = miron_response.http_status
+        # Add cookies to headers
+        miron_response.cookies.each do |k, v|
+          miron_response.headers['Set-Cookie'] = "#{k}=#{v}"
+        end
+        response_body = [miron_response.body]
+        # Write back to Unicorn
+        [response_http_status, miron_response.headers, response_body]
+      end
+
+      def start
+        @app = self
+        super
+      end
+
+      class Proxy
+        def initialize(mironfile, options)
+          @mironfile = mironfile
+          @options = options
+          listen(@options['host'], @options['port'].to_i)
+        end
+
+        def listen(address, port)
+          args = [address, port, nil]
+          # Thin versions below 0.8.0 do not support additional options
+          args.pop if ::Thin::VERSION::MAJOR < 1 && ::Thin::VERSION::MINOR < 8
+          server = ::Miron::Handler::Thin.new(@mironfile, *args)
+          yield server if block_given?
+          server.start
+        end
+      end
+    end
+  end
+end

data/lib/miron/handlers/unicorn.rb

@@ -0,0 +1,59 @@
+require 'unicorn'
+
+module Miron
+  class Handler
+    class Unicorn < Unicorn::HttpServer
+      def self.run(mironfile, options = {})
+        Unicorn::Proxy.new(mironfile, options)
+      end
+
+      def initialize(mironfile, options)
+        @mironfile = mironfile
+        super
+      end
+
+      def process_client(socket)
+        # Get response
+        miron_request = @request.read(socket)
+        miron_response = Miron::Request.new(miron_request, @mironfile).fetch_response
+        # Process response
+        response_http_status = miron_response.http_status
+        # Add cookies to headers
+        miron_response.cookies.each do |k, v|
+          miron_response.headers['Set-Cookie'] = "#{k}=#{v}"
+        end
+        response_body = [miron_response.body]
+        # Write back to Unicorn
+        http_response_write(socket, response_http_status, miron_response.headers, response_body)
+        unless socket.closed?
+          socket.shutdown
+          socket.close
+        end
+      rescue => e
+        handle_error(socket, e)
+      end
+
+      class Proxy
+        def initialize(mironfile, options)
+          @mironfile = mironfile
+          @options = options
+          listen(@options['host'], @options['port'].to_i)
+        end
+
+        def listen(address, port)
+          puts 'Unicorn starting...'
+          puts "* Environment: #{@options['environment']}"
+          puts "* Listening on #{@options['host']}:#{@options['port']}"
+          begin
+            ::Miron::Handler::Unicorn.new(@mironfile, {
+                                            listeners: ["#{address}:#{port}"],
+                                            logger: Logger.new(nil)
+                                          }).start.join
+          rescue Interrupt
+            puts '* Shutting down...'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/miron/handlers/webrick.rb

@@ -1,29 +1,33 @@
 require 'webrick'
 require 'logger'
+require 'stringio'
 
 module Miron
   class Handler
     class WEBrick < ::WEBrick::HTTPServlet::AbstractServlet
-      def self.run(app, options = {})
-        environment  = ENV['MIRON_ENV'] || 'development'
-        default_host = environment == 'development' ? 'localhost' : nil
-
-        options[:BindAddress] = options.delete(:Host) || default_host
+      def self.run(mironfile, options = {})
+        options[:BindAddress] = options['host']
         options[:Port] = options['port']
         @server = ::WEBrick::HTTPServer.new(options)
-        @server.mount('/', Miron::Handler::WEBrick, app)
+        @server.mount('/', Miron::Handler::WEBrick, mironfile)
         yield @server if block_given?
-        @server.start
+
+        begin
+          @server.start
+        rescue Interrupt
+          puts '* Shutting down...'
+        end
       end
 
-      def initialize(server, app)
+      def initialize(server, mironfile)
         super server
-        @app = app
+        @mironfile = mironfile
       end
 
       def service(webrick_request, webrick_response)
         miron_request = webrick_request.meta_vars
-        miron_response = Miron::Request.new(miron_request, webrick_response, @app).fetch_response
+        parse_input_body(webrick_request, miron_request)
+        miron_response = Miron::Request.new(miron_request, @mironfile).fetch_response
 
         webrick_response.status = miron_response.http_status
         webrick_response.body << miron_response.body
@@ -32,6 +36,14 @@ module Miron
         miron_response.body.close if miron_response.body.respond_to?(:close)
       end
 
+      def parse_input_body(webrick_request, miron_request)
+        if webrick_request.body.to_s.nil? || webrick_request.body.to_s.empty?
+          miron_request['HTTP_BODY'] = ''
+        else
+          miron_request['HTTP_BODY'] = ::MultiJson.load(webrick_request.body.to_s)
+        end
+      end
+
       def shutdown
         @server.shutdown
       end

data/lib/miron/mironfile.rb

@@ -8,17 +8,19 @@ module Miron
     # @return [Miron::Mironfile] Returns newly create {Miron::Mironfile}
     # @return [Nil] If no Mironfile was found in the given dir
     #
-    attr_reader :app
+    attr_reader :app, :middleware
 
     def self.from_dir(dir)
-      path = dir + 'Mironfile'
-      mironfile = Mironfile.new do
+      path = dir + 'Mironfile.rb'
+      mironfile = Mironfile.new(path) do
         eval(path.read, nil, path.to_s)
       end
       mironfile
     end
 
-    def initialize(&block)
+    def initialize(mironfile_path, &block)
+      require_relative File.expand_path(mironfile_path, __FILE__)
+      @middleware = []
       instance_eval(&block)
     end
 
@@ -32,7 +34,38 @@ module Miron
     #
     #   run Heartbeat
     def run(app)
-      @app = app
+      @app = app.to_s.gsub!('Miron::Mironfile::', '').constantize
+    end
+
+    # Takes an argument that is an object that responds to #call and returns a {Miron::Response}.
+    #
+    #   class Middle
+    #     def self.call(request)
+    #       puts "hello from middle"
+    #     end
+    #   end
+    #
+    #   class Heartbeat
+    #     def self.call(request)
+    #      Miron::Response.new(200, { "Content-Type" => "text/plain" }, "OK")
+    #     end
+    #   end
+    #
+    #   use Middle
+    #   run Heartbeat
+    def use(middleware)
+      middleware_string = middleware.to_s
+      if middleware_string.include?('Miron::Mironfile::')
+        @middleware << middleware_string.gsub!('Miron::Mironfile::', '').constantize
+      else
+        @middleware << middleware_string.constantize
+      end
     end
   end
 end
+
+def run(_)
+end
+
+def use(_)
+end

data/lib/miron/request.rb

@@ -2,27 +2,50 @@ module Miron
   # Miron::Request allows HTTP responses to be sent.
   #
   class Request
-    attr_reader :miron_request, :miron_response, :app
+    attr_reader :request, :mironfile
 
-    # @param  [Class] miron_request
-    #         Request object (can be an instance of `WEBrick::Request`)
+    # @param  [Hash] request
+    #         Request information
     #
-    # @param  [Class] miron_response
-    #         Response object (can be an instance of `WEBrick::Response`)
+    # @param  [Mironfile] mironfile
+    #         Mironfile that has the app and middleware to perform a `.call` on
     #
-    # @param  [] app
-    #         App to perform a `.call` on
-    #
-    def initialize(miron_request, miron_response, app)
-      @miron_request = miron_request
-      @miron_response = miron_response
-      @app = app
+    def initialize(request, mironfile)
+      @request = request
+      @mironfile = mironfile
+      @response = Miron::Response.new
+      fix_hash_keys
     end
 
     # @return [Response] returns the newly created {Miron::Response}
     #
     def fetch_response
-      @app.call(@miron_request)
+      miron_response = nil
+      @mironfile.middleware.each do |middleware|
+        middleware_response = middleware.call(@request, @response)
+        miron_response = middleware_response if middleware_response.is_a?(Miron::Response)
+      end
+
+      return miron_response unless miron_response.nil?
+
+      app_response = @mironfile.app.call(@request, @response)
+      miron_response = app_response if app_response.is_a?(Miron::Response)
+      miron_response
+    end
+
+    private
+
+    # Make request hash keys easier to understand.
+    def fix_hash_keys
+      # Convert PATH_INFO to PATH
+      return unless @request['PATH_INFO']
+      @request['PATH'] = @request['PATH_INFO']
+      @request.delete('PATH_INFO')
+
+      # Convert REQUEST_METHOD to HTTP_METHOD
+      return unless @request['REQUEST_METHOD']
+      @request['HTTP_METHOD'] = @request['REQUEST_METHOD']
+      @request.delete('REQUEST_METHOD')
     end
   end
 end

data/lib/miron/response.rb

@@ -2,7 +2,7 @@ module Miron
   # Miron::Reponse allows HTTP responses to be sent.
   #
   class Response
-    attr_reader :http_status, :headers, :body, :cookies
+    attr_accessor :http_status, :headers, :body, :cookies
 
     # @param  [Integer] http_status
     #         the HTTP status code to return
@@ -15,11 +15,11 @@ module Miron
     #
     # @return [Response] returns the newly created {Miron::Response}
     #
-    def initialize(http_status, headers, body, cookies = {})
-      @http_status = http_status
-      @headers = headers
-      @body = body
-      @cookies = cookies
+    def initialize
+      @http_status = 200
+      @headers = {}
+      @body = ''
+      @cookies = {}
     end
   end
 end

data/lib/miron/server.rb

@@ -2,31 +2,34 @@ module Miron
   # Miron::Server allows HTTP responses to be sent.
   #
   class Server
-    attr_reader :app, :options
+    attr_reader :mironfile, :options
     attr_accessor :handler
 
-    # @param  [String] app
-    #         A String of the mironfile that will be powering the {Miron::Server}
+    # @param  [Mironfile] mironfile
+    #         An instance of {Miron::Mironfile} that will be powering the {Miron::Server}
     #
     # @param  [Hash] options
     #         A Hash of configuration options
     #
-    # @return [Response] returns the newly created {Miron::Response}
+    # @return [Response] returns the newly created {Miron::Server}
     #
-    def initialize(app, options)
-      @app = app
+    def initialize(mironfile, options)
+      @mironfile = mironfile
       @options = options
       resolve_handler
     end
 
     def start
-      @handler.run(app, options)
+      # Set options defaults and run the handler
+      @options['environment'] = ENV['MIRON_ENV'] || 'development'
+      @options['host'] = '0.0.0.0'
+      @handler.run(@mironfile, @options)
     end
 
     private
 
     def resolve_handler
-      @handler = Miron::Handler.get(options['server'])
+      @handler = Miron::Handler.get(@options['handler'])
     end
   end
 end

data/lib/miron/utils.rb

@@ -9,7 +9,7 @@ module Miron
     # @return [Nil] If no Mironfile was found in the given dir
     #
     def self.mironfile_in_dir(dir)
-      mironfile = dir + 'Mironfile'
+      mironfile = dir + 'Mironfile.rb'
       if mironfile.exist?
         true
       else

data/lib/miron/version.rb

@@ -1,5 +1,5 @@
 module Miron
   # The version of Miron
   #
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/miron.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'active_support/core_ext/string/strip'
 require 'active_support/core_ext/string/inflections'
+require 'multi_json'
 
 require 'miron/version'
 
@@ -15,7 +16,14 @@ module Miron
   autoload :Server,    'miron/server'
   autoload :Utils,     'miron/utils'
 
+  module Auth
+    autoload :Basic, 'miron/auth/basic'
+  end
+
   class Handler
+    autoload :Puma,    'miron/handlers/puma'
+    autoload :Thin,    'miron/handlers/thin'
+    autoload :Unicorn, 'miron/handlers/unicorn'
     autoload :WEBrick, 'miron/handlers/webrick'
   end
 end

data/miron.gemspec

@@ -21,11 +21,16 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'claide'
+  spec.add_runtime_dependency 'multi_json'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'httparty'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'puma'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'thin'
+  spec.add_development_dependency 'unicorn'
   spec.add_development_dependency 'yard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miron
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jon Moss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicorn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -147,10 +217,14 @@ files:
 - bin/travis
 - exe/miron
 - lib/miron.rb
+- lib/miron/auth/basic.rb
 - lib/miron/command.rb
 - lib/miron/command/init.rb
 - lib/miron/command/server.rb
 - lib/miron/handler.rb
+- lib/miron/handlers/puma.rb
+- lib/miron/handlers/thin.rb
+- lib/miron/handlers/unicorn.rb
 - lib/miron/handlers/webrick.rb
 - lib/miron/mironfile.rb
 - lib/miron/request.rb
@@ -179,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A redesigned Ruby web interface.