metamodel 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d443b7aba6c0b4f80775f5d7e785d571cbcaee3
-  data.tar.gz: 0a124cd657c3c8e1584d5a106666077cebeafab8
+  metadata.gz: 36ad33602070abacabd6daa90047708d6888e35b
+  data.tar.gz: bfbdbeeab3881c3e592b62c1084dc505f7e68d7e
 SHA512:
-  metadata.gz: a56c26ba55af301427b5bc9c496230e3a5fb305e36b77360986e21be2fe5e5fc00339cbe3c2393c8e8d5aca3c42c24c2a39a2a1a7fa97bcc8f1be3b74007412c
-  data.tar.gz: f4c5d900b9c36ea62a24c481cd2c47e7da71402b52f2e1b176f93752bfa44fb57df95632830dff20ee8775a6745c6e2a7487fecd11c91d701d1c5a0f2232a81c
+  metadata.gz: 0d464c4eac3190573387c23fb4f2ddd28bb632fbd17833bf618e23bdd64b7c0247f8039020d46d11b87801d269d5321e486b6eae952923955b55fb3bc64404ab
+  data.tar.gz: e8a655ea0d4e244f3239a3b1c94ce8dd5b1b6391ab45af7483cbad83313b395b8e8e906800070c439bc7280bf6206f9e9780284d8310d8222fd449ee9f515b81

data/README.md

@@ -34,14 +34,22 @@ print(Person.all)
 
 ## Usage
 
-Use a meta file in `./meta` folder to define your model:
+Use Metafile in project folder to define your model:
 
 ```ruby
-define :User do
-  # define User model like this
-  attr :nickname, :string
-  attr :avatar, :string?
-  attr :email, :string, :unique, default: "default@gmail.com"
+metamodel_version '0.1.0'
+
+define :Article do
+  attr :title
+  attr :content
+
+  has_many :comments
+end
+
+define :Comment do
+  attr :content
+
+  belongs_to :article
 end
 ```
 
@@ -53,8 +61,6 @@ And then run `meta build` will automatically generate all the code you need.
 sudo gem install metamodel --verbose
 ```
 
-**System Requirements**: Current version of MetaModel requires macOS with Ruby 2.2.2 or above
-
 ## Quick Start
 
 After installation , run `meta init` in your iOS project root folder which will make a `meta` directory in current folder.
@@ -65,21 +71,21 @@ $ meta init
 
 Initialing MetaModel project
 
-Creating `meta` folder for MetaModel
+Creating `Metafile` for MetaModel
 ```
 
 Generate your model meta file with `meta generate`.
 
 ```shell
-$ meta generate User
+$ meta generate Article
 
 Generating model meta file
 
--> Adding `user.rb` to meta folder
+-> Adding `Article` model to Metafile
 
-[!] `user.rb` has already generated, use the command below to edit it.
+[!] Adding `Article` model scaffold to Metafile, use the command below to edit it.
 
-  vim meta/user.rb
+  vim Metafile
 ```
 
 Edit meta file using vim, Emacs or other editor and run `meta build`.
@@ -90,14 +96,13 @@ $ meta build
 Building MetaModel.framework in project
   Existing project `./metamodel/MetaModel.xcodeproj`
 
-Analyzing meta files
-  -> Resolving `user.rb`
+Analyzing Metafile
+  -> Resolving `Article`
+  -> Resolving `Comment`
 
 Generating model files
-  -> Using User.swift file
-
-Generating MetaModel.framework
-  -> MetaModel.framework located in current folder
+  -> Using Article.swift file
+  -> Using Comment.swift file
 
 [!] Please drag MetaModel.framework into Embedded Binaries phrase.
 ```

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

@@ -14,14 +14,9 @@ module MetaModel
         end
 
         def parse
-          UI.section "Analyzing meta files" do
-            meta_path = config.meta_path
-            metas = Dir[meta_path + "*.rb"]
-            metas.each do |meta_file|
-              UI.message '-> '.green + "Resolving `#{File.basename(meta_file)}`"
-              meta_code = File.read(meta_path + meta_file)
-              eval meta_code
-            end
+          UI.section "Analyzing Metafile" do
+            metafile_path = config.metafile_path
+            eval File.read(metafile_path)
           end
           @models
         end
