gyro 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a514835bd0ec32d1c3d435dacb35f57fcd5c67d3
-  data.tar.gz: 3f295908353f89859d307f4757afd277ef2ce141
+  metadata.gz: 15960f1f9c3d4bdb80d4cd3edfb5a7380b79c72c
+  data.tar.gz: 58e1994395f309312e639e61287a80ae0a00514b
 SHA512:
-  metadata.gz: 0dd5b55d23f50e1fd66e7bdddf75acbee534471c9d15434824ee1c43f970d10458ea799e6a517e1cdb9e8dea63043f8cdc3cb31c7bfbf8975fc97034f7ccaf25
-  data.tar.gz: a47c9b8e4c73e2b34368371a4d08901faec7fcd4e2bce118f1e70adf03ff8d712bdf31504160063ae1bc7b5714d278d06c6ce04d842b94902851bb2a6956030a
+  metadata.gz: b270fc1099b7e5485179085b1e88666d4e95270fb3ab3188a5987924cfcc19f2809e9a044e748869e88f999be9c61ab8bba700774e46b9bf8fa89c2105bfcf8a
+  data.tar.gz: 718cce84c7e01a71f5dd35ea8898a79220ac6dc50aeee8cf7f995bd6aeafd2411b211b8ff87e43dec9141750b836efaef4d11a38c6c86fb1c0e52d13c5dc8caf

data/lib/gyro/parser/xcdatamodel/attribute.rb

@@ -20,11 +20,12 @@ module Gyro
       class Attribute
         attr_accessor :entity_name, :name, :type, :optional, :indexed, :default
         attr_accessor :realm_ignored, :realm_read_only, :enum_type, :enum_values
-        attr_accessor :json_key_path, :json_values, :transformer, :comment, :support_annotation
+        attr_accessor :json_key_path, :json_values, :transformer, :comment, :support_annotation, :json_ignored
 
         alias optional? optional
         alias indexed? indexed
         alias realm_ignored? realm_ignored
+        alias json_ignored? json_ignored
 
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def initialize(attribute_xml, entity_name)
@@ -40,6 +41,7 @@ module Gyro
           @enum_values = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'enumValues').split(',')
           @json_key_path = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'JSONKeyPath')
           @json_values = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'JSONValues').split(',')
+          @json_ignored = !Gyro::Parser::XCDataModel.user_info(attribute_xml, 'JSONIgnored').empty?
           @transformer = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'transformer').strip
           @comment = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'comment')
           @support_annotation = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'supportAnnotation')
@@ -56,6 +58,7 @@ module Gyro
             'realm_ignored' => realm_ignored, 'realm_read_only' => realm_read_only,
             'enum_type' => enum_type, 'enum_values' => enum_values,
             'json_key_path' => json_key_path, 'json_values' => json_values,
+            'json_ignored' => json_ignored,
             'transformer' => transformer, 'need_transformer' => need_transformer?,
             'comment' => comment,
             'support_annotation' => support_annotation,

data/lib/gyro/parser/xcdatamodel/relationship.rb

@@ -19,11 +19,12 @@ module Gyro
       #
       class Relationship
         attr_accessor :entity_name, :name, :type, :optional, :deletion_rule
-        attr_accessor :inverse_name, :inverse_type, :json_key_path, :support_annotation
+        attr_accessor :inverse_name, :inverse_type, :json_key_path, :support_annotation, :json_ignored
         attr_accessor :realm_ignored
         attr_accessor :destination
 
         alias realm_ignored? realm_ignored
+        alias json_ignored? json_ignored
 
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def initialize(relationship_xml, entity_name)
@@ -35,6 +36,7 @@ module Gyro
           @inverse_type = relationship_xml.attributes['destinationEntity'].to_s
           @json_key_path = Gyro::Parser::XCDataModel.user_info(relationship_xml, 'JSONKeyPath')
           @realm_ignored = Gyro::Parser::XCDataModel.user_info(relationship_xml, 'realmIgnored').empty? ? false : true
+          @json_ignored = Gyro::Parser::XCDataModel.user_info(relationship_xml, 'JSONIgnored').empty? ? false : true
           @support_annotation = Gyro::Parser::XCDataModel.user_info(relationship_xml, 'supportAnnotation')
           load_type(relationship_xml)
           @destination = Gyro::Parser::XCDataModel.user_info(relationship_xml, 'destination')
@@ -45,7 +47,8 @@ module Gyro
           { 'entity_name' => entity_name, 'name' => name, 'type' => type.to_s,
             'optional' => optional, 'deletion_rule' => deletion_rule,
             'inverse_name' => inverse_name, 'inverse_type' => inverse_type,
-            'json_key_path' => json_key_path, 'support_annotation' => support_annotation,
+            'json_key_path' => json_key_path, 'json_ignored' => json_ignored,
+            'support_annotation' => support_annotation,
             'realm_ignored' => realm_ignored, 'destination' => destination, 'inverse' => inverse? }
         end
         # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/lib/gyro/version.rb

@@ -15,5 +15,5 @@
 # Gyro Version
 #
 module Gyro
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/templates/android/inc/_attributes_properties.liquid

@@ -1,5 +1,4 @@
-
-{%- for attribute in entity.attributes -%}
+{% for attribute in entity.attributes -%}
   {%- if attribute.realm_read_only.size == 0 -%}
       {%- comment %} ******* CONVERT TYPE CAPTURE ******* {% endcomment -%}
       {%- capture convert_type -%}
@@ -14,6 +13,18 @@
         {%- endif -%}
       {%- endcapture -%}
 
+      {%- capture default_value %}
+        {%- if attribute.default.size > 0 %} =
+          {%- if convert_type == "boolean" %}
+            {%- if attribute.default == "YES" %} true
+            {%- else %} false
+            {%- endif %}
+          {%- elsif convert_type == "String" %} "{{ attribute.default }}"
+          {%- else %} {{ attribute.default }}
+          {%- endif %}
+        {%- endif %}
+      {%- endcapture %}
+
       {%- assign name = attribute.name -%}
       {%- if name == primary_key %}
     @PrimaryKey
@@ -30,6 +41,6 @@
       {%- if params.support_annotations.size > 0 and attribute.support_annotation.size > 0 %}
     @android.support.annotation.{{ attribute.support_annotation }}
       {%- endif %}
-    private {{ convert_type }} {{ name }};
+    private {{ convert_type }} {{ name }}{{ default_value }};
   {%- endif -%}
 {%- endfor -%}

data/lib/templates/android/inc/_relationships_getter_setter.liquid

@@ -6,7 +6,7 @@
           {%- else %}
             {%- if relationship.destination.size == 0 %}
               {%- if relationship.type != "to_many"  -%}
-                {{ relationship.inverse_type }}
+                {{ relationship.inverse_type }}
               {%- else -%}
                 RealmList<{{ relationship.inverse_type }}>
               {%- endif %}

data/lib/templates/android/inc/_relationships_properties.liquid

@@ -5,7 +5,7 @@
     {%- else -%}
       {%- if relationship.destination.size == 0 -%}
         {%- if relationship.type != "to_many"  -%}
-          {{ relationship.inverse_type }}
+          {{ relationship.inverse_type }}
         {%- else -%}
           RealmList<{{ relationship.inverse_type }}>
         {%- endif -%}

data/lib/templates/decodable/README.md

