rest_kat 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/model.h.erb

@@ -31,14 +31,17 @@
 //// <%= klass.objc_class %>
 //////////////////////////////////////////////////////////////////////////////
 <%end%>
-@interface <%= klass.objc_class %> : <%= klass.objc_super_class %>
+@interface <%= klass.objc_class %> : NSObject<<%=klass.objc_protocols%>>
+
+
+
 <%klass.properties.each do |property|%>
-<%if property.klass.seq? %>
-// <%=property.name%> : <%=property.klass.json_type%> of <%=property.klass.sequence_of.objc_class%>
+<%if property.klass.is_a? ObjCSequenceOfMap %>
+// <%=property.name%> : sequence of <%=property.klass.item_class.objc_class%>
 <%else%>
 // <%=property.name%> : <%=property.klass.json_type%>
 <%end%>
-<%if property.klass.enum?%>
+<%if property.klass.is_a? ObjCPrimitiveType and property.klass.enum?%>
 //  Enumeration of
 <%property.klass.enum.each do |e|%>
 //    - <%=e%>
@@ -49,6 +52,9 @@
 
 // Initialize all the methods. Called by +initialize ( don't call manually )
 + (void)initializeMapping;
+<%if klass.cached?%>
++ (NSEntityDescription *)initializeCoreData;
+<%end%>
 
 // Static initializer ( don't call manually )
 + (void)initialize;
@@ -58,3 +64,7 @@
 @end
 
 <%end%>
+
+extern NSMutableArray * entities();
+
+extern NSManagedObjectModel * managedObjectModel();

data/lib/model.m.erb

@@ -1,4 +1,6 @@
 #import "<%=header%>"
+#import <objc/runtime.h>
+
 
 <%classes.each do |klass|%>
 //////////////////////////////////////////////////////////////////////////////
@@ -6,41 +8,149 @@
 //////////////////////////////////////////////////////////////////////////////
 @implementation <%= klass.objc_class %>
 
++ (RKObjectMapping *) mapperForParsing
+{
+    return [[RKObjectManager sharedManager].mappingProvider objectMappingForClass:self];
+}
+
++ (RKObjectMapping *) mapperForSerializing
+{
+    return [[RKObjectManager sharedManager].mappingProvider serializationMappingForClass:self];
+}
+
 <%klass.properties.each do |property|%>
 @synthesize <%= property.name %>;
 <%end%>
 
 + (void)initialize{
+  [self initializeMapping];
 <%if klass.resource%>
   [self initializeRouting];
 <%end%>
-  [self initializeMapping];
+<%if klass.cached?%>
+  (void)[self initializeCoreData];
+<%end%>
 }
 
+- (NSString*)description
+{
+    RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider serializationMappingForClass:[self class]];
+    RKObjectSerializer * serializer = [RKObjectSerializer serializerWithObject:self mapping:mapper];
+
+    NSError * error;
+    NSString * description = (NSString *)[serializer serializedObjectForMIMEType:RKMIMETypeJSON error: &error];
+    return [description stringByReplacingOccurrencesOfString:@"\"" withString:@"'"];
+}
+
+<%if klass.cached? %>
++ (NSEntityDescription * )initializeCoreData
+{
+    static NSEntityDescription * entity;
+    if(entity){
+       return entity;
+    }
+    entity = [[NSEntityDescription alloc] init];
+    entity.name = @"<%=klass.objc_class%>";
+    entity.managedObjectClassName = @"<%=klass.objc_class%>";
+
+    // -------------------------------------------
+    // Define the properties mappings
+    NSMutableArray * properties = [NSMutableArray array];
+<%klass.primitive_properties.each do |property|%>
+    {
+        // <%= property.name %>
+        NSAttributeDescription * attrDesc = [[NSAttributeDescription alloc] init];
+        attrDesc.name = @"<%= property.name %>";
+        [attrDesc setAttributeType:<%= property.ns_attribute_type %>];
+        [attrDesc setOptional:NO];
+        [properties addObject:attrDesc];
+    }
+<%end%>
+
+    // ----------------------------------------------
+    // Define 'has one' relationships
+    // ----------------------------------------------
+<%klass.has_one_properties.each do |property|%> 
+    { 
+      // <%= property.name %>
+      NSRelationshipDescription * relDesc = [[NSRelationshipDescription alloc] init];
+      [relDesc setDestinationEntity:[<%=property.klass.objc_class%> initializeCoreData]];
+      relDesc.name = @"<%= property.name %>";
+      relDesc.minCount = 1;
+      relDesc.maxCount = 1;
+      relDesc.deleteRule = NSCascadeDeleteRule;
+      [properties addObject:relDesc];
+    }
+<%end%>
+
+    // ----------------------------------------------
+    // Define 'has many' objects relationships
+    // ----------------------------------------------
+<%klass.has_many_maps_properties.each do |property|%> 
+    { 
+      // <%= property.name %>
+      NSRelationshipDescription * relDesc = [[NSRelationshipDescription alloc] init];
+      relDesc.name = @"<%= property.name %>";
+      // Sequence of core data objects
+      [relDesc setDestinationEntity:[<%=property.klass.item_class.objc_class%> initializeCoreData]];
+      relDesc.deleteRule = NSCascadeDeleteRule;
+      [properties addObject:relDesc];
+    }
+<%end%>
+
+    // ----------------------------------------------
+    // Define 'has many' primitves relationships
+    // ----------------------------------------------
+<%klass.has_many_maps_properties.each do |property|%> 
+    { 
+      // Sequence of primitives
+      // This is really a sequence of primitive
+#warning <%= property.name %> is a sequence of primitive
+    }
+<%end%>
+
+    [entity setProperties:properties];
+    return entity;
+}
+<%end%>
+
+
 + (void)initializeMapping{
     RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[<%=klass.objc_class%> class]];
 
     // -------------------------------------------
