modelmaker 0.1.2 → 0.2.0

data/src/lib/modelmaker.rb

@@ -14,6 +14,16 @@ module ModelMaker
             entity.project = self
             @entities << entity
         end
+        
+        def get_entity(name)
+            catch (:entity) {
+                for entity in @entities do
+                    if entity.short_name == name
+                        throw :entity, entity
+                    end
+                end
+            }
+        end
     end
     
     class ProjectBuilder
@@ -72,17 +82,26 @@ module ModelMaker
             add_property(UrlProperty.new(propname))
         end
         
-        def array(propname)
-            add_property(ArrayProperty.new(propname))
+        def array(*args)
+            add_property(ArrayProperty.new(*args))
         end
         
         def date(propname)
             add_property(DateProperty.new(propname))
         end
         
+        def id(propname, cls)
+            add_property(IdProperty.new(propname, cls))
+            add_dependency(cls)
+        end
+        
         def add_property(property)
             @entity.add_property(property)
         end
+        
+        def add_dependency(cls)
+            @entity.add_dependency(cls)
+        end
     end
     
     class Entity
@@ -95,12 +114,21 @@ module ModelMaker
             @superclass = 'NSObject'
             @properties = {}
             @protocols = []
+            @deps = []
         end
         
         def short_name
             @name
         end
         
+        def project=(project)
+            @project = project
+            
+            for property in properties do
+                property.project = project
+            end
+        end
+        
         def class_name
             if @project
                 "#{@project.class_prefix}#{@name}"
@@ -109,6 +137,14 @@ module ModelMaker
             end
         end
         
+        def mutable_class
+            if @project
+                "#{@project.class_prefix}Mutable#{@name}"
+            else
+                "Mutable#{@name}"
+            end
+        end
+        
         alias :name :class_name
         
         def instance_name
@@ -121,6 +157,23 @@ module ModelMaker
             @properties[property.name] = property
         end
         
+        def add_dependency(cls)
+            @deps << cls
+        end
+        
+        def dependencies
+            if not @project
+                raise "Need a project to list dependencies"
+            end
+            
+            deps = []
+            for dependency in @deps do
+                deps << @project.get_entity(dependency)
+            end
+            
+            deps
+        end
+        
         def properties
             @properties.values
         end
@@ -138,6 +191,7 @@ module ModelMaker
     
     class Property
         attr_reader :name
+        attr_accessor :project
         
         def initialize(name)
             @name = name
@@ -180,6 +234,23 @@ module ModelMaker
         def assignation_value
             exposed_name
         end
+        
+        def assignation_line
+            "#{internal_name} = #{assignation_value}"
+        end
+        
+        def comment_line
+            nil
+        end
+        
+        def make_classname(type)
+            # If we're linked to a project and class has no prefix
+            if project and not type =~ /^[A-Z]{3}/
+                "#{project.class_prefix}#{type} *"
+            else
+                "#{type} *"
+            end
+        end
     end
     
     class StringProperty < Property
@@ -229,6 +300,12 @@ module ModelMaker
     end
     
     class ArrayProperty < Property
+        def initialize(name, type=nil)
+            super(name)
+            
+            @type = type
+        end
+        
         def internal_type
             'NSMutableArray *'
         end
@@ -248,6 +325,26 @@ module ModelMaker
         def assignation_value
             "[[NSMutableArray alloc] initWithArray:#{exposed_name}]"
         end
+        
+        def comment_line
+            if @type
+                "Array of #{make_classname(@type)}"
+            else
+                nil
+            end
+        end
+    end
+    
+    class IdProperty < Property
+        def initialize(name, cls)
+            super(name)
+            
+            @cls = cls
+        end
+        
+        def type
+            make_classname(@cls)
+        end
     end
     
     class DefaultRunner
@@ -300,8 +397,8 @@ module ModelMaker
                 [
                     HeaderRenderer,
                     ImplementationRenderer,
-                    BuilderHeaderRenderer,
-                    BuilderImplementationRenderer
+                    MutableHeaderRenderer,
+                    MutableImplementationRenderer
                 ]
             end
         end
@@ -359,23 +456,23 @@ module ModelMaker
             end
         end
         
-        class BuilderHeaderRenderer < BaseRenderer
+        class MutableHeaderRenderer < BaseRenderer
             def template_file
-                'builder_header.erb'
+                'mutable_header.erb'
             end
             
             def generated_file(template_vars)
-                "#{template_vars.entity.name}Builder.h"
+                "#{template_vars.entity.mutable_class}.h"
             end
         end
         
