metamodel 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c119cc6df05af0b21c4f244f1b496f5f91ec517
-  data.tar.gz: 1faf793b51be72320af814d5d8ebcd14e575d420
+  metadata.gz: 150f0889587f6a3379d1dd291465dc4aea20c5c0
+  data.tar.gz: 616832c86c039688d8c06fdcc59076aa8745704f
 SHA512:
-  metadata.gz: 76072a392abaa5c37d6609702f88d4ee6ee9a7087bc43a4c8f22c0677ec0df910f1da5c4a2bfcb908e9fe6e170f5cfb61d6b2038e70afa3a0754f02db480b989
-  data.tar.gz: e3b57aca292f8b915b6a116b974f0896506012cbc7a421e15c3a1a3f72d3eec6ff9a79b5ce7cb76dbc6f9d612b2bc47c06818d40ef1f2c40937e2c06a419bb95
+  metadata.gz: f6a3cd5f7a04e4284887c52574cb50a7622f6aece76de076881176c1a803dffd785e5d9778d8d94aa7de6e4fcb2c0f038ad8acafa897e2be9adba9648b7b341e
+  data.tar.gz: 8b2e17fc792955ce237d907e71024a1637fa70d414716c49ffe98419b10f7efa44bf3e0a8634edfe3fe0caa30e95476ce649de3df52f4769b0f9c7cfe4b112c9

data/lib/metamodel/command/build.rb

@@ -82,14 +82,16 @@ module MetaModel
             BITCODE_GENERATION_MODE=bitcode \
             ONLY_ACTIVE_ARCH=NO \
             CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGN_IDENTITY="
+            CODE_SIGN_IDENTITY= \
+            clean build"
           build_iphonesimulator = "xcodebuild -scheme MetaModel \
             -project MetaModel/MetaModel.xcodeproj \
             -configuration Release -sdk iphonesimulator \
             -derivedDataPath './metamodel' \
             ONLY_ACTIVE_ARCH=NO \
             CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGN_IDENTITY="
+            CODE_SIGN_IDENTITY= \
+            clean build"
           result = system "#{build_iphoneos} > /dev/null &&
             #{build_iphonesimulator} > /dev/null"
 

data/lib/metamodel/record/association.rb

@@ -37,6 +37,14 @@ module MetaModel
         result
       end
 
+      def secondary_model_instance
+        case relation
+        when :has_many, :has_one then "#{secondary_model.name}.findBy(#{major_model.foreign_id}: id)"
+        when :belongs_to then "#{secondary_model.name}.findBy(id: #{secondary_model.foreign_id})"
+        else ""
+        end
+      end
+
       #-------------------------------------------------------------------------#
 
       # @!group Validation

data/lib/metamodel/record/model.rb

@@ -13,6 +13,10 @@ module MetaModel
         validate
       end
 
+      def contains?(property)
+        @properties.select { |prop| prop.name == property }.size > 0
+      end
+
       def properties_exclude_id
         @properties.select { |property| property.name != "id" }
       end
@@ -57,16 +61,16 @@ module MetaModel
         key_value_pairs_with_property properties_exclude_id, cast
       end
 
-      def property_key_type_pairs
-        key_type_pairs_with_property @properties
+      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
       end
 
-      def property_key_type_pairs_without_property(property)
-        key_type_pairs_with_property @properties.select { |element| element.name != property }
+      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
       end
 
-      def property_exclude_id_key_type_pairs
-        key_type_pairs_with_property properties_exclude_id
+      def property_key_type_pairs_without_property(property)
+        key_type_pairs_with_property @properties.select { |element| element.name != property }
       end
 
       def build_table
@@ -99,13 +103,14 @@ module MetaModel
         end.join(", ")
       end
 
-      def key_type_pairs_with_property(properties)
+      def key_type_pairs_with_property(properties, remove_extra_param = true, 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}"
-          if index == 0
+          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

data/lib/metamodel/template/foreign_key.swift

@@ -11,11 +11,11 @@
     }
 
     func delete#{association.type}(id: Int) {
