metamodel 0.2.0 → 0.3.1

data/lib/metamodel/template/static_methods.swift

@@ -1,7 +1,7 @@
 public extension <%= model.name %> {
     static var count: Int {
         get {
-            let countSQL = "SELECT count(*) FROM \(tableName.unwrapped)"
+            let countSQL = "SELECT count(*) FROM \(tableName)"
             guard let count = executeScalarSQL(countSQL) as? Int64 else { return 0 }
             return Int(count)
         }

data/lib/metamodel/template/table_initialize.swift

@@ -4,7 +4,7 @@ extension <%= model.name %> {
         executeSQL(initializeTableSQL)
     }
     static func deinitialize() {
-        let dropTableSQL = "DROP TABLE \(tableName.unwrapped)"
+        let dropTableSQL = "DROP TABLE \(tableName)"
         executeSQL(dropTableSQL)
     }
 }

data/lib/metamodel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -147,20 +147,24 @@ files:
 - bin/meta
 - lib/metamodel.rb
 - lib/metamodel/command.rb
-- lib/metamodel/command/build.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/command/install.rb
 - lib/metamodel/config.rb
 - lib/metamodel/erbal_template.rb
+- lib/metamodel/installer.rb
+- lib/metamodel/installer/renderer.rb
+- lib/metamodel/installer/validator.rb
+- lib/metamodel/metafile.rb
+- lib/metamodel/metafile/dsl.rb
 - lib/metamodel/record/association.rb
 - lib/metamodel/record/model.rb
 - lib/metamodel/record/property.rb
+- lib/metamodel/template/belongs_to_association.swift
 - lib/metamodel/template/file_header.swift
 - lib/metamodel/template/foreign_key.swift
+- lib/metamodel/template/has_many_association.swift
 - lib/metamodel/template/helper.swift
 - lib/metamodel/template/json.swift
 - lib/metamodel/template/metamodel.swift
@@ -192,7 +196,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/command/build.rb

@@ -1,148 +0,0 @@
-require 'git'
-
-module MetaModel
-  class Command
-    class Build < Command
-      include Config::Mixin
-      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
-        Clone a metamodel project template from GitHub, parsing Metafile, validating models,
-        generate model swift file and build MetaModel.framework.
-      DESC
-
-      attr_accessor :models
-
-      def initialize(argv)
-        super
-      end
-
-      def run
-        UI.section "Building MetaModel.framework in project" do
-          clone_project
-          models, associations = resolve_template
-          @models = compact_associtions_into_models models, associations
-          validate_models
-          render_model_files
-          update_initialize_method
-          build_metamodel_framework unless config.skip_build?
-        end
-        UI.notice "Please drag MetaModel.framework into Embedded Binaries phrase.\n"
-      end
-
-      def clone_project
-        if File.exist? config.metamodel_xcode_project
-          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', :depth => 1)
-            UI.message "Using `#{config.metamodel_xcode_project}` to build module"
-          end
-        end
-      end
-
-      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 == []
-      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"))
-        result = ErbalTemplate::render_from_hash(template, { :models => @models })
-        model_path = Pathname.new("./metamodel/MetaModel/MetaModel.swift")
-        File.write model_path, result
-      end
-
-      def build_metamodel_framework
-        UI.section "Generating MetaModel.framework" do
-
-          build_iphoneos = "xcodebuild -scheme MetaModel \
-            -project MetaModel/MetaModel.xcodeproj \
-            -configuration Release -sdk iphoneos \
-            -derivedDataPath './metamodel' \
-            BITCODE_GENERATION_MODE=bitcode \
-            ONLY_ACTIVE_ARCH=NO \
-            CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGN_IDENTITY= \
-            clean build"
-          build_iphonesimulator = "xcodebuild -scheme MetaModel \
-            -project MetaModel/MetaModel.xcodeproj \
-            -configuration Release -sdk iphonesimulator \
-            -derivedDataPath './metamodel' \
-            ONLY_ACTIVE_ARCH=NO \
-            CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGN_IDENTITY= \
-            clean build"
-          result = system "#{build_iphoneos} > /dev/null &&
-            #{build_iphonesimulator} > /dev/null"
-
-          raise Informative, 'Building framework failed.' unless result
-
-          build_products_folder = "./metamodel/Build/Products"
-
-          copy_command = "cp -rf #{build_products_folder}/Release-iphoneos/MetaModel.framework . && \
-            cp -rf #{build_products_folder}/Release-iphonesimulator/MetaModel.framework/Modules/MetaModel.swiftmodule/* \
-                    MetaModel.framework/Modules/MetaModel.swiftmodule/"
-          lipo_command = "lipo -create -output MetaModel.framework/MetaModel \
-            #{build_products_folder}/Release-iphonesimulator/MetaModel.framework/MetaModel \
-            #{build_products_folder}/Release-iphoneos/MetaModel.framework/MetaModel"
-
-          result = system "#{copy_command} && #{lipo_command}"
-
-          raise Informative, 'Copy framework to current folder failed.' unless result
-          UI.message "-> ".green + "MetaModel.framework located in current folder"
-        end
-      end
-
-      def validate!
-        super
-        raise Informative, 'No Metafile in current directory' unless config.metafile_in_dir(Pathname.pwd)
-      end
-
-      private
-
-      CURRENT_SUPPORTED_BUILT_IN_TYPES = %w[
-        Int
-        Double
-        Float
-        String
-        Bool
-        NSDate
-      ]
-
-      def built_in_types
-        CURRENT_SUPPORTED_BUILT_IN_TYPES.map do |t|
-          [t, "#{t}?"]
-        end.flatten
-      end
-
-      def supported_types
-        @models.reduce(CURRENT_SUPPORTED_BUILT_IN_TYPES) { |types, model|
-          types << model.name.to_s
-        }.map { |type|
-          [type, "#{type}?"]
-        }.flatten
-      end
-
-    end
-  end
-end

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

@@ -1,55 +0,0 @@
-require 'xcodeproj'
-
-module MetaModel
-  class Command
-    class Build
-      class Renderer
-        class << self
-
-          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 table_initialize model_initialize model_update model_query model_delete static_methods foreign_key helper}
-            file_paths.each do |file_path|
-              template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../../template/#{file_path}.swift"))
-              results << template
-            end
-            results
-          end
-
-          def render(models)
-            project = Xcodeproj::Project.open(Config.instance.metamodel_xcode_project)
-            target = project.targets.first
-            models.each do |model|
-              target.source_build_phase.files_references.each do |file_ref|
-                target.source_build_phase.remove_file_reference(file_ref) if file_ref && "#{model.name}.swift" == file_ref.name
-              end
-            end
-            models_group = project.main_group.find_subpath('MetaModel/Models', true)
-            models_group.clear
-            models_group.set_source_tree('SOURCE_ROOT')
-
-            file_refs = []
-            models.each do |model|
-              result = templates.map { |template|
-                ErbalTemplate::render_from_hash(template, { :model => model })
-              }.join("\n")
-              model_path = Pathname.new("./metamodel/MetaModel/#{model.name}.swift")
-              File.write model_path, result
-
-              file_refs << models_group.new_reference(Pathname.new("MetaModel/#{model.name}.swift"))
-
-              UI.message '-> '.green + "Using #{model.name}.swift file"
-            end
-            target.add_file_references file_refs
-
-            project.save
-          end
-        end
-
-        private
-
-      end
-    end
-  end
-end

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

@@ -1,72 +0,0 @@
-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, **args)
-          model_name = name.to_s.singularize.camelize if model_name.nil?
-          association = Record::Association.new(name, current_model.name, model_name, :has_one, args)
-          @associations << association
-        end
-
-        def has_many(name, model_name = nil, **args)
-          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, args)
-          @associations << association
-        end
-
-        def belongs_to(name, model_name = nil, **args)
-          model_name = name.to_s.singularize.camelize if model_name.nil?
-          association = Record::Association.new(name, current_model.name, model_name, :belongs_to, args)
-          @associations << association
-        end
-
-        private
-
-      end
-    end
-  end
-end

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

@@ -1,66 +0,0 @@
-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]
-            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, association.through].compact.size == size
-            association
-          end
-
-          satisfy_constraint = @associations.reduce([]) do |remain, association|
-            expect = remain.select { |assoc| assoc.expect_constraint? association }
-            if expect.empty?
-              remain << association
-            else
-              remain.delete expect.first
-            end
-            remain
-          end
-          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, :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
-              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
-
-          @models.each do |model|
-            model.properties.uniq! { |prop| [prop.name] }
-          end
-        end
-      end
-    end
-  end
-end