metamodel 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d8ca3a3bfe2be2fff493e0a8a6ee19f56640df
-  data.tar.gz: 4b704b41431dcc15cf3d7851512de6ec637e973d
+  metadata.gz: 93f4a8e08c9a3c0248f100f4e43409e63f085756
+  data.tar.gz: f33f3f2f7dc7a0239dc01c7b8b6dd4d48d851d7a
 SHA512:
-  metadata.gz: c37a823538cc4dc169e80a0aa1dae3839fb275a9e4d668081cbc80e7479b1936c93565249ab8cb572d7d17f35be408c03d5bf2226c9d17791217066dc67eb28b
-  data.tar.gz: e5ee4d3459de834213f65b80817130f7402076f7a86d93edbf22f2f25f51c494b0950c11da6124d9680db05cfa3bc33b8e9a0e3b7c4f6eaa1e1799f2c266781d
+  metadata.gz: 9ebff208564ec7f994210b17b8d63cf2b8a9a81a21474094391312cc070338b694b41cb108a70f7330f51fee857f297152fd71322ea664554a3ae9cdca7379fb
+  data.tar.gz: c3e358b76d40442fdc2854ddb352f79ed86f61d0d62c032556b494327d1115059b34a1ef7fb37a23a5a973c195ca21d1ec1005b5594743f31edef8f93a432bec

data/lib/metamodel/command/build.rb

@@ -64,10 +64,10 @@ 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 = Renderer::ErbalTemplate::render_from_hash(template, { :models => @models })
+        result = ErbalTemplate::render_from_hash(template, { :models => @models })
         model_path = Pathname.new("./metamodel/MetaModel/MetaModel.swift")
         File.write model_path, result
       end

data/lib/metamodel/record/association.rb

@@ -10,7 +10,8 @@ module MetaModel
       attr_accessor :through
 
       def initialize(name, major_model, secondary_model, relation, args)
-        through = args[:through]
+        # through = args[:through]
+        through = nil
         dependent = args[:dependent] || :nullify
 
         @name            = name.to_s.camelize :lower

data/lib/metamodel/template/model_query.swift

@@ -30,13 +30,11 @@ public extension <%= model.name %> {
     }
 
     static func findBy(<%= model.property_key_type_pairs(true, true) %>) -> <%= model.relation_name %> {
-        var attributes: [<%= model.name %>.Column: Any] = [:]
-        <% model.properties.each do |property| %><%= "if (#{property.name} != #{property.type_without_optional}DefaultValue) { attributes[.#{property.name}] = #{property.name} }" %>
-        <% end %>return <%= model.relation_name %>().filter(attributes)
+        return <%= model.relation_name %>().findBy(<%= model.property_key_value_pairs %>)
     }
 
     static func filter(<%= model.property_key_type_pairs(true, true) %>) -> <%= model.relation_name %> {
-        return findBy(<%= model.property_key_value_pairs %>)
+        return <%= model.relation_name %>().filter(<%= model.property_key_value_pairs %>)
     }
 
     static func limit(length: UInt, offset: UInt = 0) -> <%= model.relation_name %> {
@@ -44,7 +42,7 @@ public extension <%= model.name %> {
     }
 
     static func take(length: UInt) -> <%= model.relation_name %> {
-        return limit(length)
+        return <%= model.relation_name %>().limit(length)
     }
 
     static func offset(offset: UInt) -> <%= model.relation_name %> {

data/lib/metamodel/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Draveness Zuo
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: The Cocoa models generator.