veda-apps 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0542c96e318ef577026b308353a4c3a5181ebfe4
-  data.tar.gz: 869a88dcd3f8d51596dde99b529590b045481ed9
+  metadata.gz: 56836eca037b3c53214be7ada6488144c465150e
+  data.tar.gz: c2db5aea2dc56503fe22b3d3a97ce1e578093269
 SHA512:
-  metadata.gz: 908db94bb23955b0554a91db4ed1dabdf23da376dc14ae18aca9a1a40c9b782b64a3b789bef72598bf2f494644a45ccd9a1b7e811bed70f65c4f0261b8e37d34
-  data.tar.gz: d887d4a00ef5dcf3688d11a25e27798901ffb880daa4a7c6392e4ebc1f3a3c20f03920188f49a2a61b20a0aded02aa23e72182bec8933eb97811623e3a1d2e9f
+  metadata.gz: 088e50b34dd94473673660946f746a5f0665699168aea60fc450dac347ad0433dd59ee91e0ca351b725265bf99ece8dd4f89d2bebeaf3aba737086833acecb5f
+  data.tar.gz: e6a5eacb2473756d98f5cc8231a7722896d0f6d2cc87b687845b19928196544e31b9adf56fec0cd9f80e80ee1650f99a2347125486a1d521fbf945ad856b4cd8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    veda-apps (0.0.4)
+    veda-apps (0.0.5)
       gli (= 2.17.1)
       rest-client
 
@@ -75,4 +75,4 @@ DEPENDENCIES
   veda-apps!
 
 BUNDLED WITH
-   1.14.4
+   1.16.1

data/bin/veda

@@ -24,6 +24,7 @@ command :generate do |c|
 c.desc "Generates model for swift from config file or json file"
 c.command :model do |m|
   m.switch [:r, :realm, 'option_to_generate_models_for_realm']
+  m.flag ["m", "moya", 'option_to_generate_models_for_Moya_mapper']
   m.flag [:f, :file, 'file_path_to_json']
 
   # creates config.json
@@ -53,12 +54,24 @@ c.command :model do |m|
       if File.exist?(filepath)
         puts "creating parser with file #{filepath} and #{options[:realm]}"
         parser = Parser.new filepath, options[:realm]
-        parser.parse!
+        parser.parseForMoya!
       else
         puts "cannot find file: #{filepath}"
         puts "use: 'veda generate model config' to generate the configuration file at working directory."
       end
-    elsif
+    elsif options[:m]
+      puts "generating moya files"
+      filepath = options[:moya]
+      puts filepath
+      if File.exist?(filepath)
+        puts "creating parser with file #{filepath} and #{options[:realm]}"
+        parser = Parser.new filepath, options[:realm]
+        parser.parseForMoya!
+      else
+        puts "cannot find file: #{filepath}"
+        puts "use: 'veda generate model config' to generate the configuration file at working directory."
+      end
+    else
       config_path = Dir.pwd + "/" + "config.json"
       if File.exist?config_path
         puts "loading parser with config.json and realm = #{options[:realm]}"

data/lib/parser.rb

@@ -4,19 +4,19 @@ require 'uri'
 
 
 class String
-  def camelize
-    splitted = self.split('_')
-    camel_text = splitted[1..-1].collect(&:capitalize).join
-    camel_text = splitted.first.nil? ? self : (splitted.first + camel_text)
-    camel_text.unHyphoniezed
-  end
-
-  def unHyphoniezed
-    splitted = self.split('-')
-    camel_text = splitted[1..-1].collect(&:capitalize).join
-    splitted.first.nil? ? self : (splitted.first + camel_text)
+    def camelize
+      filtered = self.split('_').select {|v| v != ""}
+      camel_text = filtered[1..-1].collect(&:capitalize).join
+      camel_text = filtered.first.nil? ? self : (filtered.first + camel_text)
+      camel_text.unHyphoniezed
+    end
+  
+    def unHyphoniezed
+      splitted = self.split('-')
+      camel_text = splitted[1..-1].collect(&:capitalize).join
+      splitted.first.nil? ? self : (splitted.first + camel_text)
+    end
   end
