metamodel 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299648ce9da2c26b4d34f74f90acdfff7dff076c
-  data.tar.gz: b3d307c710260f446bd61c1b2aa0f049523d92b8
+  metadata.gz: 3d443b7aba6c0b4f80775f5d7e785d571cbcaee3
+  data.tar.gz: 0a124cd657c3c8e1584d5a106666077cebeafab8
 SHA512:
-  metadata.gz: 3ab3d001805ebb322de152d52f9c01a973b3d329ae5fbe532f95d34ddfe3dec7c1c77f9e5c1b048aa2f0ace724c93e1da5de1779ad086d0adb4c167a3f2d8733
-  data.tar.gz: 3faf5fff2d4738bfe1fe140ce83f4c9f52ac8ab5548836f2863ae2d229496d5cc4621b467bf524af8d7f7c3ed28e68b55c7e8aa03e10e1bf3393206de3f9b1ad
+  metadata.gz: a56c26ba55af301427b5bc9c496230e3a5fb305e36b77360986e21be2fe5e5fc00339cbe3c2393c8e8d5aca3c42c24c2a39a2a1a7fa97bcc8f1be3b74007412c
+  data.tar.gz: f4c5d900b9c36ea62a24c481cd2c47e7da71402b52f2e1b176f93752bfa44fb57df95632830dff20ee8775a6745c6e2a7487fecd11c91d701d1c5a0f2232a81c

data/README.md