-        #{association.type}.filter(.#{model.foreign_id}, value: id).findBy(id: id).first?.delete
+        #{association.type}.findBy(#{model.foreign_id}: id).first?.delete
     }
     var #{association.name}: [#{association.type}] {
         get {
-            return #{association.type}.filter(.id, value: id).result
+            return #{association.type}.filter(id: id).result
         }
         set {
             #{association.name}.forEach { (element) in
@@ -32,7 +32,7 @@
 <%= """public extension #{model.name} {
     var #{association.name}: #{association.type}? {
         get {
-            return #{association.type}.find(id)
+            return #{association.secondary_model_instance}.first
         }
         set {
             guard let newValue = newValue else { return }
@@ -44,10 +44,10 @@
 <%= """public extension #{model.name} {
     var #{association.name}: #{association.type}? {
         get {
-            return #{association.type}.find(id)
+            return #{association.secondary_model_instance}.first
         }
         set {
-            #{association.type}.filter(.#{model.foreign_id}, value: id).deleteAll
+            #{association.type}.findBy(#{model.foreign_id}: id).deleteAll
             guard var newValue = newValue else { return }
             newValue.update(#{model.foreign_id}: id)
         }

data/lib/metamodel/template/helper.swift

@@ -30,6 +30,6 @@ extension <%= model.name %> {
     }
 }
 
-public extension <%= model.name %> {
+extension <%= model.name %> {
     var itself: String { get { return "WHERE \(Article.tableName.unwrapped).\("id".unwrapped) = \(id)" } }
 }

data/lib/metamodel/template/metamodel.swift

@@ -29,57 +29,3 @@ public class MetaModel {
         <% end %>
     }
 }
-
-func executeSQL(sql: String, verbose: Bool = false, suppress: Bool = false, success: (() -> ())? = nil) -> Statement? {
-    if verbose {
-        print("-> Begin Transaction")
-    }
-    let startDate = NSDate()
-    do {
-        let result = try db.run(sql)
-        let endDate = NSDate()
-        let interval = endDate.timeIntervalSinceDate(startDate) * 1000
-
-        if verbose {
-            print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
-            print("-> Commit Transaction")
-            print("\n")
-        }
-        if let success = success {
-            success()
-        }
-
-        return result
-    } catch let error {
-        let endDate = NSDate()
-        let interval = endDate.timeIntervalSinceDate(startDate) * 1000
-        print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
-        print("\t\(error)")
-        if verbose {
-            print("-> Rollback transaction")
-            print("\n")
-        }
-    }
-    return nil
-}
-
-func executeScalarSQL(sql: String, verbose: Bool = false, suppress: Bool = false, success: (() -> ())? = nil) -> Binding? {
-    if verbose {
-        print("-> Begin Transaction")
-    }
-    let startDate = NSDate()
-    let result = db.scalar(sql)
-    let endDate = NSDate()
-    let interval = endDate.timeIntervalSinceDate(startDate) * 1000
-    if verbose {
-        print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
-        print("-> Commit Transaction")
-        print("\n")
-    }
-
-    if let success = success {
-        success()
-    }
-
-    return result
-}

data/lib/metamodel/template/model_delete.swift

@@ -4,17 +4,19 @@ public extension <%= model.name %> {
     var delete: Bool {
         get {
             let deleteSQL = "DELETE FROM \(<%= model.name %>.tableName.unwrapped) \(itself)"
-            executeSQL(deleteSQL)
+            executeSQL(deleteSQL)<% model.associations.each do |association| %>
+            <%= association.secondary_model_instance + ".delete" if association.dependent == :destroy %>
+            <%= association.secondary_model_instance + ".update(#{model.foreign_id}: 0)" if association.dependent == :nullify && model.contains?(model.foreign_id) %>
+            <% end %>
             return true
         }
     }
-    static func deleteAll() {
-        let deleteAllSQL = "DELETE FROM \(tableName.unwrapped)"
-        executeSQL(deleteAllSQL)
-    }
+    static var deleteAll: Bool { get { return <%= model.relation_name %>().deleteAll } }
 }
 
 public extension <%= model.relation_name %> {
+    var delete: Bool { get { return deleteAll } }
+
     var deleteAll: Bool {
         get {
             self.result.forEach { $0.delete }

data/lib/metamodel/template/model_initialize.swift

@@ -9,7 +9,7 @@ public struct <%= model.name %> {
         var unwrapped: String { get { return self.rawValue.unwrapped } }
     }
 
-    public init(<%= model.property_key_type_pairs %>) {
+    public init(<%= model.property_key_type_pairs false %>) {
         <% model.properties.each do |property| %><%= """self.#{property.name} = #{property.name}" %>
         <% end %>
     }

data/lib/metamodel/template/model_query.swift

@@ -29,20 +29,14 @@ public extension <%= model.name %> {
         return <%= model.relation_name %>().find(id).first
     }
 
-    static func findBy(id id: Int) -> <%= model.name %>? {
-        return <%= model.relation_name %>().findBy(id: id).first
-    }
-    <% model.properties_exclude_id.each do |property| %><%= """
-    static func findBy(#{property.name} #{property.name}: #{property.type_without_optional}) -\> #{model.name}? {
-        return #{model.relation_name}().findBy(#{property.name}: #{property.name}).first
-    }
-    """ %><% end %>
-    static func filter(column: <%= model.name %>.Column, value: Any) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().filter([column: value])
+    static func findBy(<%= model.property_key_type_pairs(true, true) %>) -> <%= model.relation_name %> {
+        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 <%= model.relation_name %>().filter(attributes)
     }
 
-    static func filter(conditions: [<%= model.name %>.Column: Any]) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().filter(conditions)
+    static func filter(<%= model.property_key_type_pairs(true, true) %>) -> <%= model.relation_name %> {
+        return findBy(<%= model.property_key_value_pairs %>)
     }
 
     static func limit(length: UInt, offset: UInt = 0) -> <%= model.relation_name %> {
@@ -76,17 +70,19 @@ public extension <%= model.name %> {
 
 public extension <%= model.relation_name %> {
     func find(id: Int) -> Self {
-        return self.findBy(id: id)
+        return findBy(id: id)
+    }
+
+    func findBy(<%= model.property_key_type_pairs(true, 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)
     }
 
-    func findBy(id id: Int) -> Self {
-        return self.filter([.id: id]).limit(1)
+    func filter(<%= model.property_key_type_pairs(true, true) %>) -> Self {
+        return findBy(<%= model.property_key_value_pairs %>)
     }
 
-    <% model.properties_exclude_id.each do |property| %><%= """func findBy(#{property.name} #{property.name}: #{property.type_without_optional}) -\> Self {
-        return self.filter([.#{property.name}: #{property.name}])
-    }""" %>
-    <% end %>
     func filter(conditions: [<%= model.name %>.Column: Any]) -> Self {
         for (column, value) in conditions {
             let columnSQL = "\(expandColumn(column))"

data/lib/metamodel/template/model_update.swift

@@ -1,11 +1,14 @@
 // MARK: - Update
 
 public extension <%= model.name %> {
-    <% model.properties_exclude_id.each do |property| %><%= """mutating func update(#{property.name} #{property.name}: #{property.type}) -> #{model.name} {
-        return self.update([.#{property.name}: #{property.name}])
+    mutating func update(<%= model.property_exclude_id_key_type_pairs(true, 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)
     }
-    """ %><% end %>
-    mutating func update(attributes: [<%= model.name %>.Column: Any]) -> <%= model.name %> {
+
+    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 {
@@ -24,8 +27,8 @@ public extension <%= model.name %> {
                 }
             }
         }
-        return self
     }
+
     var save: <%= model.name %> {
         mutating get {
             if let _ = <%= model.name %>.find(id) {
@@ -36,13 +39,27 @@ public extension <%= model.name %> {
             return self
         }
     }
+
+    var commit: <%= model.name %> {
+        mutating get {
+            return save
+        }
+    }
 }
 
 public extension <%= model.relation_name %> {
-    public func updateAll(column: <%= model.name %>.Column, value: Any) {
-        self.result.forEach { (element) in
+    public func updateAll(<%= model.property_exclude_id_key_type_pairs(true, true) %>) -> Self {
+        return update(<%= model.property_exclude_id_key_value_pairs %>)
+    }
+
+    public func update(<%= model.property_exclude_id_key_type_pairs(true, 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([column: value])
+            element.update(attributes)
         }
+        return self
     }
 }

data/lib/metamodel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide