gyro 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db016a0a566471d730df382014b89f0d0dc1d9b
-  data.tar.gz: 8ac5c0522b051b9f61382f2c6332c5c1a3884efd
+  metadata.gz: a514835bd0ec32d1c3d435dacb35f57fcd5c67d3
+  data.tar.gz: 3f295908353f89859d307f4757afd277ef2ce141
 SHA512:
-  metadata.gz: 24a479c020eadc633a9114ab6ce3d111961677a851fec2f34fcded5425bc6ff037bcac1184411dcc55b8e91674d41d68698cab4e5770b7d93640d881b3017a92
-  data.tar.gz: 891fcb7c000c6c044a5aaccf875a5bf73e320613c72e3bf055f63dbcbf75a6c321bfe820efbeb6782af33f00b031afe79eefdc32ddb446cdebf070b2e8561199
+  metadata.gz: 0dd5b55d23f50e1fd66e7bdddf75acbee534471c9d15434824ee1c43f970d10458ea799e6a517e1cdb9e8dea63043f8cdc3cb31c7bfbf8975fc97034f7ccaf25
+  data.tar.gz: a47c9b8e4c73e2b34368371a4d08901faec7fcd4e2bce118f1e70adf03ff8d712bdf31504160063ae1bc7b5714d278d06c6ce04d842b94902851bb2a6956030a

data/README.md

@@ -76,7 +76,7 @@ _To define a User Info key in Xcode's xcdatamodel editor, select the entity or a
 
 With the help of these "user infos", you will be able to give Gyro extra information about your model classes. For example, you can tell which attribute is the primary key, the attributes to ignore, the JSON mappings, …
 
-**For more information about "user infos", you can see the dedicated documentation [here](USER-INFO.md).**
+**For more information about "user infos", you can see the dedicated documentation [here](UserInfoKeys.md).**
 
 ## License
 

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

@@ -29,11 +29,11 @@ module Gyro
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def initialize(attribute_xml, entity_name)
           @entity_name = entity_name
-          @name = attribute_xml.xpath('@name').to_s
-          @optional = attribute_xml.xpath('@optional').to_s == 'YES'
-          @indexed = attribute_xml.xpath('@indexed').to_s == 'YES'
-          @default = attribute_xml.xpath('@defaultValueString').to_s
-          @type = attribute_xml.xpath('@attributeType').to_s.downcase.tr(' ', '_').to_sym
+          @name = attribute_xml.attributes['name'].to_s
+          @optional = attribute_xml.attributes['optional'].to_s == 'YES'
+          @indexed = attribute_xml.attributes['indexed'].to_s == 'YES'
+          @default = attribute_xml.attributes['defaultValueString'].to_s
+          @type = attribute_xml.attributes['attributeType'].to_s.downcase.tr(' ', '_').to_sym
           @realm_ignored = !Gyro::Parser::XCDataModel.user_info(attribute_xml, 'realmIgnored').empty?
           @realm_read_only = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'realmReadOnly')
           @enum_type = Gyro::Parser::XCDataModel.user_info(attribute_xml, 'enumType')

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

@@ -23,9 +23,9 @@ module Gyro
 
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def initialize(entity_xml)
-          @name = entity_xml.xpath('@name').to_s
-          @parent = entity_xml.xpath('@parentEntity').to_s
-          @abstract = entity_xml.xpath('@isAbstract').to_s == 'YES' ? true : false
+          @name = entity_xml.attributes['name'].to_s
+          @parent = entity_xml.attributes['parentEntity'].to_s
+          @abstract = entity_xml.attributes['isAbstract'].to_s == 'YES'
           @clean = false
           @identity_attribute = Gyro::Parser::XCDataModel.user_info(entity_xml, 'identityAttribute')
           @comment = Gyro::Parser::XCDataModel.user_info(entity_xml, 'comment')
@@ -130,7 +130,7 @@ module Gyro
 
         def transformers
           transformers = Set.new
-          @attributes.each do |_, attribute|
+          @attributes.each_value do |_, attribute|
             transformers.add attribute.transformer unless attribute.transformer.empty?
           end
           transformers
@@ -175,7 +175,7 @@ module Gyro
         end
 
         def load_attributes(entity_xml)
-          entity_xml.xpath('attribute').each do |node|
+          entity_xml.each_element('attribute') do |node|
             attribute = Attribute.new(node, @name)
             if attribute.type != 'Transformable'
               @attributes[attribute.name] = attribute
@@ -184,7 +184,7 @@ module Gyro
         end
 
         def load_relationships(entity_xml)
-          entity_xml.xpath('relationship').each do |node|
+          entity_xml.each_element('relationship') do |node|
             relationship = Relationship.new(node, @name)
             @relationships[relationship.name] = relationship
           end

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

@@ -28,11 +28,11 @@ module Gyro
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def initialize(relationship_xml, entity_name)
           @entity_name = entity_name
