jsoncop 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe2dadd4db52fbf4f373d7219133ee6a400c3c61
-  data.tar.gz: e7ce11ffaa6a534e095b73d5301e6f04a622181d
+  metadata.gz: 6d68292e78bb6f41e6f716a177702537eb7af012
+  data.tar.gz: 7d9f747880b9f1016543e68427a65efe25530066
 SHA512:
-  metadata.gz: ae267be67d57306b869c5e5bc267691941d3a4ea25dfff9188d322646da8e6d1187cb8d8268a841442c5fe5d965e55cc407e23470219e15c8bac12528eebc290
-  data.tar.gz: d1bbf93c5b176cf40c734113727e09068c0b2e2ee0d16b582a59858add6554023af9941350c096c140d2579ba63914092b575a7a493455d66aef0be66969caf9
+  metadata.gz: 455670249f7eb076763eb09268602d7658ab4446bd6e70a4c164aa8e4b29c00c9b65a8d4910883bd0cc4f7c39b14a0b76b6b32845cb59374a76e52cfc5167024
+  data.tar.gz: 05b4142380220cdd1cc5e645225ab6482901508b2b1b0bf4258dbc996f0fd1b6fa1e7d184f0e776a3fe87ddb48aa7b75786bc0adcb13ea02fd407bd0c7bb42a6

data/README.md

@@ -19,44 +19,26 @@ let person = Person.parse(json: json)
 
 ## Usage
 
-Define a model with and implement `static func JSONKeyPathByPropertyKey` method:
+Define a model with and **add `//@jsoncop` just before model definition line**:
 
 ```swift
-// jsoncop: enabled
-
+//@jsoncop
 struct Person {
     let id: Int
     let name: String
-    let createdAt: Date
-
-    static func JSONKeyPathByPropertyKey() -> [String: String] {
-        return [
-            "id": "id",
-            "name": "name",
-            "createdAt": "createdAt"
-        ]
-    }
-
-    static func createdAtJSONTransformer(value: Any) -> Date? {
-        guard let value = value as? Double else { return nil }
-        return Date(timeIntervalSinceNow: value)
-    }
 }
 ```
-
-> DO NOT forget to add "// jsoncop: enabled" before struct.
-
 Run `cop install` in project root folder.
 
 ```shell
 $ cop install
 ```
 
-This will generate several parsing methods in current file:
+This will generate several parsing methods in current file without affecting other part of your codes:
 
 ![](./images/jsoncop-demo.png)
 
-All the code between `generate-start` and `generate-end` and will be replaced when re-run `cop install` in current project folder. Other codes will remain unchanged. Please don't write any codes in this area.
+All the code between `// MARK: - JSONCop-Start` and `// MARK: - JSONCop-End` and will be replaced when re-run `cop install` in current project folder. Other codes will remain unchanged. Please don't write any codes in this area.
 
 ## Installation
 

data/lib/jsoncop/analyzer.rb

@@ -3,16 +3,18 @@ module JSONCop
 
     require 'jsoncop/model/model'
     require 'jsoncop/model/attribute'
+    require 'jsoncop/model/transformer'
 
-    JSON_COP_ENABLED = /jsoncop: enabled/
+    JSON_COP_ENABLED = /@jsoncop/
 
+    NEED_PARSING_CONTENT = /(\/\/\s*@jsoncop\s+(?:struct|class)(?:.|\s)*?\n})/
     MODEL_NAME_REGEX = /(struct|class)\s+(.+)\s*{/
     ATTRIBUTE_REGEX = /^\s+(let|var)\s(.+):(.+)/
-    JSON_TRANSFORMER_REGEX = /^\s+static\s+func\s+(.+)JSONTransformer.+->.+/
+    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_\-:\[\],]*)}/
 
     attr_reader :file_path
-    attr_accessor :model
+    attr_accessor :current_model
 
     def initialize(file_path)
       @file_path = file_path
@@ -21,23 +23,33 @@ module JSONCop
     def analyze!
       content = File.read file_path
       return unless content =~ JSON_COP_ENABLED
-      content.each_line do |line|
-        if line =~ MODEL_NAME_REGEX
-          model_name = line.scan(MODEL_NAME_REGEX).flatten.last
-          @model = Model::Model.new model_name
-        elsif line =~ ATTRIBUTE_REGEX
-          result = line.scan(ATTRIBUTE_REGEX).flatten
-          @model.attributes << Model::Attribute.new(result[1], result[2])
-        elsif line =~ JSON_TRANSFORMER_REGEX
-          result = line.scan(JSON_TRANSFORMER_REGEX).flatten
-          @model.transformers << result.first
+      models = []
+      content.scan(NEED_PARSING_CONTENT).flatten.each do |content|
+        content.each_line do |line|
+          if line =~ MODEL_NAME_REGEX
+            model_name = line.scan(MODEL_NAME_REGEX).flatten.last
+            @current_model = Model::Model.new model_name
+            models << @current_model
+          elsif line =~ ATTRIBUTE_REGEX
+            result = line.scan(ATTRIBUTE_REGEX).flatten
+            @current_model.attributes << Model::Attribute.new(result[1], result[2])
+          elsif line =~ JSON_TRANSFORMER_REGEX
+            result = line.scan(JSON_TRANSFORMER_REGEX).flatten
+            @current_model.transformers << Model::Transformer.new(result[0], result[1])
+          end
         end
+
+        json_attr_list = content.scan(JSON_BY_PROPERTY_HASH_REGEX).flatten.first
+        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
+          }]
+        end
+
       end
 