-    // Define the properties mappings
-    <%klass.properties.each do |property|%> <%if not property.klass.complex? %>
+    // Define 'primitive' properties mappings
+    // ----------------------------------------------
+<%klass.primitive_properties.each do |property|%> 
     [mapping mapKeyPath:@"<%=property.name%>" toAttribute:@"<%=property.name%>"];
-    <%end%> <%end%>
+<%end%>
+<%klass.has_many_primitives_properties.each do |property|%> 
+    // NSArray of <%= property.klass.item_class.objc_class %>
+    [mapping mapKeyPath:@"<%=property.name%>" toAttribute:@"<%=property.name%>"];
+<%end%>
 
-    // -------------------------------------------
-    // Define the relationship mappings
-    <%klass.properties.each do |property|%> 
-    <%if property.klass.complex? %>
+    // ----------------------------------------------
+    // Define 'has one' relationships
+    // ----------------------------------------------
+<%klass.has_one_properties.each do |property|%> 
     { 
-      <%if property.klass.map?%>
-        RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider objectMappingForClass:[<%=property.klass.objc_class%> class]];
+        // <%= property.name %>
+        RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider 
+            objectMappingForClass:[<%=property.klass.objc_class%> class]];
         [mapping hasOne:@"<%=property.name%>" withMapping:mapper];
-      <%elsif property.klass.seq?%>
-        RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider objectMappingForClass:[<%=property.klass.sequence_of.objc_class%> class]];
+    }
+<%end%>
+
+    // ----------------------------------------------
+    // Define 'has many' relationships
+    // ----------------------------------------------
+<%klass.has_many_maps_properties.each do |property|%> 
+    { 
+        RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider 
+            objectMappingForClass:[<%=property.klass.item_class.objc_class%> class]];
         [mapping hasMany:@"<%=property.name%>" withMapping:mapper];
-      <%end%>
     }
-    <%end%> 
-    <%end%>
+<%end%>
 
     // -------------------------------------------
     // Register the mapper for the class
@@ -56,34 +166,94 @@
   return @"<%= klass.resource.hash[:resource] %>";
 }
 
