metamodel 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150f0889587f6a3379d1dd291465dc4aea20c5c0
-  data.tar.gz: 616832c86c039688d8c06fdcc59076aa8745704f
+  metadata.gz: f0d8ca3a3bfe2be2fff493e0a8a6ee19f56640df
+  data.tar.gz: 4b704b41431dcc15cf3d7851512de6ec637e973d
 SHA512:
-  metadata.gz: f6a3cd5f7a04e4284887c52574cb50a7622f6aece76de076881176c1a803dffd785e5d9778d8d94aa7de6e4fcb2c0f038ad8acafa897e2be9adba9648b7b341e
-  data.tar.gz: 8b2e17fc792955ce237d907e71024a1637fa70d414716c49ffe98419b10f7efa44bf3e0a8634edfe3fe0caa30e95476ce649de3df52f4769b0f9c7cfe4b112c9
+  metadata.gz: c37a823538cc4dc169e80a0aa1dae3839fb275a9e4d668081cbc80e7479b1936c93565249ab8cb572d7d17f35be408c03d5bf2226c9d17791217066dc67eb28b
+  data.tar.gz: e5ee4d3459de834213f65b80817130f7402076f7a86d93edbf22f2f25f51c494b0950c11da6124d9680db05cfa3bc33b8e9a0e3b7c4f6eaa1e1799f2c266781d

data/lib/metamodel.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/string/strip'
-
 module MetaModel
 
   class PlainInformative < StandardError; end
@@ -14,9 +12,11 @@ module MetaModel
 
   require 'pathname'
   require 'active_support/inflector'
+  require 'active_support/core_ext/string'
 
   require 'metamodel/version'
   require 'metamodel/config'
+  require 'metamodel/erbal_template'
 
   # Loaded immediately after dependencies to ensure proper override of their
   # UI methods.

data/lib/metamodel/command/build.rb

@@ -67,7 +67,7 @@ module MetaModel
 #
       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 })
+        result = Renderer::ErbalTemplate::render_from_hash(template, { :models => @models })
         model_path = Pathname.new("./metamodel/MetaModel/MetaModel.swift")
         File.write model_path, result
       end
@@ -120,16 +120,6 @@ module MetaModel
 
       private
 
-      class ErbalT < OpenStruct
-        def self.render_from_hash(t, h)
-          ErbalT.new(h).render(t)
-        end
-
-        def render(template)
-          ERB.new(template).result(binding)
-        end
-      end
-
       CURRENT_SUPPORTED_BUILT_IN_TYPES = %w[
         Int
         Double

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

@@ -1,21 +1,9 @@
-require 'erb'
-require 'ostruct'
 require 'xcodeproj'
 
 module MetaModel
   class Command
     class Build
       class Renderer
-        class ErbalT < OpenStruct
-          def self.render_from_hash(t, h)
-            ErbalT.new(h).render(t)
-          end
-
-          def render(template)
-            ERB.new(template).result(binding)
-          end
-        end
-
         class << self
 
           def templates
@@ -44,7 +32,7 @@ module MetaModel
             file_refs = []
             models.each do |model|
               result = templates.map { |template|
-                ErbalT::render_from_hash(template, { :model => model })
+                ErbalTemplate::render_from_hash(template, { :model => model })
               }.join("\n")
               model_path = Pathname.new("./metamodel/MetaModel/#{model.name}.swift")
               File.write model_path, result

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

@@ -21,8 +21,10 @@ module MetaModel
             major_model.associations << association
             association.major_model = major_model
             association.secondary_model = name_model_hash[association.secondary_model]
+            size = association.through ? 3 : 2
+            association.through = name_model_hash[association.through]
             raise Informative, "Associations not satisfied in `Metafile`" \
-              unless [association.major_model, association.secondary_model].compact.size == 2
+              unless [association.major_model, association.secondary_model, association.through].compact.size == size
             association
           end
 
@@ -35,21 +37,21 @@ module MetaModel
             end
             remain
           end
-          raise Informative, "Unsatisfied constraints in #{satisfy_constraint.map { |x| x.major_model.name }}" \
-           if satisfy_constraint.size > 0
+          raise Informative, "Unsatisfied constraints in #{satisfy_constraint.map \
+            { |x| x.debug_description }}" \
+            if satisfy_constraint.size > 0
 
           @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)
+            when :has_one, :has_many then
+              name = association.through ? association.through.foreign_id : major_model.foreign_id
+              property = Record::Property.new(name, :int, :foreign, :default => 0)
               secondary_model.properties << property
             when :belongs_to then
-              property = Record::Property.new(secondary_model.foreign_id, :int, :foreign, :default => 0)
+              name = association.through ? association.through.foreign_id : secondary_model.foreign_id
+              property = Record::Property.new(name, :int, :foreign, :default => 0)
               major_model.properties << property
             end
           end

