ymldot 0.0.4 → 0.0.5

data/bin/ymldot

@@ -9,12 +9,12 @@ end
 require 'ymldot'
 require 'optparse'
 
-Version = "0.0.2"
+Version = "0.0.5"
 is_output = false
 is_csv = false
 opt = OptionParser.new
 opt.version = Version
-opt.release = "0.0.1"
+opt.release = "0.1.0"
 opt.on('-o', 'output file to current directory. name is "#{input_filename}.dot"') {|v| is_output = true }
 opt.on('-c', '--csv', 'csv format output') {|v| is_csv = true }
 opt.parse!(ARGV)

data/lib/util.rb

@@ -0,0 +1,48 @@
+# by activesupport/lib/active_support/inflector.rb
+
+@@singular = []
+
+def add_singular(rule, replace)
+  @@singular << [rule, replace]
+end
+
+add_singular(/s$/i, '')
+add_singular(/(n)ews$/i, '\1ews')
+add_singular(/([ti])a$/i, '\1um')
+add_singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
+add_singular(/(^analy)ses$/i, '\1sis')
+add_singular(/([^f])ves$/i, '\1fe')
+add_singular(/(hive)s$/i, '\1')
+add_singular(/(tive)s$/i, '\1')
+add_singular(/([lr])ves$/i, '\1f')
+add_singular(/([^aeiouy]|qu)ies$/i, '\1y')
+add_singular(/(s)eries$/i, '\1eries')
+add_singular(/(m)ovies$/i, '\1ovie')
+add_singular(/(x|ch|ss|sh)es$/i, '\1')
+add_singular(/([m|l])ice$/i, '\1ouse')
+add_singular(/(bus)es$/i, '\1')
+add_singular(/(o)es$/i, '\1')
+add_singular(/(shoe)s$/i, '\1')
+add_singular(/(cris|ax|test)es$/i, '\1is')
+add_singular(/(octop|vir)i$/i, '\1us')
+add_singular(/(alias|status)es$/i, '\1')
+add_singular(/^(ox)en/i, '\1')
+add_singular(/(vert|ind)ices$/i, '\1ex')
+add_singular(/(matr)ices$/i, '\1ix')
+add_singular(/(quiz)zes$/i, '\1')
+
+# The reverse of +pluralize+, returns the singular form of a word in a string.
+#
+# Examples:
+#   "posts".singularize            # => "post"
+#   "octopi".singularize           # => "octopus"
+#   "sheep".singluarize            # => "sheep"
+#   "word".singluarize             # => "word"
+#   "the blue mailmen".singularize # => "the blue mailman"
+#   "CamelOctopi".singularize      # => "CamelOctopus"
+def singularize(word)
+  result = word.to_s.dup
+  @@singular.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+  result
+end
+

data/lib/ymldot.rb

@@ -125,7 +125,9 @@ EOS
   def config_to_dot
     res = ""
     res << "graph [overlap=false, splines=true]\n"
-    res << %Q!graph [size="#{@config["size"]["x"]/2.54},#{@config["size"]["y"]/2.54}"]\n! if @config["size"] && @config["size"]["x"] && @config["size"]["y"]
+    if @config["size"] && @config["size"]["x"] && @config["size"]["y"]
+      res << %Q!graph [size="#{(@config["size"]["x"]/2.54).round},#{(@config["size"]["y"]/2.54).round}"]\n! 
+    end
     raise "Error: please seto 'font'" if @config["ja"] && @config["font"]
     res << %Q!node [fontname="#{@config["font"]}"]! if @config["font"]
     res
@@ -217,7 +219,7 @@ EOS
       @entity_dict[tname].foreignkeys << append_fk_str(singularize(rel["name"])) if key = rel["name"]
       @entity_dict[tname].columns.unshift "#{singularize(rel["type"])}(type)" if key = rel["type"]
       rel["tables"].each do |t|
-        @one_relations << {:self => @entity_dict[t], :have => @entity_dict[tname] }
+        @many_relations << {:self => @entity_dict[t], :have => @entity_dict[tname] }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymldot
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - nari
@@ -25,6 +25,7 @@ files:
 - README
 - bin/ymldot
 - lib/ymldot.rb
+- lib/util.rb
 - sample/sample.dot
 - sample/sample.png
 - sample/sample.yml
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ymldot
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Can describe ERD in a from of ".yml"