cocoapods-aomi-bin 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae0f1c3d276bd9f8b0cd9a8f6fd44b98152a7e5bf47e3f9e5fd1b652173013e
-  data.tar.gz: eb24bbf850884f1cc01a801960a78d3d1d39cf1796d11ca350a97791bae34ffb
+  metadata.gz: ed246e9a0f0e2f98e30932e84961ac9134201400e7b699264faf3f1f0cc122ae
+  data.tar.gz: 80944ebf177b7dcfebc249d45effba91be1072988261a841f19cf89000928a44
 SHA512:
-  metadata.gz: 7232bbe4165e66208653984d2a5f92827fdd68da37109db474c0c278b364df17376eeab3f720b220cf9fe06ebf10cc3c0f5f62360ae63c86ce209ac71c28c3a0
-  data.tar.gz: 2ba17d477ce1401f7d7e25cb1c7b47e11a46e74572ed6dcb1b619e946a784a1d854da6b1129acf257817e14bdca3d7d0b10641588bd954d300ef4f60d3a4712f
+  metadata.gz: 8704818341ad7763e15195dcc3f6a925d1a530fac67f027303cdab6ded57ebff868a1f84572999d44b35538dbe8d6d99d92d953ce3befe32d7055377b02c6eb1
+  data.tar.gz: f869b158e0a6cd7f5ae359e349a9547c0159bd4a72095af484308c1a2528cb2dd096c76acbbcfa53e65d0f5b1c982eeff8e5a1be1c2bb6a4513fde10634c80ed

data/lib/cocoapods-lhj-bin/command/bin/model.rb

@@ -10,6 +10,7 @@ module Pod
 
         def initialize(argv)
           @url = argv.shift_argument
+          @model_pre_name = argv.option('model-pre', 'ML')
           @models = []
         end
 
@@ -20,6 +21,7 @@ module Pod
           detail_msg = res_body['detailMsg']
           fetch_models(nil, detail_msg) if detail_msg
           print_models
+          print_models_implementation
         end
 
         def validate!
@@ -29,10 +31,12 @@ module Pod
         def fetch_models(name, obj)
           model = obj
           model = obj.first if obj.respond_to? :<<
-          @models.unshift({name: name, value: model})
-          model.each do |key, value|
-            if (value.instance_of? Hash) || (value.instance_of? Array)
-              fetch_models(key, value)
+          @models.unshift({name: name, value: model}) if model.instance_of? Hash
+          if model.instance_of? Hash
+            model.each do |key, value|
+              if (value.instance_of? Hash) || (value.instance_of? Array)
+                fetch_models(key, value)
+              end
             end
           end
         end
@@ -41,17 +45,21 @@ module Pod
           @models.each do |model|
             model_name = ''
             model_name = model[:name].gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase } if model[:name]
-            puts "@interface ML#{model_name}Model : NSObject"
+            puts "@interface #{@model_pre_name}#{model_name}Model : NSObject"
             model[:value].each do |key, value|
               print_property(key, value)
             end
-            puts "@end\n\n"
-            puts "@implementation ML#{model_name}Model"
-            if model[:name]
-              puts "+(NSDictionary *)modelContainerPropertyGenericClass {"
-              puts "  return @{@\"#{model[:name]}\" : ML#{model_name}Model.class};"
-              puts "}"
-            end
+            puts "@end\n\n\n"
+          end
+        end
+
+        def print_models_implementation
+          @models.each do |model|
+            model_name = model[:name].gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase } if model[:name]
+            puts "@implementation #{@model_pre_name}#{model_name}Model"
+            puts "+(NSDictionary *)modelContainerPropertyGenericClass {"
+            puts "  return @{@\"#{model[:name]}\" : #{@model_pre_name}#{model_name}Model.class};"
+            puts "}"
             puts "@end\n\n\n"
           end
         end
@@ -72,13 +80,21 @@ module Pod
             puts "///#{value}"
             puts "@property (nonatomic, assign) BOOL #{key};"
           elsif value.instance_of? Array
-            puts "///#{key}"
-            name = key.gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase }
-            puts "@property (nonatomic, strong) NSArray<ML#{name}Model *> *#{key};"
+            if value.first.instance_of? String
+              puts "///#{key}"
+              puts "@property (nonatomic, strong) NSArray<NSString *> *#{key};"
+            else
+              puts "///#{key}"
+              name = key.gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase }
+              puts "@property (nonatomic, strong) NSArray<#{@model_pre_name}#{name}Model *> *#{key};"
+            end
           elsif value.instance_of? Hash
             puts "///#{key}"
             name = key.gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase }
-            puts "@property (nonatomic, strong) ML#{name}Model *#{key};"
+            puts "@property (nonatomic, strong) #{@model_pre_name}#{name}Model *#{key};"
+          else
+            puts "///#{value}"
+            puts "@property (nonatomic, copy) NSString *#{key};"
           end
         end
       end

data/lib/cocoapods-lhj-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end
 
 module Pod

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - lihaijian