data/lib/metamodel/erbal_template.rb

@@ -0,0 +1,14 @@
+require 'erb'
+require 'ostruct'
+
+module MetaModel
+  class ErbalTemplate < OpenStruct
+    def self.render_from_hash(t, h)
+      ErbalTemplate.new(h).render(t)
+    end
+
+    def render(template)
+      ERB.new(template).result(binding)
+    end
+  end
+end

data/lib/metamodel/record/association.rb

@@ -4,10 +4,10 @@ module MetaModel
       attr_reader :name
       attr_reader :type
       attr_reader :relation
-      attr_reader :through
       attr_reader :dependent
       attr_accessor :major_model
       attr_accessor :secondary_model
+      attr_accessor :through
 
       def initialize(name, major_model, secondary_model, relation, args)
         through = args[:through]
@@ -15,7 +15,7 @@ module MetaModel
 
         @name            = name.to_s.camelize :lower
         @relation        = relation
-        @through         = through
+        @through         = through.to_s.camelize.singularize unless through.nil?
         @dependent       = dependent
         @major_model     = major_model
         @secondary_model = secondary_model
@@ -27,9 +27,18 @@ module MetaModel
         result = true
         result &= self.major_model == constraint.secondary_model
         result &= self.secondary_model == constraint.major_model
+        result &= self.through == constraint.through
+
         result &= case [self.relation, constraint.relation]
           when [:has_one, :belongs_to], [:belongs_to, :has_one] then true
-          when [:belongs_to, :has_many], [:has_many, :belongs_to] then true
+          when [:belongs_to, :has_many] then
+            return false if self.dependent == :destroy
+            return true unless constraint.through
+            return false
+          when [:has_many, :belongs_to] then
+            return false if constraint.dependent == :destroy
+            return true unless self.through
+            return false
           when [:has_many, :has_many] then
             self.through == constraint.through
           else false
@@ -39,8 +48,8 @@ module MetaModel
 
       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})"
+        when :has_many, :has_one then "#{secondary_model.name}.find(privateId)"
+        when :belongs_to then "#{secondary_model.name}.find(#{secondary_model.foreign_id})"
         else ""
         end
       end
@@ -51,6 +60,7 @@ module MetaModel
 
       def validate_association
         validate_dependent(@dependent)
+        validate_through(@through)
       end
 
       def validate_dependent(dependent)
@@ -60,6 +70,11 @@ module MetaModel
           unless supported_dependent_options.include? dependent
       end
 
+      def validate_through(through)
+        raise Informative, "belongs_to can't coexist with through." \
+          if !!through && @relation == :belongs_to
+      end
+
 
       #-------------------------------------------------------------------------#
 
@@ -79,9 +94,15 @@ module MetaModel
 
       def type
         case @relation
-        when :has_one    then secondary_model.name
-        when :has_many   then secondary_model.name
-        when :belongs_to then secondary_model.name
+        when :has_one, :has_many, :belongs_to then secondary_model.name
+        end
+      end
+
+      def debug_description
+        if through
+          "#{major_model.name}.#{relation}.#{secondary_model.name}.through.#{through.name}.#{dependent}"
+        else
+          "#{major_model.name}.#{relation}.#{secondary_model.name}.#{dependent}"
         end
       end
     end

data/lib/metamodel/record/model.rb

@@ -9,20 +9,26 @@ module MetaModel
         @name = name.to_s.camelize
         @properties = []
         @associations = []
-
-        validate
       end
 
       def contains?(property)
         @properties.select { |prop| prop.name == property }.size > 0
       end
 
+      def all_foreign_properties
+        @properties.select { |element| element.is_foreign? }
+      end
+
       def properties_exclude_id
-        @properties.select { |property| property.name != "id" }
+        properties_exclude_property "id"
+      end
+
+      def properties_exclude_property(property)
+        @properties.select { |element| element.name != property }
       end
 
       def foreign_id
-        "#{name}_id".camelize(:lower)
+        "#{name}Id".camelize(:lower)
       end
 
       def table_name
@@ -33,18 +39,6 @@ module MetaModel
         "#{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
@@ -85,10 +79,10 @@ module MetaModel
         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)"
+          "FOREIGN KEY(#{property.name}) REFERENCES #{reference_table_name}(privateId)"
         end
 
-        table + "(_id INTEGER PRIMARY KEY, #{(main_sql + foreign_sql).compact.join(", ")});"
+        table + "(privateId INTEGER PRIMARY KEY, #{(main_sql + foreign_sql).compact.join(", ")});"
       end
 
       private

data/lib/metamodel/record/property.rb

@@ -20,8 +20,8 @@ module MetaModel
 
       class << self
         def primary_id
-          property = Property.new(:_id, :int, :primary)
-          property.name = :_id
+          property = Property.new(:privateId, :int, :primary)
+          property.name = :privateId
           property
         end
       end
@@ -74,7 +74,7 @@ module MetaModel
       end
 
       def is_foreign?
-        @modifiers.include? :foreign
+        @modifiers[:foreign]
       end
 
       def is_optional?

data/lib/metamodel/template/foreign_key.swift

@@ -1,21 +1,11 @@
 // MARK: - Association
 <% model.associations.each do |association| %><% if association.has_many? %>
 <%= """public extension #{model.name} {
-    func append#{association.type}(element: #{association.type}) {
-        var element = element
-        element.update(#{model.foreign_id}: 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#{association.type}(id: Int) {
-        #{association.type}.findBy(#{model.foreign_id}: id).first?.delete
-    }
-    var #{association.name}: [#{association.type}] {
+    var #{association.name}: #{association.secondary_model.relation_name} {
         get {
-            return #{association.type}.filter(id: id).result
+            var result = #{association.type}.filter(#{model.foreign_id}: privateId)
+            result.#{model.foreign_id} = privateId
+            return result
         }
         set {
             #{association.name}.forEach { (element) in
@@ -24,19 +14,20 @@
             }
             newValue.forEach { (element) in
                 var element = element
-                element.update(#{model.foreign_id}: id)
+                element.update(#{model.foreign_id}: privateId)
             }
+            #{association.name}.#{model.foreign_id} = privateId
         }
     }
 }""" %><% elsif association.belongs_to? %>
 <%= """public extension #{model.name} {
     var #{association.name}: #{association.type}? {
         get {
-            return #{association.secondary_model_instance}.first
+            return #{association.secondary_model_instance}
         }
         set {
             guard let newValue = newValue else { return }
-            update(#{association.secondary_model.foreign_id}: newValue.id)
+            update(#{association.secondary_model.foreign_id}: newValue.privateId)
         }
     }
 
@@ -47,9 +38,9 @@
             return #{association.secondary_model_instance}.first
         }
         set {
-            #{association.type}.findBy(#{model.foreign_id}: id).deleteAll
+            #{association.type}.findBy(#{model.foreign_id}: privateId).deleteAll
             guard var newValue = newValue else { return }
-            newValue.update(#{model.foreign_id}: id)
+            newValue.update(#{model.foreign_id}: privateId)
         }
     }
 }"""%><% end %><% end %>

data/lib/metamodel/template/helper.swift