@@ -5,13 +5,13 @@
 [![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)
 
-MetaModel is an iOS framework designed to help developer to deal with data persistent, JSON to model constructor 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 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.
 
-+ [x] Fastest JSON to model API
 + [x] Dealing with database without writing SQL
 + [x] Most concise API to retrieve data from persistent level
++ [ ] Fastest JSON to model API
 
 MetaModel provides convenience chainable APIs to manipulate models like ActiveRecord.
 
@@ -37,11 +37,11 @@ print(Person.all)
 Use a meta file in `./meta` folder to define your model:
 
 ```ruby
-define :User do |j|
+define :User do
   # define User model like this
-  j.nickname :string
-  j.avatar :string
-  j.email :string, :unique, default: "default@gmail.com"
+  attr :nickname, :string
+  attr :avatar, :string?
+  attr :email, :string, :unique, default: "default@gmail.com"
 end
 ```
 
@@ -99,10 +99,10 @@ Generating model files
 Generating MetaModel.framework
   -> MetaModel.framework located in current folder
 
-[!] Please drag MetaModel.framework into Linked Frameworks and Libraries phrase.
+[!] Please drag MetaModel.framework into Embedded Binaries phrase.
 ```
 
-This command build a `MetaModel.framework` in project root folder, you need to add this framework to **Linked frameworks and Libraries** phrase which located in `General` tab.
+This command build a `MetaModel.framework` in project root folder, you need to add this framework to **Embedded Binaries** phrase which located in `General` tab.
 
 ![integrate-metamodel-framework](images/integrate-metamodel-framework.png)
 

data/lib/metamodel/command/build/parser.rb

@@ -5,9 +5,8 @@ module MetaModel
 
         include Config::Mixin
 
-        require 'metamodel/model/cocoa_model'
-        require 'metamodel/model/cocoa_property'
-        require 'metamodel/model/property_constructor'
+        require 'metamodel/model/model'
+        require 'metamodel/model/property'
         require 'metamodel/command/build/renderer'
 
         def initialize
@@ -35,9 +34,33 @@ module MetaModel
         end
 
         def define(model_name)
-          model = CocoaModel.new(model_name)
-          yield PropertyConstructor.new(model)
-          @models << model
+          @models << Model.new(model_name)
+          yield
+        end
+
+        def attr(key, type = :string, *args)
+          current_model.properties << Property.new(key, type, args)
+        end
+
+        def has_one(name, model)
+          current_model.relation_properties << Property.new(name, model, :has_one)
+        end
+
+        def has_many(name, model)
+          property = Property.new(name, model, :has_many)
+          raise Informative, "Property type in has_many relation can't be optional" if property.is_optional?
+          current_model.relation_properties << property
+        end
+
+        def belongs_to(name, model)
+          current_model.relation_properties << Property.new(name, model, :belongs_to)
+          current_model.properties << Property.new("#{name}_id".camelize, "Int", :foreign, :default => 0)
+        end
+
+        private
+
+        def current_model
+          @models.last
         end
       end
     end

data/lib/metamodel/command/build/renderer.rb

@@ -20,9 +20,10 @@ module MetaModel
 
           def templates
             results = []
-            file_paths = %w{file_header attributes json recordable initialize static_methods instance_methods model_query model_relation}
+            # file_paths = %w{file_header attributes json recordable initialize static_methods instance_methods model_query model_relation}
+            file_paths = %w{file_header attributes recordable initialize static_methods instance_methods model_query model_relation foreign_key}
             file_paths.each do |file_path|
-              template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../../template/#{file_path}.swift.erb"))
+              template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../../template/#{file_path}.swift"))
               results << template
             end
             results

data/lib/metamodel/command/build.rb

@@ -21,11 +21,12 @@ module MetaModel
         UI.section "Building MetaModel.framework in project" do
           clone_project
           parse_template
+          validate_models
           render_model_files
           update_initialize_method
           build_metamodel_framework
         end
-        UI.notice "Please drag MetaModel.framework into Linked Frameworks and Libraries phrase.\n"
+        UI.notice "Please drag MetaModel.framework into Embedded Binaries phrase.\n"
       end
 
       def clone_project
@@ -33,7 +34,7 @@ module MetaModel
           UI.message "Existing project `#{config.metamodel_xcode_project}`"
         else
           UI.section "Cloning MetaModel project into `./metamodel` folder" do
-            Git.clone(config.metamodel_template_uri, 'metamodel')
+            Git.clone(config.metamodel_template_uri, 'metamodel', :depth => 1)
             UI.message "Using `./metamodel/MetaModel.xcodeproj` to build module"
           end
         end
@@ -44,13 +45,25 @@ module MetaModel
         @models = parser.parse
       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 == []
+        # class_types = supported_types - built_in_types
+        # @models.each do |model|
+        #   model.properties do |property|
+        #
+        #   end
+        # end
+      end
+
       def render_model_files
         UI.section "Generating model files" do
           Renderer.render(@models)
         end
       end
       def update_initialize_method
-        template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/metamodel.swift.erb"))
+        template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/metamodel.swift"))
         result = ErbalT::render_from_hash(template, { :models => @models })
         model_path = Pathname.new("./metamodel/MetaModel/MetaModel.swift")
         File.write model_path, result
@@ -112,6 +125,20 @@ module MetaModel
         end
       end
 
+      def built_in_types
+        %w[Int Double String].map do |t|
+          [t, "#{t}?"]
+        end.flatten
+      end
+
+      def supported_types
+        @models.reduce(%w[Int Double String]) { |types, model|
+          types << model.name.to_s
+        }.map { |type|
+          [type, "#{type}?"]
+        }.flatten
+      end
+
     end
   end
 end

data/lib/metamodel/command/generate.rb

@@ -32,9 +32,9 @@ module MetaModel
         modelfile = ''
         modelfile << "metamodel_version '#{VERSION}'\n\n"
         modelfile << <<-TEMPLATE.strip_heredoc
-          define :#{model} do |j|
+          define :#{model} do
             # define #{model} model like this
-            # j.nickname :string
+            # attr nickname, :string
           end
         TEMPLATE
         modelfile

data/lib/metamodel/config.rb

@@ -66,7 +66,7 @@ module MetaModel
     # @return [String]
     #
     def metamodel_template_uri
-      "git@github.com:MetaModel-Framework/MetaModel-Template.git"
+      "git@github.com:MModel/MetaModel-Template.git"
     end
 
     # Returns the path of the MetaModel.xcodeproj.

data/lib/metamodel/model/model.rb

@@ -0,0 +1,104 @@
+module MetaModel
+
+  class Model
+    attr_reader :name
+    attr_reader :properties
+    attr_reader :relation_properties
+
+    def initialize(name)
+      @name = name
+      @properties = []
+      @relation_properties = []
+
+      validate
+    end
+
+    def properties_exclude_id
+      @properties.select { |property| property.name != :id }
+    end
+
+    def foreign_id
+      "#{name}_id".camelize(:lower)
+    end
+
+    def table_name
+      name.to_s.tableize
+    end
+
+    def relation_name
+      "#{name}Relation"
+    end
+
+    def all_properties
+      all_properties = properties.clone
+      all_properties.push Property.primary_id
+      all_properties
+    end
+
+    def validate
+      property_keys = @properties.map { |property| property.name }
+
+      unless property_keys.include? :id
+        property_id = Property.new(:id, :int, :unique, :default => 0)
+        @properties << property_id
+      end
+    end
+
+    def hash_value
+      self.hash.to_s(16)
+    end
+
+    def property_key_value_pairs
+      @properties.map { |property| "#{property.name.to_s}: #{property.name.to_s}" }.join(", ")
+    end
+
+    def property_key_type_pairs
+      key_type_pairs_with_property(@properties, false)
+    end
+
+    def property_exclude_id_key_value_pairs(prefix = true, cast = false)
+      result = ""
+      if cast
+        result = properties_exclude_id.map { |property| "#{property.name.to_s}: #{property.type_without_optional == "Int" ? "Int(#{property.name.to_s})" : property.name.to_s}" }.join(", ")
+      else
+        result = properties_exclude_id.map { |property| "#{property.name.to_s}: #{property.name.to_s}" }.join(", ")
+      end
+      return result unless prefix
+      return result.length > 0 ? ", #{result}" : ""
+    end
+
+    def property_exclude_id_key_type_pairs(prefix = true)
+      key_type_pairs_with_property(properties_exclude_id, prefix)
+    end
+
+    def key_type_pairs_with_property(properties, prefix = true)
+      result = properties.map { |property|
+        has_default_value = property.has_default_value?
+        default_value = property.type_without_optional == "String" ?
+          "\"#{property.default_value}\"" : property.default_value
+        "#{property.name.to_s}: #{property.type.to_s}#{if has_default_value then " = " + "#{default_value}" end}"
+      }.join(", ")
+      return result unless prefix
+      return result.length > 0 ? ", #{result}" : ""
+    end
+
+    def build_table
+      table = "CREATE TABLE #{table_name}"
+      main_sql = @properties.map do |property|
+        result = "#{property.name} #{property.database_type}"
+        result << " PRIMARY KEY" if property.is_primary?
+        result << " UNIQUE" if property.is_unique?
+        result << " DEFAULT #{property.default_value}" if property.has_default_value?
+        result
+      end
+      foreign_sql = @properties.map do |property|
+        next unless property.is_foreign?
+        reference_table_name = property.type.tableize
+        "FOREIGN KEY(#{property.name}) REFERENCES #{reference_table_name}(_id)"
+      end
+
+      table + "(_id INTEGER PRIMARY KEY, #{(main_sql + foreign_sql).compact.join(", ")});"
+    end
+  end
+
+end

data/lib/metamodel/model/{cocoa_property.rb → property.rb}

@@ -1,14 +1,14 @@
 module MetaModel
 
-  class CocoaProperty
+  class Property
     attr_reader :json_key
-    attr_reader :key
+    attr_accessor :name
     attr_reader :type
     attr_reader :modifiers
 
     def initialize(json_key, type = :string, *modifiers)
       @json_key = json_key
-      @key = json_key.to_s.camelize(:lower).to_sym
+      @name = json_key.to_s.camelize(:lower).to_sym
       @type = convert_symbol_to_type type
 
       @modifiers = {}
@@ -20,6 +20,14 @@ module MetaModel
       end
     end
 
+    class << self
+      def primary_id
+        property = Property.new(:_id, :int, :primary)
+        property.name = :_id
+        property
+      end
+    end
+
     def type_without_optional
       return type.to_s[0..-2] if type.to_s.end_with? "?"
       type
@@ -40,6 +48,10 @@ module MetaModel
       type_without_optional == "Int" ? "Int64" : type_without_optional
     end
 
+    def is_array?
+      @type.pluralize == str
+    end
+
     def is_unique?
       @modifiers.include? :unique
     end
@@ -48,16 +60,32 @@ module MetaModel
       @modifiers.include? :primary
     end
 
+    def is_foreign?
+      @modifiers.include? :foreign
+    end
+
     def is_optional?
       @type.to_s.end_with? "?"
     end
 
+    def has_one?
+      @modifiers.include? :has_one
+    end
+
+    def has_many?
+      @modifiers.include? :has_many
+    end
+
+    def belongs_to?
+      @modifiers.include? :belongs_to
+    end
+
     def has_default_value?
-      @modifiers[:default].nil?
+      !!@modifiers[:default]
     end
 
     def default_value
-      modifiers[:default]
+      has_default_value? ? modifiers[:default] : ""
     end
 
     private

data/lib/metamodel/template/{attributes.swift.erb → attributes.swift}

@@ -1,10 +1,10 @@
  public struct <%= model.name %> {
-    <% model.properties.each do |property| %><%= """public var #{property.key}: #{property.type}""" %>
+    <% model.properties.each do |property| %><%= """public var #{property.name}: #{property.type}""" %>
     <% end %>
     static let tableName = "<%= model.table_name %>"
 
     public enum Column: String, Unwrapped {
-        <% model.properties.each do |property| %><%= """case #{property.key} = \"#{property.key}\"""" %>
+        <% model.properties.each do |property| %><%= """case #{property.name} = \"#{property.name}\"""" %>
         <% end %>
         var unwrapped: String { get { return self.rawValue.unwrapped } }
     }

data/lib/metamodel/template/foreign_key.swift

@@ -0,0 +1,54 @@
+<% model.relation_properties.each do |property| %><% if property.has_many? %>
+<%= """public extension #{model.name} {
+    func append#{property.type}(element: #{property.type}) {
+        var element = element
+        element.update(#{model.foreign_id}: id)
+    }
+
+    func create#{property.type}(id: Int, content: String) -> #{property.type}? {
+        return #{property.type}.create(id, content: content, #{model.foreign_id}: id)
+    }
+
+    func delete#{property.type}(id: Int) {
+        #{property.type}.filter(.#{model.foreign_id}, value: id).findBy(id: id).first?.delete()
+    }
+    var #{property.name}: [#{property.type}] {
+        get {
+            return #{property.type}.filter(.id, value: id).result
+        }
+        set {
+            #{property.name}.forEach { (element) in
+                var element = element
+                element.update(#{model.foreign_id}: 0)
+            }
+            newValue.forEach { (element) in
+                var element = element
+                element.update(#{model.foreign_id}: id)
+            }
+        }
+    }
+}""" %><% elsif property.belongs_to? %>
+<%= """public extension #{model.name} {
+    var #{property.name}: #{property.type}? {
+        get {
+            return #{property.type}.find(id)
+        }
+        set {
+            guard let newValue = newValue else { return }
+            update(#{property.type.camelize(:lower)}Id: newValue.id)
+        }
+    }
+
+}""" %><% elsif property.has_one? %>
+<%= """public extension #{model.name} {
+    var #{property.name}: #{property.type}? {
+        get {
+            return #{property.type}.find(id)
+        }
+        set {
+            #{property.type}.filter(.#{model.name.to_s.camelize(:lower)}Id, value: id).deleteAll
+            guard var newValue = newValue else { return }
+            newValue.update(articleId: id)
+        }
+    }
+}"""%><% end %><% end %>

data/lib/metamodel/template/instance_methods.swift

@@ -0,0 +1,47 @@
+public extension <%= model.name %> {
+    var itself: String { get { return "WHERE \(<%= model.name %>.tableName.unwrapped).\("id".unwrapped) = \(id)" } }
+
+    var delete: Bool {
+        get {
+            let deleteSQL = "DELETE FROM \(<%= model.name %>.tableName.unwrapped) \(itself)"
+            executeSQL(deleteSQL)
+            return true
+        }
+    }
+
+    <% 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}])
+    }""" %>
+    <% end %>
+    mutating func update(attributes: [<%= model.name %>.Column: Any]) -> <%= model.name %> {
+        var setSQL: [String] = []
+        if let attributes = attributes as? [<%= model.name %>.Column: Unwrapped] {
+            for (key, value) in attributes {
+                switch key {
+                <% model.properties_exclude_id.each do |property| %><%= """case .#{property.name}: setSQL.append(\"\\(key.unwrapped) = \\(value.unwrapped)\")""" %>
+                <% end %>default: break
+                }
+            }
+            let updateSQL = "UPDATE \(<%= model.name %>.tableName.unwrapped) 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
+                    }
+                }
+            }
+        }
+        return self
+    }
+    var save: <%= model.name %> {
+        mutating get {
+            if let _ = <%= model.name %>.find(id) {
+                update([<% column_values = model.properties.map do |property| %><% ".#{property.name}: #{property.name}" %><% end %><%= column_values.join(", ") %>])
+            } else {
+                <%= model.name %>.create(id<%= model.property_exclude_id_key_value_pairs %>)
+            }
+            return self
+        }
+    }
+}