@@ -34,3 +34,9 @@ extension Shop: Decodable {
   }
 }
 ```
+
+# Specific JSON tasks
+
+## Ignoring specific properties
+
+If you don't want to generate a decodable call for a specific property, just add the `JSONIgnored` attribute in the xcdatamodel property's userInfos.

data/lib/templates/decodable/entity.liquid

@@ -8,49 +8,77 @@ extension {{ entity.name }}: Decodable {
   static func decode(_ json: Any) throws -> {{ entity.name }} {
     {%- assign entityVariable = entity.name | uncapitalize  %}
     let {{ entityVariable }} = {{ entity.name }}()
+
     {%- for attribute in entity.attributes %}
-      {% assign attributeKey = attribute.name -%}
+    {%- if attribute.json_ignored == false %}
+      {%- assign trySyntax = "try" -%}
+      {%- if attribute.optional == true -%}
+        {%- assign trySyntax = "try?" -%}
+      {%- endif -%}
+      {%- assign attributeKey = attribute.name -%}
       {%- if attribute.json_key_path.size > 0 -%}
         {%- assign attributeKey = attribute.json_key_path -%}
       {%- endif -%}
       {%- case attribute.type -%}
-        {%- when "date" -%}
-    {{ entityVariable }}.{{ attribute.name }} = try Date.decode(json => "{{ attributeKey }}")
+        {%- when "date" %}
+    {{ entityVariable }}.{{ attribute.name }} = {{ trySyntax }} Date.decode(json => "{{ attributeKey }}")
         {%- when "integer_16" or "integer_32" or "integer_64" or "float" or "double" or "boolean" -%}
           {%- if attribute.optional == true -%}
-            {%- if attribute.transformer.size > 0 -%}
-    {{ entityVariable }}.{{ attribute.name }}.value = try {{ attribute.transformer }}.decode(json => "{{ attributeKey }}")
+            {%- if attribute.enum_values.size > 0 -%}
+              {%- if attribute.transformer.size > 0 %}
+    {{ entityVariable }}.{{ attribute.name }} = {{ trySyntax }} {{ attribute.transformer }}.decode(json => "{{ attributeKey }}")
+              {%- else %}
+    {{ entityVariable }}.{{ attribute.name }} = {{ trySyntax }} json => "{{ attributeKey }}"
+              {%- endif -%}
             {%- else -%}
-    {{ entityVariable }}.{{ attribute.name }}.value = try json => "{{ attributeKey }}"
+              {%- if attribute.transformer.size > 0 %}
+    {{ entityVariable }}.{{ attribute.name }}.value = {{ trySyntax }} {{ attribute.transformer }}.decode(json => "{{ attributeKey }}")
+              {%- else %}
+    {{ entityVariable }}.{{ attribute.name }}.value = {{ trySyntax }} json => "{{ attributeKey }}"
+              {%- endif -%}
             {%- endif -%}
           {%- else -%}
-            {%- if attribute.transformer.size > 0 -%}
-    {{ entityVariable }}.{{ attribute.name }} = try {{ attribute.transformer }}.decode(json => "{{ attributeKey }}")
-            {%- else -%}
-    {{ entityVariable }}.{{ attribute.name }} = try json => "{{ attributeKey }}"
+            {%- if attribute.transformer.size > 0 %}
+    {{ entityVariable }}.{{ attribute.name }} = {{ trySyntax }} {{ attribute.transformer }}.decode(json => "{{ attributeKey }}")
+            {%- else %}
+    {{ entityVariable }}.{{ attribute.name }} = {{ trySyntax }} json => "{{ attributeKey }}"
             {%- endif -%}
           {%- endif -%}
         {%- else -%}
-            {%- if attribute.transformer.size > 0 -%}
-    {{ entityVariable }}.{{ attribute.name }} = try {{ attribute.transformer }}.decode(json => "{{ attributeKey }}")
-            {%- else -%}
-    {{ entityVariable }}.{{ attribute.name }} = try json => "{{ attributeKey }}"
+            {%- if attribute.transformer.size > 0 %}
+    {{ entityVariable }}.{{ attribute.name }} = {{ trySyntax }} {{ attribute.transformer }}.decode(json => "{{ attributeKey }}")
+            {%- else %}
+    {{ entityVariable }}.{{ attribute.name }} = {{ trySyntax }} json => "{{ attributeKey }}"
             {%- endif -%}
       {%- endcase -%}
+    {%- endif -%}
     {%- endfor -%}
 
-    {%- for relationship in entity.relationships %}
-      {% assign relationKey = relationship.name -%}
+    {% for relationship in entity.relationships -%}
+    {%- if relationship.json_ignored == false %}
+      {%- assign relationKey = relationship.name -%}
+      {%- assign trySyntax = "try" -%}
+      {%- if relationship.optional == true -%}
+        {%- assign trySyntax = "try?" -%}
+      {%- endif -%}
       {%- if relationship.json_key_path.size > 0 -%}
         {%- assign relationKey = relationship.json_key_path -%}
       {%- endif -%}
       {%- if relationship.type == "to_many" -%}
-    let {{ relationship.name }}Sandbox: [{{ relationship.inverse_type }}] = try json => "{{ relationKey }}"
+        {%- if relationship.optional == true %}
+    if let {{ relationship.name }}Sandbox: [{{ relationship.inverse_type }}] = {{ trySyntax }} json => "{{ relationKey }}" {
+      {{ entityVariable }}.{{ relationship.name }}.append(objectsIn: {{ relationship.name }}Sandbox)
+    }
+      {%- else %}
+    let {{ relationship.name }}Sandbox: [{{ relationship.inverse_type }}] = {{ trySyntax }} json => "{{ relationKey }}"
     {{ entityVariable }}.{{ relationship.name }}.append(objectsIn: {{ relationship.name }}Sandbox)
-      {%- else -%}
-    {{ entityVariable }}.{{ relationship.name }} = try json => "{{ relationKey }}"
       {%- endif -%}
+      {%- else %}
+    {{ entityVariable }}.{{ relationship.name }} = {{ trySyntax }} json => "{{ relationKey }}"
+      {%- endif -%}
+    {%- endif -%}
     {%- endfor %}
+
     return {{ entityVariable }}
   }
 

data/lib/templates/swift3-variant/inc/_default_value_converter.liquid

@@ -1,12 +1,32 @@
 {%- case attribute.type -%}
 {%- when 'integer_16' or 'integer_32' or 'integer_64' -%}
-0
+  {%- if attribute.default.size > 0 -%}
+    {{ attribute.default }}
+  {%- else -%}
+    0
+  {%- endif -%}
 {%- when 'float' or 'double' or 'decimal' -%}
-0.0
+  {%- if attribute.default.size > 0 -%}
+    {{ attribute.default }}
+  {%- else -%}
+    0.0
+  {%- endif -%}
 {%- when 'string' -%}
-""
+  {%- if attribute.default.size > 0 -%}
+    "{{ attribute.default }}"
+  {%- else -%}
+    ""
+  {%- endif -%}
 {%- when 'boolean' -%}
+{%- if attribute.default.size > 0 -%}
+  {%- if attribute.default == "YES" -%}
+    true
+  {%- else -%}
+    false
+  {%- endif -%}
+{%- else -%}
 false
+{%- endif -%}
 {%- when 'date' -%}
 Date()
 {%- when 'binary' -%}

data/lib/templates/swift3/README.md

@@ -58,4 +58,4 @@ final class Product: Object {
   
   let users = List<Users>()
 }
-```
+```

data/lib/templates/swift3/inc/_default_value_converter.liquid

@@ -1,12 +1,32 @@
 {%- case attribute.type -%}
 {%- when 'integer_16' or 'integer_32' or 'integer_64' -%}
-0
+  {%- if attribute.default.size > 0 -%}
+    {{ attribute.default }}
+  {%- else -%}
+    0
+  {%- endif -%}
 {%- when 'float' or 'double' or 'decimal' -%}
-0.0
+  {%- if attribute.default.size > 0 -%}
+    {{ attribute.default }}
+  {%- else -%}
+    0.0
+  {%- endif -%}
 {%- when 'string' -%}
-""
+  {%- if attribute.default.size > 0 -%}
+    "{{ attribute.default }}"
+  {%- else -%}
+    ""
+  {%- endif -%}
 {%- when 'boolean' -%}
+{%- if attribute.default.size > 0 -%}
+  {%- if attribute.default == "YES" -%}
+    true
+  {%- else -%}
+    false
+  {%- endif -%}
+{%- else -%}
 false
+{%- endif -%}
 {%- when 'date' -%}
 Date()
 {%- when 'binary' -%}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyro
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - NijiDigital
@@ -16,28 +16,28 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
 description: |2
@@ -149,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Generate Realm.io models for Swift, Java & ObjC from xcdatamodel