@@ -1,6 +1,8 @@
 // MAKR: - Helper
 
 public class <%= model.relation_name %>: Relation<<%= model.name %>> {
+    <% model.all_foreign_properties.each do |foreign_property| %><%= """var #{foreign_property.name} = 0
+    """%><% end %>
     override init() {
         super.init()
         self.select = "SELECT \(<%= model.name %>.tableName.unwrapped).* FROM \(<%= model.name %>.tableName.unwrapped)"
@@ -27,9 +29,23 @@ extension <%= model.name %> {
         <% model.properties.each_with_index do |property, index| %><%= """let #{property.name}: #{property.real_type} = values[#{index+1}] as! #{property.real_type}""" %>
         <% end %>
         self.init(<%= model.property_key_value_pairs true %>)
+
+        let privateId: Int64 = values[0] as! Int64
+        self.privateId = Int(privateId)
     }
 }
 
 extension <%= model.name %> {
-    var itself: String { get { return "WHERE \(Article.tableName.unwrapped).\("id".unwrapped) = \(id)" } }
+    var itself: String { get { return "WHERE \(<%= model.name %>.tableName.unwrapped).\("privateId".unwrapped) = \(privateId)" } }
+}
+
+extension <%= model.relation_name %> {
+    func find(privateId: Int) -> Self {
+        return filter(privateId)
+    }
+
+    func filter(privateId: Int) -> Self {
+        self.filter.append("\"privateId\" = \(privateId)")
+        return self
+    }
 }

data/lib/metamodel/template/model_delete.swift

@@ -5,8 +5,8 @@ public extension <%= model.name %> {
         get {
             let deleteSQL = "DELETE FROM \(<%= model.name %>.tableName.unwrapped) \(itself)"
             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) %>
+            <%= 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
         }

data/lib/metamodel/template/model_initialize.swift

@@ -1,4 +1,5 @@
 public struct <%= model.name %> {
+    var privateId: Int = 0
     <% model.properties.each do |property| %><%= """public var #{property.name}: #{property.type}""" %>
     <% end %>
     static let tableName = "<%= model.table_name %>"
@@ -6,6 +7,7 @@ public struct <%= model.name %> {
     public enum Column: String, Unwrapped {
         <% model.properties.each do |property| %><%= """case #{property.name} = \"#{property.name}\"""" %>
         <% end %>
+        case privateId = "privateId"
         var unwrapped: String { get { return self.rawValue.unwrapped } }
     }
 
@@ -19,14 +21,12 @@ public struct <%= model.name %> {
     }
 
     static public func create(<%= model.property_key_type_pairs %>) -> <%= model.name %>? {
-        if <%= model.properties.select { |p| p.name.downcase.end_with? "id" }.map { |p| "#{p.name} == 0" }.join(" || ") %> { return nil }
+        //if <%= model.properties.select { |p| p.name.downcase.end_with? "id" }.map { |p| "#{p.name} == 0" }.push("false == true").join(" || ") %> { return nil }
 
         var columnsSQL: [<%= model.name %>.Column] = []
         var valuesSQL: [Unwrapped] = []
 
-        columnsSQL.append(.id)
-        valuesSQL.append(id)
-        <% model.properties_exclude_id.each do |property| %><% if property.is_optional? %>
+        <% model.properties.each do |property| %><% if property.is_optional? %>
         <%= """if let #{property.name} = #{property.name} {
             columnsSQL.append(.#{property.name})
             valuesSQL.append(#{property.name})
@@ -35,7 +35,23 @@ public struct <%= model.name %> {
         valuesSQL.append(#{property.name})
         """ %><% end %><% end %>
         let insertSQL = "INSERT INTO \(tableName.unwrapped) (\(columnsSQL.map { $0.rawValue }.joinWithSeparator(", "))) VALUES (\(valuesSQL.map { $0.unwrapped }.joinWithSeparator(", ")))"
-        guard let _ = executeSQL(insertSQL) else { return nil }
-        return <%= model.name %>(<%= model.property_key_value_pairs %>)
+        guard let _ = executeSQL(insertSQL),
+          let lastInsertRowId = executeScalarSQL("SELECT last_insert_rowid();") as? Int64 else { return nil }
+        var result = <%= model.name %>(<%= model.property_key_value_pairs %>)
+        result.privateId = Int(lastInsertRowId)
+        return result
+    }
+}
+
+public extension <%= model.relation_name %> {
+    <% model.all_foreign_properties.each do |property| %>
+    func create(<%= model.property_key_type_pairs_without_property property.name %>) -> <%= model.name %>? {
+        return <%= model.name %>.create(<% if model.properties_exclude_property(property).count == 0 %><%= "#{property}: property" %><% else %><%= model.property_key_value_pairs %><% end %>)
     }
+
+    func append(element: <%= model.name %>) {
+        var element = element
+        element.<%= property.name %> = <%= property.name %>
+    }
+    <% end %>
 }

data/lib/metamodel/template/model_query.swift

@@ -7,22 +7,22 @@ public extension <%= model.name %> {
 
     static var first: <%= model.name %>? {
         get {
-            return <%= model.relation_name %>().orderBy(.id, asc: true).first
+            return <%= model.relation_name %>().orderBy(.privateId, asc: true).first
         }
     }
 
     static var last: <%= model.name %>? {
         get {
-            return <%= model.relation_name %>().orderBy(.id, asc: false).first
+            return <%= model.relation_name %>().orderBy(.privateId, asc: false).first
         }
     }
 
     static func first(length: UInt) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().orderBy(.id, asc: true).limit(length)
+        return <%= model.relation_name %>().orderBy(.privateId, asc: true).limit(length)
     }
 
     static func last(length: UInt) -> <%= model.relation_name %> {
-        return <%= model.relation_name %>().orderBy(.id, asc: false).limit(length)
+        return <%= model.relation_name %>().orderBy(.privateId, asc: false).limit(length)
     }
 
     static func find(id: Int) -> <%= model.name %>? {
@@ -69,10 +69,6 @@ public extension <%= model.name %> {
 }
 
 public extension <%= model.relation_name %> {
-    func find(id: Int) -> Self {
-        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} }" %>

data/lib/metamodel/template/model_update.swift

@@ -31,7 +31,7 @@ public extension <%= model.name %> {
 
     var save: <%= model.name %> {
         mutating get {
-            if let _ = <%= model.name %>.find(id) {
+            if let _ = <%= model.name %>.find(privateId) {
                 update([<% column_values = model.properties.map do |property| %><% ".#{property.name}: #{property.name}" %><% end %><%= column_values.join(", ") %>])
             } else {
                 <%= model.name %>.create(<%= model.property_key_value_pairs %>)

data/lib/metamodel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -155,6 +155,7 @@ files:
 - lib/metamodel/command/generate.rb
 - lib/metamodel/command/init.rb
 - lib/metamodel/config.rb
+- lib/metamodel/erbal_template.rb
 - lib/metamodel/record/association.rb
 - lib/metamodel/record/model.rb
 - lib/metamodel/record/property.rb