appril 0.0.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd7e7cfc93a83e1a2b21f54f9ca1f6ff982188b
-  data.tar.gz: 29c6281c4353748e7ae403445e780e143c2e0ab7
+  metadata.gz: 9fac08ec14ea8a2fc574565add3a62e956ffe315
+  data.tar.gz: c41b91b89bd6a9f81c95c0cb9cb54da5e1d2e8ad
 SHA512:
-  metadata.gz: 47596d9940d92dcd4c29c75320239e867b1625b08108d8e70419abcef8813e013f03504c4311525f517ca38748e5dd2622cea762688d2ab100f6a97c0a2e9e25
-  data.tar.gz: c6f28e28ff524b7ecf0afe6563a35d6e83c37d5301d3b23750b0efaafb29b1bc0e1b154a55f7e89a5c2b58612ebb6172649c02c9aa0dd86d3667be82e7316371
+  metadata.gz: f9db9bd50c5909293335a56efce0ca3de492ef6ec8dcbc8228d2d4276f418b5d5535f99fdae83ef7aaad64e73fc6bccad48bf8d121510c01408bdab742b8d022
+  data.tar.gz: 43ceccf951f7e3df393b6cbadc0eff0eb8ef15884a0788bdfa0d025cf7e437b0befd606efad79dce49a3711030ad91b3c8e3efc204ac28be1a09a4607dd21269

data/lib/appril/generate_configs.rb

@@ -0,0 +1,97 @@
+require 'fileutils'
+require 'rocketio'
+require 'appril/load_configs'
+
+module Appril
+  extend self
+
+  def generate_configs dir
+    generate_components_file(dir)
+    generate_config_file(dir)
+    generate_store_modules_file(dir)
+  end
+
+  def generate_components_file dir
+    components = JSON.pretty_generate(controllers_map(dir))
+    File.open(File.expand_path('components.json', dir), 'w') {|f| f << components}
+  end
+
+  def generate_config_file dir
+    config = Appril.load_configs("#{dir}/config", env: :development)
+    File.open File.expand_path('config.js', dir), 'w' do |f|
+      f << "// auto-generated file, do not edit\n"
+      f << "module.exports = " << JSON.pretty_generate({
+        build_path: config[:build_path],
+        client_url: config[:client_url],
+        server_url: config[:server_url],
+        default_api: config[:default_api],
+        webpack_entries: webpack_entries(dir, controllers_map(dir))
+      })
+    end
+  end
+
+  def generate_store_modules_file dir
+    lines = controllers_map(dir).each_with_object([
+      '// auto-generated file, do not edit',
+      'const modules = {}'
+    ]) do |c,o|
+      next unless c[:name] # skip anonymous controllers
+      pattern = "base/components/#{c[:path]}/store.*"
+      next unless file = Dir[File.expand_path(pattern, dir)].find {|e| File.file?(e)}
+      path = file.sub(dir, 'app')
+      o << "
+        import #{c[:name]} from '#{path}'
+        modules.#{c[:name]} = #{c[:name]}
+      "
+    end
+    lines.push('export default modules')
+    file = File.expand_path('store_modules.js', dir)
+    FileUtils.mkdir_p(File.dirname(file))
+    File.open(file, 'w') {|f| f << lines.join("\n")}
+  end
+
+  def controllers_map dir
+    path_prefix = File.expand_path('base/components', dir)
+    RocketIO.controllers.each_with_object([]) do |controller,o|
+      next if controller.to_s =~ /BaseController|RTCPController/
+      o << {
+        path: controller.dirname.sub(path_prefix, '').gsub(/\A\/|\/\Z/, ''),
+        url: controller.url,
+        url_pattern: url_pattern(controller),
+        name: controller.name.gsub('::', '__'),
+        controller_name: controller.name,
+        api: controller.api.keys
+      }
+    end.sort do |a,b|
+      b[:url].split('/').size <=> a[:url].split('/').size
+    end
+  end
+
+  def webpack_entries dir, controllers
+    entries = controllers.each_with_object({}) do |controller,o|
+      pattern = "base/components/#{controller[:path]}/index.*"
+      next unless entry = Dir[File.expand_path(pattern, dir)].find {|e| File.file?(e)}
+      o[controller[:path]] = entry.sub(dir, '.')
+    end
+
+    pattern = "base/core.*"
+    if core = Dir[File.expand_path(pattern, dir)].find {|e| File.file?(e)}
+      entries[:core] = core.sub(dir, '.')
+    end
+
+    entries
+  end
+
+  def url_pattern controller
+    controller.url *controller.instance_method(:index).parameters.each_with_object([]) {|param,o|
+      pattern = if param[0] == :rest
+        "*"
+      elsif param[0] == :req
+        ":#{param[1]}"
+      elsif param[0] == :opt
+        ":#{param[1]}?"
+      end
+      o << pattern if pattern
+    }
+  end
+end