++ (void)initializeRouting{
+    RKObjectRouter * router = [RKObjectManager sharedManager].router;
+    
+    NSString * collectionResource = [self resourcePath];
+    NSString * objectResource = [NSString stringWithFormat:@"%@/(id)", collectionResource];
+
+<%if klass.resource.create?%>
+    [router routeClass:self toResourcePath:collectionResource forMethod:RKRequestMethodPOST];
+<%end%>
+<%if klass.resource.read?%>
+    [router routeClass:self toResourcePath:objectResource forMethod:RKRequestMethodGET];
+<%end%>
+<%if klass.resource.update?%>
+    [router routeClass:self toResourcePath:objectResource forMethod:RKRequestMethodPUT];
+<%end%>
+<%if klass.resource.delete?%>
+    [router routeClass:self toResourcePath:objectResource forMethod:RKRequestMethodDELETE];
+<%end%>
 
-+ (Class) classForResource{
-  return [ <%=klass.resource.objc_resource_type%> class];
 }
 
-+ (bool)isSingleton
+- (BOOL)isNew
 {
-  return <%=klass.resource.c_permission_for 's'%>;
+    BOOL hasId = class_getProperty([self class], [@"id" UTF8String]) != NULL;
+    return ([self valueForKey:@"id"] == NULL || !hasId);
+}
+
+-(void) saveWithDelegate:(id<RKObjectLoaderDelegate>)delegate
+{
+    RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider objectMappingForClass:[self class]];
+
+    if ([self isNew])
+    {
+        [[RKObjectManager sharedManager] postObject:self mapResponseWith:mapper delegate:delegate];
+    }else{
+        [[RKObjectManager sharedManager] putObject:self mapResponseWith:mapper delegate:delegate];
+    }
+    
 }
 
-+ (bool)canCreate
+- (void)deleteWithDelegate:(id<RKObjectLoaderDelegate>)delegate
 {
-  return <%=klass.resource.c_permission_for 'c'%>;
+    RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider objectMappingForClass:[self class]];
+    [[RKObjectManager sharedManager] deleteObject:self mapResponseWith:mapper delegate:delegate];
 }
 
-+ (bool)canRead
++ (void) loadItem:(NSNumber *)id 
+     withDelegate:(id<RKObjectLoaderDelegate>)delegate;
 {
-  return <%=klass.resource.c_permission_for 'r'%>;
+    RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider objectMappingForClass:[self class]];
+
+    <%= klass.objc_class%> * instance = [[self alloc] init];
+    [instance setValue:id forKey:@"id"];
+    [[RKObjectManager sharedManager] getObject:instance 
+                               mapResponseWith:mapper
+                                      delegate:delegate];
 }
 
-+ (bool)canUpdate
+// Load collection
++ (void) loadCollectionWithDelegate:(id<RKObjectLoaderDelegate>)delegate
 {
-  return <%=klass.resource.c_permission_for 'u'%>;
+    RKObjectManager * objectManager = [RKObjectManager sharedManager];
+    RKObjectMapping * mapping = [objectManager.mappingProvider 
+                                 objectMappingForClass:self ];
+    
+    [objectManager loadObjectsAtResourcePath:[self resourcePath] 
+                               objectMapping:mapping 
+                                    delegate:delegate];
 }
 
-+ (bool)canDelete
+
+// Load collection with query
++ (void) loadCollectionThroughQuery:(NSObject *)mappableQueryObject 
+                       withDelegate:(id<RKObjectLoaderDelegate>)delegate
 {
-  return <%=klass.resource.c_permission_for 'd'%>;
+    
+    RKObjectManager * objectManager = [RKObjectManager sharedManager];
+    RKObjectMapping * mapping = [objectManager.mappingProvider
+                                 objectMappingForClass:self ];
+    
+    
+    // Append the dictionary to the resource as query parameters
+    NSString * resourcePath = RKPathAppendQueryParams([self resourcePath], convertToDictionary(mappableQueryObject));
+    
+    // Load the objects at the query
+    [objectManager loadObjectsAtResourcePath:resourcePath 
+                               objectMapping:mapping 
+                                    delegate:delegate];
 }
 <%end%>
 
@@ -104,12 +274,43 @@ return object;
 - (id) copyWithZone : (NSZone * ) zone
 {
   <%=klass.objc_class%> * object = [[<%=klass.objc_class%> allocWithZone:zone] init];
-  <%klass.properties.each do |property|%>
-    object.<%=property.name%> = [self.<%=property.name%> copy];
-  <%end%>
+<%klass.properties.each do |property|%>
+  object.<%=property.name%> = [self.<%=property.name%> copy];
+<%end%>
   return object;
 }
 
+
 @end
 
 <%end%>
+
+
+
+
+NSMutableArray * entities(){
+static NSMutableArray * _entities = nil;
+    if(!_entities){
+        _entities = [[NSMutableArray alloc] init];
+<%classes.each do |klass|%>
+<%if klass.cached? %>
+        [_entities addObject:[<%=klass.objc_class%> initializeCoreData]];
+<%end%>
+<%end%>
+    }
+    return _entities;
+}
+
+NSManagedObjectModel * managedObjectModel(){
+    static NSManagedObjectModel *mom = nil;
+ 
+    if (mom != nil) {
+        return mom;
+    }
+    
+    mom = [[NSManagedObjectModel alloc] init];
+    [mom setEntities:entities()];
+
+    return mom;
+
+}

data/lib/rest_kat.rb

@@ -5,6 +5,10 @@ module RestKat
       self.hash = resource
     end
 
+    def cached?
+      self.hash[:cached]
+    end
+
     def objc_resource_type
       hash[:type][:name]
     end
@@ -76,39 +80,115 @@ module RestKat
       self.klass = klass
       self.name = name
     end
+
+    def ns_attribute_type
+        #         typedef enum {
+        #             NSUndefinedAttributeType = 0,
+        #             NSInteger16AttributeType = 100,
+        #             NSInteger32AttributeType = 200,
+        #             NSInteger64AttributeType = 300,
+        #             NSDecimalAttributeType = 400,
+        #             NSDoubleAttributeType = 500,
+        #             NSFloatAttributeType = 600,
+        #             NSStringAttributeType = 700,
+        #             NSBooleanAttributeType = 800,
+        #             NSDateAttributeType = 900,
+        #             NSBinaryDataAttributeType = 1000,
+        #             NSTransformableAttributeType = 1800,
+        #             NSObjectIDAttributeType = 2000
+        #             } NSAttributeType;
+        case self.klass.objc_class
+        when "NSNumber"
+            case self.klass.json_type
+            when "int"
+                "NSInteger32AttributeType"
+            when "float"
+                "NSFloatAttributeType"
+            when "bool"
+                "NSBooleanAttributeType"
+            end
+        when "NSDate"
+            "NSDateAttributeType"
+        when "NSString"
+            "NSStringAttributeType"
+        else
+            raise Exception.new("Unknown type #{self.klass.objc_class} for NSAttributeType to be handled for property #{self.name}" )
+        end
+        
+    end
   end
 
-  class ObjCClass
-    attr_accessor :properties
-    attr_accessor :sequence_of
-    attr_accessor :type
-    attr_accessor :parent
-    attr_accessor :json_type
-    attr_accessor :node
-    attr_accessor :resource
+  class ObjCSequence
+      attr_accessor :item_class
 
-    def objc_super_class
-      if resource
-        "MSRestSerializableResource"
-      else
-        "MSRestSerializable"
+      def cached
+        item_class.cached
+      end
+
+      def cached=val
+        item_class.cached = val
+      end
+
+      def initialize klass
+          self.item_class = klass
+      end
+
+      def objc_property_decl name
+          "@property (nonatomic, strong) NSArray * #{name}"
+      end
+
+      def objc_property_arg_decl name
+          "#{name}: (NSArray *) #{name}"
       end
+
+      def json_type
+          "seq"
+      end
+
+      def objc_class
+          "NSArray *"
+      end
+  end
+
+  class ObjCSequenceOfMap < ObjCSequence
+    def initialize klass
+        super klass
     end
+  end
+
+  class ObjCSequenceOfPrimitve < ObjCSequence
+    def initialize klass
+        super klass
+    end
+  end
+
+  class ObjCType
+    attr_accessor :objc_class
+    attr_accessor :json_type
+    attr_accessor :node
+    attr_accessor :cached
 
-    def complex?
-      map? || seq?
+    def objc_property_decl name
+      "@property (nonatomic, strong) #{objc_class} * #{name}"
     end
 
-    def map?
-      properties && (not properties.empty?)
+    def objc_property_arg_decl name
+      "#{name}: (#{objc_class} *) #{name}"
     end
 
-    def seq?
-      !!sequence_of
+    def initialize objc_class, json_type, node
+        self.objc_class = objc_class
+        self.json_type = json_type
+        self.node = node
     end
+  end
 
-    def objc_class
-      self.type
+  class ObjCPrimitiveType < ObjCType
+    attr_accessor :objc_class
+    attr_accessor :json_type
+    attr_accessor :node
+    def initialize objc_class, json_type, node
+        super objc_class, json_type, node
     end
 
     def enum?
@@ -118,13 +198,68 @@ module RestKat
     def enum
       node["enum"]
     end
+  end
 
-    def objc_property_decl name
-      "@property (nonatomic, strong) #{objc_class} * #{name}"
+  class ObjCMapType < ObjCType
+    attr_accessor :properties
+    attr_accessor :sequence_of
+    attr_accessor :resource
+
+    def cached?
+      cached
     end
 
-    def objc_property_arg_decl name
-      "#{name}: (#{objc_class} *) #{name}"
+    def cached=val
+      @cached = val
+      if properties 
+        properties.each do |property|
+          property.klass.cached = val
+        end
+      end
+    end
+
+    def primitive_properties
+        properties.select do |p|
+            p.klass.is_a? ObjCPrimitiveType
+        end
+    end
+
+    def has_one_properties
+        properties.select do |p|
+            p.klass.is_a? ObjCMapType
+        end
+    end
+
+    def has_many_properties
+        properties.select do |p|
+            p.klass.is_a? ObjCSequence
+        end
+    end
+
+    def has_many_primitives_properties
+        properties.select do |p|
+            p.klass.is_a? ObjCSequenceOfPrimitve
+        end
+    end
+
+    def has_many_maps_properties
+        properties.select do |p|
+            p.klass.is_a? ObjCSequenceOfMap
+        end
+    end
+
+    def objc_super_class
+      if resource
+        "MSRestSerializableResource"
+      else
+        "MSRestSerializable"
+      end
+    end
+
+    def objc_protocols
+      ["NSCopying"].tap do |p|
+        p << "MSRestResource" if resource
+      end.join ', '
     end
 
     def objc_properites_arg_list_decl
@@ -133,11 +268,10 @@ module RestKat
       end.join "\n   "
     end
 
-    def initialize type, json_type, node
-      self.properties = nil
-      self.type = type
-      self.json_type = json_type
-      self.node = node
+    def initialize objc_class, json_type, node
+        super objc_class, json_type, node
+        self.properties = nil
+        self.cached = false
     end
 
   end
@@ -188,10 +322,11 @@ module RestKat
         Resource.new(resource_hash).tap do |resource|
           # Generate the query classes first
           resource.queries.each do |query|
-            to_objective_c_class query["type"]
+            # Query objects do not get cached in core data
+            to_objective_c_class node:query["type"], cached:false
           end
           # Generate the resource classes next
-          klass = to_objective_c_class resource.hash[:type]
+          klass = to_objective_c_class node:resource.hash[:type], cached:resource.cached?
           # Mark this class as being a REST resource
           klass.resource = resource
         end
@@ -218,7 +353,7 @@ module RestKat
     end
 
     def find_processed_class node
-      classes.find{|c| c.type == node[:name]}
+      classes.find{|c| c.objc_class == node[:name]}
     end
 
     # Perform a depth first traversal of the type tree. The resulting
@@ -226,49 +361,47 @@ module RestKat
     # the code generation phase this classes will be injected last into
     # the code making sure the dependencies are define in the correct
     # order.
-    def to_objective_c_class node
+    def to_objective_c_class options
+
+      node = options[:node]
+      cached = options[:cached]
+
       unless node
-        raise Exception.new("node is nil for name '#{name}'")
+        raise Exception.new("node is nil")
       end
 
       case node[:type]
       when "map"
 
         unless klass = find_processed_class(node)
-          klass = ObjCClass.new(node[:name], node[:type], node)
+          klass = ObjCMapType.new(node[:name], node[:type], node)
 
           klass.properties = node[:mapping].collect do |property_name, property_node|
             if property_node[:type] == "map"
               property_node[:name] ||= IosMapping.obj_c_type_for_property(node, property_name)
             end
-            ObjCProperty.new(to_objective_c_class(property_node), property_name)
+            ObjCProperty.new(to_objective_c_class(node:property_node, cached:cached), property_name)
           end
 
           self.classes << klass
         end
 
+        # Inherit caching from parent as the whole object graph 
+        # of cached objects needs to go into Core Data
+        klass.cached = cached
+
       when "seq"
-        klass = ObjCClass.new(node[:name] || "NSArray", node[:type], node)
-        if node[:sequence].length != 1
-          raise "Only support sequence of map with one map type"
-        end
-        sequence_node = node[:sequence].first
-        if sequence_node["type"] == "map"
-          if not sequence_node["name"]
-            raise Exception.new ("sequence of map nodes must have a :name to generate the objective C types")
-          end
-          klass.sequence_of = to_objective_c_class sequence_node
-        end
+        klass = create_sequence(node, cached)
       when "str", "text"
-        klass = ObjCClass.new(node[:name] || "NSString", node[:type], node)
+        klass = ObjCPrimitiveType.new(node[:name] || "NSString", node[:type], node)
       when "int"
