kanji-web 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c6fbf06d007d55da99eb86d06bfe74651debcf
-  data.tar.gz: 8c3e432adbcc7362093c06e18be541bdd30132d6
+  metadata.gz: 512e7dcf1cdfb757204cf5b9755a12bdb62b247e
+  data.tar.gz: 742c4dbffa9d83b5ddaef6559f3d0182a51996bb
 SHA512:
-  metadata.gz: 8cf7309a75133d5bc34b2669e856eeb5972cd63ca1a7491a21ed185e78893a698c0bde2255f0cdfd4e3dea4b1f68653ec54899767c92745fc45c32711b9286fe
-  data.tar.gz: 4af6da9436be590e459140a429447cb526851d4c8f858ea18ff86e0fb95dbb4c5515db062a22332c8e75bb1a4fdbca04fea672427f963d9c296eb840fb712146
+  metadata.gz: 3ce621e3bc1dfabff3e3ee83fca6b0c234707677f0c86efc0ef9337f2d328cf1b9c2c597cb374bff9a178244fe02c9f852c3221f055fdb365f814e297d737b6f
+  data.tar.gz: d2e49e0cc713edb8621928ad776cb6f5936a93afa515db045121e3c6fef90005a0c54d2d7a27e481ddff1dea14d902e62081debe347006f45388e781939c0337

data/lib/kanji/cli.rb

@@ -17,8 +17,11 @@ module Kanji
     map "g" => "generate"
 
     desc "server", "Start the application server"
+    method_option :port, default: 3300, aliases: "p"
     def server
-      `shotgun config.ru`
+      require "kanji/cli/server"
+      require_relative "#{Dir.pwd}/system/boot"
+      CLI::Server.start(options)
     end
 
     map "s" => "server"

data/lib/kanji/cli/server.rb

@@ -0,0 +1,32 @@
+require "rerun"
+require "pathname"
+require "dry/core/inflector"
+
+module Kanji
+  class CLI < Thor
+    class Server
+      def self.start(options = {})
+        Rerun::Runner.keep_running(
+          "thin -R config.ru -a 127.0.0.1 -p #{options["port"]} -D start",
+          default_options
+        )
+      end
+
+      def self.default_options
+        {
+          pattern: "**/*.rb",
+          signal: "TERM",
+          notify: false,
+          name: app_name,
+          ignore: [],
+          dir: ["app", "system"],
+          cmd: "rackup config.ru"
+        }
+      end
+
+      def self.app_name
+        Dry::Core::Inflector.camelize(Pathname.getwd.basename.to_s)
+      end
+    end
+  end
+end

data/lib/kanji/container.rb

@@ -1,5 +1,4 @@
 require "dry/system/container"
-require "kanji/graph/container"
 
 module Kanji
   class Container < Dry::System::Container

data/lib/kanji/generators/project.rb

@@ -49,7 +49,7 @@ end
 Now open up `app/schema.rb` and uncomment the lines that add the
 query and mutation types.
 
-Start your server: `kanji s` and visit `localhost:9393/graphiql` and
+Start your server: `kanji s` and visit `localhost:3300/graphiql` and
 start exploring!
         TEXT
 

data/lib/kanji/graph/register_mutation.rb

@@ -1,6 +1,7 @@
 require "graphql"
 require "dry-initializer"
 require "kanji/types"
+require "kanji/type/attribute"
 require "kanji/graph/coerce_type"
 
 module Kanji
@@ -8,11 +9,11 @@ module Kanji
     class RegisterMutation
       extend Dry::Initializer
 
-      option :return_type, Types::Class
-      option :attributes, Types::Strict::Array.member(Type::Attribute)
-      option :name, Types::Strict::String
-      option :description, Types::Strict::String, optional: true
-      option :resolve, Types::Callable
+      option :return_type, Kanji::Types::Class
+      option :attributes, Kanji::Types::Strict::Array.member(Kanji::Type::Attribute)
+      option :name, Kanji::Types::Strict::String
+      option :description, Kanji::Types::Strict::String, optional: true
+      option :resolve, Kanji::Types::Callable
 
       def call
         return_type = self.return_type

data/lib/kanji/graph/register_object.rb

@@ -9,9 +9,9 @@ module Kanji
     class RegisterObject
       extend Dry::Initializer
 
-      option :attributes, Types::Strict::Array.member(Type::Attribute)
-      option :name, Types::Strict::String
-      option :description, Types::Strict::String, optional: true
+      option :attributes, Kanji::Types::Strict::Array.member(Kanji::Type::Attribute)
+      option :name, Kanji::Types::Strict::String
+      option :description, Kanji::Types::Strict::String, optional: true
 
       def call
         name = "#{self.name}Type"

data/lib/kanji/templates/.env.test.tt

