metamodel 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ad33602070abacabd6daa90047708d6888e35b
-  data.tar.gz: bfbdbeeab3881c3e592b62c1084dc505f7e68d7e
+  metadata.gz: d1b98b98f7bd126d83e0066d44beb8beb5708351
+  data.tar.gz: 48f9bb451aeb155aaa3a6cbd7ee426b7e0aa1467
 SHA512:
-  metadata.gz: 0d464c4eac3190573387c23fb4f2ddd28bb632fbd17833bf618e23bdd64b7c0247f8039020d46d11b87801d269d5321e486b6eae952923955b55fb3bc64404ab
-  data.tar.gz: e8a655ea0d4e244f3239a3b1c94ce8dd5b1b6391ab45af7483cbad83313b395b8e8e906800070c439bc7280bf6206f9e9780284d8310d8222fd449ee9f515b81
+  metadata.gz: a2de3e544e6e583d81a84d51bc82ec98aebe2b7fc0a0d73b11ebfe4624a0ab06a8c42b00c03132e3a210644d306247360376f0711ecd902ad6406d72413c1e48
+  data.tar.gz: 0947bc3d2862f25536d744e963bc0213ffaaaf63c4a9dbc60ff4f368813859dd5306d8b10c66822dcb15efcaef943ed9db9fc5e183d971c7566902d631b0eb9a

data/README.md

@@ -1,6 +1,6 @@
 ![MetaModel-banner](./images/banner.png)
 
-# MetaModel
+# MetaModel [![Join the chat at https://gitter.im/MModel/MetaModel](https://badges.gitter.im/MModel/MetaModel.svg)](https://gitter.im/MModel/MetaModel?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [![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)

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

@@ -0,0 +1,72 @@
+module MetaModel
+  class Command
+    class Build
+      class Resolver
+
+        include Config::Mixin
+
+        require 'metamodel/record/model'
+        require 'metamodel/record/property'
+        require 'metamodel/record/association'
+
+        attr_accessor :models
+        attr_accessor :associations
+
+        attr_accessor :current_model
+
+        def initialize
+          @models = []
+          @associations = []
+        end
+
+        def resolve
+          UI.section "Analyzing Metafile" do
+            metafile_path = config.metafile_path
+            eval File.read(metafile_path)
+          end
+          return models, associations
+        end
+
+        private
+
+        def metamodel_version(version)
+          raise Informative,
+            "Meta file #{version} not matched with current metamodel version #{VERSION}" if version != VERSION
+        end
+
+        def define(model_name)
+          UI.message '-> '.green + "Resolving `#{model_name.to_s.camelize}`"
+          @current_model = Record::Model.new(model_name)
+          yield
+          @models << current_model
+        end
+
+        def attr(key, type = :string, *args)
+          current_model.properties << Record::Property.new(key, type, args)
+        end
+
+        def has_one(name, model_name = nil)
+          model_name = name.to_s.singularize.camelize if model_name.nil?
+          association = Record::Association.new(name, current_model.name, model_name, :has_one)
+          @associations << association
+        end
+
+        def has_many(name, model_name = nil)
+          model_name = name.to_s.singularize.camelize if model_name.nil?
+          raise Informative, "has_many relation can't be created with optional model name" if model_name.end_with? "?"
+          association = Record::Association.new(name, current_model.name, model_name, :has_many)
+          @associations << association
+        end
+
+        def belongs_to(name, model_name = nil)
+          model_name = name.to_s.singularize.camelize if model_name.nil?
+          association = Record::Association.new(name, current_model.name, model_name, :belongs_to)
+          @associations << association
+        end
+
+        private
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module MetaModel
+  class Command
+    class Build
+      class Translator
+        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
+
+        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
+
+          @associations.each do |association|
+            major_model = association.major_model
+            secondary_model = association.secondary_model
+            case association.relation
+            when :has_one then
+              property = Record::Property.new(major_model.foreign_id, :int, :foreign, :default => 0)
+              secondary_model.properties << property
+            when :has_many then
+              property = Record::Property.new(major_model.foreign_id, :int, :foreign, :default => 0)
+              secondary_model.properties << property
+            when :belongs_to then
+              property = Record::Property.new(secondary_model.foreign_id, :int, :foreign, :default => 0)
+              major_model.properties << property
+            end
+          end
+
+          @models.each do |model|
+            model.properties.uniq! { |prop| [prop.name] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metamodel/command/build.rb

@@ -3,8 +3,9 @@ require 'git'
 module MetaModel
   class Command
     class Build < Command
-      require 'metamodel/command/build/parser'
+      require 'metamodel/command/build/resolver'
       require 'metamodel/command/build/renderer'
+      require 'metamodel/command/build/translator'
 
       self.summary = "Build a MetaModel.framework from Metafile"
       self.description = <<-DESC
@@ -21,7 +22,8 @@ module MetaModel
       def run
         UI.section "Building MetaModel.framework in project" do
           clone_project
-          parse_template
+          models, associations = resolve_template
+          @models = compact_associtions_into_models models, associations
           validate_models
           render_model_files
           update_initialize_method
@@ -36,28 +38,24 @@ 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_xcode_project}` to build module"
+            UI.message "Using `#{config.metamodel_xcode_project}` to build module"
           end
         end
       end
 
