nidyx 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e11dd4c1a128f7bc0710298931654abeea27dc4
-  data.tar.gz: e3961e8433db99a3be62e680f67aceba40e324f4
+  metadata.gz: a53778a9adf9de3c62d1ffdb974284a02cdca740
+  data.tar.gz: b36f6615c8225250204b96490cfc4b4f0dc8c18b
 SHA512:
-  metadata.gz: 53b523b9a753819ea6562be0d5ff3154ce13ce8073b206a71fbe90952d7ee0a07522c5d491d0fac8d2de0bfc38890deea74faa7c4d093901871b3609f11ef111
-  data.tar.gz: c45145bbfa67322c24d3ab70aa46b0a6a38c65c5d2f9f1577ea8cb02d198cc75255a0e8186894a2f66e6b2b1dd85e8503eb512d13608d73dc53c6f261f57e448
+  metadata.gz: fea4e6facf4778988a0d5b7bd704555983a3bbf3f3877a04317570e3285413276b943f850dd976d6ea49d4a37c341b565e0c408fe9b3d93e2ef11a2f4a132f04
+  data.tar.gz: c631e3569bfbdb2a42deb3f36b81a57c326029574badd44105fc4c252569b8cc8c3ec6ee0385feff6d3dfa1f739285fca090034ecf158931600bf09cf449d735

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Chris Knadler
+Copyright (c) 2016 Chris Knadler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
 # Nidyx [![Gem Version](https://badge.fury.io/rb/nidyx.svg)](http://badge.fury.io/rb/nidyx) [![Build Status](https://travis-ci.org/cknadler/nidyx.svg?branch=master)](https://travis-ci.org/cknadler/nidyx) [![Code Climate](https://codeclimate.com/github/cknadler/nidyx/badges/gpa.svg)](https://codeclimate.com/github/cknadler/nidyx) [![Documentation](https://inch-ci.org/github/cknadler/nidyx.svg?branch=master)](https://inch-ci.org/github/cknadler/nidyx)
 
-[JSON Schema][JSONSchema] ⇒ Model.
+[JSON Schema][JSONSchema] ⇒ Model
 
 Nidyx generates Objective-C models from JSON Schema. It can also generate
 models with [JSONModel](https://github.com/icanzilb/JSONModel) support.

data/lib/nidyx/objc/constants.rb

@@ -1,8 +1,8 @@
 module Nidyx
   module ObjCConstants
 
-    PRIMITIVE_ATTRIBUTES = "assign, nonatomic"
-    OBJECT_ATTRIBUTES = "strong, nonatomic"
+    PRIMITIVE_ATTRIBUTES = "assign, nonatomic".freeze
+    OBJECT_ATTRIBUTES = "strong, nonatomic".freeze
 
     ATTRIBUTES = {
       :array      => OBJECT_ATTRIBUTES,
@@ -14,7 +14,7 @@ module Nidyx
       :string     => OBJECT_ATTRIBUTES,
       :object     => OBJECT_ATTRIBUTES,
       :id         => OBJECT_ATTRIBUTES
-    }
+    }.freeze
 
     # Objective-C types
     # :object intentionally omitted
@@ -27,7 +27,7 @@ module Nidyx
       :number_obj => "NSNumber",
       :string     => "NSString",
       :id         => "id"
-    }
+    }.freeze
 
     # Hash and Array intentionally omitted
     ENUM_TYPES = {
@@ -37,14 +37,14 @@ module Nidyx
       Float      => :number,
       TrueClass  => :boolean,
       FalseClass => :boolean
-    }
+    }.freeze
 
-    OBJECTS = Set.new [:array, :number_obj, :string, :object, :id]
+    OBJECTS = Set.new [:array, :number_obj, :string, :object, :id].freeze
 
-    SIMPLE_NUMBERS = Set.new [:unsigned, :integer, :number]
+    SIMPLE_NUMBERS = Set.new [:unsigned, :integer, :number].freeze
 
-    BOXABLE_NUMBERS = SIMPLE_NUMBERS + [:boolean]
+    BOXABLE_NUMBERS = SIMPLE_NUMBERS + [:boolean].freeze
 
-    FORBIDDEN_PROPERTY_PREFIXES = ["new", "copy"]
+    FORBIDDEN_PROPERTY_PREFIXES = ["new", "copy"].freeze
   end
 end

data/lib/nidyx/objc/mapper.rb

@@ -28,7 +28,9 @@ module Nidyx
     def self.map_interface(model, options)
       interface = Nidyx::ObjCInterface.new(model.name, options)
       interface.properties = model.properties.map { |p| Nidyx::ObjCProperty.new(p) }
-      interface.imports += Nidyx::ObjCUtils.filter_standard_types(model.dependencies.to_a)
+      dependencies = Nidyx::ObjCUtils.filter_standard_types(model.dependencies.to_a)
+      interface.class_forward_declarations += dependencies
+      interface.protocol_forward_declarations += dependencies
       interface
     end
 

data/lib/nidyx/objc/model_base.rb