-        class BuilderImplementationRenderer < BaseRenderer
+        class MutableImplementationRenderer < BaseRenderer
             def template_file
-                'builder_implementation.erb'
+                'mutable_implementation.erb'
             end
             
             def generated_file(template_vars)
-                "#{template_vars.entity.name}Builder.m"
+                "#{template_vars.entity.mutable_class}.m"
             end
         end
         

data/src/templates/header.erb

@@ -12,16 +12,26 @@
 //
 
 #import <Foundation/Foundation.h>
+<% for dependency in entity.dependencies %>
+#import "<%= dependency.class_name %>.h"
+<% end %>
 
 @interface <%= @entity.name %> : <%= @entity.superclass %> <%= '<' + @entity.protocols.join(', ') + '> ' if not @entity.protocols.empty? %>{
-@package
+@protected
 <% for @property in @entity.properties %>
     <%= @property.internal_type %> <%= @property.internal_name %>;
 <% end %>
 }
 
-<% for @property in @entity.properties %>
-@property (readonly) <%= @property.exposed_type %> <%= @property.exposed_name %>;
+<% for property in @entity.properties %>
+<% if property.comment_line %>
+
+/**
+ * <%= property.comment_line %>
+
+ */
+<% end %>
+@property (readonly) <%= property.exposed_type %> <%= property.exposed_name %>;
 <% end %>
 
 @end

data/src/templates/{builder_header.erb → mutable_header.erb}

@@ -1,5 +1,5 @@
 //
-// <%= entity.name %>Builder.h
+// <%= entity.mutable_class %>.h
 // <%= project.name %>
 
 <% if project.copyright %>
@@ -12,16 +12,13 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "<%= entity.name %>.h"
+#import "<%= entity.class_name %>.h"
 
-@interface <%= entity.name %>Builder : NSObject
+@interface <%= entity.mutable_class %> : <%= entity.class_name %>
 
-@property (readonly) <%= entity.name %> *<%= entity.instance_name %>;
-
-- (id)init;
 
 <% for property in entity.properties %>
-<%= property.setter_signature %>;
+@property (readwrite) <%= property.exposed_type %> <%= property.exposed_name %>;
 <% end %>
 
 @end

data/src/templates/mutable_implementation.erb

@@ -0,0 +1,26 @@
+//
+// <%= entity.mutable_class %>.m
+// <%= project.name %>
+
+<% if project.copyright %>
+//
+// Copyright (c) <%= project.copyright %>. All rights reserved.
+<% end %>
+//
+// Generated by ModelMaker
+// See http://github.com/aspyct/ModelMaker
+//
+
+#import "<%= entity.mutable_class %>.h"
+
+@implementation <%= entity.mutable_class %>
+
+
+<% for property in entity.properties %>
+<%= property.setter_signature %> {
+    <%= property.assignation_line %>;
+}
+
+<% end %>
+
+@end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modelmaker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: src/bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies: []
 description: ! 'ModelMaker generates your model classes based on a simple ruby definition. '
 email: a.dotreppe@aspyct.org
@@ -18,10 +18,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- src/templates/builder_header.erb
-- src/templates/builder_implementation.erb
 - src/templates/header.erb
 - src/templates/implementation.erb
+- src/templates/mutable_header.erb
+- src/templates/mutable_implementation.erb
 - src/bin/modelmake
 - src/lib/modelmaker.rb
 homepage: https://github.com/aspyct/ModelMaker

data/src/templates/builder_implementation.erb

@@ -1,36 +0,0 @@
-//
-// <%= entity.name %>Builder.m
-// <%= project.name %>
-
-<% if project.copyright %>
-//
-// Copyright (c) <%= project.copyright %>. All rights reserved.
-<% end %>
-//
-// Generated by ModelMaker
-// See http://github.com/aspyct/ModelMaker
-//
-
-#import "<%= entity.name %>Builder.h"
-
-@implementation <%= entity.name %>Builder
-
-@synthesize <%= entity.instance_name %> = _<%= entity.instance_name %>;
-
-- (id)init {
-    self = [super init];
-    
-    if (self) {
-        _<%= entity.instance_name %> = [[<%= entity.name %> alloc] init];
-    }
-    
-    return self;
-}
-
-<% for property in entity.properties %>
-<%= property.setter_signature %> {
-    _<%= entity.instance_name %>-><%= property.internal_name %> = <%= property.assignation_value %>;
-}
-
-<% end %>
-@end