@@ -34,6 +29,7 @@ module MetaModel
         end
 
         def define(model_name)
+          UI.message '-> '.green + "Resolving `#{model_name.to_s.camelize}`"
           @models << Model.new(model_name)
           yield
         end
@@ -42,17 +38,20 @@ module MetaModel
           current_model.properties << Property.new(key, type, args)
         end
 
-        def has_one(name, model)
+        def has_one(name, model = nil)
+          model = name.to_s.singularize.camelize if model.nil?
           current_model.relation_properties << Property.new(name, model, :has_one)
         end
 
-        def has_many(name, model)
+        def has_many(name, model = nil)
+          model = name.to_s.singularize.camelize if model.nil?
           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)
+        def belongs_to(name, model = nil)
+          model = name.to_s.singularize.camelize if model.nil?
           current_model.relation_properties << Property.new(name, model, :belongs_to)
           current_model.properties << Property.new("#{name}_id".camelize, "Int", :foreign, :default => 0)
         end

data/lib/metamodel/command/build.rb

@@ -6,9 +6,10 @@ module MetaModel
       require 'metamodel/command/build/parser'
       require 'metamodel/command/build/renderer'
 
-      self.summary = ""
+      self.summary = "Build a MetaModel.framework from Metafile"
       self.description = <<-DESC
-
+        Clone a metamodel project template from GitHub, parsing Metafile, validating models,
+        generate model swift file and build MetaModel.framework.
       DESC
 
       attr_accessor :models
@@ -35,7 +36,7 @@ module MetaModel
         else
           UI.section "Cloning MetaModel project into `./metamodel` folder" do
             Git.clone(config.metamodel_template_uri, 'metamodel', :depth => 1)
-            UI.message "Using `./metamodel/MetaModel.xcodeproj` to build module"
+            UI.message "Using `#{metamodel_xcode_project}` to build module"
           end
         end
       end
@@ -49,12 +50,14 @@ module MetaModel
         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
+
+        @models.each do |main|
+          main.relation_properties.each do |property|
+            @models.each do |secondary|
+              property.relation_model = secondary if property.type == secondary.name
+            end
+          end
+        end
       end
 
       def render_model_files
@@ -110,7 +113,7 @@ module MetaModel
 
       def validate!
         super
-        raise Informative, 'No meta folder in directory' unless config.meta_path_in_dir(Pathname.pwd)
+        raise Informative, 'No Metafile in current directory' unless config.metafile_in_dir(Pathname.pwd)
       end
 
       private
@@ -125,14 +128,22 @@ module MetaModel
         end
       end
 
+      CURRENT_SUPPORTED_BUILT_IN_TYPES = %w[
+        Int
+        Double
+        String
+        Bool
+        NSDate
+      ]
+
       def built_in_types
-        %w[Int Double String].map do |t|
+        CURRENT_SUPPORTED_BUILT_IN_TYPES.map do |t|
           [t, "#{t}?"]
         end.flatten
       end
 
       def supported_types
-        @models.reduce(%w[Int Double String]) { |types, model|
+        @models.reduce(CURRENT_SUPPORTED_BUILT_IN_TYPES) { |types, model|
           types << model.name.to_s
         }.map { |type|
           [type, "#{type}?"]

data/lib/metamodel/command/clean.rb

@@ -17,6 +17,7 @@ module MetaModel
       def run
         UI.section "Removing MetaModel project" do
           FileUtils.rm_rf 'MetaModel'
+          FileUtils.rm_rf 'MetaModel.framework'
           UI.message "Already clean up the whole MetaModel project from current folder"
         end
       end

data/lib/metamodel/command/generate.rb

@@ -10,34 +10,34 @@ module MetaModel
 
       def initialize(argv)
         @model_name = argv.shift_argument
-        @file_path = config.meta_path + "#{@model_name.underscore}.rb"
+        @metafile_path = config.metafile_path
         super
       end
 
       def run
         verify_meta_exists!
-        UI.section "Generating model meta file" do
+        UI.section "Generating model scaffold" do
           title_options = { :verbose_prefix => '-> '.green }
-          UI.titled_section "Adding `#{File.basename(@file_path)}` to meta folder", title_options do
-            @file_path.open('w') { |f| f << model_template(@model_name) }
+          UI.titled_section "Adding `#{@model_name.camelize} model to Metafile", title_options do
+            @metafile_path.open('a') do |source|
+              source.puts model_template(@model_name)
+            end
           end
-          UI.notice "`#{File.basename(@file_path)}` has already generated, use the command below to edit it.\n"
-          UI.message "vim meta/#{File.basename(@file_path)}"
+          UI.notice "Adding `#{@model_name.camelize}` model scaffold to Metafile, use the command below to edit it.\n"
+          UI.message "vim Metafile"
         end
       end
 
       private
 
       def model_template(model)
-        modelfile = ''
-        modelfile << "metamodel_version '#{VERSION}'\n\n"
-        modelfile << <<-TEMPLATE.strip_heredoc
+        <<-TEMPLATE.strip_heredoc
+
           define :#{model} do
             # define #{model} model like this
             # attr nickname, :string
           end
         TEMPLATE
-        modelfile
       end
     end
   end

data/lib/metamodel/command/init.rb

@@ -9,20 +9,23 @@ module MetaModel
       DESC
 
       def initialize(argv)
-        @meta_path = Pathname.pwd + 'meta'
+        @metafile_path = Pathname.pwd + 'Metafile'
         @project_path = argv.shift_argument
         super
       end
 
       def validate!
         super
-        raise Informative, 'Existing meta folder in directory' unless config.meta_path_in_dir(Pathname.pwd).nil?
+        raise Informative, 'Existing Metafile in directory' unless config.metafile_in_dir(Pathname.pwd).nil?
       end
 
       def run
         UI.section "Initialing MetaModel project" do
-          UI.section "Creating `meta` folder for MetaModel" do
-            FileUtils.mkdir(@meta_path)
+          UI.section "Creating `Metafile` for MetaModel" do
+            FileUtils.touch(@metafile_path)
+            @metafile_path.open('w') do |source|
+              source.puts "metamodel_version '#{VERSION}'\n\n"
+            end
           end
         end
       end

data/lib/metamodel/command.rb

@@ -16,8 +16,19 @@ module MetaModel
     self.description = 'MetaModel, the Model generator.'
     self.plugin_prefixes = %w(claide meta)
 
+    METAMODEL_COMMAND_ALIAS = {
+      "g"  => "generate",
+      "i"  => "init",
+      "b"  => "build",
+      "c"  => "clean"
+    }
+
     def self.run(argv)
-      super(argv)
+      if METAMODEL_COMMAND_ALIAS[argv.first]
+        super([METAMODEL_COMMAND_ALIAS[argv.first]] + argv[1..-1])
+      else
+        super(argv)
+      end
     end
 
     def initialize(argv)
@@ -34,7 +45,7 @@ module MetaModel
     #
     # @return [void]
     def verify_meta_exists!
-      unless config.meta_folder
+      unless config.metefile_exist?
         raise Informative, "No `meta' folder found in the project directory."
       end
     end

data/lib/metamodel/config.rb

@@ -46,7 +46,7 @@ module MetaModel
       current_path = Pathname.new(current_dir)
       unless @installation_root
         until current_path.root?
-          if meta_path_in_dir(current_path)
+          if metafile_in_dir(current_path)
             @installation_root = current_path
             break
           else
@@ -77,33 +77,33 @@ module MetaModel
       "./metamodel/MetaModel.xcodeproj"
     end
 
-    # Returns whether or not meta folder is in current project.
+    # Returns whether or not metafile is in current project.
     #
     # @return [Bool]
     #
-    def meta_folder
-      Pathname.new(meta_path).exist?
+    def metefile_exist?
+      Pathname.new(metafile_path).exist?
     end
 
-    # Returns the path of the meta.
+    # Returns the path of the Metafile.
     #
     # @return [Pathname]
     # @return [Nil]
     #
-    def meta_path
-      @meta_path_in_dir ||= installation_root + 'meta'
+    def metafile_path
+      @metafile_in_dir ||= installation_root + 'Metafile'
     end
 
-    # Returns the path of the meta folder in the given dir if any exists.
+    # Returns the path of the Metafile in the given dir if any exists.
     #
     # @param  [Pathname] dir
     #         The directory where to look for the meta.
     #
-    # @return [Pathname] The path of the meta.
+    # @return [Pathname] The path of the metafile.
     # @return [Nil] If not meta was found in the given dir
     #
-    def meta_path_in_dir(dir)
-      candidate = dir + 'meta'
+    def metafile_in_dir(dir)
+      candidate = dir + 'Metafile'
       if candidate.exist?
         return candidate
       end

data/lib/metamodel/model/model.rb

@@ -6,7 +6,7 @@ module MetaModel
     attr_reader :relation_properties
 
     def initialize(name)
-      @name = name
+      @name = name.to_s
       @properties = []
       @relation_properties = []
 
@@ -14,7 +14,7 @@ module MetaModel
     end
 
     def properties_exclude_id
-      @properties.select { |property| property.name != :id }
+      @properties.select { |property| property.name != "id" }
     end
 
     def foreign_id
@@ -22,7 +22,7 @@ module MetaModel
     end
 
     def table_name
-      name.to_s.tableize
+      name.tableize
     end
 
     def relation_name
@@ -38,7 +38,7 @@ module MetaModel
     def validate
       property_keys = @properties.map { |property| property.name }
 
-      unless property_keys.include? :id
+      unless property_keys.include? "id"
         property_id = Property.new(:id, :int, :unique, :default => 0)
         @properties << property_id
       end
@@ -48,38 +48,28 @@ module MetaModel
       self.hash.to_s(16)
     end
 
-    def property_key_value_pairs
-      @properties.map { |property| "#{property.name.to_s}: #{property.name.to_s}" }.join(", ")
+    def property_key_value_pairs(cast = false)
+      key_value_pairs_with_property @properties, cast
     end
 
-    def property_key_type_pairs
-      key_type_pairs_with_property(@properties, false)
+    def property_key_value_pairs_without_property(property)
+      key_value_pairs_with_property @properties.select { |element| element.name != property }
     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}" : ""
+    def property_exclude_id_key_value_pairs(cast = false)
+      key_value_pairs_with_property properties_exclude_id, cast
     end
 
-    def property_exclude_id_key_type_pairs(prefix = true)
-      key_type_pairs_with_property(properties_exclude_id, prefix)
+    def property_key_type_pairs
+      key_type_pairs_with_property @properties
     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}" : ""
+    def property_key_type_pairs_without_property(property)
+      key_type_pairs_with_property @properties.select { |element| element.name != property }
+    end
+
+    def property_exclude_id_key_type_pairs
+      key_type_pairs_with_property properties_exclude_id
     end
 
     def build_table
@@ -98,7 +88,29 @@ module MetaModel
       end
 
       table + "(_id INTEGER PRIMARY KEY, #{(main_sql + foreign_sql).compact.join(", ")});"
+
     end
+
+    private
+
+    def key_value_pairs_with_property(properties, cast = false)
+      properties.map do |property|
+        if cast
+          "#{property.name}: #{property.type_without_optional}(#{property.name})"
+        else
+          "#{property.name}: #{property.name}"
+        end
+      end.join(", ")
+    end
+
+    def key_type_pairs_with_property(properties)
+      properties.map do |property|
+        has_default_value = property.has_default_value?
+        default_value = property.type_without_optional == "String" ? "\"#{property.default_value}\"" : property.default_value
+        "#{property.name} #{property.name}: #{property.type.to_s}#{if has_default_value then " = " + "#{default_value}" end}"
+      end.join(", ")
+    end
+
   end
 
 end

data/lib/metamodel/model/property.rb

@@ -1,14 +1,15 @@
 module MetaModel
 
   class Property
