Merge pull request #35 from Swinject/snake_case

Author: yoichitgy

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

CSVParser.rb

@@ -1,65 +1,65 @@
 class CSVParser
 
-  def parseCSV(inputFilename)
-    returnHash = {
+  def parse_CSV(input_filename)
+    result_hash = {
       :DEPENDENCIES => [],
       :DEFINITIONS => []
     }
 
-    f = File.open(inputFilename)
+    f = File.open(input_filename)
 
     f.each_line do |line|
       if line.nil? || line.chomp.empty?
         # ignores empty lines
       elsif line.start_with?("#")
         # detect command
         if(line.start_with?("#ADD_DEPENDENCY "))
-          returnHash[:DEPENDENCIES].push(line.split(" ")[1])
+          result_hash[:DEPENDENCIES].push(line.split(" ")[1])
         elsif(line.start_with?("# ADD_DEPENDENCY "))
-          returnHash[:DEPENDENCIES].push(line.split(" ")[2])
+          result_hash[:DEPENDENCIES].push(line.split(" ")[2])
         end
       elsif line.start_with?("//")
         # ignores comments
       else
         array = line.split(";").map { |a| a.strip }
         arguments = array[3..-1]
-        argumentHashes = nil
+        argument_hashes = nil
         unless arguments.nil?
           arguments.reject { |a| a.empty? }
-          argumentHashes = arguments.map do |a|
+          argument_hashes = arguments.map do |a|
             hash = nil
             if(a.include?(":"))
               hash = {
-                :argumentName => a.split(":").first.strip,
-                :argumentType => a.split(":").last.strip
+                :argument_name => a.split(":").first.strip,
+                :argument_type => a.split(":").last.strip
               }
             else
               hash = {
-                :argumentName => a.downcase,
-                :argumentType => a
+                :argument_name => a.downcase,
+                :argument_type => a
               }
             end
             hash
           end
         end
 
-        baseClass = array[0]
-        targetClass = array[1] || baseClass
-        targetClassName = targetClass.gsub("<", "").gsub(">", "").gsub(".", "")
+        base_class = array[0]
+        target_class = array[1] || base_class
+        target_class_name = target_class.gsub("<", "").gsub(">", "").gsub(".", "")
         name = array[2]
 
         hash = {
-          :baseClass => baseClass,
-          :targetClass => targetClass,
-          :targetClassName => targetClassName,
+          :base_class => base_class,
+          :target_class => target_class,
+          :target_class_name => target_class_name,
           :name => name,
-          :arguments => argumentHashes
+          :arguments => argument_hashes
         }
 
-        returnHash[:DEFINITIONS].push hash
+        result_hash[:DEFINITIONS].push hash
       end
     end
-    return returnHash
+    return result_hash
   end
 
 end

ExampleScript/example.yml

@@ -2,47 +2,47 @@
 :DEPENDENCIES:
   - ADependency
 :DEFINITIONS:
-- :baseClass: PersonType
-  :targetClass: InjectablePerson
-  :targetClassName: InjectablePerson
+- :base_class: PersonType
+  :target_class: InjectablePerson
+  :target_class_name: InjectablePerson
   :name: initializer
-- :baseClass: PersonType
-  :targetClass: InjectablePerson
-  :targetClassName: InjectablePerson
-- :baseClass: PersonType
-  :targetClass: PersonType
-  :targetClassName: PersonType
-- :baseClass: AnotherPersonType
-  :targetClass: AnotherPersonType
-  :targetClassName: AnotherPersonType
-- :baseClass: PersonType
-  :targetClass: InjectablePerson
-  :targetClassName: InjectablePerson
+- :base_class: PersonType
+  :target_class: InjectablePerson
+  :target_class_name: InjectablePerson
+- :base_class: PersonType
+  :target_class: PersonType
+  :target_class_name: PersonType
+- :base_class: AnotherPersonType
+  :target_class: AnotherPersonType
+  :target_class_name: AnotherPersonType
+- :base_class: PersonType
+  :target_class: InjectablePerson
+  :target_class_name: InjectablePerson
   :arguments:
-  - :argumentName: argumentName
-    :argumentType: ArgumentType
-- :baseClass: PersonType
-  :targetClass: InjectablePerson
-  :targetClassName: InjectablePerson
+  - :argument_name: argument_name
+    :argument_type: argument_type
+- :base_class: PersonType
+  :target_class: InjectablePerson
+  :target_class_name: InjectablePerson
   :arguments:
-  - :argumentName: argumentName
-    :argumentType: ArgumentType
-  - :argumentName: argumenttypewithoutspecificname
-    :argumentType: ArgumentTypeWithoutSpecificName
-  - :argumentName: title
-    :argumentType: String
-  - :argumentName: string
-    :argumentType: String
-- :baseClass: PersonType
-  :targetClass: InjectablePerson
-  :targetClassName: InjectablePerson
+  - :argument_name: argument_name
+    :argument_type: argument_type
+  - :argument_name: argument_typewithoutspecificname
+    :argument_type: argument_typeWithoutSpecificName
+  - :argument_name: title
+    :argument_type: String
+  - :argument_name: string
+    :argument_type: String
+- :base_class: PersonType
+  :target_class: InjectablePerson
+  :target_class_name: InjectablePerson
   :name: initializer
   :arguments:
-  - :argumentName: argumentName
-    :argumentType: ArgumentType
-  - :argumentName: argumenttypewithoutspecificname
-    :argumentType: ArgumentTypeWithoutSpecificName
-  - :argumentName: title
-    :argumentType: String
-  - :argumentName: string
-    :argumentType: String
+  - :argument_name: argument_name
+    :argument_type: argument_type
+  - :argument_name: argument_typewithoutspecificname
+    :argument_type: argument_typeWithoutSpecificName
+  - :argument_name: title
+    :argument_type: String
+  - :argument_name: string
+    :argument_type: String

ExampleScript/generateCode.sh

@@ -1,8 +1,8 @@
 #/bin/sh
 ../swinject_codegen -i example.csv -o containerExtension.swift
 ../swinject_codegen -i example.yml -o containerExtension2.swift
-../swinject_codegen -i example.csv  -c
-../swinject_codegen -i example.yml  -c
+../swinject_codegen -i example.csv  -c -o example.csv.yml
+../swinject_codegen -i example.yml  -c -o example.yml.csv
 ../swinject_codegen -i example.csv  -m
 ../swinject_codegen -i example.yml  -m
 ../swinject_codegen -i example.csv.yml -o containerExtension3.swift

YMLParser.rb

@@ -2,8 +2,8 @@
 
 class YMLParser
 
-  def parseYML(inputFilename)
-    return YAML.load_file(inputFilename)
+  def parse_YML(input_filename)
+    return YAML.load_file(input_filename)
   end
 
 end

YMLSerializer.rb

@@ -2,14 +2,14 @@
 
 class YMLSerializer
 
-  def serializeHashToYML(hash, outputFilename)
+  def serialize_hash_to_YML(hash, output_filename)
     code = hash.to_yaml
 
-    if outputFilename.nil?
+    if output_filename.nil?
       puts code
     else
-      File.open(outputFilename, 'w') do |fileToWriteTo|
-        fileToWriteTo.puts code
+      File.open(output_filename, 'w') do |file_to_write_to|
+        file_to_write_to.puts code
       end
     end
   end

container.erb

@@ -7,17 +7,17 @@ import  <%= dependency %>
 <% end -%>
 
 extension Resolvable {
-<% @contentArray.each do |hash| %>
-    func <%= hash[:resolveFunctionSignature] %> {
-        return self<%= hash[:resolveFunctionCall] %><%= ", argument: #{hash[:arguments][0][:argumentName]}" if !hash[:arguments].nil? && hash[:arguments].count == 1 -%><%= ", arguments: (#{hash[:arguments].map {|a| a[:argumentName]}.join(', ')})" if !hash[:arguments].nil? && hash[:arguments].count > 1 -%>)<%=hash[:baseClass] != hash[:targetClass] ? " as! #{hash[:targetClass]}" : "!"%>
+<% @content_array.each do |hash| %>
+    func <%= hash[:resolve_function_signature] %> {
+        return self<%= hash[:resolve_function_call] %><%= ", argument: #{hash[:arguments][0][:argument_name]}" if !hash[:arguments].nil? && hash[:arguments].count == 1 -%><%= ", arguments: (#{hash[:arguments].map {|a| a[:argument_name]}.join(', ')})" if !hash[:arguments].nil? && hash[:arguments].count > 1 -%>)<%=hash[:base_class] != hash[:target_class] ? " as! #{hash[:target_class]}" : "!"%>
     }
 <% end -%>
 }
 
 extension Container {
-<% @contentArray.each do |hash| %>
-    func <%= hash[:registerFunctionSignature] %> {
-        return self<%= hash[:registerFunctionCall] %> factory: registerClosure)
+<% @content_array.each do |hash| %>
+    func <%= hash[:register_function_signature] %> {
+        return self<%= hash[:register_function_call] %> factory: registerClosure)
     }
 <% end -%>
 }