data/lib/appril/load_configs.rb

@@ -0,0 +1,60 @@
+require 'yaml'
+require 'rocketio'
+
+module Appril
+  extend self
+
+  def load_configs *dirs, env: RocketIO.environment
+
+    config = RocketIO.indifferent_params({environment: env.to_s.freeze})
+
+    dirs.each do |dir|
+      config.update(load_config_file("#{dir}/config.yml"))
+      config.update(load_config_file("#{dir}/env/#{env}.yml"))
+
+      loaded = [
+        File.expand_path("config.yml", dir),
+        File.expand_path("env/#{env}.yml", dir)
+      ]
+
+      %w[
+        *.yml
+        **/*.yml
+      ].each do |pattern|
+        Dir[File.join(dir, pattern)].each do |file|
+
+          path = File.expand_path(file, dir)
+          next if loaded.include?(path)
+          loaded << path
+
+          key = File.basename(file, '.yml')
+          key_config = load_config_file(file)
+          key_config_keys = key_config.keys.map(&:to_s)
+
+          config[key] = if key_config_keys.include?(config[:environment])
+            # current environment found, use it
+            key_config[config[:environment]]
+          else
+            if RocketIO::ENVIRONMENTS.keys.find {|k| key_config_keys.include?(k)}
+              # there are some environment(s), but no current one so set current environment to nil
+              nil
+            else
+              # there are no environments, so this config is available on any environment
+              key_config
+            end
+          end
+        end
+      end
+    end
+
+    def config.method_missing key
+      self[key]
+    end
+
+    config
+  end
+
+  def load_config_file file
+    RocketIO.indifferent_params(YAML.load(File.read(file)) || {})
+  end
+end

data/lib/appril/rtcp_controller.rb

@@ -5,8 +5,6 @@ module Appril
     def index
       return unless websocket?
 
-      @router = RocketIO::Router.new(*RocketIO.controllers)
-
       @socket = Tubesock.hijack(env)
       @socket.onopen(&method(:on_open))
       @socket.onmessage(&method(:on_message))
@@ -20,7 +18,7 @@ module Appril
 
     def on_open
       connected
-      write(serial: 0, data: initialization_data)
+      write(serial: 0, data: _env)
     end
 
     def on_message msg
@@ -32,17 +30,20 @@ module Appril
           controller,
           msg[:method],
           msg[:arguments],
-          env.merge(rtcp_serial: msg[:serial]).update(rtcp_env)
+          env.merge(RocketIO::REQUEST_METHOD => msg[:request_method], rtcp_serial: msg[:serial], **controller_env)
         )
 
-        if status == 200
+        if status.to_i / 100 == 2
 
           if body.is_a?(Proc)
             body.call
             return
           end
 
-          write(serial: msg[:serial], data: body) if msg[:reply]
+          if msg[:reply]
+            write(serial: msg[:serial], data: body)
+          end
+
           return
         end
       else
@@ -69,16 +70,17 @@ module Appril
 
     def on_close
       @socket.close! if @socket
-      @socket, @user, @router = nil
+      @socket = nil
       disconnected
     end
 
-    def resolve_controller url
-      @router.resolve_path(url)[0]
+    def resolve_controller controller
+      ::RocketIO.controllers.find {|c| c.name == controller}
     end
 
     def call_controller controller, method, arguments, env
-      controller.new(method.to_sym, arguments).call(env)
+      params = arguments.last.is_a?(Hash) ? arguments.pop : {}
+      controller.new(method, arguments).call(env, params: params)
     end
 
     def write data
@@ -89,13 +91,13 @@ module Appril
     def connected
     end
 
-    # data sent to client after connection established
-    def initialization_data
+    # environmental data to be sent to client at App initialization
+    def _env
       {}
     end
 
-    # merged into original env when calling a controller
-    def rtcp_env
+    # merged into original env when calling a controller method
+    def controller_env
       {}
     end
 

data/lib/appril/version.rb

@@ -1,3 +1,3 @@
 module Appril
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rocketio
@@ -51,6 +51,8 @@ files:
 - appril.gemspec
 - lib/appril.rb
 - lib/appril/base_controller.rb
+- lib/appril/generate_configs.rb
+- lib/appril/load_configs.rb
 - lib/appril/rtcp_controller.rb
 - lib/appril/version.rb
 homepage: https://github.com/appril/ruby-server
@@ -76,5 +78,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-0.0.8", "Opinionated framework for building opinionated web applications"]'
+summary: '["appril-0.2.0", "Opinionated framework for building opinionated web applications"]'
 test_files: []