-    attr_reader :json_key
     attr_accessor :name
-    attr_reader :type
-    attr_reader :modifiers
+    attr_accessor :relation_model
+    attr_reader   :json_key
+    attr_reader   :type
+    attr_reader   :modifiers
 
     def initialize(json_key, type = :string, *modifiers)
       @json_key = json_key
-      @name = json_key.to_s.camelize(:lower).to_sym
+      @name = json_key.to_s.camelize(:lower)
       @type = convert_symbol_to_type type
 
       @modifiers = {}
@@ -34,20 +35,39 @@ module MetaModel
     end
 
     def database_type
-      lowercase_type = self.type.downcase
-      if lowercase_type == "string"
-        return "TEXT"
-      elsif lowercase_type == "int"
-        return "INTEGER"
-      elsif lowercase_type == "double"
-        return "REAL"
+      case type_without_optional
+        when "String" then "TEXT"
+        when "Int"    then "INTEGER"
+        when "Bool"   then "INTEGER"
+        when "Double" then "REAL"
+        when "NSDate" then "REAL"
+        else raise Informative, "Unsupported type #{self.type}"
       end
     end
 
     def real_type
-      type_without_optional == "Int" ? "Int64" : type_without_optional
+      case type_without_optional
+      when "String" then "String"
+      when "Int"    then "Int64"
+      when "Bool"   then "Int64"
+      when "Double" then "Double"
+      when "NSDate" then "Double"
+      else raise Informative, "Unsupported type #{self.type}"
+      end
+    end
+
+    def convert_symbol_to_type(symbol)
+      case symbol
+      when :int    then "Int"
+      when :double then "Double"
+      when :bool   then "Bool"
+      when :string then "String"
+      when :date   then "NSDate"
+      else symbol.to_s.camelize
+      end
     end
 
+
     def is_array?
       @type.pluralize == str
     end
@@ -89,11 +109,6 @@ module MetaModel
     end
 
     private
-
-    def convert_symbol_to_type(symbol)
-      symbol.to_s.capitalize
-    end
-
   end
 
 end

data/lib/metamodel/template/foreign_key.swift

@@ -5,12 +5,12 @@
         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 create#{property.type}(#{property.relation_model.property_key_type_pairs_without_property model.foreign_id}) -> #{property.type}? {
+        return #{property.type}.create(#{property.relation_model.property_key_value_pairs_without_property model.foreign_id}, #{model.foreign_id}: self.id)
     }
 
     func delete#{property.type}(id: Int) {
-        #{property.type}.filter(.#{model.foreign_id}, value: id).findBy(id: id).first?.delete()
+        #{property.type}.filter(.#{model.foreign_id}, value: id).findBy(id: id).first?.delete
     }
     var #{property.name}: [#{property.type}] {
         get {
@@ -46,7 +46,7 @@
             return #{property.type}.find(id)
         }
         set {
-            #{property.type}.filter(.#{model.name.to_s.camelize(:lower)}Id, value: id).deleteAll
+            #{property.type}.filter(.#{model.name.camelize(:lower)}Id, value: id).deleteAll
             guard var newValue = newValue else { return }
             newValue.update(articleId: id)
         }

data/lib/metamodel/template/instance_methods.swift

@@ -39,7 +39,7 @@ public extension <%= model.name %> {
             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 %>)