csv.erb

@@ -1,6 +1,6 @@
 <% @dependencies.uniq.each do |dependency| -%>
 # ADD_DEPENDENCY <%= dependency %>
 <% end -%>
-<% @contentArray.each do |hash| -%>
-<%=hash[:baseClass] unless hash[:baseClass].nil? %>; <%= hash[:targetClass] unless hash[:targetClass].nil? %> ; <%= hash[:name] unless hash[:name].nil? %> ; <%= hash[:arguments].map {|a| "#{a[:argumentName]}: #{a[:argumentType]}"}.join("; ") unless hash[:arguments].nil? %>
+<% @content_array.each do |hash| -%>
+<%=hash[:base_class] unless hash[:base_class].nil? %>; <%= hash[:target_class] unless hash[:target_class].nil? %> ; <%= hash[:name] unless hash[:name].nil? %> ; <%= hash[:arguments].map {|a| "#{a[:argument_name]}: #{a[:argument_type]}"}.join("; ") unless hash[:arguments].nil? %>
 <% end -%>

migration.erb

@@ -3,9 +3,9 @@ find . -type f | grep ".swift" > swiftindex.temp
 while IFS= read -r filename
 do
     LC_ALL=C sed -i "" \
-    <% @migrationArray.each do |hash| -%>
-    -e s/<%=hash[:resolveFunctionCall]%>/<%=hash[:resolveFunctionSignatureRegex]%>/g \
-        -e s/<%=hash[:registerFunctionCall]%>/<%=hash[:registerFunctionSignatureRegex]%>/g \
+    <% @migration_array.each do |hash| -%>
+    -e s/<%=hash[:resolve_function_call]%>/<%=hash[:resolve_function_signature_regex]%>/g \
+        -e s/<%=hash[:register_function_call]%>/<%=hash[:register_function_signature_regex]%>/g \
     <% end -%> "$filename"
 done < swiftindex.temp
 rm swiftindex.temp