jsoncop 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4661699526bb0f0bc7066755875aa0cdf87f3005
-  data.tar.gz: 4185ad9d96938c2dd3ac93e91767f2faca424c53
+  metadata.gz: 7784c2e3c647143607c371e7253421fcbd54848c
+  data.tar.gz: e62a4673e734dc2a25650d1800cf7ccfa1a917a9
 SHA512:
-  metadata.gz: 18d32c6cb4a60cfac861e91a5a40dc2c6120b2884ddaf1eaa623bc223718a77724b93b9e4d6adbef8b984a152218c49bb5efa53b6892d333a738e52586d6402f
-  data.tar.gz: bfa0bd079a97d783ade970ec58f074b5edf16b74567227aa825c61593829e48ec4aa395b0fb0387ab1caf79e358e75eae226d990d9ef3fe7f6e374da2b27a01c
+  metadata.gz: d0d47f9d3493cf8a5b9124a9b16a44388e25c9b7f06bc103cea4f2f665a99393cf34cf831e3a06de764d69ce63beb420c336022158e9847a9e461fd4449f1198
+  data.tar.gz: 5e3bcbb3012ff57a07b3d7dcf82f65d096b0f86b046e8eb9df055e9c2a0e8958c7fc23bea506a2fc7499cca83e36aca3fe06933057a71c29807f2fd9b3ee90ea

data/README.md

@@ -1,3 +1,5 @@
+![](./images/jsoncop-banner.png)
+
 # JSONCop
 
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/draveness/jsoncop/blob/master/LICENSE)
@@ -19,13 +21,13 @@ let person = Person.parse(json: json)
 
 ## Usage
 
-1. Install JSONCop with `sudo gem install jsoncop --verbose` below in system ruby version
-2. Run `cop install` in project root folder
+1. Install JSONCop with `sudo gem install jsoncop --verbose` below in **system ruby version**
+2. Run `cop install` in **project root folder**
 3. **Add `//@jsoncop` just before model definition line**
 
 ```shell
 $ sudo gem install jsoncop --verbose
-~/project $ cop install
+$ cop install
 ```
 
 ```swift
@@ -70,7 +72,7 @@ Checkout [JSONCopExample](./JSONCopExample) for more information.
       let name: String
 
       static func JSONKeyPathByPropertyKey() -> [String: String] {
-          return ["nickname": "name"]
+          return ["name": "nickname"]
       }
   }
   ```
@@ -99,6 +101,14 @@ Checkout [JSONCopExample](./JSONCopExample) for more information.
   }
   ```
 
++ Nested JSON value extraction
+
+  ```swift
+  static func JSONKeyPathByPropertyKey() -> [String: String] {
+      return ["currentProjectName": "project.name"]
+  }
+  ```
+
 ## Installation
 
 ```shell

data/lib/jsoncop/analyzer.rb

@@ -11,7 +11,7 @@ module JSONCop
     MODEL_NAME_REGEX = /(struct|class)\s+(.+)\s*{/
     ATTRIBUTE_REGEX = /^\s+(let|var)\s(.+):(.+)/
     JSON_TRANSFORMER_REGEX = /^\s+static\s+func\s+(.+)JSONTransformer\(.+?\:(.+)\).+->.+/
-    JSON_BY_PROPERTY_HASH_REGEX = /static\s+func\s+JSONKeyPathByPropertyKey\(\)\s*->\s*\[String\s*:\s*String\]\s*{\s*return\s*(\[[\s"a-z0-9A-Z_\-:\[\],]*)}/
+    JSON_BY_PROPERTY_HASH_REGEX = /static\s+func\s+JSONKeyPathByPropertyKey\(\)\s*->\s*\[String\s*:\s*String\]\s*{\s*return\s*(\[[\s\."a-z0-9A-Z_\-:\[\],]*)}/
 
     attr_reader :file_path
     attr_accessor :current_model
@@ -43,10 +43,9 @@ module JSONCop
         if json_attr_list
           json_attr_list.gsub!(/[(\[\]"\s)]*/, '')
           @current_model.attr_json_hash = Hash[json_attr_list.split(",").map {
-            |attr_json_pair| attr_json_pair.split(":").reverse
+            |attr_json_pair| attr_json_pair.split(":")
           }]
         end
-
       end
 
       models

data/lib/jsoncop/generator.rb

@@ -14,10 +14,10 @@ module JSONCop
 
     def generate!
       jsoncop_generate_start = /\/\/ MARK: \- JSONCop\-Start/
-      jsoncop_generate_end = /\/\/ MARK: \- JSONCop\-End/
+      jsoncop_generate_end = /\/\/ JSONCop\-End/
       content = File.read file_path
       if content.match(jsoncop_generate_start) && content.match(jsoncop_generate_end)
-        content.gsub!(/\/\/ MARK: \- JSONCop\-Start[^$]*MARK: \- JSONCop\-End/, json_cop_template)
+        content.gsub!(/\/\/ MARK: \- JSONCop\-Start[^$]*JSONCop\-End/, json_cop_template)
       else
         content += json_cop_template
       end
@@ -56,18 +56,33 @@ JSONCOP
 #
 # CODING
       end
-      result += "// MARK: - JSONCop-End"
+      result += "// JSONCop-End"
       result
     end
 
     def json_parsing_template(model)
       model.attributes.map do |attr|
         transformer = model.transformers.select { |t| t.name == attr.name }.first
-        if transformer
-          "let #{attr.name} = (json[\"#{model.attr_json_hash[attr.name] || attr.name}\"] as? #{transformer.type}).flatMap(#{attr.name}JSONTransformer)"
-        else
-          "let #{attr.name} = json[\"#{model.attr_json_hash[attr.name] || attr.name}\"] as? #{attr.type}"
+        attr_key_path = model.attr_json_hash[attr.name] || attr.name
+        return unless attr_key_path
+        value = "json"
+        key_paths = attr_key_path.split(".")
+        key_paths.each_with_index do |key, index|
+          value.insert 0, "("
+          value += "[\"#{key}\"] as? "
+          if index == key_paths.count - 1
+            if transformer
+              value += "#{transformer.type})"
+              value += ".flatMap(#{attr.name}JSONTransformer)"
+            else
+              value += "#{attr.type})"
+            end
+          else
+            value += "[String: Any])?"
+          end
         end
+
+        "let #{attr.name} = #{value}"
       end.join(",\n\t\t\t")
     end
 

data/lib/jsoncop/model/attribute.rb

@@ -3,8 +3,8 @@ module JSONCop
     class Attribute
       attr_reader :name, :type
       def initialize(name, type)
-          @name = name.gsub(/\s+/, "")
-          @type = type.gsub(/\s+/, "")
+        @name = name.gsub(/\s+/, "")
+        @type = type.gsub(/\s+/, "")
       end
 
       def real_type

data/lib/jsoncop/version.rb

@@ -1,3 +1,3 @@
 module JSONCop
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsoncop
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Draveness
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide