ruby-api 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eec1157e5e196267d1b08d450fb9c754ed2a5b5
-  data.tar.gz: beae12dd9f939ff1b112498eabae2eee0cdce7ea
+  metadata.gz: 690eb8fb0de772562ea754e3baf9d694f1180df1
+  data.tar.gz: 93a607e48c16654b6cb1b9f44836ac8ebfc7ac16
 SHA512:
-  metadata.gz: e2d13ac8c0561fff292ebf410e72e1fc9ba11f0e6f0f3e18356da51a13486fb0427e29b0a7ea962d6182b698f34aec38616abe10107112f215d45ca095a101b4
-  data.tar.gz: aa11a57965b83d2c6575a7bbf9267422d98f96a7c01019440cd7bd184f1e54e349e384e4f4b2b1a9f4c1e3bc1c68615fa7f518c2d48423b75e4955794eb4301d
+  metadata.gz: e2d2518098e9d1c9010d0986cf55c68a05219a5172f1ef4593dc1745dbd2823c98875037d4451912f033f399f0bba72c0a7450d0d12d3122889149772f996d1b
+  data.tar.gz: 93fd8c681642c55f06634dfa35037bb68b625542294ef4a9848c1ed1d98217c696bda8721a84157b80ff734bfd25de55585b495cb160f5ac620bc97e49c6caa3

data/lib/ruby_api.rb

@@ -18,12 +18,32 @@ module RubyAPI
   require_relative 'ruby_api/application'
 
   CONFIG_DIR = 'config'
+  CONFIG_FILE = 'app.yml'
   BOOT_SCRIPT = 'boot'
 
-  def self.application(config = nil)
-    return @app if @app
-    @app = Application.new(config)
-                      .boot
+  def self.application(root, overrides = {})
+    @root = root
+    Application.new(config(overrides)).boot
+  end
+
+  def self.config(overrides = {})
+    path = overrides[:config_file]
+    path ||= File.join CONFIG_DIR, CONFIG_FILE
+    path = path(path)
+    raise "Config missing at #{path}" unless File.exist?(path)
+    Config.new YAML.load_file(path)
+  end
+
+  def self.root=(path)
+    @root = path
+  end
+
+  def self.root
+    @root
+  end
+
+  def self.path(path)
+    File.join @root, path
   end
 
   def self.environment

data/lib/ruby_api/application.rb

@@ -4,35 +4,30 @@ module RubyAPI
   # Application
   class Application
     APP_MODULE_NAME = 'APP'
-    APP_SOURCE_PATH = 'app/app'
+    APP_SOURCE_PATH = 'src/main'
 
     attr_reader :config, :logger, :routes
 
-    def initialize(cfg = {})
-      @config = load_config(cfg)
+    def initialize(config)
+      raise "Invalid config: #{config.inspect}" unless config.is_a?(Config)
+      @config = config
       @routes = load_routes
     end
 
-    def load_config(cfg)
-      require_hash_or_string(cfg, 'Invalid configuration: %s')
-      cfg = YAML.load_file cfg if cfg.is_a?(String)
-      Config.new(cfg)
-    end
-
     def load_routes
       return {} unless config.key?(:routes)
 
       routes = config.routes
       require_hash_or_string(routes, 'Invalid routes config: %s')
-      routes = YAML.load_file routes if routes.is_a?(String)
+      routes = YAML.load_file RubyAPI.path(routes) if routes.is_a?(String)
       @routes = routes.deep_symbolize_keys!
     end
 
     def boot
       @logger = Logger.new log_path[:info]
       @logger_err = Logger.new log_path[:error]
-      require boot_script if boot_script?
-      require app_path
+      require RubyAPI.path(boot_script) if boot_script?
+      require RubyAPI.path(app_path)
       self
     end
 
@@ -76,9 +71,10 @@ module RubyAPI
 
     def boot_script?
       return false unless config.key?(:boot_script)
-      path = config.boot_script
-      logger.warn "Boot script not found at: #{path}" unless File.exist?(path)
-      path
+      path = RubyAPI.path(boot_script)
+      return true if File.exist?(path)
+      logger.warn "Boot script not found at: #{path}"
+      false
     end
 
     def process(request)

data/lib/ruby_api/cli/generate.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../../ruby_api'
+
+module RubyAPI
+  module Cli
+    # :nodoc
+    class Generate < Thor
+      desc 'feature NAME', 'generate application feature module'
+      def feature(name)
+        path = File.join RubyAPI::CONFIG_DIR, RubyAPI::CONFIG_FILE
+        config = RubyAPI.config
+        puts config.to_yaml
+      end
+    end
+  end
+end

data/lib/ruby_api/cli/main.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
+require_relative 'server'
+require_relative 'generate'
+
 module RubyAPI
   module Cli
     # RubyAPI Main CLI command
     class Main < Thor
-      desc 'hello [MESSAGE]', 'say: Hello MESSAGE'
-      def hello(message = 'World')
-        puts "Hello #{message}"
-      end
+      desc 'server COMMAND', 'control API server'
+      subcommand 'server', Server
+
+      desc 'generate OBJECT [OPTIONS]', 'generate framework objects'
+      subcommand 'generate', Generate
     end
   end
 end

data/lib/ruby_api/cli/server.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RubyAPI
+  module Cli
+    # :nodoc
+    class Server < Thor
+      desc 'start', 'start API server'
+      option :server, aliases: [:s], type: :string, default: 'puma'
+      option :port,   aliases: [:p], type: :numeric, default: 1234
+      option :config, aliases: [:c], type: :string, default: 'config.ru'
+      def start
+        exec format('bundle exec %<server>s -p %<port>d %<config>s',
+                    server: options[:server],
+                    port: options[:port],
+                    config: options[:config])
+      end
+    end
+  end
+end

data/lib/ruby_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyAPI
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Voislav Jovanovic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,7 +119,9 @@ files:
 - lib/ruby_api.rb
 - lib/ruby_api/application.rb
 - lib/ruby_api/cli.rb
+- lib/ruby_api/cli/generate.rb
 - lib/ruby_api/cli/main.rb
+- lib/ruby_api/cli/server.rb
 - lib/ruby_api/config.rb
 - lib/ruby_api/operation.rb
 - lib/ruby_api/request.rb