vulcano 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9936810f307e280d9cf047a82bf8188b4ee07d3
-  data.tar.gz: baa7200f85f8464e923f603795f3cd661929e6d8
+  metadata.gz: 8321bbfa2fec6b2364797671e98be8b492271502
+  data.tar.gz: fe982cac6d4748c8345e3c0ae26d0785c497a876
 SHA512:
-  metadata.gz: 1f6a701340d20417def057c970ed0ebc8de4b03149faf5403a4cc7173abd8221916246788add177dbc3167e216e8ef3a939c6907b97cba225622d492a18263ff
-  data.tar.gz: 4db1f9280f5c94fd034c8dc5bbd81d3234f23aeee2d03fc8ae44aa17b3acbcb0ed83c25f2f15be4af4121499b3ce99892bec60e50ddfad6c6d6153a90808a383
+  metadata.gz: a658b32cd5c2f85aa9dd7868c823ecfb43f2b8b50ed877cb2fe4fbf76f60c9b03857c7933091c6a53a346ad9ba091c11b78cbfe70c9a6091d2883c905e948eb1
+  data.tar.gz: fe38eac69b6af13202c09c26fd6fa4e101e803642376a882a4f010510ebcf229ddb5800908c892d8ec1f415eaead2f549274f7e6df7ff541b01bafaa79738db2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vulcano (0.5.0)
+    vulcano (0.6.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/vulcano/codable_generator.rb

@@ -3,23 +3,23 @@ require "vulcano/parsed_variable"
 
 module Vulcano
   class CodableGenerator
-    def generate_codable_file(json, destination_folder, className = nil)
+    def generate_codable_file(json, destination_folder, options, className)
       if json.is_a?(Array)
-        generate_codable_file(json.first, destination_folder, className)
+        generate_codable_file(json.first, destination_folder, options, className)
         return
       end
 
       variables = []
 
       json.each do |key, value|
-        parsed_object = parse_object(destination_folder, key, value)
+        parsed_object = parse_object(destination_folder, options, key, value)
 
         variables.push(parsed_object) unless parsed_object.nil?
       end
 
       name = className.nil? ? 'Generated' : className
 
-      parsed_class = ParsedClass.new(name, variables)
+      parsed_class = ParsedClass.new(name, variables, !(options[:public].nil?), options[:use_classes].nil?)
 
       spec = Gem::Specification.find_by_name('vulcano')
       template = File.read("#{spec.gem_dir}/resources/TemplateFile.swift")
@@ -30,13 +30,13 @@ module Vulcano
       File.open("#{destination_folder}/#{name}.swift", 'w') { |f| f.write(result) }
     end
 
-    def parse_object(destination_folder, key, value)
+    def parse_object(destination_folder, options, key, value)
       return nil if value.is_a?(Array) && value.size == 0
-      return parse_object(destination_folder, key, value.first).array if value.is_a?(Array)
+      return parse_object(destination_folder, options, key, value.first).array if value.is_a?(Array)
       return nil if value.nil?
 
       if value.is_a?(Hash)
-        generate_codable_file(value, destination_folder, class_name_from_key(key))
+        generate_codable_file(value, destination_folder, options, class_name_from_key(key))
       end
 
       ParsedVariable.new(key, value)

data/lib/vulcano/parsed_class.rb

@@ -5,11 +5,15 @@ module Vulcano
     attr_reader :name
     attr_reader :variables
     attr_reader :codable_keys
+    attr_reader :is_public
+    attr_reader :is_struct
 
-    def initialize(name, variables)
+    def initialize(name, variables, is_public, is_struct)
+      @is_public = is_public
       @name = name
       @variables = variables
       @codable_keys = codable_keys
+      @is_struct = is_struct
     end
 
     def class_binding

data/lib/vulcano/version.rb

@@ -1,3 +1,3 @@
 module Vulcano
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/vulcano.rb

@@ -15,7 +15,7 @@ module Vulcano
       json_path = ARGV[0]
       destination_folder = options[:destination_folder].nil? ? "." : options[:destination_folder]
       json = JsonReader.new.read_from_file(json_path)
-      CodableGenerator.new.generate_codable_file(json, destination_folder, options[:class_name])
+      CodableGenerator.new.generate_codable_file(json, destination_folder, options, options[:class_name])
     end
 
     def parse_options
@@ -31,6 +31,14 @@ module Vulcano
         opts.on("-n", "--class-name CLASS_NAME", String, "Name for the generated class (the default name is 'Generated')") do |class_name|
           options[:class_name] = class_name
         end
+
+        opts.on("-p", "--public", "Generates all the objects as public objects") do |is_public|
+          options[:public] = is_public
+        end
+
+        opts.on("-c", "--use-classes", "Generates classes instead of structs") do |use_classes|
+          options[:use_classes] = use_classes
+        end
       end.parse!
 
       return options

data/resources/TemplateFile.swift

@@ -4,8 +4,8 @@
 //  Generated with Vulcano https://rubygems.org/gems/vulcano
 //
 
-class <%= @name %>: Codable {<% for @variable in @variables %>
-    var <%= @variable.name %>: <%= @variable.type %><% end %><% if (@codable_keys != nil) then %>
+<% if is_public then %>public <% end %><% if is_struct then %>struct<% else %>class<% end %> <%= @name %>: Codable {<% for @variable in @variables %>
+    <% if is_public then %>public <% end %>var <%= @variable.name %>: <%= @variable.type %><% end %><% if (@codable_keys != nil) then %>
     
     enum CodingKeys: String, CodingKey { <% for @codable_key in @codable_keys %>
         <% if (@codable_key.codable_name != nil) then %> case <%= @codable_key.codable_name %> = "<%= @codable_key.original_name %>"<% else %> case <%= @codable_key.original_name %><% end %><% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vulcano
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Franco Meloni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler