schemard 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce4c14510a96e6b9ecbeb11c07c791f6dac2d397
-  data.tar.gz: c1b1e3e296f590e8f1ad905ea5896856d3b1e210
+  metadata.gz: 13fe06cc263a4818c45fc93141b22df17cd1d4f9
+  data.tar.gz: 06e7350eca638dab57d0917ab6ed656350bb0fcb
 SHA512:
-  metadata.gz: a771fa891f159f992c3076ec2424c83ac077633812b303a3dac12daf65edb928fc2960ffcdfe3ff26af04e348f6f128245e2e12dbf98b8a25733ccbbbf864217
-  data.tar.gz: 9af6e49421c170b3e1c4745347b90ce26f1e86c89b12cc02a6504ed43eff1e451ef0cee4ee25c89fc952fffd4ee5ada134606757db1bc1d01a1362364316376d
+  metadata.gz: 812775e4e6d8c8b03d679e434089b90aa52d506f5b4d6464a4565e7cd8f9372247f9ac59d2bc55a859aef804912aad7db6d089d018708b22f7a53bacbaed9459
+  data.tar.gz: 040fa25567af6b21552690291a99d5f11a5a4c7add19430c720e0698d9c92724f528698974df269da0db1824b6ef647ac38af6e97a1f813c35a82686dacd9067

data/lib/schemard.rb

@@ -2,5 +2,5 @@ require_relative 'schemard/web_server'
 require_relative 'schemard/controller'
 
 module SchemaRD
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/schemard/controller.rb

@@ -15,20 +15,20 @@ module SchemaRD
     end
 
     def index(req, res)
-      locale = localizer(req)
+      locale = SchemaRD::Utils::MessageLocalizer.new(default_lang(req))
       schema = SchemaRD::SchemaParser.new(config.input_file).parse(with_comment: config.parse_db_comment?)
-      SchemaRD::Metadata.load(config: self.config, lang: locale.lang, schema: schema)
+      SchemaRD::Metadata.load(config: self.config, lang: default_lang(req), schema: schema)
       send(req, res, render("index.html.erb", binding))
     end
 
     def show(req, res)
-      locale = localizer(req)
+      locale = SchemaRD::Utils::MessageLocalizer.new(default_lang(req))
       match = req.path.match(/\/tables\/(\w+)/)
       unless match
         res.status = 404
       else
         schema = SchemaRD::SchemaParser.new(config.input_file).parse(with_comment: config.parse_db_comment?)
-        SchemaRD::Metadata.load(config: self.config, lang: locale.lang, schema: schema)
+        SchemaRD::Metadata.load(config: self.config, lang: default_lang(req), schema: schema)
         table_name = match[1]
         send(req, res, render("show.html.erb", binding))
       end
@@ -56,8 +56,8 @@ module SchemaRD
 
     private
 
-    def localizer(req)
-      SchemaRD::Utils::MessageLocalizer.new(req.accept_language[0] || "en")
+    def default_lang(req)
+      req.accept_language[0] || "en"
     end
 
     def send(req, res, body = nil)
@@ -89,7 +89,8 @@ module SchemaRD
     parse_db_comment_as: "ignore",
     log_output: STDOUT,
     webserver_host: "127.0.0.1",
-    webserver_port: "10080"
+    webserver_port: "10080",
+    show_version: false
   }
 
   class Configuration < Struct.new(*DEFAULT_CONFIG.keys)
@@ -97,7 +98,7 @@ module SchemaRD
     attr_reader :errors
     def initialize(argv = nil)
       hash = {}.merge(DEFAULT_CONFIG)
-      hash.merge(YAML.load_file(CONFIG_FILE)) if File.readable?(CONFIG_FILE)
+      hash.merge!(YAML.load_file(CONFIG_FILE)) if File.readable?(CONFIG_FILE)
 
       unless argv.nil?
         opt = OptionParser.new
@@ -110,6 +111,7 @@ module SchemaRD
         opt.on('-h VAL', '--host=VAL') {|v| hash[:webserver_host] = v }
         opt.on('-p VAL', '--port=VAL') {|v| hash[:webserver_port] = v }
         opt.on('-l VAL', '--log-output=VAL') {|v| hash[:log_output] = self.class.str_to_io(v) }
+        opt.on('-v', '--version') {|v| hash[:show_version] = true }
         opt.parse(argv)
       end
       self.assign(hash)
@@ -141,6 +143,9 @@ module SchemaRD
       unless self.webserver_port =~ /^[0-9]+$/
         self.errors << "WebServerPort: \"#{self.webserver_port}\" is invalid!"
       end
+      if self.show_version
+        self.errors << "schemard: version-#{SchemaRD::VERSION}"
+      end
       self.errors.empty?
     end
 

data/lib/schemard/utils/localizer.rb

@@ -3,9 +3,11 @@ require_relative 'singularizer'
 
 module SchemaRD::Utils
   class Localizer
-    attr_reader :lang
-    def initialize(lang)
-      @lang = self.dictionary && self.dictionary.has_key?(lang) ? lang : "en"
+    def initialize(primary_lang)
+      @primary_lang = primary_lang
+    end
+    def lang
+      @lang ||= self.dictionary && self.dictionary.has_key?(@primary_lang) ? @primary_lang : "en"
     end
     def translate(key)
       key.split(".").inject(self.dictionary[lang]) do |dict, k|
@@ -28,10 +30,12 @@ module SchemaRD::Utils
   end
 
   class SchemaLocalizer < Localizer
-    attr_reader :dictionary
     def initialize(lang, hash)
       super(lang)
-      @dictionary = hash
+      @hash = hash
+    end
+    def dictionary
+      @hash
     end
     def table_name(name)
       self.t("activerecord.models.#{name.singularize}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemard
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - ken TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler