rails_to_swift 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 968e10d71957f4b24eb1e11ce85609dd486760e6
-  data.tar.gz: d020859c17b938ce7f25e2cb83b45c5ecd459265
+  metadata.gz: 1b0328f5b75a2159b36a2496d6ad8da3b377e76e
+  data.tar.gz: 1a2720d759048ecd1f54f6289f7bd98a340891cf
 SHA512:
-  metadata.gz: 181a3875a19a9db0b6180f2a820b9746cd8e1605c5faa5eb0c67cc823dc11ff64319235fc093589af562d34990ffd064973ed6f2840b6f51791fc6c4c9f4e375
-  data.tar.gz: fa2daca4f1a57b67cee3cc9600f4137f59f477e918d3c58c964e881c321c9a0cc562a480238969452355f1a23cb78ecca4e935ecbb08f89a95bc793ffd4cf82d
+  metadata.gz: d54ca4fb299280000571575fe970bcba2f0354656bd7a83fde5c22199cfc4e7f382a8e3398101d5e87673b5a80912d4a760fdd6ce82e149c51cd93e95a0c35b0
+  data.tar.gz: 4c236a8870a3480ae941b8b21fe010c622979609d30a9de0a36b1c5c612bf3ff463628d7c28bb3a2d7fbb2013e9f32a7a9cf714f15d8d52435b93ca50e154f3c

data/bin/rails_to_swift

@@ -20,4 +20,4 @@ RailsToSwift.bootstrap_rake
 
 RailsToSwift.eager_load()
 
-SwiftModels.create_model_files
+SwiftModels.create_model_files({classified_sort: true})

data/lib/rails_to_swift/swift_models.rb

@@ -143,17 +143,17 @@ module SwiftModels
       cols = cols.each do |c|
         if c.name.eql?("id")
           id = c
-        elsif (c.name.eql?("created_at") || c.name.eql?("updated_at"))
-          timestamps << c
-        elsif c.name[-3,3].eql?("_id")
-          associations << c
+        # elsif (c.name.eql?("created_at") || c.name.eql?("updated_at"))
+        #   timestamps << c
+        # elsif c.name[-3,3].eql?("_id")
+        #   associations << c
         else
           rest_cols << c
         end
       end
-      [rest_cols, timestamps, associations].each {|a| a.sort_by!(&:name) }
+      [rest_cols].each {|a| a.sort_by!(&:name) }
 
-      return ([id] << rest_cols << timestamps << associations).flatten
+      return ([id] << rest_cols << timestamps).flatten
     end
 
   end

data/lib/rails_to_swift/templates/model.swift

@@ -1,10 +1,13 @@
 //
 //  <%= @class_name %>.swift
+//  Generated by RailsToSwift
+//  https://github.com/JoshJuncker/RailsToSwift
 //
 
 import Foundation
 
 final class <%= @class_name %>: ResponseObjectSerializable, ResponseCollectionSerializable {
+
 <% @columns.each do |col| %>
 <% if col.not_null %>
 	<%= "var #{col.formatted_name}:#{col.formatted_type}?" %>
@@ -15,47 +18,42 @@ final class <%= @class_name %>: ResponseObjectSerializable, ResponseCollectionSe
 <% end %>
 	
 	init?(response: NSHTTPURLResponse, representation: AnyObject) {
+		
+<% @columns.each do |col| %>
+<% if col.not_null %>
+		<%= "assert(representation.valueForKey(\"#{col.name}\") != nil, \"Expected #{col.name} to not be nil.\")" %>
+
+<% end %>
+<% end %>
+
 <% @columns.each do |col| %>
 <% if col.type == "string" %>
-		<%= "self.#{col.formatted_name} = (representation.valueForKey('#{col.name}') as? String) ?? ''" %>
+		<%= "#{col.formatted_name} = (representation.valueForKey(\"#{col.name}\") as? String) ?? \"\"" %>
 <% elsif col.type == "integer" %>
-		<%= "self.#{col.formatted_name} = (representation.valueForKey('#{col.name}') as? Int) ?? -1" %>
+		<%= "#{col.formatted_name} = (representation.valueForKey(\"#{col.name}\") as? Int) ?? -1" %>
 <% elsif col.type == "float" %>
-		<%= "self.#{col.formatted_name} = (representation.valueForKey('#{col.name}') as? Float) ?? -1.0" %>
+		<%= "#{col.formatted_name} = (representation.valueForKey(\"#{col.name}\") as? Float) ?? -1.0" %>
 <% elsif col.type == "datetime" %>
-		<%= "self.#{col.formatted_name} = NSDate.fromRails(representation.valueForKey('#{col.name}') as? String ?? '')" %>
+		<%= "#{col.formatted_name} = NSDate.fromRails(representation.valueForKey(\"#{col.name}\") as? String ?? \"\")" %>
 <% elsif col.type == "text" %>
-		<%= "self.#{col.formatted_name} = (representation.valueForKey('#{col.name}') as? String) ?? ''" %>
+		<%= "#{col.formatted_name} = (representation.valueForKey(\"#{col.name}\") as? String) ?? \"\"" %>
 <% end %>
 
 <% if col.not_null %>
-		<%= "assert(representation.valueForKey('#{col.name}') != nil, 'Expected #{col.name} to not be nil.')" %>
+		<%= "assert(representation.valueForKey(\"#{col.name}\") != nil, \"Expected #{col.name} to not be nil.\")" %>
 
 <% end %>
 <% end %>
 	}
 	
-	class func collection(response response: NSHTTPURLResponse, representation: AnyObject) -> [<%= @class_name %>] {
-		let xarray = representation as! [AnyObject]
-		let mapped:[<%= @class_name%>?] = xarray.map({ <%= @class_name%>(response: response, representation: $0) })
-		return mapped.filter({ (element:<%= @class_name %>?) -> Bool in
-			if let _ = element {
-				return true
-			}
-			return false
-		}).map({ (element) -> <%= @class_name%> in
-			return element!
-		})
-	}
-	
 	func toDict() -> [String: AnyObject] {
 		let dict:[String:AnyObject?] = [
 <% @columns.each do |col| %>
 <% line = "" %>
 <% if col.type == "datetime" %>
-<% line = "'#{col.name}':#{col.formatted_name}.railsFriendly()" %>
+<% line = "\"#{col.name}\":#{col.formatted_name}.railsFriendly()" %>
 <% else %>
-<% line = "'#{col.name}':#{col.formatted_name}" %>
+<% line = "\"#{col.name}\":#{col.formatted_name}" %>
 <% end %>
 <% line += "," if col != @columns.last %>
 			<%= line %>

data/lib/rails_to_swift/version.rb

@@ -1,3 +1,3 @@
 module RailsToSwift
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_to_swift
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josh Juncker