@@ -1 +1,2 @@
 DATABASE_URL='postgres://localhost/<%= config[:underscored_project_name] %>_test'
+ENV='test'

data/lib/kanji/templates/.env.tt

@@ -1 +1,2 @@
 DATABASE_URL='postgres://localhost/<%= config[:underscored_project_name] %>_development'
+ENV='development'

data/lib/kanji/templates/system/boot/graph.rb.tt

@@ -1,9 +1,7 @@
+require "kanji/graph/container"
+
 <%= config[:camel_cased_app_name] %>::Container.namespace :graph do |container|
   container.finalize :graph do
-    init do
-      require "kanji/graph/container"
-    end
-
     start do
       container.register :query, Kanji::Graph::Container[:query]
     end

data/lib/kanji/templates/system/boot/monitor.rb.tt

@@ -1,9 +1,11 @@
-<%= config[:camel_cased_app_name] %>::Container.finalize :monitor do |_container|
-  init do
-    require "dry/monitor"
-  end
+require "dry/monitor"
 
+<%= config[:camel_cased_app_name] %>::Container.finalize :monitor do |_container|
   start do
     Dry::Monitor::SQL::Logger.new(logger).subscribe(notifications)
+
+    if settings[:env] == "development"
+      Dry::Monitor::SQL::Logger.new(stdout_logger).subscribe(notifications)
+    end
   end
 end

data/lib/kanji/templates/system/boot/rom.rb.tt

@@ -1,10 +1,10 @@
+require "sequel"
+require "rom"
+require "rom/sql"
+
 <%= config[:camel_cased_app_name] %>::Container.namespace :persistence do |container|
   container.finalize :rom do
     init do
-      require "sequel"
-      require "rom"
-      require "rom/sql"
-
       use :settings
       use :monitor
 

data/lib/kanji/templates/system/boot/settings.rb.tt

@@ -1,8 +1,6 @@
-<%= config[:camel_cased_app_name] %>::Container.finalize :settings do |container|
-  init do
-    require "<%= config[:underscored_project_name] %>/settings"
-  end
+require "<%= config[:underscored_project_name] %>/settings"
 
+<%= config[:camel_cased_app_name] %>::Container.finalize :settings do |container|
   start do
     settings = <%= config[:camel_cased_app_name] %>::Settings.load(container.config.root, container.config.env)
     container.register :settings, settings

data/lib/kanji/templates/system/project/container.rb.tt

@@ -1,7 +1,7 @@
-require "dry/web/container"
+require "kanji/web_container"
 
 module <%= config[:camel_cased_app_name] %>
-  class Container < Dry::Web::Container
+  class Container < Kanji::WebContainer
     configure do
       config.name = :<%= config[:underscored_project_name] %>
       config.listeners = true

data/lib/kanji/templates/system/project/settings.rb.tt

@@ -4,5 +4,6 @@ require "kanji/types"
 module <%= config[:camel_cased_app_name] %>
   class Settings < Dry::Web::Settings
     setting :database_url, Kanji::Types::Strict::String.constrained(filled: true)
+    setting :env, Kanji::Types::Strict::String.default("development")
   end
 end

data/lib/kanji/version.rb

@@ -1,3 +1,3 @@
 module Kanji
-  Version = "0.2.2".freeze
+  Version = "0.3.0".freeze
 end

data/lib/kanji/web_container.rb

@@ -0,0 +1,24 @@
+require "dry/web/container"
+
+module Kanji
+  class WebContainer < Dry::Web::Container
+    setting :stdout_logger
+
+    class << self
+      def configure(&block)
+        super.configure_stdout_logger
+
+        return unless self[:settings][:env] == "development"
+        rack_logger = Dry::Monitor::Rack::Logger.new(self[:stdout_logger])
+        rack_logger.attach(self[:rack_monitor])
+      end
+
+      def configure_stdout_logger
+        config.stdout_logger = Dry::Monitor::Logger.new($stdout)
+        config.stdout_logger.level = Dry::Monitor::Logger::DEBUG
+        register(:stdout_logger, config.stdout_logger)
+        self
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanji-web
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Darin Haener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rerun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
@@ -276,20 +290,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: shotgun
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -473,6 +473,7 @@ files:
 - lib/kanji/application.rb
 - lib/kanji/cli.rb
 - lib/kanji/cli/generate.rb
+- lib/kanji/cli/server.rb
 - lib/kanji/container.rb
 - lib/kanji/errors.rb
 - lib/kanji/generate.rb
@@ -539,6 +540,7 @@ files:
 - lib/kanji/types/callable.rb
 - lib/kanji/types/type_interface.rb
 - lib/kanji/version.rb
+- lib/kanji/web_container.rb
 homepage: https://github.com/dphaener/kanji
 licenses:
 - MIT