nidyx 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb9be5f10368cc90ad4e6692306e0b1f525f657
-  data.tar.gz: 5381d4cc120acdc4a4f020d73218951fe4bc54e4
+  metadata.gz: 7e11dd4c1a128f7bc0710298931654abeea27dc4
+  data.tar.gz: e3961e8433db99a3be62e680f67aceba40e324f4
 SHA512:
-  metadata.gz: 0743f7437b9476c4fe6330fdb54284c8265b3745e1afb9e8f6a5e56e2cb6c43c61b1b16a4e0cd9dc37a103889e0924d99dfdb00631f88a39e56d3d18e536cb30
-  data.tar.gz: 8eca92e4a710fa7d1903db3a3cf5415beb0c1f8f728d6b94b38620004fb3c456a7695b94304b9da82b40d0a7437df559a6e70ca45a79525cff9432bdb812c978
+  metadata.gz: 53b523b9a753819ea6562be0d5ff3154ce13ce8073b206a71fbe90952d7ee0a07522c5d491d0fac8d2de0bfc38890deea74faa7c4d093901871b3609f11ef111
+  data.tar.gz: c45145bbfa67322c24d3ab70aa46b0a6a38c65c5d2f9f1577ea8cb02d198cc75255a0e8186894a2f66e6b2b1dd85e8503eb512d13608d73dc53c6f261f57e448

data/lib/nidyx/objc/constants.rb

@@ -0,0 +1,50 @@
+module Nidyx
+  module ObjCConstants
+
+    PRIMITIVE_ATTRIBUTES = "assign, nonatomic"
+    OBJECT_ATTRIBUTES = "strong, nonatomic"
+
+    ATTRIBUTES = {
+      :array      => OBJECT_ATTRIBUTES,
+      :boolean    => PRIMITIVE_ATTRIBUTES,
+      :integer    => PRIMITIVE_ATTRIBUTES,
+      :unsigned   => PRIMITIVE_ATTRIBUTES,
+      :number     => PRIMITIVE_ATTRIBUTES,
+      :number_obj => OBJECT_ATTRIBUTES,
+      :string     => OBJECT_ATTRIBUTES,
+      :object     => OBJECT_ATTRIBUTES,
+      :id         => OBJECT_ATTRIBUTES
+    }
+
+    # Objective-C types
+    # :object intentionally omitted
+    TYPES = {
+      :array      => "NSArray",
+      :boolean    => "BOOL",
+      :integer    => "NSInteger",
+      :unsigned   => "NSUInteger",
+      :number     => "double",
+      :number_obj => "NSNumber",
+      :string     => "NSString",
+      :id         => "id"
+    }
+
+    # Hash and Array intentionally omitted
+    ENUM_TYPES = {
+      Fixnum     => :integer,
+      String     => :string,
+      NilClass   => :null,
+      Float      => :number,
+      TrueClass  => :boolean,
+      FalseClass => :boolean
+    }
+
+    OBJECTS = Set.new [:array, :number_obj, :string, :object, :id]
+
+    SIMPLE_NUMBERS = Set.new [:unsigned, :integer, :number]
+
+    BOXABLE_NUMBERS = SIMPLE_NUMBERS + [:boolean]
+
+    FORBIDDEN_PROPERTY_PREFIXES = ["new", "copy"]
+  end
+end

data/lib/nidyx/objc/mapper.rb

@@ -6,13 +6,12 @@ require "nidyx/objc/property"
 
 module Nidyx
   module ObjCMapper
-    extend self
 
     # Generates a list of ObjCModels
     # @param models [Array] an array of generic Models to map
     # @param options [Hash] runtime options
     # @return [Array] a list of ObjCModels
-    def map(models, options)
+    def self.map(models, options)
       objc_models = []
 
       models.each do |m|
@@ -26,14 +25,14 @@ module Nidyx
 
     private
 
-    def map_interface(model, options)
+    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 += model.dependencies.to_a
+      interface.imports += Nidyx::ObjCUtils.filter_standard_types(model.dependencies.to_a)
       interface
     end
 
