flight-router 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2967c636a1f9d9bc68dbc4aafd39e256ae569d30
-  data.tar.gz: 4ce606e0571159e32efd4743b960bac094f9d575
+  metadata.gz: c4ed599d578f6115fcf38ff43bcd5a8d4c189217
+  data.tar.gz: 3f4239e5c3892121cd1809c16d77ad07110086bd
 SHA512:
-  metadata.gz: 494a9afd4c9a3f1e4a8925ba8eb0a5851f10afb5765703fe0ea3fe6e055b063cc8cb9a27a611ec38c0a1966b4a419ed785517b4e40c6b497d7fba8092c739985
-  data.tar.gz: 3de38526cbcf3b221eaf4df5917070bddbeea06436b57ae3e0ba8f3d46e797fd4b1fbd3692fcdb21cd5fe40b34d93da3adccbe1da00782f6002ed0e71bf4beb0
+  metadata.gz: fbda631c772456afe2161ba8a2b1a7da9cbdf2f88846c6c7846802d26936ba6b27b7264a58e36657923b0e36a01eb297d4c1204100679d655f34ea22f170ef12
+  data.tar.gz: 241eb9d8f232da9e5302e0c1092f8d3469a8d64d57e9eb157263446747efdf791d57b7c94c5a249fc288194c065328c508034221bb3c5474c3133db7e3b0a269

data/CHANGELOG/0.1.3.md

@@ -0,0 +1,6 @@
+# Changelog : 0.1.3
+
+## commits
+
+* fix instance variable #drawer
+* feature load_yaml

data/lib/flight/router/drawer.rb

@@ -2,10 +2,10 @@ require "json"
 
 module Flight::Router
   class Drawer
-    def initialize(opts)
-      @output_dir = opts[:output_dir]
-      @output_file = opts[:output_file]
-      @map = Map.new(opts[:env])
+    def initialize(project:,output_dir:,input_dir:,env:)
+      @project = project
+      @output_dir = output_dir
+      @map = Map.new(env: env.to_sym, input_dir: File.join(input_dir,project))
       @app = App.new(@map)
     end
 
@@ -16,15 +16,13 @@ module Flight::Router
       @app.instance_exec(&block)
     end
 
-    def draw(path,&block)
+    def draw(&block)
       dir = File.join(@output_dir,path)
       FileUtils.mkdir_p(dir)
       File.write File.join(dir,"routes.json"), JSON.generate(build(path,&block))
     end
-    def build(path,&block)
-      if path == "/"
-        path == ""
-      end
+    def build(&block)
+      path = File.join("/", @project)
       container = Container.new([path], app: @app.config, map: @map.map, output_dir: @output_dir)
       container.instance_exec(&block)
       container.config

data/lib/flight/router/map.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module Flight::Router
   class Map < MapBase
     module Builder
@@ -22,16 +24,25 @@ module Flight::Router
       end
     end
 
-    def initialize(env)
-      @env = env.to_sym
+    def initialize(env:,input_dir:)
+      @env = env
+      @input_dir = input_dir
       @builder = Builder.builder
     end
 
     def env(**opts)
-      unless opts.has_key?(@env)
-        raise "env not defined: [#{@env}]"
+      if opts.empty?
+        @env
+      else
+        unless opts.has_key?(@env)
+          raise "env not defined: [#{@env}]"
+        end
+        opts[@env]
       end
-      opts[@env]
+    end
+
+    def load_yaml(file)
+      YAML.load_file File.join(@input_dir,file)
     end
 
     private

data/lib/flight/router/version.rb

@@ -1,5 +1,5 @@
 module Flight
   module Router
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight-router
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - shun@getto.systems
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - ".travis.yml"
 - CHANGELOG/0.1.1.md
 - CHANGELOG/0.1.2.md
+- CHANGELOG/0.1.3.md
 - Gemfile
 - LICENSE
 - README.md