swift_generator 0.1.2 → 0.3.0

data/lib/swift_generator/code_generation/swift_file_template.rb

@@ -347,8 +347,6 @@ module SwiftGenerator
 
 def write_files_for_definition_set( definition_set )
     for _, f in definition_set.output_files
-        path = Pathname.new( f.file_path )
-        path.parent.mkpath
         SwiftGenerator::writeGeneratedFile( f )
     end
 end
@@ -360,10 +358,14 @@ module_function :write_files_for_definition_set
 
 # Templated Output Methods
 def write_element( element )
-  if( element.kind_of? SwiftClass )
-    SwiftGenerator::write_class( element )
+  if( element.kind_of? SwiftCategory )
+    SwiftGenerator::write_category( element )
+  elsif( element.kind_of? SwiftProtocol )
+    SwiftGenerator::write_protocol( element )
   elsif( element.kind_of? SwiftEnum )
     SwiftGenerator::write_enum( element )
+  elsif( element.kind_of? SwiftClass )      # Must be last as it is the superclass
+    SwiftGenerator::write_class( element )
   end
 end
 
@@ -372,10 +374,12 @@ module_function :write_element
 def writeGeneratedFile( f )
     return if ( f.is_user_file && File.exist?( f.file_path ))
 
+    Pathname.new( f.file_path ).parent().mkpath()
+
 Ribosome.output( f.file_path )
 
 Ribosome.dot("//", binding)
-Ribosome.dot("//  @{f.file_name}", binding)
+Ribosome.dot("//  @{ Pathname.new( f.file_name ).basename }", binding)
 Ribosome.dot("//  @{f.company_name}", binding)
 if $definition_file
 Ribosome.dot("//", binding)
@@ -431,7 +435,6 @@ Ribosome.dot("    &{declLine}", binding)
   SwiftGenerator::write_methods( e.methods )
 Ribosome.dot(" }", binding)
 end
-
 module_function :write_enum
 
 
@@ -444,21 +447,58 @@ Ribosome.add(" : @{c.inheritance_list.join( \", \" )}", binding)
     end
 Ribosome.add("  {", binding)
 
-  SwiftGenerator::write_property_declarations( c.transient_properties, "Transient" )
-  SwiftGenerator::write_property_declarations( c.persistent_properties, "Persistent" )
+  SwiftGenerator::write_class_body( c )
+Ribosome.dot("}", binding)
+end
+module_function :write_class
 
-  SwiftGenerator::write_methods( c.initializers )
-  SwiftGenerator::write_methods( c.methods )
+
+def write_category( c )
+Ribosome.dot("", binding)
+Ribosome.dot("", binding)
+Ribosome.dot("&{c.access_control_modifier}extension @{c.categorized_class_name} /*@{c.type_name || ' '}*/ {", binding)
+  SwiftGenerator::write_class_body( c )
 Ribosome.dot("}", binding)
+end
+module_function :write_category
+
+def write_class_body( c )
+    c.top_inner_comment_block().each do |line|
+Ribosome.dot("    &{line}", binding)
+    end
 
+  # SwiftGenerator::write_property_declarations( c.transient_properties, "Transient" )
+  # SwiftGenerator::write_property_declarations( c.persistent_properties, "Persistent" )
+  SwiftGenerator::write_property_declarations( c.transient_properties )
+  SwiftGenerator::write_property_declarations( c.persistent_properties )
+
+  SwiftGenerator::write_methods( c.initializers )
+  SwiftGenerator::write_methods( c.methods )
 end
+module_function :write_class_body
 
-module_function :write_class
+def write_protocol( p )
+Ribosome.dot("", binding)
+Ribosome.dot("", binding)
+Ribosome.dot("&{p.access_control_modifier}protocol @{p.type_name}", binding)
+    if p.inheritance_list.count > 0
+Ribosome.add(" : @{p.inheritance_list.join( \", \" )}", binding)
+    end
+Ribosome.add("  {", binding)
+  # SwiftGenerator::write_property_declarations( c.transient_properties, "Transient" )
+  # SwiftGenerator::write_property_declarations( c.persistent_properties, "Persistent" )
+  SwiftGenerator::write_property_declarations( p.transient_properties )
+  SwiftGenerator::write_property_declarations( p.persistent_properties )
 