-        klass = ObjCClass.new(node[:name] || "NSNumber", node[:type], node)
+        klass = ObjCPrimitiveType.new(node[:name] || "NSNumber", node[:type], node)
       when "float"
-        klass = ObjCClass.new(node[:name] || "NSNumber", node[:type], node)
+        klass = ObjCPrimitiveType.new(node[:name] || "NSNumber", node[:type], node)
       when "bool"
-        klass = ObjCClass.new(node[:name] || "NSNumber", node[:type], node)
+        klass = ObjCPrimitiveType.new(node[:name] || "NSNumber", node[:type], node)
       when "any"
-        klass = ObjCClass.new(node[:name] || "NSObject", node[:type], node)
+        klass = ObjCPrimitiveType.new(node[:name] || "NSObject", node[:type], node)
       else
         raise Exception.new("Unhandled type '#{node[:type]} for node with name #{node[:name]}")
       end
@@ -278,6 +411,20 @@ module RestKat
       klass
 
     end
+
+    def create_sequence node, cached
+        if node[:sequence].length != 1
+          raise "Only support sequence of map with one map type"
+        end
+        item_class = to_objective_c_class node:node[:sequence].first, cached:cached
+        if item_class.is_a? ObjCMapType
+            ObjCSequenceOfMap.new(item_class)
+        elsif item_class.is_a? ObjCPrimitiveType
+            ObjCSequenceOfPrimitve.new(item_class)
+        else
+            raise Exception.new "#{item_class.class} cannot be handled here"
+        end
+    end
   end
 end
 
@@ -296,7 +443,6 @@ module RestKat
             model.h.erb
             model.m.erb
             rest_kat.rb
-            validator.rb
         ].collect do |d|
             File.expand_path "../#{d}", __FILE__
         end
@@ -328,11 +474,11 @@ module RestKat
         tgt_m = File.join api_location, "MSRestSerializable.m"
 
 
-        t0 = file tgt_h, src_h do
+        t0 = file tgt_h => src_h do
             cp src_h, tgt_h, :verbose => true
         end
 
-        t1 = file tgt_m, src_m do
+        t1 = file tgt_m => src_m do
             cp src_m, tgt_m, :verbose => true
         end
 

