metamodel 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a027c62103e0c1e22308807cbb65e60921e2cfc3
-  data.tar.gz: ef725ae4f7bdfbbfd06b306523f127346ac1b44f
+  metadata.gz: 7adfa65f45006eee379d8f03964b8298dee77b52
+  data.tar.gz: a108ca5428b350e56a5557f035a9cd4eb62aa255
 SHA512:
-  metadata.gz: 0d68afdc7a74ed5c62a66f5ba85a071c1ffdee8a45e30b2d23fe581e4c2b4212c5db55a3de07e2f799ab8a08d18b036f490379da9926faaf6abb74c3d17cfa61
-  data.tar.gz: 83c413f52a8c1fe141424395862d9640311fc0cbc114b943f02f5463a134da0ddef7661217bc0a087201a62d240ba020cb3e635961039f418f71d4a5f3f7db57
+  metadata.gz: 2ab0f7cc26c1801f0f257c50abd3654260b41772a6a5380db0641b9600bd8e7bff3a7bfea338d2c0f8a5a008bfec627563a3ab8ddd6037e09c4bd9633d96e82b
+  data.tar.gz: 29e4a52b085c51529068f1a4dfa050563b816da3315c924b2bd303370eefa14ac154aa9ee52aa7a935c56d29a016814fbb3bef4ce3fb760daa5c037812a789bc

data/README.md