-      def parse_template
-        parser = Parser.new
-        @models = parser.parse
+      def resolve_template
+        resolver = Resolver.new
+        resolver.resolve
+      end
+
+      def compact_associtions_into_models(models, associations)
+        Translator.new(models, associations).translate
       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 == []
-
-        @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
@@ -65,6 +63,7 @@ module MetaModel
           Renderer.render(@models)
         end
       end
+#
       def update_initialize_method
         template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/metamodel.swift"))
         result = ErbalT::render_from_hash(template, { :models => @models })

data/lib/metamodel/record/association.rb

@@ -0,0 +1,40 @@
+module MetaModel
+  module Record
+    class Association
+      attr_reader :name
+      attr_reader :type
+      attr_reader :relation
+      attr_reader :through
+      attr_accessor :major_model
+      attr_accessor :secondary_model
+
+      def initialize(name, major_model, secondary_model, relation, through = nil)
+        @name            = name.to_s.camelize :lower
+        @relation        = relation
+        @through         = through
+        @major_model     = major_model
+        @secondary_model = secondary_model
+      end
+
+      def has_one?
+        @relation == :has_one
+      end
+
+      def has_many?
+        @relation == :has_many
+      end
+
+      def belongs_to?
+        @relation == :belongs_to
+      end
+
+      def type
+        case @relation
+        when :has_one    then secondary_model.name
+        when :has_many   then secondary_model.name
+        when :belongs_to then major_model.name
+        end
+      end
+    end
+  end
+end

data/lib/metamodel/record/model.rb

@@ -0,0 +1,118 @@
+module MetaModel
+  module Record
+    class Model
+      attr_reader :name
+      attr_reader :properties
+      attr_reader :associations
+
+      def initialize(name)
+        @name = name.to_s.camelize
+        @properties = []
+        @associations = []
+
+        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.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 }
+
+        @properties << Property.new(:id, :int, :unique, :default => 0) unless property_keys.include? "id"
+      end
+
+      def hash_value
+        self.hash.to_s(16)
+      end
+
+      def property_key_value_pairs(cast = false)
+        key_value_pairs_with_property @properties, cast
+      end
+
+      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(cast = false)
+        key_value_pairs_with_property properties_exclude_id, cast
+      end
+
+      def property_key_type_pairs
+        key_type_pairs_with_property @properties
+      end
+
+      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
+        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
+
+      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.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
+            "#{property.name} #{result}"
+          else
+            result
+          end
+        end.join(", ")
+      end
+
+    end
+  end
+end

data/lib/metamodel/record/property.rb

@@ -0,0 +1,99 @@
+module MetaModel
+  module Record
+    class Property
+      attr_accessor :name
+      attr_reader   :type
+      attr_reader   :modifiers
+
+      def initialize(json_key, type = :string, *modifiers)
+        @name = json_key.to_s.camelize(:lower)
+        @type = convert_symbol_to_type type
+
+        @modifiers = {}
+        @modifiers.default = false
+
+        modifiers.flatten.map do |modifier|
+          @modifiers[modifier] = true if modifier.is_a? Symbol
+          @modifiers[:default] = modifier[:default] if modifier.is_a? Hash and modifier[:default]
+        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
+      end
+
+      def database_type
+        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
+        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
+
+      def is_unique?
+        @modifiers.include? :unique
+      end
+
+      def is_primary?
+        @modifiers.include? :primary
+      end
+
+      def is_foreign?
+        @modifiers.include? :foreign
+      end
+
+      def is_optional?
+        @type.to_s.end_with? "?"
+      end
+
+      def has_default_value?
+        !!@modifiers[:default]
+      end
+
+      def default_value
+        has_default_value? ? modifiers[:default] : ""
+      end
+
+      private
+    end
+  end
+end

data/lib/metamodel/template/attributes.swift

@@ -1,4 +1,4 @@
- public struct <%= model.name %> {
+public struct <%= model.name %> {
     <% model.properties.each do |property| %><%= """public var #{property.name}: #{property.type}""" %>
     <% end %>
     static let tableName = "<%= model.table_name %>"

data/lib/metamodel/template/foreign_key.swift

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

data/lib/metamodel/template/model_query.swift

@@ -3,6 +3,18 @@ public extension <%= model.name %> {
         get { return <%= model.relation_name %>() }
     }
 
+    static var first: <%= model.name %>? {
+        get {
+            return <%= model.relation_name %>().orderBy(.id, asc: true).first
+        }
+    }
+
+    static var last: <%= model.name %>? {
+        get {
+            return <%= model.relation_name %>().orderBy(.id, asc: false).first
+        }
+    }
+
     static func first(length: UInt) -> <%= model.relation_name %> {
         return <%= model.relation_name %>().orderBy(.id, asc: true).limit(length)
     }
@@ -18,8 +30,8 @@ public extension <%= model.name %> {
     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}? {
+    <% 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 %>

data/lib/metamodel/version.rb

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

data/lib/metamodel.rb

@@ -14,7 +14,6 @@ module MetaModel
 
   require 'pathname'
   require 'active_support/inflector'
-  require 'active_support/core_ext/string'
 
   require 'metamodel/version'
   require 'metamodel/config'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Draveness Zuo
@@ -148,14 +148,16 @@ files:
 - lib/metamodel.rb
 - lib/metamodel/command.rb
 - lib/metamodel/command/build.rb
-- lib/metamodel/command/build/parser.rb
 - lib/metamodel/command/build/renderer.rb
+- lib/metamodel/command/build/resolver.rb
+- lib/metamodel/command/build/translator.rb
 - lib/metamodel/command/clean.rb
 - lib/metamodel/command/generate.rb
 - lib/metamodel/command/init.rb
 - lib/metamodel/config.rb
-- lib/metamodel/model/model.rb
-- lib/metamodel/model/property.rb
+- lib/metamodel/record/association.rb
+- lib/metamodel/record/model.rb
+- lib/metamodel/record/property.rb
 - lib/metamodel/template/attributes.swift
 - lib/metamodel/template/file_header.swift
 - lib/metamodel/template/foreign_key.swift
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: The Cocoa models generator.

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

@@ -1,67 +0,0 @@
-module MetaModel
-  class Command
-    class Build
-      class Parser
-
-        include Config::Mixin
-
-        require 'metamodel/model/model'
-        require 'metamodel/model/property'
-        require 'metamodel/command/build/renderer'
-
-        def initialize
-          @models = []
-        end
-
-        def parse
-          UI.section "Analyzing Metafile" do
-            metafile_path = config.metafile_path
-            eval File.read(metafile_path)
-          end
-          @models
-        end
-
-        private
-
-        def metamodel_version(version)
-          raise Informative,
-            "Meta file #{version} not matched with current metamodel version #{VERSION}" if version != VERSION
-        end
-
-        def define(model_name)
-          UI.message '-> '.green + "Resolving `#{model_name.to_s.camelize}`"
-          @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 = 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 = 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 = 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
-
-        private
-
-        def current_model
-          @models.last
-        end
-      end
-    end
-  end
-end

data/lib/metamodel/model/model.rb

@@ -1,116 +0,0 @@
-module MetaModel
-
-  class Model
-    attr_reader :name
-    attr_reader :properties
-    attr_reader :relation_properties
-
-    def initialize(name)
-      @name = name.to_s
-      @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.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(cast = false)
-      key_value_pairs_with_property @properties, cast
-    end
-
-    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(cast = false)
-      key_value_pairs_with_property properties_exclude_id, cast
-    end
-
-    def property_key_type_pairs
-      key_type_pairs_with_property @properties
-    end
-
-    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
-      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
-
-    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,114 +0,0 @@
-module MetaModel
-
-  class Property
-    attr_accessor :name
-    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)
-      @type = convert_symbol_to_type type
-
-      @modifiers = {}
-      @modifiers.default = false
-
-      modifiers.flatten.map do |modifier|
-        @modifiers[modifier] = true if modifier.is_a? Symbol
-        @modifiers[:default] = modifier[:default] if modifier.is_a? Hash and modifier[:default]
-      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
-    end
-
-    def database_type
-      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
-      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
-
-    def is_unique?
-      @modifiers.include? :unique
-    end
-
-    def is_primary?
-      @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]
-    end
-
-    def default_value
-      has_default_value? ? modifiers[:default] : ""
-    end
-
-    private
-  end
-
-end