data/rest_kat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_kat}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Brad Phelan}]
-  s.date = %q{2011-11-24}
+  s.date = %q{2011-11-28}
   s.description = %q{The generated source code is a layer on top of the iOS REST framework http://restkit.org/}
   s.email = %q{brad.phelan@mysugr.com}
   s.extra_rdoc_files = [

data/src/MSRestSerializable.h

@@ -10,73 +10,35 @@
 #import "NSDate+APIDate.h"
 #import <RestKit/RestKit.h>
 
-@interface MSRestSerializable : NSObject<NSCopying>
-// The mapper for this instance
-- (RKObjectMapping *) _mapper;
+extern NSDictionary * convertToDictionary( NSObject * object);
 
-// The serializer for this instance
-- (RKObjectMapping *) _serializer;
+extern NSString * convertToFormURLEncoded( NSObject * object);
 
-- (NSDictionary *)convertToDictionary;
+extern NSString * convertToJSON( NSObject * object);
 
-- (NSString *)convertToFormURLEncoded;
 
-- (NSString *)convertToJSON;
+@protocol MSRestResource
 
+// Is the object new or not
 - (BOOL)isNew;
-@end
-
-@interface MSRestSerializableResource : MSRestSerializable
-
-#pragma mark methods to be overridden
-
-+ (Class) classForResource;
-
-// The resource path. If this 
-+ (NSString *) resourcePath;
-
-// Is the resource a singleton or a collection
-+ (bool) isSingleton;
-
-// Can the client create resources
-+ (bool) canCreate;
-
-// Can the client read resources
-+ (bool) canRead;
-
-// Can the client update resources
-+ (bool) canUpdate;
-
-// Can the client delete resources
-+ (bool) canDelete;
-
-#pragma mark helpers
-
-// The router for this class
-+ (RKObjectRouter *) router;
-
-// Intialize the routing module. Must
-// be called from +initialize in a 
-// subclass or the logic will not
-// work.
-+ (void) initializeRouting;
 
++ (void)initializeRouting;
 
-// save the object
+// Save a single record
 -(void) saveWithDelegate:(id<RKObjectLoaderDelegate>)delegate;
 
-//delete the object
+// Delete a single record
 - (void)deleteWithDelegate:(id<RKObjectLoaderDelegate>)delegate;
 
-// Find an instance by id
-+ (void) find:(NSNumber *)id 
- withDelegate:(id<RKObjectLoaderDelegate>)delegate;
+// Load a single record
++ (void) loadItem:(NSNumber *)id 
+     withDelegate:(id<RKObjectLoaderDelegate>)delegate;
 
 // Load collection
 + (void) loadCollectionWithDelegate:(id<RKObjectLoaderDelegate>)delegate;
 
 // Load collection with query
-+ (void) loadCollectionThroughQuery:(MSRestSerializable *)mappableQueryObject 
++ (void) loadCollectionThroughQuery:(NSObject *)mappableQueryObject 
                        withDelegate:(id<RKObjectLoaderDelegate>)delegate;
 
 @end

data/src/MSRestSerializable.m

@@ -10,210 +10,36 @@
 #import <RestKit/RestKit.h>
 #import <objc/runtime.h>
 
-@implementation MSRestSerializable
-
-
-- (RKObjectMapping *) _mapper
-{
-    RKObjectMappingProvider * provider = [RKObjectManager sharedManager].mappingProvider;
-    RKObjectMapping * mapping = [provider objectMappingForClass:[self class]];
-    return mapping;
-
-
-}
-
-- (RKObjectMapping *) _serializer
+static RKObjectSerializer * serializerFor(NSObject * serializable)
 {
-    RKObjectMappingProvider * provider = [RKObjectManager sharedManager].mappingProvider;
-    RKObjectMapping * mapping = [provider serializationMappingForClass:[self class]];
-    return mapping;
-}
+    RKObjectMapping * mapper = [[RKObjectManager sharedManager].mappingProvider 
+        serializationMappingForClass:serializable.class];
 
-
-
-- (BOOL)isNew
-{
-    BOOL hasId = class_getProperty([self class], [@"id" UTF8String]) != NULL;
-    return ([self valueForKey:@"id"] == NULL || !hasId);
+    return [RKObjectSerializer 
+        serializerWithObject:serializable 
+                     mapping:mapper];
 }
 
-
-- (NSDictionary *)convertToDictionary
+NSDictionary * convertToDictionary(NSObject * serializable)
 {
     NSError * error;
-    // First convert the query object into a dictionary
-    RKObjectSerializer * querySerializer = [RKObjectSerializer serializerWithObject:self mapping:[self _serializer]];
-    return [querySerializer serializedObject:&error];
+    return [serializerFor(serializable) 
+        serializedObject:&error];
 }
 
 
-- (NSString*)convertToJSON
+NSString * convertToJSON(NSObject * serializable)
 {
-    RKObjectSerializer * serializer = [RKObjectSerializer serializerWithObject:self mapping:[self _serializer]];
     NSError * error;
-    NSString * text = (NSString *)[serializer serializedObjectForMIMEType:RKMIMETypeJSON error:&error];
-    return text;
+    return (NSString *)[serializerFor(serializable) 
+        serializedObjectForMIMEType:RKMIMETypeJSON error:&error];
 }
 
-- (NSString *)convertToFormURLEncoded
+NSString * convertToFormURLEncoded(NSObject * serializable)
 {
-    RKObjectSerializer * serializer = [RKObjectSerializer serializerWithObject:self mapping:[self _serializer]];
-
     NSError * error;
-    NSString * text = (NSString *)[serializer serializedObjectForMIMEType:RKMIMETypeFormURLEncoded error: &error];
-    return text;
-}
-
-- (NSString*)description
-{
-
-
-    RKObjectSerializer * serializer = [RKObjectSerializer serializerWithObject:self mapping:[self _serializer]];
-
-    NSError * error;
-    NSString * description = (NSString *)[serializer serializedObjectForMIMEType:RKMIMETypeJSON error: &error];
-    return [description stringByReplacingOccurrencesOfString:@"\"" withString:@"'"];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
-    return [[MSRestSerializable allocWithZone:zone] init];
-}
-
-@end
-
-@implementation MSRestSerializableResource
-
-+ (RKObjectRouter *) router
-{
-    return [RKObjectManager sharedManager].router;
-}
-
-+ (Class) classForResource
-{
-    NSAssert(NO, @"Stub implementation. Must be implemented in subclass");
-    return NULL;
-}
-
-
-+ (void) initializeRouting
-{
-    RKObjectRouter * router = [self router];
-    
-    NSString * collectionResource = [self resourcePath];
-    NSString * objectResource = [NSString stringWithFormat:@"%@/:id", collectionResource];
-    
-    if([self isSingleton])
-    {
-        objectResource = collectionResource;
-    }
-    
-    if ([self canCreate]){
-        [router routeClass:self toResourcePath:collectionResource forMethod:RKRequestMethodPOST];
-    }
-    
-    if ([self canRead]){
-        [router routeClass:self toResourcePath:objectResource forMethod:RKRequestMethodGET];
-    }
-    
-    if ([self canUpdate])
-    {
-        [router routeClass:self toResourcePath:objectResource forMethod:RKRequestMethodPUT];
-    }
-    
-    if ([self canDelete])
-    {
-        [router routeClass:self toResourcePath:objectResource forMethod:RKRequestMethodDELETE];
-    }
-    
-}
-
-
-+ (NSString *) resourcePath{
-    NSAssert(NO, @"Not implemented");
-    return NULL;
-}
-
-+ (bool) isSingleton{
-    return true;
-}
-+ (bool) canCreate{
-    return true;
-}
-+ (bool) canRead{
-    return true;
-}
-+ (bool) canUpdate{
-    return true;
-}
-+ (bool) canDelete{
-    return true;
-}
-
-
-- (void) saveWithDelegate:(id<RKObjectLoaderDelegate>)delegate
-{
-    if ([self isNew])
-    {
-        NSAssert(self.class.canCreate, @"Object must allow create to be created");
-        NSLog(@"Creating new object\n%@", self);
-        // Save a new object
-        [[RKObjectManager sharedManager] postObject:self mapResponseWith:[self _mapper] delegate:delegate];
-    }else{
-        NSAssert(self.class.canUpdate, @"Object must allow update to be updated");
-        NSLog(@"Updating object\n%@", self);
-        // Update the object as it allready has an id
-        [[RKObjectManager sharedManager] putObject:self mapResponseWith:[self _mapper] delegate:delegate];
-    }
-}
-
-- (void)deleteWithDelegate:(id<RKObjectLoaderDelegate>)delegate
-{
-    NSAssert(self.class.canDelete, @"Object must allow delete to be deleted");
-    [[RKObjectManager sharedManager] deleteObject:self mapResponseWith:[self _mapper] delegate:delegate];
-}
-
-// Find an instance by id
-+ (void) find:(NSNumber *)id withDelegate:(id<RKObjectLoaderDelegate>)delegate
-{
-    MSRestSerializable * instance = [[self alloc] init];
-    [instance setValue:id forKey:@"id"];
-    [[RKObjectManager sharedManager] getObject:instance 
-                               mapResponseWith:[instance _mapper] 
-                                      delegate:delegate];
-}
-
-// Load collection
-+ (void) loadCollectionWithDelegate:(id<RKObjectLoaderDelegate>)delegate
-{
-    RKObjectManager * objectManager = [RKObjectManager sharedManager];
-    RKObjectMapping * mapping = [objectManager.mappingProvider 
-                                 objectMappingForClass:self ];
-    
-    [objectManager loadObjectsAtResourcePath:[self resourcePath] 
-                               objectMapping:mapping 
-                                    delegate:delegate];
-}
-
-
-// Load collection with query
-+ (void) loadCollectionThroughQuery:(MSRestSerializable *)mappableQueryObject 
-                       withDelegate:(id<RKObjectLoaderDelegate>)delegate
-{
-    
-    RKObjectManager * objectManager = [RKObjectManager sharedManager];
-    RKObjectMapping * mapping = [objectManager.mappingProvider
-                                 objectMappingForClass:self ];
-    
-    
-    // Append the dictionary to the resource as query parameters
-    NSString * resourcePath = RKPathAppendQueryParams([self resourcePath], [mappableQueryObject convertToDictionary]);
-    
-    // Load the objects at the query
-    [objectManager loadObjectsAtResourcePath:resourcePath 
-                               objectMapping:mapping 
-                                    delegate:delegate];
+    return (NSString *)[serializerFor(serializable) 
+        serializedObjectForMIMEType:RKMIMETypeFormURLEncoded error: &error];
 }
 
 
-@end

metadata

@@ -2,7 +2,7 @@
 name: rest_kat
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Brad Phelan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 Z
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kwalify
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -812837393126239167
+      hash: -4151209479782223092
       segments: 
       - 0
       version: "0"