+  SwiftGenerator::write_methods( p.initializers, for_protocol=true )
+  SwiftGenerator::write_methods( p.methods, for_protocol=true )
+Ribosome.dot("}", binding)
+end
+module_function :write_protocol
 
-def write_property_declarations( properties, property_type_label )
+def write_property_declarations( properties, property_type_label=nil )
   properties.each_with_index do |prop, i|
-    if i == 0
+    if i == 0 && ! property_type_label.nil?
 Ribosome.dot("", binding)
 Ribosome.dot("    // MARK: @{property_type_label} Properties", binding)
     end
@@ -466,13 +506,12 @@ Ribosome.dot("    // MARK: @{property_type_label} Properties", binding)
 Ribosome.dot("    &{declLine}", binding)
     end
   end
-
 end
 
 module_function :write_property_declarations
 
 
-def write_methods( methods )
+def write_methods( methods, for_protocol=false )
     methods.each_with_index do |m, i|
         overrideString = m.override ? 'override ' : ''
 Ribosome.dot("", binding)
@@ -480,15 +519,18 @@ Ribosome.dot("", binding)
 Ribosome.dot("   &{m.comment}", binding)
     end
     args = m.argStr.nil? || m.argStr.empty? ? m.argStr : ' ' + m.argStr + ' '
-Ribosome.dot("   &{overrideString}&{m.access_control_modifier}&{m.func_fragment} @{m.name}(&{args})", binding)
+    access_control_modifier_str = m.access_control_modifiers.length > 0 ? m.access_control_modifiers.join( ", " ) + " " : ""
+Ribosome.dot("    &{overrideString}&{access_control_modifier_str}&{m.func_fragment + \" \" unless m.func_fragment.length == 0}@{m.name}(&{args})", binding)
     if ! (m.returns.nil? || m.returns.length == 0 )
 Ribosome.add(" -> @{m.returns}", binding)
     end
+    unless for_protocol
 Ribosome.add(" {", binding)
-    m.bodyLines.each do |line|
-Ribosome.dot("        &{line}", binding)
-    end
+        m.bodyLines.each do |line|
+Ribosome.dot("           &{line}", binding)
+        end
 Ribosome.dot("    }", binding)
+    end
   end
 end
 

data/lib/swift_generator/code_generation/swift_types.rb

@@ -76,31 +76,64 @@ end
 def initial_property_types
 
 	iso_date = SwiftPropertyType.new( :NSDate, :String, auto_bridged:false, test_value: $date_lambda )
-	iso_date.custom_marshaling = lambda{|dest, value| "#{dest} = DateFormatting.isoStringFromDate( #{value} )" }
-	iso_date.custom_unmarshaling = lambda{|dest, value| "#{dest} = DateFormatting.dateFromISOString( #{value} )" }
+	iso_date.custom_marshaling    = lambda{|dest, value| "#{dest} = DateFormatting.isoStringFromDate( #{value} )" }
+	iso_date.custom_unmarshaling  = lambda{|dest, value| "#{dest} = DateFormatting.dateFromISOString( #{value} )" }
 	iso_date.custom_equality_test = lambda{|name, other| "optionalDatesEqual( #{name}, #{other})" }
 