-end
 
 class Parser
   def initialize path, realm=false
@@ -85,36 +85,35 @@ class Parser
   def generate_attributes_literals json
     swiftClassAttributes = []
     swiftClass = ""
+    # take all hash
     if json.is_a? Hash
+      # loop on each key value pair
       json.each do |key, value|
+        # if value is not array or hash it is a attribute
         if !(value.is_a? Array) && !(value.is_a? Hash)
-          #  string = "#{get_attribute_literal_prefix}var #{key}: #{attribute_type value} = #{default_value value}\n"
-          # swiftClass =  swiftClass + string
           attribute = Attribute.new(key, "#{attribute_type value}")
           swiftClassAttributes.push(attribute)
         elsif value.is_a? Hash
           newSwiftClass = generate_attributes_literals value
           @parsed.store(key.capitalize.camelize, newSwiftClass)
-          # string = "#{get_attribute_literal_prefix}var #{key}: #{key.capitalize}?\n"
-          # swiftClass = swiftClass + string
           attribute = Attribute.new(key, "#{key}")
           swiftClassAttributes.push(attribute)
         elsif value.is_a? Array
           if value.first.is_a? Hash
             newSwiftClass = generate_attributes_literals value.first
             @parsed.store(key.capitalize.camelize, newSwiftClass)
-            # string = "var #{key}#{get_array_attribute_literal key}\n"
-            # swiftClass = swiftClass + string
             attribute = Attribute.new(key, "#{key}", true)
             swiftClassAttributes.push(attribute)
           else
-            # string = "var #{key}: [#{attribute_type value.first}] = []\n"
-            # swiftClass = swiftClass + string
             attribute = Attribute.new(key, "#{attribute_type value.first}", true)
             swiftClassAttributes.push(attribute)
           end
         end
       end
+    elsif json.is_a? Array
+      if json.first.is_a? Hash
+        generate_attributes_literals json.first
+      end
     end
     # swiftClass
     swiftClassAttributes
@@ -162,6 +161,11 @@ DEFAULT
       end
 
       class_model = <<-CLASS
+//
+// Created with veda-apps.
+// https://rubygems.org/gems/veda-apps
+//
+import Foundation
 import ObjectMapper
 #{@realm? "import RealmSwift\nimport ObjectMapper_Realm" : ""}
 
@@ -177,6 +181,59 @@ CLASS
     end
   end
 
+
+ # parser for moya model mapper
+ def parseForMoya!
+  
+  swiftClass = generate_attributes_literals @json
+  if @json.is_a? Hash
+    @parsed.store("Container", swiftClass)
+  end
+
+  @parsed.each do |class_name, attributes|
+    attribute_literals = ""
+    mapping_literals = ""
+    key_literals = ""
+    attributes.each do |attribute|
+      attribute_literal = ""
+      mapping_literal = ""
+      key_literal = ""
+      if attribute.is_array
+        attribute_literal = "\tlet #{attribute.name.camelize}: [#{attribute.type.capitalize}]\n"
+      else
+        attribute_literal = "\tlet #{attribute.name.camelize}: #{attribute.type.capitalize}\n"
+      end
+      mapping_literal = "\t\t#{attribute.name.camelize} = try map.from(Key.#{attribute.name.camelize})\n"
+      key_literal = "\t\tstatic let #{attribute.name.camelize} = \"#{attribute.name}\"\n"
+      attribute_literals += attribute_literal
+      mapping_literals += mapping_literal
+      key_literals += key_literal
+    end
+
+    class_model = <<-CLASS
+//
+// Created with veda-apps.
+// https://rubygems.org/gems/veda-apps
+//
+import Foundation
+import Moya
+import Mapper
+
+struct #{class_name}: Mappable {
+#{attribute_literals}
+\tinit(map: Mapper) throws {
+#{mapping_literals}
+\t}
+
+\tstruct Key {
+#{key_literals}
+\t}
+}\n
+CLASS
+    create_file class_name, class_model
+  end
+end
+ 
 end
 
 class Attribute

data/lib/veda/version.rb

@@ -1,3 +1,3 @@
 module Veda
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veda-apps
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Shishir sapkota