-          @name = relationship_xml.xpath('@name').to_s
-          @optional = relationship_xml.xpath('@optional').to_s == 'YES' ? true : false
-          @deletion_rule = relationship_xml.xpath('@deletionRule').to_s
-          @inverse_name = relationship_xml.xpath('@inverseName').to_s
-          @inverse_type = relationship_xml.xpath('@destinationEntity').to_s
+          @name = relationship_xml.attributes['name'].to_s
+          @optional = relationship_xml.attributes['optional'].to_s == 'YES'
+          @deletion_rule = relationship_xml.attributes['deletionRule'].to_s
+          @inverse_name = relationship_xml.attributes['inverseName'].to_s
+          @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
           @support_annotation = Gyro::Parser::XCDataModel.user_info(relationship_xml, 'supportAnnotation')
@@ -61,7 +61,7 @@ module Gyro
         private ################################################################
 
         def load_type(relationship_xml)
-          max_count = relationship_xml.xpath('@maxCount').to_s
+          max_count = relationship_xml.attributes['maxCount'].to_s
           @type = !max_count.nil? && (max_count == '1') ? :to_one : :to_many
         end
 

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

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include REXML
+
 module Gyro
   module Parser
     # Parser for CoreData's xcdatamodel files
@@ -25,7 +27,7 @@ module Gyro
       end
 
       def self.user_info(xml, key)
-        xml.xpath("userInfo/entry[@key='#{key}']/@value").to_s
+        XPath.first(xml, "userInfo/entry[@key='#{key}']/@value").to_s
       end
 
       # Represents the whole xcdatamodel file struture, once parsed
@@ -38,7 +40,7 @@ module Gyro
           Gyro::Log.fail!('Unable to find contents of xcdatamodel', stacktrace: true) unless File.exist?(contents_file)
           @entities = {}
           file = File.open(contents_file)
-          document_xml = Nokogiri::XML(file).remove_namespaces!
+          document_xml = Document.new(file)
           file.close
           load_entities(document_xml)
         end
@@ -54,7 +56,7 @@ module Gyro
         private
 
         def load_entities(document_xml)
-          document_xml.xpath('//entity').each do |node|
+          document_xml.root.each_element('//entity') do |node|
             entity = Entity.new(node)
             @entities[entity.name] = entity
           end

data/lib/gyro/parser/xcdatamodel.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'nokogiri'
+require 'rexml/document'
 
 require 'gyro/parser/xcdatamodel/xcdatamodel'
 require 'gyro/parser/xcdatamodel/attribute'

data/lib/gyro/version.rb

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

data/lib/templates/decodable/README.md

@@ -6,7 +6,9 @@
 | Invocation example | `gyro -m <model> -t decodable …` |
 | Language | Swift 3 |
 
-This template generate `Decodable` extension for each object of your data model.
+This template generate code to be used with [Anviking's Decodable Swift library](https://github.com/Anviking/Decodable) (not to be confused with Swift 4's Decodable)
+
+It generates a `Decodable` extension for each object of your data model.
 
 # Generated Code
 
@@ -31,4 +33,4 @@ extension Shop: Decodable {
     return shop
   }
 }
-```
+```

data/lib/templates/object-mapper/README.md

@@ -6,7 +6,9 @@
 | Invocation example | `gyro -m <model> -t object-mapper …` |
 | Language | Swift 3 |
 
-This template generate `ObjectMapper` extension for each object of your data model.
+This template is useful if you use [ObjectMapper](https://github.com/Hearst-DD/ObjectMapper) to handle the JSON parsing of your model objects. It generates an `ObjectMapper` extension for each object of your data model.
+
+_Note: When using this template to handle your JSON parsing for Swift, you'll have to use the `swift3-variant` template (instead of using the `swift3` template) to generate your main code for Realm Object classes (as it generates `var` and optional properties which are needed by `ObjectMapper`)_
 
 # Generated Code
 
@@ -37,4 +39,4 @@ extension Shop: Mappable {
     self.attrInteger64 <- (map["attrInteger64"], MPIntegerTransformer())
   }
 }
-```
+```

data/lib/templates/swift3/README.md

@@ -41,6 +41,7 @@ In this template optional Realm objects (Attributes - RealmOptional - or Relatio
 /* DO NOT EDIT | Generated by gyro */
 
 import RealmSwift
+import Foundation
 
 final class Product: Object {
 

data/lib/templates/swift3/entity.liquid

@@ -1,6 +1,7 @@
 /* DO NOT EDIT | Generated by gyro */
 
 import RealmSwift
+import Foundation
 
 final class {{ entity.name }}: Object {
     {%- include 'inc/attributes_enum' -%}

data/lib/templates/swift3-variant/README.md

@@ -40,6 +40,7 @@ In this template optional Realm objects (Attributes - RealmOptional - or Relatio
 /* DO NOT EDIT | Generated by gyro */
 
 import RealmSwift
+import Foundation
 
 final class Product: Object {
 

data/lib/templates/swift3-variant/entity.liquid

@@ -1,6 +1,7 @@
 /* DO NOT EDIT | Generated by gyro */
 
 import RealmSwift
+import Foundation
 
 final class {{ entity.name }}: Object {
     {%- include 'inc/attributes_enum' -%}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyro
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - NijiDigital
@@ -16,42 +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: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.8
 - !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
@@ -163,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.6.7
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Generate Realm.io models for Swift, Java & ObjC from xcdatamodel