-	int_type 	= SwiftPropertyType.new( :Int, 		:NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	int_type 	  = SwiftPropertyType.new( :Int, 		:NSNumber, auto_bridged:true, 	test_value: $number_lambda )
 	uint_type 	= SwiftPropertyType.new( :UInt, 	:NSNumber, auto_bridged:true, 	test_value: $number_lambda )
 	float_type 	= SwiftPropertyType.new( :Float, 	:NSNumber, auto_bridged:true, 	test_value: $number_lambda )
-	double_type = SwiftPropertyType.new( :Double, 	:NSNumber, auto_bridged:true,	test_value: $number_lambda )
+	double_type = SwiftPropertyType.new( :Double, :NSNumber, auto_bridged:true,	  test_value: $number_lambda )
 	bool_type 	= SwiftPropertyType.new( :Bool, 	:NSNumber, auto_bridged:true, 	test_value: lambda{|num| return num.even? ? 'true' : 'false' })
-	int_type.custom_unmarshaling 		= lambda{|dest, value| "#{dest} = #{value}.integerValue" }
+
+	int_type.custom_unmarshaling 		  = lambda{|dest, value| "#{dest} = #{value}.integerValue" }
 	uint_type.custom_unmarshaling 		= lambda{|dest, value| "#{dest} = #{value}.unsignedIntegerValue" }
+
 	float_type.custom_unmarshaling 		= lambda{|dest, value| "#{dest} = #{value}.floatValue" }
 	double_type.custom_unmarshaling 	= lambda{|dest, value| "#{dest} = #{value}.doubleValue" }
 	bool_type.custom_unmarshaling 		= lambda{|dest, value| "#{dest} = #{value}.boolValue" }
 
+	# Specified-Precision numeric types
+	int8_type 		= SwiftPropertyType.new( :Int8,     :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	int16_type 		= SwiftPropertyType.new( :Int16,    :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	int32_type 		= SwiftPropertyType.new( :Int32,    :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	int64_type 		= SwiftPropertyType.new( :Int64,    :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	uint8_type 		= SwiftPropertyType.new( :UInt8,    :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	uint16_type 	= SwiftPropertyType.new( :UInt16,   :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	uint32_type 	= SwiftPropertyType.new( :UInt32,   :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+	uint64_type 	= SwiftPropertyType.new( :UInt64,   :NSNumber, auto_bridged:true, 	test_value: $number_lambda )
+
+	float80_type 	= SwiftPropertyType.new( :Float80, 	:NSNumber, auto_bridged:true,	test_value: $number_lambda )
+	# TODO: unmarshaling for specified-precision numeric types
+	# int8_type.custom_unmarshaling
+	# int16_type.custom_unmarshaling
+	# int32_type.custom_unmarshaling
+	# int64_type.custom_unmarshaling
+	# uint8_type.custom_unmarshaling
+	# uint16_type.custom_unmarshaling
+	# uint32_type.custom_unmarshaling
+	# uint64_type.custom_unmarshaling
+
+	# float80_type.custom_unmarshaling
+
 	return [
 		int_type,
 		uint_type,
 		float_type,
 		double_type,
 		bool_type,
-		SwiftPropertyType.new( :String, 		:NSString, auto_bridged:true,		test_value: $string_lambda  ),
-		SwiftPropertyType.new( :NSString, 		:NSString, auto_bridged:true, 		test_value: $string_lambda  ),
-		SwiftPropertyType.new( :USIObjectID,	:NSString, auto_bridged:true, 		test_value: $string_lambda  ),
-		SwiftPropertyType.new( :AnvilEndpoint,	:AnvilEndpoint, auto_bridged:true, 	test_value: nil  ),
+		int8_type,
+		int16_type,
+		int32_type,
+		int64_type,
+		uint8_type,
+		uint16_type,
+		uint32_type,
+		uint64_type,
+		SwiftPropertyType.new( :String, 		    :NSString, auto_bridged:true,		    test_value: $string_lambda ),
+		SwiftPropertyType.new( :NSString, 		  :NSString, auto_bridged:true, 		  test_value: $string_lambda ),
+		SwiftPropertyType.new( :USIObjectID,	  :NSString, auto_bridged:true, 		  test_value: $string_lambda ),
+		SwiftPropertyType.new( :AnvilEndpoint,	:AnvilEndpoint, auto_bridged:true, 	test_value: nil ),
 		iso_date
 	]
 end

data/lib/swift_generator/specfile_parser.rb

@@ -48,8 +48,8 @@ module SwiftGenerator
         inheritance_list        = class_spec[ "inheritanceList" ]
         file_name               = class_spec[ "fileName" ]
         characteristics_name    = class_spec[ "characteristics" ]
-        is_test_element         = class_spec[ "isTestElement" ]
-        is_user_editable        = class_spec[ "isUserEditable" ]      # not yet supported (?)
+        is_test_element         = class_spec[ "isTestElement" ] || false
+        is_user_editable        = class_spec[ "isUserEditable" ] || false
 
         characteristics = characteristics_by_name[ characteristics_name ]
         characteristics ||= $default_swift_class_characteristics
@@ -78,18 +78,15 @@ module SwiftGenerator
         property_name         = prop_spec[ "name" ]
         type_symbol           = prop_spec[ "type" ].to_sym
         is_persistent         = prop_spec[ "isPersistent" ]
-        mutability            = prop_spec[ "mutability" ]
+        mutability            = prop_spec[ "mutability" ]   || "let"
         initialization_value  = prop_spec[ "initializationValue" ]
         collection_type       = prop_spec[ "collectionType" ]
-        required              = prop_spec[ "required" ]
+        required              = prop_spec[ "required" ]     || true
         rest_omit             = prop_spec[ "restOmit" ]
         json_key              = prop_spec[ "jsonKey" ]      # only used by SwiftPersistentProperty
 
-        mutability  ||= "let"
         mutability = mutability.to_sym
 
-        required    ||= true
-
         if( is_persistent )
           SwiftPersistentProperty.new( swift_class,
                                        property_name,

data/lib/swift_generator/version.rb

@@ -1,3 +1,3 @@
 module SwiftGenerator
-  VERSION = "0.1.2"
+  VERSION = "0.3.0"
 end

data/swift_generator.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|# for "generating swift classes"
   spec.require_paths = ["lib"]
 
   # if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "http://rubygems:n6uqyRnAqzQP3M@rubygems-noneventsystems.rhcloud.com/"
+  #   spec.metadata['allowed_push_host'] = "http://rubygems:n6uqyRnAqzQP3M@rubygems-noneventsystems.rhcloud.com/"
   # end
 
   spec.add_development_dependency "bundler", "~> 1.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Kornher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,10 +78,9 @@ files:
 - bin/console
 - bin/genswift
 - bin/setup
+- examples/ReadmeExample.rb
 - lib/swift_generator.rb
-- lib/swift_generator/code_generation/POSOTest.rb
 - lib/swift_generator/code_generation/SwiftFileTemplate.dna
-- lib/swift_generator/code_generation/ToRemove/generate.bash
 - lib/swift_generator/code_generation/code_generation_common.rb
 - lib/swift_generator/code_generation/swift_class_generation.rb
 - lib/swift_generator/code_generation/swift_file_template.rb
@@ -93,8 +92,7 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata:
-  allowed_push_host: http://rubygems:n6uqyRnAqzQP3M@rubygems-noneventsystems.rhcloud.com/
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/swift_generator/code_generation/POSOTest.rb

@@ -1,8 +0,0 @@
-require_relative 'swift_class_generation'
-
-gen = SwiftDefinitionSet.new( 'output' )
-
-c1 = swift_class.new( gen, 'User', ['USIWireData'] )
-
-puts c1
-puts gen

data/lib/swift_generator/code_generation/ToRemove/generate.bash

@@ -1,41 +0,0 @@
-#!/bin/bash
-cd "$(dirname "$0")"
-pwd
-
-SOURCE_FILES=../Useful/Shared/Models/Generated/*.swift
-for f in $SOURCE_FILES
-do
-  rm $f
-done
-
-TEST_FILES=../UsefulTests/Shared/Models/Generated/*.swift
-for f in $TEST_FILES
-do
-  rm $f
-done
-
-./Tools/ribosome --rna PlainOldSwiftObjects.dna > PlainOldSwiftObjects.rna
-./PlainOldSwiftObjects.rna
-
-
-for f in $SOURCE_FILES
-do
-    echo " "
-    echo "--------------------------------------------------------------------------------"
-    echo " "
-    echo "Generated Source File: $f"
-    echo " "
-  # take action on each file. $f store current file name
-  cat $f
-done
-
-for f in $TEST_FILES
-do
-    echo " "
-    echo "--------------------------------------------------------------------------------"
-    echo " "
-    echo "Generated Test File: $f"
-    echo " "
- # take action on each file. $f store current file name
-  cat $f
-done