-    def map_implementation(model, options)
+    def self.map_implementation(model, options)
       implementation = Nidyx::ObjCImplementation.new(model.name, options)
       name_overrides = {}
       model.properties.each { |p| name_overrides[p.overriden_name] = p.name if p.overriden_name }

data/lib/nidyx/objc/property.rb

@@ -1,12 +1,17 @@
 require "set"
+require "nidyx/objc/utils"
+require "nidyx/objc/constants"
 
 module Nidyx
   class ObjCProperty
-    attr_reader :name, :attributes, :type, :type_name, :desc, :getter_override,
-                :protocols
+
+    include Nidyx::ObjCConstants
 
     class UnsupportedEnumTypeError < StandardError; end
 
+    attr_reader :name, :attributes, :type, :type_name, :desc, :getter_override,
+                :protocols
+
     # @param property [Property] generic property
     def initialize(property)
       @name = property.name
@@ -19,7 +24,8 @@ module Nidyx
       @type_name = lookup_type_name(@type, property.class_name)
 
       @protocols = []
-      @protocols += property.collection_types if property.collection_types
+      # Exclude any standard objc types from the protocols
+      @protocols += Nidyx::ObjCUtils.filter_standard_types(property.collection_types) if property.collection_types
       @protocols << "Optional" if @optional
     end
 
@@ -40,52 +46,6 @@ module Nidyx
 
     private
 
-    PRIMITIVE_ATTRIBUTES = "assign, nonatomic"
-    OBJECT_ATTRIBUTES = "strong, nonatomic"
-
-    ATTRIBUTES = {
-      :array      => OBJECT_ATTRIBUTES,
-      :boolean    => PRIMITIVE_ATTRIBUTES,
-      :integer    => PRIMITIVE_ATTRIBUTES,
-      :unsigned   => PRIMITIVE_ATTRIBUTES,
-      :number     => PRIMITIVE_ATTRIBUTES,
-      :number_obj => OBJECT_ATTRIBUTES,
-      :string     => OBJECT_ATTRIBUTES,
-      :object     => OBJECT_ATTRIBUTES,
-      :id         => OBJECT_ATTRIBUTES
-    }
-
-    # Objective-C types
-    # :object intentionally omitted
-    TYPES = {
-      :array      => "NSArray",
-      :boolean    => "BOOL",
-      :integer    => "NSInteger",
-      :unsigned   => "NSUInteger",
-      :number     => "double",
-      :number_obj => "NSNumber",
-      :string     => "NSString",
-      :id         => "id"
-    }
-
-    # Hash and Array intentionally omitted
-    ENUM_TYPES = {
-      Fixnum     => :integer,
-      String     => :string,
-      NilClass   => :null,
-      Float      => :number,
-      TrueClass  => :boolean,
-      FalseClass => :boolean
-    }
-
-    OBJECTS = Set.new [:array, :number_obj, :string, :object, :id]
-
-    SIMPLE_NUMBERS = Set.new [:unsigned, :integer, :number]
-
-    BOXABLE_NUMBERS = SIMPLE_NUMBERS + [:boolean]
-
-    FORBIDDEN_PROPERTY_PREFIXES = ["new", "copy"]
-
     # @param type [Symbol] an obj-c property type
     # @param class_name [String] an object's type name
     # @return [String] the property's type name
@@ -93,6 +53,16 @@ module Nidyx
       type == :object ? class_name : TYPES[type]
     end
 
