Skip to content

Replacing imports with forward references #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viteinfinite wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Replacing imports with forward references #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3987401
Replaced imports with forward declarations in MTLXMLAdapter.h
Dec 9, 2013
25e3852
Version bump in pod spec
Dec 9, 2013
8933963
Updated source version in pod spec
Dec 9, 2013
9e914d1
Makes dateFormatter thread safe
akinsella Jan 9, 2014
75e7d6f
Makes dateFormatter thread safe
akinsella Jan 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ profile
*.moved-aside
# Desktop Servies
.DS_Store
.idea
4 changes: 2 additions & 2 deletions Mantle/MTLXMLAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//

#import <Foundation/Foundation.h>
#import "DDXML.h"
#import "DDXMLNode.h"

@class DDXMLNode;
@class DDXMLElement;
@class MTLModel;

@protocol MTLXMLSerializing
Expand Down
26 changes: 13 additions & 13 deletions Mantle/NSValueTransformer+MTLXMLTransformerAdditions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@
#import "MTLModel.h"
#import "MTLValueTransformer.h"
#import "MTLXMLAdapter.h"

#import "DDXML.h"

@implementation NSValueTransformer (MTLXMLTransformerAdditions)

+ (NSDateFormatter *)dateFormatter
{
static NSDateFormatter* _dateFormatter;
if (!_dateFormatter)
{
_dateFormatter = [NSDateFormatter new];
[_dateFormatter setDateStyle:NSDateFormatterFullStyle];
[_dateFormatter setTimeStyle:NSDateFormatterFullStyle];
+ (NSDateFormatter *)dateFormatter {
NSMutableDictionary *dictionary = [[NSThread currentThread] threadDictionary];
NSDateFormatter *dateFormatter = dictionary[@"MTLDateFormatter"];
if (!dateFormatter) {
dateFormatter = [[NSDateFormatter alloc] init];
dateFormatter.dateStyle = NSDateFormatterFullStyle;
dateFormatter.timeStyle = NSDateFormatterFullStyle;
dictionary[@"MTLDateFormatter"] = dateFormatter;
}
return _dateFormatter;

return dateFormatter;
}

+ (NSValueTransformer *)mtl_XMLTransformerForDateWithFormat:(NSString*)dateFormat {
+ (NSValueTransformer *)mtl_XMLTransformerForDateWithFormat:(NSString *)dateFormat {
return [MTLValueTransformer
reversibleTransformerWithForwardBlock:^id(NSArray *nodes) {
if (nodes == nil || nodes.count == 0) return nil;
Expand Down Expand Up @@ -149,7 +149,7 @@ + (NSValueTransformer *)mtl_XMLArrayTransformerWithModelClass:(Class)modelClass
];
}

+ (NSValueTransformer *)mtl_XMLNonUniformObjectArrayTransformerWithModelClass:(Class)modelClass {
+ (NSValueTransformer *)mtl_XMLNonUniformObjectArrayTransformerWithModelClass:(Class<MTLXMLSerializing>)modelClass {

return [MTLValueTransformer
reversibleTransformerWithForwardBlock:^ id (NSArray *nodes) {
Expand Down
4 changes: 2 additions & 2 deletions MantleXMLAdapter.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = "MantleXMLAdapter"
s.platform = :ios, "5.0"
s.version = "0.2.2"
s.version = "0.2.5"
s.summary = "MantleXMLAdapter adds support to Mantle to create MTLModel objects from xml documents and (optionally) from models into xml documents."
s.homepage = "https://github.com/mbaranowski/MantleXMLAdapter"
s.license = "MIT"
s.authors = { "Matthew Baranowski" => "matt.baranowski@willowtreeapps.com" }
s.source = { :git => "https://github.com/mbaranowski/MantleXMLAdapter.git", :tag => '0.2.2' }
s.source = { :git => "https://github.com/mbaranowski/MantleXMLAdapter.git", :tag => '0.2.5' }
s.source_files = 'Mantle/MTLXMLAdapter.{h,m}', 'Mantle/NSValueTransformer+MTLXMLTransformerAdditions.{h,m}'
s.dependency 'KissXML'
s.dependency 'Mantle'
Expand Down