data/lib/metamodel/template/{json.swift.erb → json.swift}

@@ -2,17 +2,13 @@ extension <%= model.name %> {
     public static func parse(json: [String: AnyObject]) -> <%= model.name %> {
         let id: Int = json["id"] as! Int
         <% model.properties_exclude_id.each do |property| %>
-        <%= """let #{property.key}: #{property.type} = json[\"#{property.key}\"] as! #{property.type}""" %>
+        <%= """let #{property.name}: #{property.type} = json[\"#{property.name}\"] as! #{property.type}""" %>
         <% end %>
         return <%= model.name %>(<%= model.property_key_value_pairs %>)
     }
 
     public static func parse(jsons: [[String: AnyObject]]) -> [<%= model.name %>] {
-        var results: [<%= model.name %>] = []
-        for json in jsons {
-            results.append(<%= model.name %>.parse(json))
-        }
-        return results
+        return jsons.map(<%= model.name %>.parse)
     }
 
     public static func parse(data: NSData) throws -> <%= model.name %> {

data/lib/metamodel/template/{metamodel.swift.erb → metamodel.swift}

@@ -31,17 +31,21 @@ public class MetaModel {
     }
 }
 
-func executeSQL(sql: String, silent: Bool = false, success: (() -> ())? = nil) -> Statement? {
-    defer { print("\n") }
-    print("-> Begin Transaction")
+func executeSQL(sql: String, verbose: Bool = true, 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
-        print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
-        print("-> Commit Transaction")
 
+        if verbose {
+            print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
+            print("-> Commit Transaction")
+            print("\n")
+        }
         if let success = success {
             success()
         }
@@ -50,22 +54,29 @@ func executeSQL(sql: String, silent: Bool = false, success: (() -> ())? = nil) -
     } catch let error {
         let endDate = NSDate()
         let interval = endDate.timeIntervalSinceDate(startDate) * 1000
-        print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
-        print("\t\(error)")
-        print("-> Rollback transaction")
+        if verbose {
+            print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
+            print("\t\(error)")
+            print("-> Rollback transaction")
+            print("\n")
+        }
     }
     return nil
 }
 
-func executeScalarSQL(sql: String, silent: Bool = false, success: (() -> ())? = nil) -> Binding? {
-    defer { print("\n") }
-    print("-> Begin Transaction")
+func executeScalarSQL(sql: String, verbose: 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
-    print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
-    print("-> Commit Transaction")
+    if verbose {
+        print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
+        print("-> Commit Transaction")
+        print("\n")
+    }
 
     if let success = success {
         success()

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

@@ -19,10 +19,10 @@ public extension <%= model.name %> {
         return <%= model.relation_name %>().findBy(id: id).first
     }
 
-    <% model.properties_exclude_id.each do |property| %><%= """static func findBy(#{property.key} #{property.key}: #{property.type_without_optional}) -\> #{model.name}? {
-        return #{model.relation_name}().findBy(#{property.key}: #{property.key}).first
-    }""" %>
-    <% end %>
+    <% 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])
     }

data/lib/metamodel/template/{model_relation.swift.erb → model_relation.swift}

@@ -19,8 +19,8 @@ public class <%= model.relation_name %>: Relation<<%= model.name %>> {
     }
 
     <% model.properties_exclude_id.each do |property| %>
-    <%= """public func findBy(#{property.key} #{property.key}: #{property.type_without_optional}) -\> Self {
-        return self.filter([.#{property.key}: #{property.key}]).limit(1)
+    <%= """public func findBy(#{property.name} #{property.name}: #{property.type_without_optional}) -\> Self {
+        return self.filter([.#{property.name}: #{property.name}])
     }""" %>
     <% end %>
 
@@ -79,4 +79,17 @@ public class <%= model.relation_name %>: Relation<<%= model.name %>> {
         return self
     }
 
+    public func updateAll(column: <%= model.name %>.Column, value: Any) {
+        self.result.forEach { (element) in
+            var element = element
+            element.update([column: value])
+        }
+    }
+
+    public var deleteAll: Bool {
+        get {
+            self.result.forEach { $0.delete }
+            return true
+        }
+    }
 }

data/lib/metamodel/template/{recordable.swift.erb → recordable.swift}

@@ -1,6 +1,6 @@
 extension <%= model.name %>: Recordable {
     public init(values: Array<Optional<Binding>>) {
-        <% model.properties.each_with_index do |property, index| %><%= """let #{property.key}: #{property.real_type} = values[#{index}] as! #{property.real_type}""" %>
+        <% model.properties.each_with_index do |property, index| %><%= """let #{property.name}: #{property.real_type} = values[#{index+1}] as! #{property.real_type}""" %>
         <% end %>
         self.init(id: Int(id)<%= model.property_exclude_id_key_value_pairs(true, true) %>)
     }

data/lib/metamodel/template/{static_methods.swift.erb → static_methods.swift}

@@ -9,23 +9,25 @@ public extension <%= model.name %> {
         return Int(count)
     }
 
-    static func new(<%= model.property_exclude_id_key_type_pairs(false) %>) -> <%= model.name %> {
-        return <%= model.name %>(id: -1<%= model.property_exclude_id_key_value_pairs %>)
+    static func new(<%= model.property_key_type_pairs %>) -> <%= model.name %> {
+        return <%= model.name %>(<%= model.property_key_value_pairs %>)
     }
 
     static func create(<%= model.property_key_type_pairs %>) -> <%= model.name %>? {
+        if <%= model.properties.select { |p| p.name.to_s.downcase.end_with? "id" }.map { |p| "#{p.name} == 0" }.join(" || ") %> { return nil }
+
         var columnsSQL: [<%= model.name %>.Column] = []
         var valuesSQL: [Unwrapped] = []
 
         columnsSQL.append(.id)
         valuesSQL.append(id)
         <% model.properties_exclude_id.each do |property| %><% if property.is_optional? %>
-        <%= """if let #{property.key} = #{property.key} {
-            columnsSQL.append(.#{property.key})
-            valuesSQL.append(#{property.key})
+        <%= """if let #{property.name} = #{property.name} {
+            columnsSQL.append(.#{property.name})
+            valuesSQL.append(#{property.name})
         }""" %><% else %>
-        <%= """columnsSQL.append(.#{property.key})
-        valuesSQL.append(#{property.key})
+        <%= """columnsSQL.append(.#{property.name})
+        valuesSQL.append(#{property.name})
         """ %><% end %><% end %>
 
         let insertSQL = "INSERT INTO \(tableName.unwrapped) (\(columnsSQL.map { $0.rawValue }.joinWithSeparator(", "))) VALUES (\(valuesSQL.map { $0.unwrapped }.joinWithSeparator(", ")))"

data/lib/metamodel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -148,19 +148,19 @@ files:
 - lib/metamodel/command/generate.rb
 - lib/metamodel/command/init.rb
 - lib/metamodel/config.rb
-- lib/metamodel/model/cocoa_model.rb
-- lib/metamodel/model/cocoa_property.rb
-- lib/metamodel/model/property_constructor.rb
-- lib/metamodel/template/attributes.swift.erb
-- lib/metamodel/template/file_header.swift.erb
-- lib/metamodel/template/initialize.swift.erb
-- lib/metamodel/template/instance_methods.swift.erb
-- lib/metamodel/template/json.swift.erb
-- lib/metamodel/template/metamodel.swift.erb
-- lib/metamodel/template/model_query.swift.erb
-- lib/metamodel/template/model_relation.swift.erb
-- lib/metamodel/template/recordable.swift.erb
-- lib/metamodel/template/static_methods.swift.erb
+- lib/metamodel/model/model.rb
+- lib/metamodel/model/property.rb
+- lib/metamodel/template/attributes.swift
+- lib/metamodel/template/file_header.swift
+- lib/metamodel/template/foreign_key.swift
+- lib/metamodel/template/initialize.swift
+- lib/metamodel/template/instance_methods.swift
+- lib/metamodel/template/json.swift
+- lib/metamodel/template/metamodel.swift
+- lib/metamodel/template/model_query.swift
+- lib/metamodel/template/model_relation.swift
+- lib/metamodel/template/recordable.swift
+- lib/metamodel/template/static_methods.swift
 - lib/metamodel/user_interface.rb
 - lib/metamodel/version.rb
 homepage: https://github.com/MModel/MetaModel
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: The Cocoa models generator.

data/lib/metamodel/model/cocoa_model.rb

@@ -1,79 +0,0 @@
-module MetaModel
-
-  class CocoaModel
-    attr_reader :name
-    attr_reader :properties
-
-    def initialize(name)
-      @name = name
-      @properties = []
-
-      validate
-    end
-
-    def properties_exclude_id
-      @properties.select { |property| property.key != :id }
-    end
-
-    def table_name
-      name.to_s.tableize
-    end
-
-    def relation_name
-      "#{name}Relation"
-    end
-
-    def validate
-      property_keys = @properties.map { |property| property.key }
-
-      unless property_keys.include? :id
-        property_id = CocoaProperty.new(:id, :int, :primary)
-        @properties << property_id
-      end
-    end
-
-    def hash_value
-      self.hash.to_s(16)
-    end
-
-    def property_key_value_pairs
-      @properties.map { |property| "#{property.key.to_s}: #{property.key.to_s}" }.join(", ")
-    end
-
-    def property_key_type_pairs
-      @properties.map { |property| "#{property.key.to_s}: #{property.type.to_s}" }.join(", ")
-    end
-
-    def property_exclude_id_key_value_pairs(prefix = true, cast = false)
-      result = ""
-      if cast
-        result = properties_exclude_id.map { |property| "#{property.key.to_s}: #{property.type_without_optional == "Int" ? "Int(#{property.key.to_s})" : property.key.to_s}" }.join(", ")
-      else
-        result = properties_exclude_id.map { |property| "#{property.key.to_s}: #{property.key.to_s}" }.join(", ")
-      end
-      return result unless prefix
-      return result.length > 0 ? ", #{result}" : ""
-    end
-
-    def property_exclude_id_key_type_pairs(prefix = true)
-      result = properties_exclude_id.map { |property| "#{property.key.to_s}: #{property.type.to_s}" }.join(", ")
-      return result unless prefix
-      return result.length > 0 ? ", #{result}" : ""
-    end
-
-    def build_table
-      table = "CREATE TABLE #{table_name}"
-      main_sql = @properties.map do |property|
-        result = "#{property.key} #{property.database_type}"
-        result << " NOT NULL" if !property.is_optional?
-        result << " PRIMARY KEY" if property.is_primary?
-        result << " UNIQUE" if property.is_unique?
-        result << " DEFAULT #{property.default_value}" if property.has_default_value?
-        result
-      end.join(", ")
-      main_sql = "(#{main_sql});"
-      table + main_sql
-    end
-  end
-
-end

data/lib/metamodel/model/property_constructor.rb

@@ -1,31 +0,0 @@
-module MetaModel
-
-  class PropertyConstructor
-
-    attr_reader :model
-
-    def initialize(model)
-      @model = model
-    end
-
-    def method_missing(meth, *arguments, &block)
-      (class << self; self; end).class_eval do
-        define_method meth do |type, *arguments|
-          save_property CocoaProperty.new(meth, type, arguments)
-        end
-      end
-      self.send meth, *arguments
-    end
-
-    private
-
-    # Save property to current Cocoa Model
-    #
-    # @param [CocoaProperty] the instance for cocoa property
-    # @return [Void]
-    def save_property(property)
-      @model.properties << property
-    end
-  end
-
-end

data/lib/metamodel/template/instance_methods.swift.erb

@@ -1,38 +0,0 @@
-public extension <%= model.name %> {
-    var itself: String { get { return "WHERE \(<%= model.name %>.tableName.unwrapped).\("id".unwrapped) = \(id)" } }
-
-    func delete() {
-        let deleteSQL = "DELETE FROM \(<%= model.name %>.tableName.unwrapped) \(itself)"
-        executeSQL(deleteSQL)
-    }
-
-    <% model.properties_exclude_id.each do |property| %><%= """mutating func update(#{property.key} #{property.key}: #{property.type}) -> #{model.name} {
-        return self.update([.#{property.key}: #{property.key}])
-    }""" %>
-    <% end %>
-    mutating func update(attributes: [<%= model.name %>.Column: Any]) -> <%= model.name %> {
-        var setSQL: [String] = []
-        for (key, _) in attributes {
-            switch key {
-            <% model.properties_exclude_id.each do |property| %><%= """case .#{property.key}: setSQL.append(\"\\(key.unwrapped) = \\(#{property.key}#{property.is_optional? ? "?" : ""}.unwrapped)\")""" %>
-            <% end %>default: break
-            }
-        }
-        let updateSQL = "UPDATE \(<%= model.name %>.tableName.unwrapped) SET \(setSQL.joinWithSeparator(", ")) \(itself)"
-        executeSQL(updateSQL) {
-            for (key, value) in attributes {
-                switch key {
-                <% model.properties_exclude_id.each do |property| %><%= """case .#{property.key}: self.#{property.key} = value as#{property.is_optional? ? "?" : "!"} #{property.type_without_optional}""" %>
-                <% end %>default: break
-                }
-            }
-        }
-        return self
-    }
-    var save: <%= model.name %> {
-        get {
-            <%= model.name %>.create(id<%= model.property_exclude_id_key_value_pairs %>)
-            return self
-        }
-    }
-}