+    # @param name [String] the property name
+    # @return [String, nil] the getter override string if necessary
+    def process_getter_override(name)
+      FORBIDDEN_PROPERTY_PREFIXES.each do |p|
+        return ", getter=get#{name.camelize}" if name.match(/^#{p}[_A-Z].*/)
+      end
+
+      nil
+    end
+
     # @param property [Property] generic property
     # @return [Symbol] an obj-c property type
     def process_type(property)
@@ -106,6 +76,7 @@ module Nidyx
       end
     end
 
+    private
 
     # @param property [Property] generic property
     # @return [Symbol] an obj-c property type
@@ -160,15 +131,5 @@ module Nidyx
 
       :id
     end
-
-    # @param name [String] the property name
-    # @return [String, nil] the getter override string if necessary
-    def process_getter_override(name)
-      FORBIDDEN_PROPERTY_PREFIXES.each do |p|
-        return ", getter=get#{name.camelize}" if name.match(/^#{p}[_A-Z].*/)
-      end
-
-      nil
-    end
   end
 end

data/lib/nidyx/objc/utils.rb

@@ -0,0 +1,21 @@
+require "nidyx/objc/constants"
+
+module Nidyx
+  module ObjCUtils
+
+    include Nidyx::ObjCConstants
+
+    # Filters standard objc object types from an array of types. The result is
+    # an array of non-standard object types. For example:
+    #
+    #   filter_standard_types(["AnObj", "string"]) #=> ["AnObject"]
+    #   filter_standard_types(["string", "number_obj"]) #=> []
+    #
+    # @param type [Array[String|Symbol]] collection of any objc types
+    # @return [Array[Symbol]] the collection w/o standard objc types
+    def self.filter_standard_types(types)
+      # TODO: throw an exception on primitives
+      types.reject { |t| TYPES.keys.include?(t.to_sym) }
+    end
+  end
+end

data/lib/nidyx/parser.rb

@@ -135,6 +135,7 @@ module Nidyx
     # @return [Array] types contained in the array
     def resolve_array_refs(obj)
       items = obj[ITEMS_KEY]
+
       case items
       when Array
         return resolve_items_array(items)
@@ -154,11 +155,19 @@ module Nidyx
     # @return [Array] types contained in the array
     def resolve_items_array(items)
       types = []
-      items.each do |item|
+      items.each { |i| types << resolve_single_item(i) }
+      types.compact
+    end
+
+    # @param item [Hash] a single item
+    # return [Array] types for the single item
+    def resolve_single_item(item)
+      if item[REF_KEY]
         resolve_reference_string(item[REF_KEY])
-        types << class_name_from_ref(item[REF_KEY])
+        class_name_from_ref(item[REF_KEY])
+      elsif item[TYPE_KEY]
+        item[TYPE_KEY]
       end
-      types.compact
     end
 
     # @param ref [String] reference in json pointer format

data/lib/nidyx/version.rb

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

data/test/nidyx/objc/test_property.rb

@@ -1,8 +1,11 @@
 require "minitest/autorun"
 require "nidyx"
+require "nidyx/parse_constants"
 require "nidyx/property"
 require "nidyx/objc/property"
 
+include Nidyx::ParseConstants
+
 class TestObjCProperty < Minitest::Test
 
   def test_is_obj
@@ -19,7 +22,7 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_simple_array
-    obj = { "type" => "array" }
+    obj = { TYPE_KEY => "array" }
     p = property(obj, false)
     assert_equal(:array, p.type)
     assert_equal(nil, p.getter_override)
@@ -34,14 +37,21 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_typed_optional_array
-    obj = { "type" => ["array", "null"] }
+    obj = { TYPE_KEY => ["array", "null"] }
     p = property(obj, false)
     assert_equal(:array, p.type)
     assert_equal(["Optional"], p.protocols)
   end
 
+  def test_typed_array_with_protocls
+    obj = { TYPE_KEY => ["array" ], COLLECTION_TYPES_KEY => ["aClass", "string"]  }
+    p = property(obj, false)
+    assert_equal(:array, p.type)
+    assert_equal(["aClass"], p.protocols)
+  end
+
   def test_boolean
-    obj = { "type" => "boolean" }
+    obj = { TYPE_KEY => "boolean" }
     p = property(obj, false)
     assert_equal(:boolean, p.type)
 
@@ -51,13 +61,13 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_typed_optional_boolean
-    obj = { "type" => ["boolean", "null"] }
+    obj = { TYPE_KEY => ["boolean", "null"] }
     p = property(obj, false)
     assert_equal(:number_obj, p.type)
   end
 
   def test_integer
-    obj = { "type" => "integer" }
+    obj = { TYPE_KEY => "integer" }
     p = property(obj, false)
     assert_equal(:integer, p.type)
 
@@ -67,20 +77,20 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_unsigned_integer
-    obj = { "type" => "integer", "minimum" => 0 }
+    obj = { TYPE_KEY => "integer", "minimum" => 0 }
     p = property(obj, false)
     assert_equal(:unsigned, p.type)
   end
 
   def test_typed_optional_integer
-    obj = { "type" => ["integer", "null"] }
+    obj = { TYPE_KEY => ["integer", "null"] }
     p = property(obj, false)
     assert_equal(:number_obj, p.type)
     assert_equal(["Optional"], p.protocols)
   end
 
   def test_number
-    obj = { "type" => "number" }
+    obj = { TYPE_KEY => "number" }
     p = property(obj, false)
     assert_equal(:number, p.type)
 
@@ -89,13 +99,13 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_typed_optional_number
-    obj = { "type" => ["number", "null"] }
+    obj = { TYPE_KEY => ["number", "null"] }
     p = property(obj, false)
     assert_equal(:number_obj, p.type)
   end
 
   def test_string
-    obj = { "type" => "string" }
+    obj = { TYPE_KEY => "string" }
     p = property(obj, false)
     assert_equal(:string, p.type)
 
@@ -104,15 +114,15 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_typed_optional_string
-    obj = { "type" => ["string", "null"] }
+    obj = { TYPE_KEY => ["string", "null"] }
     p = property(obj, false)
     assert_equal(:string, p.type)
   end
 
   def test_object
     obj = {
-      "type" => "object",
-      "properties" => {}
+      TYPE_KEY => "object",
+      PROPERTIES_KEY => {}
     }
 
     p = property(obj, false)
@@ -120,32 +130,32 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_multiple_numeric_types
-    obj = { "type" => ["number", "integer", "boolean"] }
+    obj = { TYPE_KEY => ["number", "integer", "boolean"] }
     p = property(obj, false)
     assert_equal(:number_obj, p.type)
   end
 
   def test_typed_optional_multiple_numeric_types
-    obj = { "type" => ["number", "integer", "boolean", "null"] }
+    obj = { TYPE_KEY => ["number", "integer", "boolean", "null"] }
     p = property(obj, false)
     assert_equal(:number_obj, p.type)
     assert_equal(["Optional"], p.protocols)
   end
 
   def test_multiple_disparate_types
-    obj = { "type" => ["object", "number"] }
+    obj = { TYPE_KEY => ["object", "number"] }
     p = property(obj, false)
     assert_equal(:id, p.type)
   end
 
   def test_typed_optional_multiple_disparate_types
-    obj = { "type" => ["object", "number", "null"] }
+    obj = { TYPE_KEY => ["object", "number", "null"] }
     p = property(obj, false)
     assert_equal(:id, p.type)
   end
 
   def test_simple_numbers
-    obj = { "type" => [ "integer", "number" ] }
+    obj = { TYPE_KEY => [ "integer", "number" ] }
     p = property(obj, false)
     assert_equal(:number, p.type)
 
@@ -154,13 +164,13 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_typed_optional_simple_numbers
-    obj = { "type" => [ "integer", "number", "null" ] }
+    obj = { TYPE_KEY => [ "integer", "number", "null" ] }
     p = property(obj, false)
     assert_equal(:number_obj, p.type)
   end
 
   def test_integer_enum
-    obj = { "enum" => [1, 2] }
+    obj = { ENUM_KEY => [1, 2] }
     p = property(obj, false)
     assert_equal(:integer, p.type)
 
@@ -170,39 +180,39 @@ class TestObjCProperty < Minitest::Test
   end
 
   def test_string_enum
-    obj = { "enum" => ["a", "b"] }
+    obj = { ENUM_KEY => ["a", "b"] }
     p = property(obj, false)
     assert_equal(:string, p.type)
   end
 
   def test_typed_optional_enum
-    obj = { "enum" => [1, 2, nil] }
+    obj = { ENUM_KEY => [1, 2, nil] }
     p = property(obj, false)
     assert_equal(:number_obj, p.type)
     assert_equal(["Optional"], p.protocols)
   end
 
   def test_single_element_array_type
-    obj = { "type" => ["integer"] }
+    obj = { TYPE_KEY => ["integer"] }
     p = property(obj, false)
     assert_equal(:integer, p.type)
   end
 
   def test_anonymous_object
-    obj = { "type" => "object" }
+    obj = { TYPE_KEY => "object" }
     p = property(obj, false)
     assert_equal(:id, p.type)
   end
 
   def test_unsafe_getter
-    obj = { "type" => "integer" }
+    obj = { TYPE_KEY => "integer" }
     p = Nidyx::ObjCProperty.new(Nidyx::Property.new("newInt", nil, false, obj))
     assert_equal(", getter=getNewInt", p.getter_override)
   end
 
   def test_protocols
     obj = {
-      "type" => "array",
+      TYPE_KEY => "array",
       COLLECTION_TYPES_KEY => ["SomeModel", "OtherModel"]
     }
 
@@ -219,7 +229,7 @@ class TestObjCProperty < Minitest::Test
 
   def test_unsupported_types_enum
     assert_raises(Nidyx::ObjCProperty::UnsupportedEnumTypeError) do
-      obj = { "enum" => ["a", {}] }
+      obj = { ENUM_KEY => ["a", {}] }
       Nidyx::ObjCProperty.new(Nidyx::Property.new("i", nil, false, obj))
     end
   end
@@ -227,7 +237,7 @@ class TestObjCProperty < Minitest::Test
   private
 
   def simple_property(type)
-    obj = { "type" => type }
+    obj = { TYPE_KEY => type }
     Nidyx::ObjCProperty.new(Nidyx::Property.new("p", nil, false, obj))
   end
 

data/test/nidyx/test_parser.rb

@@ -196,7 +196,8 @@ class TestParser < Minitest::Test
           "type" => "array",
           "items" => [
             { "$ref" => "#/definitions/object" },
-            { "$ref" => "#/definitions/other_object" }
+            { "$ref" => "#/definitions/other_object" },
+            { "type" => "string" }
           ]
         }
       },