+                <%= model.name %>.create(<%= model.property_key_value_pairs %>)
             }
             return self
         }

data/lib/metamodel/template/metamodel.swift

@@ -17,8 +17,6 @@ let db =  try! Connection("\(path)/metamodel_db.sqlite3")
 public class MetaModel {
     public static func initialize() {
         validateMetaModelTables()
-        <% models.each do |model| %><%= "#{model.name}.initialize()" %>
-        <% end %>
     }
     static func validateMetaModelTables() {
         createMetaModelTable()
@@ -26,12 +24,13 @@ public class MetaModel {
         <% models.each do |model| %><%= """if infos[#{model.name}.tableName] != \"#{model.hash_value}\" {
             updateMetaModelTableInfos(#{model.name}.tableName, hashValue: \"#{model.hash_value}\")
             #{model.name}.deinitialize()
+            #{model.name}.initialize()
         }""" %>
         <% end %>
     }
 }
 
-func executeSQL(sql: String, verbose: Bool = true, success: (() -> ())? = nil) -> Statement? {
+func executeSQL(sql: String, verbose: Bool = false, suppress: Bool = false, success: (() -> ())? = nil) -> Statement? {
     if verbose {
         print("-> Begin Transaction")
     }
@@ -54,9 +53,9 @@ func executeSQL(sql: String, verbose: Bool = true, 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)")
         if verbose {
-            print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
-            print("\t\(error)")
             print("-> Rollback transaction")
             print("\n")
         }
@@ -64,7 +63,7 @@ func executeSQL(sql: String, verbose: Bool = true, success: (() -> ())? = nil) -
     return nil
 }
 
-func executeScalarSQL(sql: String, verbose: Bool = false, success: (() -> ())? = nil) -> Binding? {
+func executeScalarSQL(sql: String, verbose: Bool = false, suppress: Bool = false, success: (() -> ())? = nil) -> Binding? {
     if verbose {
         print("-> Begin Transaction")
     }

data/lib/metamodel/template/recordable.swift

@@ -2,6 +2,6 @@ extension <%= model.name %>: Recordable {
     public 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(id: Int(id)<%= model.property_exclude_id_key_value_pairs(true, true) %>)
+        self.init(<%= model.property_key_value_pairs true %>)
     }
 }

data/lib/metamodel/template/static_methods.swift

@@ -3,10 +3,13 @@ public extension <%= model.name %> {
         let deleteAllSQL = "DELETE FROM \(tableName.unwrapped)"
         executeSQL(deleteAllSQL)
     }
-    static func count() -> Int {
-        let countSQL = "SELECT count(*) FROM \(tableName.unwrapped)"
-        guard let count = executeScalarSQL(countSQL) as? Int64 else { return 0 }
-        return Int(count)
+
+    static var count: Int {
+        get {
+            let countSQL = "SELECT count(*) FROM \(tableName.unwrapped)"
+            guard let count = executeScalarSQL(countSQL) as? Int64 else { return 0 }
+            return Int(count)
+        }
     }
 
     static func new(<%= model.property_key_type_pairs %>) -> <%= model.name %> {
@@ -14,7 +17,7 @@ public extension <%= model.name %> {
     }
 
     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 }
+        if <%= model.properties.select { |p| p.name.downcase.end_with? "id" }.map { |p| "#{p.name} == 0" }.join(" || ") %> { return nil }
 
         var columnsSQL: [<%= model.name %>.Column] = []
         var valuesSQL: [Unwrapped] = []

data/lib/metamodel/version.rb

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

data/lib/metamodel.rb

@@ -13,7 +13,8 @@ module MetaModel
   end
 
   require 'pathname'
-  require 'active_record'
+  require 'active_support/inflector'
+  require 'active_support/core_ext/string'
 
   require 'metamodel/version'
   require 'metamodel/config'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -59,17 +59,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.6
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.6
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -183,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Cocoa models generator.