@@ -4,8 +4,9 @@
 
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/draveness/metamodel/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/metamodel.svg?style=flat)](http://rubygems.org/gems/metamodel)
+[![Swift](https://img.shields.io/badge/swift-3.0-yellow.svg)](https://img.shields.io/badge/Swift-%203.0%20-yellow.svg)
 
-MetaModel is an iOS framework designed to help developer to deal with data persistent, JSON parsing and a bunch of APIs which provides an approach of handling client side database very easily.
+MetaModel is an iOS framework designed to help developer to deal with data persistent, JSON parsing and offer a bunch of APIs which provides an approach of handling client side database very easily.
 
 > MetaModel is under-development, API may constantly change before gets to 1.0.0.
 

data/lib/metamodel/command/install.rb

@@ -23,7 +23,10 @@ module MetaModel
           installer = installer_for_config
           installer.install!
         end
-        UI.notice "Please drag MetaModel.framework into Embedded Binaries phrase.\n"
+        UI.section "Copying MetaModel.framework into Embedded Binaries phrase." do
+          integrate_to_project
+        end
+        # UI.notice "Please drag MetaModel.framework into Embedded Binaries phrase.\n"
       end
 
       def prepare
@@ -41,6 +44,32 @@ module MetaModel
         end
       end
 
+      def integrate_to_project
+        xcodeprojs = Dir.glob("#{config.installation_root}/*.xcodeproj")
+        project = Xcodeproj::Project.open(xcodeprojs.first)
+        target = project.targets.first
+        return if target.build_phases.find { |build_phase| build_phase.to_s == "[MetaModel] Embedded Frameworks"}
+
+        # Get useful variables
+        frameworks_group = project.main_group.find_subpath('MetaModel', true)
+        frameworks_group.clear
+        frameworks_group.set_source_tree('SOURCE_ROOT')
+        frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'FrameworksBuildPhase' }
+
+        # Add new "Embed Frameworks" build phase to target
+        embedded_frameworks_build_phase = project.new(Xcodeproj::Project::Object::PBXCopyFilesBuildPhase)
+        embedded_frameworks_build_phase.name = '[MetaModel] Embedded Frameworks'
+        embedded_frameworks_build_phase.symbol_dst_subfolder_spec = :frameworks
+        target.build_phases << embedded_frameworks_build_phase
+
+        # Add framework to target as "Embedded Frameworks"
+        framework_ref = frameworks_group.new_file("./MetaModel.framework")
+        build_file = embedded_frameworks_build_phase.add_file_reference(framework_ref)
+        frameworks_build_phase.add_file_reference(framework_ref)
+        build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy', 'RemoveHeadersOnCopy'] }
+        project.save
+      end
+
       def validate!
         # super
         raise Informative, 'No Metafile in current directory' unless config.metafile_in_dir(Pathname.pwd)

data/lib/metamodel/installer.rb

@@ -24,6 +24,7 @@ module MetaModel
       end
 
       update_initialize_method
+      update_packing_file
       build_metamodel_framework unless config.skip_build?
     end
 
@@ -34,6 +35,13 @@ module MetaModel
       File.write model_path, result
     end
 
+    def update_packing_file
+      template = File.read File.expand_path(File.join(File.dirname(__FILE__), "./template/packing.swift"))
+      result = ErbalTemplate::render_from_hash(template, { :models => @models, :associations => @associations })
+      model_path = Pathname.new("./metamodel/MetaModel/Packing.swift")
+      File.write model_path, result
+    end
+
     def build_metamodel_framework
       UI.section "Generating MetaModel.framework" do
         build_framework_on_iphoneos

data/lib/metamodel/installer/renderer.rb

@@ -16,26 +16,6 @@ module MetaModel
         @project = Xcodeproj::Project.open(Config.instance.metamodel_xcode_project)
       end
 
-      SWIFT_TEMPLATES_FILES = %w(
-        file_header
-        table_initialize
-        model_initialize
-        model_update
-        model_query
-        model_delete
-        static_methods
-        helper
-      )
-
-      def model_swift_templates
-        [].tap do |templates|
-          SWIFT_TEMPLATES_FILES.each do |file_path|
-            template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/#{file_path}.swift"))
-            templates << template
-          end
-        end
-      end
-
       def render!
         remove_previous_files_refereneces
         UI.section "Generating model files" do
@@ -92,9 +72,6 @@ module MetaModel
         association_group.clear
         association_group.set_source_tree('SOURCE_ROOT')
 
-        has_many_association_template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/has_many_association.swift"))
-        belongs_to_association_template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/belongs_to_association.swift"))
-
         file_refs = []
         @associations.each do |association|
           template = association.relation == :has_many ? has_many_association_template : belongs_to_association_template
@@ -111,6 +88,33 @@ module MetaModel
 
       private
 
+      SWIFT_TEMPLATES_FILES = %w(
+        file_header
+        table_initialize
+        model_initialize
+        model_update
+        model_query
+        model_delete
+        static_methods
+        helper
+      )
+
+      def model_swift_templates
+        [].tap do |templates|
+          SWIFT_TEMPLATES_FILES.each do |file_path|
+            template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/model/#{file_path}.swift"))
+            templates << template
+          end
+        end
+      end
+
+      def has_many_association_template
+        File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/association/has_many_association.swift"))
+      end
+
+      def belongs_to_association_template
+        File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/association/belongs_to_association.swift"))
+      end
     end
   end
 end

data/lib/metamodel/installer/validator.rb

@@ -1,55 +1,50 @@
 module MetaModel
-  class Installer
-    class Validator
-      require 'metamodel/record/model'
-      require 'metamodel/record/property'
-      require 'metamodel/record/association'
-
-      def translate!
-        satisfy_constraint = @associations.reduce([]) do |remain, association|
-          expect = remain.select { |assoc| assoc.expect_constraint? association }
-          if expect.empty?
-            remain << association
-          else
-            remain.delete expect.first
-          end
-          remain
+  class Command
+    class Install
+      class Validator
+        require 'metamodel/record/model'
+        require 'metamodel/record/property'
+        require 'metamodel/record/association'
+
+        attr_reader :models
+        attr_reader :associations
+
+        def initialize(models, associations)
+          @models = models
+          @associations = associations
         end
-        raise Informative, "Unsatisfied constraints in #{satisfy_constraint.map \
-          { |x| x.debug_description }}" if satisfy_constraint.size > 0
-
-      end
 
-      def validate_models
-        existing_types = @models.map { |m| m.properties.map { |property| property.type } }.flatten.uniq
-        unsupported_types = existing_types - supported_types
-        raise Informative, "Unsupported types #{unsupported_types}" unless unsupported_types == []
-      end
-
-      CURRENT_SUPPORTED_BUILT_IN_TYPES = %w[
-        Int
-        Double
-        Float
-        String
-        Bool
-        NSDate
-      ]
+        def translate
+          name_model_hash = Hash[@models.collect { |model| [model.name, model] }]
+          @associations.map! do |association|
+            major_model = name_model_hash[association.major_model]
+            major_model.associations << association
+            association.major_model = major_model
+            association.secondary_model = name_model_hash[association.secondary_model]
+            raise Informative, "Associations not satisfied in `Metafile`" \
+              unless [association.major_model, association.secondary_model].compact.size == 2
+            association
+          end
 
-      def built_in_types
-        CURRENT_SUPPORTED_BUILT_IN_TYPES.map do |t|
-          [t, "#{t}?"]
-        end.flatten
-      end
+          satisfy_constraint = @associations.reduce([]) do |remain, association|
+            expect = remain.select { |assoc| assoc.expect_constraint? association }
+            if expect.empty?
+              remain << association
+            else
+              remain.delete expect.first
+            end
+            remain
+          end
+          raise Informative, "Unsatisfied constraints in #{satisfy_constraint.map \
+            { |x| x.debug_description }}" \
+            if satisfy_constraint.size > 0
 
-      def supported_types
-        @models.reduce(CURRENT_SUPPORTED_BUILT_IN_TYPES) { |types, model|
-          types << model.name.to_s
-        }.map { |type|
-          [type, "#{type}?"]
-        }.flatten
+          @models.each do |model|
+            model.properties.uniq! { |prop| [prop.name] }
+          end
+          return @models, @associations
+        end
       end
-
-
     end
   end
 end

data/lib/metamodel/record/association.rb

@@ -91,6 +91,10 @@ module MetaModel
         @relation == :belongs_to
       end
 
+      def is_active?
+        has_one? || has_many?
+      end
+
       def type
         case @relation
         when :has_one, :has_many, :belongs_to then secondary_model.name

data/lib/metamodel/record/model.rb

@@ -51,12 +51,12 @@ module MetaModel
         key_value_pairs_with_property properties_exclude_id, cast
       end
 
-      def property_key_type_pairs(remove_extra_param = true, use_default_value = false)
-        key_type_pairs_with_property @properties, remove_extra_param, use_default_value
+      def property_key_type_pairs(use_default_value = false)
+        key_type_pairs_with_property @properties, use_default_value
       end
 
-      def property_exclude_id_key_type_pairs(remove_extra_param = true, use_default_value = false)
-        key_type_pairs_with_property properties_exclude_id, remove_extra_param, use_default_value
+      def property_exclude_id_key_type_pairs(use_default_value = false)
+        key_type_pairs_with_property properties_exclude_id, use_default_value
       end
 
       def property_key_type_pairs_without_property(property)
@@ -93,18 +93,14 @@ module MetaModel
         end.join(", ")
       end
 
-      def key_type_pairs_with_property(properties, remove_extra_param = true, use_default_value = false)
+      def key_type_pairs_with_property(properties, use_default_value = false)
         properties.enum_for(:each_with_index).map do |property, index|
           has_default_value = property.has_default_value?
           default_value = property.type_without_optional == "String" ? "\"#{property.default_value}\"" : property.default_value
 
           result = "#{property.name}: #{property.type.to_s}#{if has_default_value then " = " + "#{default_value}" end}"
           result = "#{property.name}: #{property.type.to_s} = #{property.type_without_optional}DefaultValue" if use_default_value
-          if index == 0 && remove_extra_param
-            "#{property.name} #{result}"
-          else
-            result
-          end
+          result
         end.join(", ")
       end
 

data/lib/metamodel/record/property.rb

@@ -35,7 +35,7 @@ module MetaModel
         case type_without_optional
           when "String" then "TEXT"
           when "Int", "Bool" then "INTEGER"
-          when "Double", "NSDate", "Float" then "REAL"
+          when "Double", "Date", "Float" then "REAL"
           else raise Informative, "Unsupported type #{self.type}"
         end
       end
@@ -44,7 +44,7 @@ module MetaModel
         case type_without_optional
         when "String" then "String"
         when "Int", "Bool" then "Int64"
-        when "Double", "NSDate", "Float" then "Double"
+        when "Double", "Date", "Float" then "Double"
         else raise Informative, "Unsupported type #{self.type}"
         end
       end
@@ -55,7 +55,7 @@ module MetaModel
         when :double then "Double"
         when :bool   then "Bool"
         when :string then "String"
-        when :date   then "NSDate"
+        when :date   then "Date"
         else symbol.to_s.camelize
         end
       end

data/lib/metamodel/template/{belongs_to_association.swift → association/belongs_to_association.swift}

@@ -9,7 +9,7 @@
 import Foundation
 
 extension <%= association.class_name %> {
-    static func create(<%= association.major_model_id %> <%= association.major_model_id %>: Int, <%= association.secondary_model_id %>: Int) {
+    @discardableResult static func create(<%= association.major_model_id %>: Int, <%= association.secondary_model_id %>: Int) {
         executeSQL("INSERT INTO \(<%= association.class_name %>.tableName) (<%= association.major_model_id.underscore %>, <%= association.secondary_model_id.underscore %>) VALUES (\(<%= association.major_model_id %>), \(<%= association.secondary_model_id %>))")
     }
 }
@@ -17,12 +17,12 @@ extension <%= association.class_name %> {
 public extension <%= association.major_model.name %> {
     var <%= association.name %>: <%= association.secondary_model.name %>? {
         get {
-            guard let id = <%= association.class_name %>.findBy(<%= association.major_model.foreign_id %>: privateId).first?.commentId else { return nil }
+            guard let id = <%= association.class_name %>.findBy(<%= association.major_model.foreign_id %>: privateId).first?.<%= association.secondary_model.foreign_id %> else { return nil }
             return <%= association.secondary_model.name %>.find(id)
         }
         set {
             guard let newValue = newValue else { return }
-            <%= association.class_name %>.findBy(<%= association.major_model_id %>: privateId).forEach { $0.delete() }
+            <%= association.class_name %>.findBy(<%= association.major_model_id %>: privateId).forEach { $0.delete }
             <%= association.class_name %>.create(<%= association.major_model_id %>: newValue.privateId, <%= association.secondary_model_id %>: privateId)
         }
     }

data/lib/metamodel/template/association/has_many_association.swift

@@ -0,0 +1,120 @@
+//
+//  <%= association.class_name %>.swift
+//  MetaModel
+//
+//  Created by MetaModel.
+//  Copyright © 2016 metamodel. All rights reserved.
+//
+
+import Foundation
+
+typealias <%= association.reverse_class_name %> = <%= association.class_name %>
+
+struct <%= association.class_name %> {
+    var privateId: Int = 0
+    var <%= association.major_model_id %>: Int = 0
+    var <%= association.secondary_model_id %>: Int = 0
+
+    enum Association: String, CustomStringConvertible {
+        case privateId = "private_id"
+        case <%= association.major_model_id %> = "<%= association.major_model_id.underscore %>"
+        case <%= association.secondary_model_id %> = "<%= association.secondary_model_id.underscore %>"
+        var description: String { get { return self.rawValue } }
+    }
+    <% [association.major_model, association.secondary_model].zip([association.secondary_model, association.major_model]).each do |first, second| %>
+    static func fetch<%= first.table_name.camelize %>(<%= second.foreign_id %>: Int, first: Bool = false) -> [<%= first.name %>] {
+        var query = "SELECT * FROM <%= first.table_name %> WHERE <%= first.table_name %>.private_id IN (" +
+            "SELECT private_id " +
+            "FROM \(tableName) " +
+            "WHERE \(Association.<%= second.foreign_id %>) = \(<%= second.foreign_id %>)" +
+        ")"
+        if first { query += "LIMIT 1" }
+        return MetaModels.fromQuery(query)
+    }
+    <% end %><% [association.major_model, association.secondary_model].each do |model| %>
+    static func findBy(<%= model.foreign_id %>: Int) -> [<%= association.class_name %>] {
+        let query = "SELECT * FROM \(tableName) WHERE <%= model.foreign_id.underscore %> = \(<%= model.foreign_id %>)"
+        return MetaModels.fromQuery(query)
+    }
+    <% end %>
+    var delete: Void {
+        get {
+            executeSQL("DELETE * FROM \(<%= association.class_name %>.tableName) WHERE private_id = \(privateId)")
+        }
+    }
+}
+
+extension <%= association.class_name %> {
+    static func create(<%= association.major_model_id %>: Int, <%= association.secondary_model_id %>: Int) {
+        executeSQL("INSERT INTO \(<%= association.class_name %>.tableName) (<%= association.major_model_id.underscore %>, <%= association.secondary_model_id.underscore %>) VALUES (\(<%= association.major_model_id %>), \(<%= association.secondary_model_id %>))")
+    }
+}
+
+extension <%= association.class_name %> {
+    static let tableName = "<%= association.class_name.underscore %>"
+    static func initialize() {
+        let initializeTableSQL = "CREATE TABLE \(tableName)(" +
+          "private_id INTEGER PRIMARY KEY, " +
+          "<%= association.major_model_id.underscore %> INTEGER NOT NULL, " +
+          "<%= association.secondary_model_id.underscore %> INTEGER NOT NULL, " +
+          "FOREIGN KEY(<%= association.major_model_id.underscore %>) REFERENCES <%= association.major_model.table_name %>(private_id)," +
+          "FOREIGN KEY(<%= association.secondary_model_id.underscore %>) REFERENCES <%= association.secondary_model.table_name %>(private_id)" +
+        ");"
+
+        executeSQL(initializeTableSQL)
+        initializeTrigger()
+    }
+
+    static func deinitialize() {
+        let dropTableSQL = "DROP TABLE \(tableName)"
+        executeSQL(dropTableSQL)
+        deinitializeTrigger()
+    }
+
+    static func initializeTrigger() {
+        let majorDeleteTrigger = "CREATE TRIGGER <%= association.major_model.name.underscore %>_delete_trigger " +
+            "AFTER DELETE ON <%= association.major_model.table_name %> " +
+            "FOR EACH ROW BEGIN " +
+                "DELETE FROM \(tableName) WHERE private_id = OLD.private_id; " +
+            "END;";
+
+        let secondaryDeleteTrigger = "CREATE TRIGGER <%= association.secondary_model.name.underscore %>_delete_trigger " +
+            "AFTER DELETE ON <%= association.secondary_model.table_name %> " +
+            "FOR EACH ROW BEGIN " +
+                "DELETE FROM \(tableName) WHERE private_id = OLD.private_id; " +
+            "END;";
+
+        executeSQL(majorDeleteTrigger)
+        executeSQL(secondaryDeleteTrigger)
+    }
+
+    static func deinitializeTrigger() {
+        let dropMajorTrigger = "DROP TRIGGER IF EXISTS <%= association.major_model.name.underscore %>_delete_trigger;"
+        executeSQL(dropMajorTrigger)
+
+        let dropSecondaryTrigger = "DROP TRIGGER IF EXISTS <%= association.secondary_model.name.underscore %>_delete_trigger;"
+        executeSQL(dropSecondaryTrigger)
+    }
+}
+
+public extension <%= association.major_model.name %> {
+    var <%= association.name %>: [<%= association.secondary_model.name %>] {
+        get {
+            return <%= association.class_name %>.fetch<%= association.secondary_model.name.tableize.camelize %>(<%= association.major_model.foreign_id %>: privateId)
+        }
+        set {
+            <%= association.class_name %>.findBy(<%= association.major_model_id %>: privateId).forEach { $0.delete }
+            newValue.forEach { <%= association.class_name %>.create(<%= association.major_model_id %>: privateId, <%= association.secondary_model_id %>: $0.privateId) }
+        }
+    }
+
+    @discardableResult func create<%= association.secondary_model.name %>(<%= association.secondary_model.property_key_type_pairs %>) -> <%= association.secondary_model.name %>? {
+        guard let result = <%= association.secondary_model.name %>.create(<%= association.secondary_model.property_key_value_pairs %>) else { return nil }
+        <%= association.class_name %>.create(<%= association.major_model_id %>: privateId, <%= association.secondary_model_id %>: result.privateId)
+        return result
+    }
+
+    @discardableResult func append<%= association.secondary_model.name %>(<%= association.secondary_model.property_key_type_pairs %>) -> <%= association.secondary_model.name %>? {
+        return create<%= association.secondary_model.name %>(<%= association.secondary_model.property_key_value_pairs %>)
+    }
+}

data/lib/metamodel/template/metamodel.swift

@@ -8,12 +8,6 @@
 
 import Foundation
 
-let path = NSSearchPathForDirectoriesInDomains(
-    .DocumentDirectory, .UserDomainMask, true
-).first! as String
-
-let db =  try! Connection("\(path)/metamodel_db.sqlite3")
-
 public class MetaModel {
     public static func initialize() {
         validateMetaModelTables()
@@ -28,7 +22,7 @@ public class MetaModel {
         }""" %>
         <% end %>
 
-        <% associations.each do |association| %><% if association.relation.to_s.start_with? "has" %><%= """if infos[#{association.class_name}.tableName] != \"#{association.hash_value}\" {
+        <% associations.each do |association| %><% if association.is_active? %><%= """if infos[#{association.class_name}.tableName] != \"#{association.hash_value}\" {
             updateMetaModelTableInfos(#{association.class_name}.tableName, hashValue: \"#{association.hash_value}\")
             #{association.class_name}.deinitialize()
             #{association.class_name}.initialize()

data/lib/metamodel/template/model/helper.swift

@@ -0,0 +1,37 @@
+// MAKR: - Helper
+
+open class <%= model.relation_name %>: Relation<<%= model.name %>> {
+    override init() {
+        super.init()
+        self.select = "SELECT \(<%= model.name %>.tableName).* FROM \(<%= model.name %>.tableName)"
+    }
+
+    override var result: [<%= model.name %>] {
+        get {
+            return MetaModels.fromQuery(query)
+        }
+    }
+
+    func expandColumn(_ column: <%= model.name %>.Column) -> String {
+        return "\(<%= model.name %>.tableName).\(column)"
+    }
+}
+
+extension <%= model.name %> {
+    var itself: String { get { return "WHERE \(<%= model.name %>.tableName).private_id = \(privateId)" } }
+}
+
+extension <%= model.relation_name %> {
+    func find(_ privateId: Int) -> Self {
+        return filter(privateId)
+    }
+
+    func find(_ privateIds: [Int]) -> Self {
+        return filter(conditions: [.privateId: privateIds])
+    }
+
+    func filter(_ privateId: Int) -> Self {
+        self.filter.append("private_id = \(privateId)")
+        return self
+    }
+}

data/lib/metamodel/template/{model_delete.swift → model/model_delete.swift}

@@ -1,23 +1,21 @@
 // MARK: - Delete
 
 public extension <%= model.name %> {
-    var delete: Bool {
+    var delete: Void {
         get {
             let deleteSQL = "DELETE FROM \(<%= model.name %>.tableName) \(itself)"
             executeSQL(deleteSQL)
-            return true
         }
     }
-    static var deleteAll: Bool { get { return <%= model.relation_name %>().deleteAll } }
+    static var deleteAll: Void { get { return <%= model.relation_name %>().deleteAll } }
 }
 
 public extension <%= model.relation_name %> {
-    var delete: Bool { get { return deleteAll } }
+    var delete: Void { get { return deleteAll } }
 
-    var deleteAll: Bool {
+    var deleteAll: Void {
         get {
             self.result.forEach { $0.delete }
-            return true
         }
     }
 }

data/lib/metamodel/template/{model_initialize.swift → model/model_initialize.swift}

@@ -12,16 +12,16 @@ public struct <%= model.name %> {
         public var description: String { get { return self.rawValue } }
     }
 
-    public init(<%= model.property_key_type_pairs false %>) {
+    public init(<%= model.property_key_type_pairs %>) {
         <% model.properties.each do |property| %><%= """self.#{property.name} = #{property.name}" %>
         <% end %>
     }
 
-    static public func new(<%= model.property_key_type_pairs %>) -> <%= model.name %> {
+    @discardableResult static public func new(<%= model.property_key_type_pairs %>) -> <%= model.name %> {
         return <%= model.name %>(<%= model.property_key_value_pairs %>)
     }
 
-    static public func create(<%= model.property_key_type_pairs %>) -> <%= model.name %>? {
+    @discardableResult static public func create(<%= model.property_key_type_pairs %>) -> <%= model.name %>? {
         //if <%= model.properties.select { |p| p.name.downcase.end_with? "id" }.map { |p| "#{p.name} == 0" }.push("false == true").join(" || ") %> { return nil }
 
         var columnsSQL: [<%= model.name %>.Column] = []
@@ -35,7 +35,7 @@ public struct <%= model.name %> {
         <%= """columnsSQL.append(.#{property.name})
         valuesSQL.append(#{property.name})
         """ %><% end %><% end %>
-        let insertSQL = "INSERT INTO \(tableName) (\(columnsSQL.map { $0.rawValue }.joinWithSeparator(", "))) VALUES (\(valuesSQL.map { $0.unwrapped }.joinWithSeparator(", ")))"
+        let insertSQL = "INSERT INTO \(tableName) (\(columnsSQL.map { $0.rawValue }.joined(separator: ", "))) VALUES (\(valuesSQL.map { $0.unwrapped }.joined(separator: ", ")))"
         guard let _ = executeSQL(insertSQL),
           let lastInsertRowId = executeScalarSQL("SELECT last_insert_rowid();") as? Int64 else { return nil }
         var result = <%= model.name %>(<%= model.property_key_value_pairs %>)

data/lib/metamodel/template/{model_query.swift → model/model_query.swift}

@@ -7,37 +7,37 @@ public extension <%= model.name %> {
 
     static var first: <%= model.name %>? {
         get {
-            return <%= model.relation_name %>().orderBy(.privateId, asc: true).first
+            return <%= model.relation_name %>().orderBy(column: .privateId, asc: true).first
         }
     }
 
     static var last: <%= model.name %>? {
         get {
-            return <%= model.relation_name %>().orderBy(.privateId, asc: false).first
+            return <%= model.relation_name %>().orderBy(column: .privateId, asc: false).first
         }
     }
 
     static func first(length: UInt) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().orderBy(.privateId, asc: true).limit(length)
+        return <%= model.relation_name %>().orderBy(column: .privateId, asc: true).limit(length)
     }
 
     static func last(length: UInt) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().orderBy(.privateId, asc: false).limit(length)
+        return <%= model.relation_name %>().orderBy(column: .privateId, asc: false).limit(length)
     }
 
-    static func find(id: Int) -> <%= model.name %>? {
-        return <%= model.relation_name %>().find(id).first
+    internal static func find(_ privateId: Int) -> <%= model.name %>? {
+        return <%= model.relation_name %>().find(privateId).first
     }
 
-    static func find(ids: [Int]) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().find(ids)
+    internal static func find(_ privateIds: [Int]) -> <%= model.relation_name %> {
+        return <%= model.relation_name %>().find(privateIds)
     }
 
-    static func findBy(<%= model.property_key_type_pairs(true, true) %>) -> <%= model.relation_name %> {
+    static func findBy(<%= model.property_key_type_pairs(true) %>) -> <%= model.relation_name %> {
         return <%= model.relation_name %>().findBy(<%= model.property_key_value_pairs %>)
     }
 
-    static func filter(<%= model.property_key_type_pairs(true, true) %>) -> <%= model.relation_name %> {
+    static func filter(<%= model.property_key_type_pairs(true) %>) -> <%= model.relation_name %> {
         return <%= model.relation_name %>().filter(<%= model.property_key_value_pairs %>)
     }
 
@@ -54,30 +54,30 @@ public extension <%= model.name %> {
     }
 
     static func groupBy(columns: <%= model.name %>.Column...) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().groupBy(columns)
+        return <%= model.relation_name %>().groupBy(columns: columns)
     }
 
     static func groupBy(columns: [<%= model.name %>.Column]) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().groupBy(columns)
+        return <%= model.relation_name %>().groupBy(columns: columns)
     }
 
     static func orderBy(column: <%= model.name %>.Column) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().orderBy(column)
+        return <%= model.relation_name %>().orderBy(column: column)
     }
 
     static func orderBy(column: <%= model.name %>.Column, asc: Bool) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().orderBy(column, asc: asc)
+        return <%= model.relation_name %>().orderBy(column: column, asc: asc)
     }
 }
 
 public extension <%= model.relation_name %> {
-    func findBy(<%= model.property_key_type_pairs(true, true) %>) -> Self {
+    func findBy(<%= model.property_key_type_pairs(true) %>) -> Self {
         var attributes: [<%= model.name %>.Column: Any] = [:]
         <% model.properties.each do |property| %><%= "if (#{property.name} != #{property.type_without_optional}DefaultValue) { attributes[.#{property.name}] = #{property.name} }" %>
-        <% end %>return self.filter(attributes)
+        <% end %>return self.filter(conditions: attributes)
     }
 
-    func filter(<%= model.property_key_type_pairs(true, true) %>) -> Self {
+    func filter(<%= model.property_key_type_pairs(true) %>) -> Self {
         return findBy(<%= model.property_key_value_pairs %>)
     }
 
@@ -85,12 +85,12 @@ public extension <%= model.relation_name %> {
         for (column, value) in conditions {
             let columnSQL = "\(expandColumn(column))"
 
-            func filterByEqual(value: Any) {
+            func filterByEqual(_ value: Any) {
                 self.filter.append("\(columnSQL) = \(value)")
             }
 
-            func filterByIn(value: [String]) {
-                self.filter.append("\(columnSQL) IN (\(value.joinWithSeparator(", ")))")
+            func filterByIn(_ value: [String]) {
+                self.filter.append("\(columnSQL) IN (\(value.joined(separator: ", ")))")
             }
 
             if let value = value as? String {
@@ -115,7 +115,7 @@ public extension <%= model.relation_name %> {
     }
 
     func groupBy(columns: <%= model.name %>.Column...) -> Self {
-        return self.groupBy(columns)
+        return self.groupBy(columns: columns)
     }
 
     func groupBy(columns: [<%= model.name %>.Column]) -> Self {

data/lib/metamodel/template/{model_update.swift → model/model_update.swift}

@@ -1,14 +1,14 @@
 // MARK: - Update
 
 public extension <%= model.name %> {
-    mutating func update(<%= model.property_exclude_id_key_type_pairs(true, true) %>) {
+    @discardableResult mutating func update(<%= model.property_exclude_id_key_type_pairs true %>) {
         var attributes: [<%= model.name %>.Column: Any] = [:]
         <% model.properties_exclude_id.each do |property| %><%= "if (#{property.name} != #{property.type_without_optional}DefaultValue) { attributes[.#{property.name}] = #{property.name} }" %>
         <% end %>
-        self.update(attributes)
+        self.update(attributes: attributes)
     }
 
-    mutating func update(attributes: [<%= model.name %>.Column: Any]) {
+    @discardableResult mutating func update(attributes: [<%= model.name %>.Column: Any]) {
         var setSQL: [String] = []
         if let attributes = attributes as? [<%= model.name %>.Column: Unwrapped] {
             for (key, value) in attributes {
@@ -17,13 +17,12 @@ public extension <%= model.name %> {
                 <% end %>default: break
                 }
             }
-            let updateSQL = "UPDATE \(<%= model.name %>.tableName) SET \(setSQL.joinWithSeparator(", ")) \(itself)"
-            executeSQL(updateSQL) {
-                for (key, value) in attributes {
-                    switch key {
-                    <% model.properties_exclude_id.each do |property| %><%= """case .#{property.name}: self.#{property.name} = value as#{property.is_optional? ? "?" : "!"} #{property.type_without_optional}""" %>
-                    <% end %>default: break
-                    }
+            let updateSQL = "UPDATE \(<%= model.name %>.tableName) SET \(setSQL.joined(separator: ", ")) \(itself)"
+            guard let _ = executeSQL(updateSQL) else { return }
+            for (key, value) in attributes {
+                switch key {
+                <% model.properties_exclude_id.each do |property| %><%= """case .#{property.name}: #{property.name} = value as#{property.is_optional? ? "?" : "!"} #{property.type_without_optional}""" %>
+                <% end %>default: break
                 }
             }
         }
@@ -32,7 +31,7 @@ public extension <%= model.name %> {
     var save: <%= model.name %> {
         mutating get {
             if let _ = <%= model.name %>.find(privateId) {
-                update([<% column_values = model.properties.map do |property| %><% ".#{property.name}: #{property.name}" %><% end %><%= column_values.join(", ") %>])
+                update(attributes: [<% column_values = model.properties.map do |property| %><% ".#{property.name}: #{property.name}" %><% end %><%= column_values.join(", ") %>])
             } else {
                 <%= model.name %>.create(<%= model.property_key_value_pairs %>)
             }
@@ -48,17 +47,17 @@ public extension <%= model.name %> {
 }
 
 public extension <%= model.relation_name %> {
-    public func updateAll(<%= model.property_exclude_id_key_type_pairs(true, true) %>) -> Self {
+    @discardableResult public func updateAll(<%= model.property_exclude_id_key_type_pairs true %>) -> Self {
         return update(<%= model.property_exclude_id_key_value_pairs %>)
     }
 
-    public func update(<%= model.property_exclude_id_key_type_pairs(true, true) %>) -> Self {
+    @discardableResult public func update(<%= model.property_exclude_id_key_type_pairs true %>) -> Self {
         var attributes: [<%= model.name %>.Column: Any] = [:]
         <% model.properties_exclude_id.each do |property| %><%= "if (#{property.name} != #{property.type_without_optional}DefaultValue) { attributes[.#{property.name}] = #{property.name} }" %>
         <% end %>
         result.forEach { (element) in
             var element = element
-            element.update(attributes)
+            element.update(attributes: attributes)
         }
         return self
     }

data/lib/metamodel/template/packing.swift

@@ -0,0 +1,52 @@
+//
+//  Packing.swift
+//  MetaModel
+//
+//  Created by Draveness on 9/16/16.
+//  Copyright © 2016 metamodel. All rights reserved.
+//
+
+import Foundation
+
+protocol Packing {
+    init(values: Array<Optional<Binding>>);
+}
+
+class MetaModels {
+    static func fromQuery<T>(_ query: String) -> [T] where T: Packing {
+        var models: [T] = []
+        guard let stmt = executeSQL(query) else { return models }
+        for values in stmt {
+            let association = T(values: values)
+            models.append(association)
+        }
+        return models
+    }
+}
+
+// MARK: - Model Packing
+<% models.each do |model| %>
+extension <%= model.name %>: Packing {
+    init(values: Array<Optional<Binding>>) {
+        <% model.properties.each_with_index do |property, index| %><%= """let #{property.name}: #{property.real_type} = values[#{index+1}] as! #{property.real_type}""" %>
+        <% end %>
+        self.init(<%= model.property_key_value_pairs true %>)
+
+        let privateId: Int64 = values[0] as! Int64
+        self.privateId = Int(privateId)
+    }
+}
+<% end %>
+
+// MARK: - Association Packing
+<% associations.each do |association| if association.is_active? %>
+extension <%= association.class_name %>: Packing {
+    init(values: Array<Optional<Binding>>) {
+        let privateId: Int64 = values[0] as! Int64
+        let <%= association.major_model_id %>: Int64 = values[1] as! Int64
+        let <%= association.secondary_model_id %>: Int64 = values[2] as! Int64
+
+        self.init(privateId: Int(privateId), <%= association.major_model_id %>: Int(<%= association.major_model_id %>), <%= association.secondary_model_id %>: Int(<%= association.secondary_model_id %>))
+    }
+}
+<% end %><% end %>

data/lib/metamodel/version.rb

@@ -1,5 +1,5 @@
 module MetaModel
   # The version of the MetaModel command line tool.
   #
-  VERSION = '0.3.1' unless defined? MetaModel::VERSION
+  VERSION = '0.4.0' unless defined? MetaModel::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -161,19 +161,21 @@ files:
 - lib/metamodel/record/association.rb
 - lib/metamodel/record/model.rb
 - lib/metamodel/record/property.rb
-- lib/metamodel/template/belongs_to_association.swift
-- lib/metamodel/template/file_header.swift
-- lib/metamodel/template/foreign_key.swift
-- lib/metamodel/template/has_many_association.swift
-- lib/metamodel/template/helper.swift
+- lib/metamodel/template/association/belongs_to_association.swift
+- lib/metamodel/template/association/has_many_association.swift
 - lib/metamodel/template/json.swift
 - lib/metamodel/template/metamodel.swift
-- lib/metamodel/template/model_delete.swift
-- lib/metamodel/template/model_initialize.swift
-- lib/metamodel/template/model_query.swift
-- lib/metamodel/template/model_update.swift
-- lib/metamodel/template/static_methods.swift
-- lib/metamodel/template/table_initialize.swift
+- lib/metamodel/template/model/file_header.swift
+- lib/metamodel/template/model/foreign_key.swift
+- lib/metamodel/template/model/helper.swift
+- lib/metamodel/template/model/model_delete.swift
+- lib/metamodel/template/model/model_initialize.swift
+- lib/metamodel/template/model/model_query.swift
+- lib/metamodel/template/model/model_update.swift
+- lib/metamodel/template/model/static_methods.swift
+- lib/metamodel/template/model/table_initialize.swift
+- lib/metamodel/template/packing.swift
+- lib/metamodel/template/triggers.swift
 - lib/metamodel/user_interface.rb
 - lib/metamodel/version.rb
 homepage: https://github.com/MModel/MetaModel
@@ -196,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: The Cocoa models generator.

data/lib/metamodel/template/has_many_association.swift

@@ -1,99 +0,0 @@
-//
-//  <%= association.class_name %>.swift
-//  MetaModel
-//
-//  Created by MetaModel.
-//  Copyright © 2016 metamodel. All rights reserved.
-//
-
-import Foundation
-
-typealias <%= association.reverse_class_name %> = <%= association.class_name %>
-
-struct <%= association.class_name %> {
-    var privateId: Int = 0
-    var <%= association.major_model_id %>: Int = 0
-    var <%= association.secondary_model_id %>: Int = 0
-
-    enum Association: String, CustomStringConvertible {
-        case privateId = "private_id"
-        case <%= association.major_model_id %> = "<%= association.major_model_id.underscore %>"
-        case <%= association.secondary_model_id %> = "<%= association.secondary_model_id.underscore %>"
-        var description: String { get { return self.rawValue } }
-    }
-    <% [association.major_model, association.secondary_model].each do |model| %>
-    <%= """static func findBy(#{model.foreign_id} #{model.foreign_id}: Int) -> [#{association.class_name}] {
-        let query = \"SELECT * FROM \\(tableName) WHERE \\(Association.#{model.foreign_id}) = \\(#{model.foreign_id})\"
-
-        var models: [#{association.class_name}] = []
-        guard let stmt = executeSQL(query) else { return models }
-        for values in stmt {
-            let association = #{association.class_name}(values: values)
-            models.append(association)
-        }
-        return models
-    }""" %>
-    <% end %>
-    func delete() {
-        executeSQL("DELETE * FROM \(<%= association.class_name %>.tableName) WHERE \(Association.privateId) = \(privateId)")
-    }
-}
-
-extension <%= association.class_name %> {
-    static func create(<%= association.major_model_id %> <%= association.major_model_id %>: Int, <%= association.secondary_model_id %>: Int) {
-        executeSQL("INSERT INTO \(<%= association.class_name %>.tableName) (<%= association.major_model_id.underscore %>, <%= association.secondary_model_id.underscore %>) VALUES (\(<%= association.major_model_id %>), \(<%= association.secondary_model_id %>))")
-    }
-}
-
-extension <%= association.class_name %> {
-    init(values: Array<Optional<Binding>>) {
-        let privateId: Int64 = values[0] as! Int64
-        let <%= association.major_model_id %>: Int64 = values[1] as! Int64
-        let <%= association.secondary_model_id %>: Int64 = values[2] as! Int64
-
-        self.init(privateId: Int(privateId), <%= association.major_model_id %>: Int(<%= association.major_model_id %>), <%= association.secondary_model_id %>: Int(<%= association.secondary_model_id %>))
-    }
-}
-
-extension <%= association.class_name %> {
-
-    static let tableName = "<%= association.class_name.underscore %>"
-    static func initialize() {
-        let initializeTableSQL = "CREATE TABLE \(tableName)(" +
-          "private_id INTEGER PRIMARY KEY, " +
-          "<%= association.major_model_id.underscore %> INTEGER NOT NULL, " +
-          "<%= association.secondary_model_id.underscore %> INTEGER NOT NULL, " +
-          "FOREIGN KEY(<%= association.major_model_id.underscore %>) REFERENCES <%= association.major_model.table_name %>(private_id)," +
-          "FOREIGN KEY(<%= association.secondary_model_id.underscore %>) REFERENCES <%= association.secondary_model.table_name %>(private_id)" +
-        ");"
-
-        executeSQL(initializeTableSQL)
-    }
-    static func deinitialize() {
-        let dropTableSQL = "DROP TABLE \(tableName)"
-        executeSQL(dropTableSQL)
-    }
-}
-
-public extension <%= association.major_model.name %> {
-    var <%= association.name %>: [<%= association.secondary_model.name %>] {
-        get {
-            let ids = <%= association.class_name %>.findBy(<%= association.major_model_id %>: privateId).map { $0.<%= association.secondary_model_id %> }
-            return <%= association.secondary_model.name %>.find(ids).result
-        }
-        set {
-            <%= association.class_name %>.findBy(<%= association.major_model_id %>: privateId).forEach { $0.delete() }
-            newValue.forEach { <%= association.class_name %>.create(<%= association.major_model_id %>: privateId, <%= association.secondary_model_id %>: $0.privateId) }
-        }
-    }
-
-    func create<%= association.secondary_model.name %>(<%= association.secondary_model.property_key_type_pairs %>) -> <%= association.secondary_model.name %>? {
-        guard let result = <%= association.secondary_model.name %>.create(<%= association.secondary_model.property_key_value_pairs %>) else { return nil }
-        <%= association.class_name %>.create(<%= association.major_model_id %>: privateId, <%= association.secondary_model_id %>: result.privateId)
-        return result
-    }
-
-    func append<%= association.secondary_model.name %>(<%= association.secondary_model.property_key_type_pairs %>) -> <%= association.secondary_model.name %>? {
-        return create<%= association.secondary_model.name %>(<%= association.secondary_model.property_key_value_pairs %>)
-    }
-}

data/lib/metamodel/template/helper.swift

@@ -1,53 +0,0 @@
-// MAKR: - Helper
-
-public class <%= model.relation_name %>: Relation<<%= model.name %>> {
-    override init() {
-        super.init()
-        self.select = "SELECT \(<%= model.name %>.tableName).* FROM \(<%= model.name %>.tableName)"
-    }
-
-    override var result: [<%= model.name %>] {
-        get {
-            var models: [<%= model.name %>] = []
-            guard let stmt = executeSQL(query) else { return models }
-            for values in stmt {
-                models.append(<%= model.name %>(values: values))
-            }
-            return models
-        }
-    }
-
-    func expandColumn(column: <%= model.name %>.Column) -> String {
-        return "\(<%= model.name %>.tableName).\(column)"
-    }
-}
-
-extension <%= model.name %> {
-    init(values: Array<Optional<Binding>>) {
-        <% model.properties.each_with_index do |property, index| %><%= """let #{property.name}: #{property.real_type} = values[#{index+1}] as! #{property.real_type}""" %>
-        <% end %>
-        self.init(<%= model.property_key_value_pairs true %>)
-
-        let privateId: Int64 = values[0] as! Int64
-        self.privateId = Int(privateId)
-    }
-}
-
-extension <%= model.name %> {
-    var itself: String { get { return "WHERE \(<%= model.name %>.tableName).private_id = \(privateId)" } }
-}
-
-extension <%= model.relation_name %> {
-    func find(privateId: Int) -> Self {
-        return filter(privateId)
-    }
-
-    func find(privateIds: [Int]) -> Self {
-        return filter([.privateId: privateIds])
-    }
-
-    func filter(privateId: Int) -> Self {
-        self.filter.append("private_id = \(privateId)")
-        return self
-    }
-}