@@ -222,7 +223,7 @@ class TestParser < Minitest::Test
 
     # root model
     model = models["TSModel"]
-    assert_deps(%w(TSObjectModel TSOtherObjectModel), model)
+    assert_deps(%w(TSObjectModel TSOtherObjectModel string), model)
     props = model.properties
 
     string_array = props.shift
@@ -235,7 +236,7 @@ class TestParser < Minitest::Test
 
     multi_object_array = props.shift
     assert_equal(:array, multi_object_array.type)
-    assert_equal(%w(TSObjectModel TSOtherObjectModel), multi_object_array.collection_types)
+    assert_equal(%w(TSObjectModel TSOtherObjectModel string), multi_object_array.collection_types)
 
     # object model
     model = models["TSObjectModel"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nidyx
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Knadler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.6
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.6
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
 description: Nidyx generates Objective-C models from JSONSchema files. Use your API's
   spec to make your client's models in a snap.
 email: takeshi91k@gmail.com
@@ -85,12 +71,14 @@ files:
 - lib/nidyx/generator.rb
 - lib/nidyx/mapper.rb
 - lib/nidyx/model.rb
+- lib/nidyx/objc/constants.rb
 - lib/nidyx/objc/implementation.rb
 - lib/nidyx/objc/interface.rb
 - lib/nidyx/objc/mapper.rb
 - lib/nidyx/objc/model.rb
 - lib/nidyx/objc/model_base.rb
 - lib/nidyx/objc/property.rb
+- lib/nidyx/objc/utils.rb
 - lib/nidyx/output.rb
 - lib/nidyx/parse_constants.rb
 - lib/nidyx/parser.rb
@@ -122,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: JSON Schema -> Objective-C models