@@ -2,7 +2,9 @@ require "mustache"
 
 module Nidyx
   class ObjCModelBase < Mustache
-    attr_accessor :name, :file_name, :author, :owner, :project, :imports, :comments, :json_model
+    attr_accessor :name, :file_name, :author, :owner, :project, :imports,
+                  :class_forward_declarations, :protocol_forward_declarations,
+                  :protocol_declarations, :comments, :json_model
 
     self.template_path = File.join(__FILE__, "../../../../templates/objc")
 
@@ -14,12 +16,28 @@ module Nidyx
       @comments = options[:comments]
       @json_model = options[:objc][:json_model] if options[:objc]
       @imports = []
+      @class_forward_declarations = []
+      @protocol_forward_declarations = []
+      @protocol_declarations = []
+      @protocol_declarations << name if @json_model
     end
 
     def has_imports?
       !self.imports.empty?
     end
 
+    def has_class_forward_declarations?
+      !self.class_forward_declarations.empty?
+    end
+
+    def has_protocol_forward_declarations?
+      !self.protocol_forward_declarations.empty?
+    end
+
+    def has_protocol_declarations?
+      !self.protocol_declarations.empty?
+    end
+
     def no_owner?
       !self.owner
     end

data/lib/nidyx/parse_constants.rb

@@ -4,27 +4,27 @@ module Nidyx
     ###
     # Schema key definitions
     ###
-    REF_KEY              = "$ref"
-    ENUM_KEY             = "enum"
-    TYPE_KEY             = "type"
-    DESCRIPTION_KEY      = "description"
-    REQUIRED_KEY         = "required"
-    PROPERTIES_KEY       = "properties"
-    NAME_OVERRIDE_KEY    = "nameOverride"
-    ITEMS_KEY            = "items"
-    MINIMUM_KEY          = "minimum"
-    ANY_OF_KEY           = "anyOf"
+    REF_KEY              = "$ref".freeze
+    ENUM_KEY             = "enum".freeze
+    TYPE_KEY             = "type".freeze
+    DESCRIPTION_KEY      = "description".freeze
+    REQUIRED_KEY         = "required".freeze
+    PROPERTIES_KEY       = "properties".freeze
+    NAME_OVERRIDE_KEY    = "nameOverride".freeze
+    ITEMS_KEY            = "items".freeze
+    MINIMUM_KEY          = "minimum".freeze
+    ANY_OF_KEY           = "anyOf".freeze
 
     ###
     # Internal schema key definitions
     ###
-    DERIVED_NAME         = "__derivedName"
-    COLLECTION_TYPES_KEY = "__collectionTypes"
+    DERIVED_NAME         = "__derivedName".freeze
+    COLLECTION_TYPES_KEY = "__collectionTypes".freeze
 
     ###
     # Object types
     ###
-    OBJECT_TYPE = "object"
-    ARRAY_TYPE  = "array"
+    OBJECT_TYPE = "object".freeze
+    ARRAY_TYPE  = "array".freeze
   end
 end

data/lib/nidyx/version.rb

@@ -1,3 +1,3 @@
 module Nidyx
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/templates/objc/class_forward_declarations.mustache

@@ -0,0 +1,5 @@
+{{#has_class_forward_declarations?}}
+{{#class_forward_declarations}}
+@class {{.}};
+{{/class_forward_declarations}}
+{{/has_class_forward_declarations?}}

data/templates/objc/interface.mustache

@@ -1,10 +1,9 @@
 {{> top_info}}
 {{> imports}}
-{{#json_model?}}
-@protocol {{name}}
-@end
+{{> class_forward_declarations}}
+{{> protocol_forward_declarations}}
+{{> protocol_declarations}}
 
-{{/json_model?}}
 @interface {{name}}{{#json_model?}} : JSONModel{{/json_model?}}
 {{#properties}}
 {{#desc}}

data/templates/objc/protocol_declarations.mustache

@@ -0,0 +1,5 @@
+{{#has_protocol_declarations?}}
+{{#protocol_declarations}}
+@protocol {{.}}; @end
+{{/protocol_declarations}}
+{{/has_protocol_declarations?}}

data/templates/objc/protocol_forward_declarations.mustache

@@ -0,0 +1,5 @@
+{{#has_protocol_forward_declarations?}}
+{{#protocol_forward_declarations}}
+@protocol {{.}};
+{{/protocol_forward_declarations}}
+{{/has_protocol_forward_declarations?}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nidyx
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Chris Knadler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -86,9 +86,12 @@ files:
 - lib/nidyx/property.rb
 - lib/nidyx/reader.rb
 - lib/nidyx/version.rb
+- templates/objc/class_forward_declarations.mustache
 - templates/objc/implementation.mustache
 - templates/objc/imports.mustache
 - templates/objc/interface.mustache
+- templates/objc/protocol_declarations.mustache
+- templates/objc/protocol_forward_declarations.mustache
 - templates/objc/top_info.mustache
 - test/nidyx/core_ext/test_string.rb
 - test/nidyx/objc/test_model_base.rb
@@ -118,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: JSON Schema -> Objective-C models