-      json_attr_list = content.scan(JSON_BY_PROPERTY_HASH_REGEX).flatten.first
-      json_attr_list.gsub!(/[(\[\]"\s)]*/, '')
-      @model.attr_json_hash = Hash[json_attr_list.split(",").map { |attr_json_pair| attr_json_pair.split(":").reverse }]
-      @model
+      models
     end
 
   end

data/lib/jsoncop/generator.rb

@@ -7,47 +7,75 @@ module JSONCop
     attr_reader :file_path
     attr_reader :model
 
-    def initialize(file_path, model)
+    def initialize(file_path, models)
       @file_path = file_path
-      @model = model
+      @models = models
     end
 
     def generate!
-      jsoncop_generate_start = /jsoncop: generate\-start/
-      jsoncop_generate_end = /jsoncop: generate\-end/
+      jsoncop_generate_start = /\/\/ MARK: \- JSONCop\-Start/
+      jsoncop_generate_end = /\/\/ MARK: \- JSONCop\-End/
       content = File.read file_path
       if content.match(jsoncop_generate_start) && content.match(jsoncop_generate_end)
-        content.gsub!(/\/\/ jsoncop: generate-start[^$]*jsoncop: generate\-end/, "")
+        content.gsub!(/\/\/ MARK: \- JSONCop\-Start[^$]*MARK: \- JSONCop\-End/, json_cop_template)
+      else
+        content += json_cop_template
       end
-      File.write file_path, content + json_cop_template
+      File.write file_path, content
     end
 
     def json_cop_template
-      <<-JSONCOP
-// jsoncop: generate-start
-
-extension #{@model.name} {
-    static func parse(json: [String: Any]) -> #{@model.name}? {
-        guard #{json_parsing_template} else { return nil }
-        return #{@model.name}(#{model.key_value_pair})
+      result = "// MARK: - JSONCop-Start\n\n"
+      @models.each do |model|
+        result += <<-JSONCOP
+extension #{model.name} {
+    static func parse(json: Any) -> #{model.name}? {
+        guard let json = json as? [String: Any] else { return nil }
+        guard #{json_parsing_template model} else { return nil }
+        return #{model.name}(#{model.key_value_pair})
     }
-    static func parse(jsons: [[String: Any]]) -> [#{@model.name}] {
+    static func parses(jsons: Any) -> [#{model.name}] {
+        guard let jsons = jsons as? [[String: Any]] else { return [] }
         return jsons.flatMap(parse)
     }
 }
 
-// jsoncop: generate-end
-      JSONCOP
+JSONCOP
+#         result += <<-CODING
+# extension #{model.name}: NSCoding {
+#     func encode(with aCoder: NSCoder) {
+#
+#     }
+#
+#     init?(coder decoder: NSCoder) {
+#         guard #{decode_template model} else { return nil }
+#
+#         self.init(#{model.key_value_pair})
+#     }
+# }
+#
+# CODING
+      end
+      result += "// MARK: - JSONCop-End"
+      result
     end
 
-    def json_parsing_template
-      @model.attributes.map do |attr|
-        if @model.transformers.include? attr.name
-          "let #{attr.name} = (json[\"#{@model.attr_json_hash[attr.name]}\"]).flatMap(#{attr.name}JSONTransformer)"
+    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]}\"] as? #{attr.type}"
+          "let #{attr.name} = json[\"#{model.attr_json_hash[attr.name] || attr.name}\"] as? #{attr.type}"
         end
-      end.join(",\n\t\t")
+      end.join(",\n\t\t\t")
     end
+
+    def decode_template(model)
+      model.attributes.map do |attr|
+        "let #{attr.name} = decoder.decode#{attr.decode_type}(forKey: \"#{attr.name}\") as? #{attr.type}"
+      end.join(",\n\t\t\t")
+    end
+
   end
 end

data/lib/jsoncop/model/attribute.rb

@@ -6,6 +6,27 @@ module JSONCop
           @name = name.gsub(/\s+/, "")
           @type = type.gsub(/\s+/, "")
       end
+
+      def real_type
+        return type[0..-2] if type.end_with? "?"
+        return type
+      end
+
+      def optional_type
+        return type if type.end_with? "?"
+        return type + "?"
+      end
+
+      def decode_type
+        built_in_types = %w[Int32 Int64 Bool Float Double]
+        return real_type if built_in_types.include? real_type
+
+        case real_type
+        when "Int" then "Integer"
+        when "Date" then "Object"
+        else "Object"
+        end
+      end
     end
   end
 end

data/lib/jsoncop/model/model.rb

@@ -2,6 +2,7 @@ module JSONCop
   module Model
     class Model
       attr_reader :name
+      attr_accessor :is_struct
       attr_accessor :attributes
       attr_accessor :transformers
       attr_accessor :attr_json_hash

data/lib/jsoncop/model/transformer.rb

@@ -0,0 +1,11 @@
+module JSONCop
+  module Model
+    class Transformer
+      attr_reader :name, :type
+      def initialize(name, type)
+          @name = name.gsub(/\s+/, "")
+          @type = type.gsub(/\s+/, "").gsub(/:/, ": ")
+      end
+    end
+  end
+end

data/lib/jsoncop/version.rb

@@ -1,3 +1,3 @@
 module JSONCop
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsoncop
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Draveness
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -126,6 +126,7 @@ files:
 - lib/jsoncop/helper.rb
 - lib/jsoncop/model/attribute.rb
 - lib/jsoncop/model/model.rb
+- lib/jsoncop/model/transformer.rb
 - lib/jsoncop/version.rb
 homepage: https://github.com/Draveness/JSONCop
 licenses:
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A JSON to model method generator.