sjs/Marshmallows
1
0
Fork 0
mirror of https://github.com/samsonjs/Marshmallows.git synced 2026-03-26 09:15:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: sjs:master
Branches Tags
sjs:master
sjs:no-arc
sjs:0.1.2
sjs:0.1.1
..
compare: sjs:0.1.1
Branches Tags
sjs:master
sjs:no-arc
sjs:0.1.2
sjs:0.1.1

No commits in common. "master" and "0.1.1" have entirely different histories.
master ... 0.1.1

2 changed files with 6 additions and 6 deletions
Show stats Expand all files Collapse all files

4
Marshmallows.podspec
View file

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "Marshmallows" s.name = "Marshmallows"
s.version = "0.1.2" s.version = "0.1.1"
s.summary = "Marshmallows sweeten up your Cocoa for iOS." s.summary = "Marshmallows sweeten up your Cocoa for iOS."
s.description = <<-DESC s.description = <<-DESC
Sometimes the simple things are verbose with Cocoa. This project aims Sometimes the simple things are verbose with Cocoa. This project aims
@ -37,7 +37,7 @@ Pod::Spec.new do |s|
s.author = { "Sami Samhuri" => "sami@samhuri.net" } s.author = { "Sami Samhuri" => "sami@samhuri.net" }
s.social_media_url = "https://twitter.com/_sjs" s.social_media_url = "https://twitter.com/_sjs"
s.platform = :ios, "5.0" s.platform = :ios, "5.0"
s.source = { :git => "https://github.com/samsonjs/Marshmallows.git", :tag => "0.1.2" } s.source = { :git => "https://github.com/samsonjs/Marshmallows.git", :tag => "0.1.1" }
s.source_files = "Marshmallows" s.source_files = "Marshmallows"
s.public_header_files = "Marshmallows/**/*.h" s.public_header_files = "Marshmallows/**/*.h"
s.requires_arc = false s.requires_arc = false

8
Marshmallows/NSString+marshmallows.m
View file

@ -30,7 +30,7 @@ NSString* URLEncode(NSString *string) {
{ {
NSRegularExpression *regex = [NSRegularExpression NSRegularExpression *regex = [NSRegularExpression
regularExpressionWithPattern: pattern regularExpressionWithPattern: pattern
options: 0 options: NSMatchingReportCompletion
error: NULL]; error: NULL];
NSRange match = [regex rangeOfFirstMatchInString: self NSRange match = [regex rangeOfFirstMatchInString: self
options: NSMatchingReportCompletion options: NSMatchingReportCompletion
@ -42,7 +42,7 @@ NSString* URLEncode(NSString *string) {
{ {
NSRegularExpression *regex = [NSRegularExpression NSRegularExpression *regex = [NSRegularExpression
regularExpressionWithPattern: pattern regularExpressionWithPattern: pattern
options: 0 options: NSRegularExpressionCaseInsensitive
error: NULL]; error: NULL];
return [regex stringByReplacingMatchesInString: self return [regex stringByReplacingMatchesInString: self
options: NSMatchingReportCompletion options: NSMatchingReportCompletion
@ -54,10 +54,10 @@ NSString* URLEncode(NSString *string) {
{ {
NSRegularExpression *regex = [NSRegularExpression NSRegularExpression *regex = [NSRegularExpression
regularExpressionWithPattern: pattern regularExpressionWithPattern: pattern
options: 0 options: NSMatchingReportCompletion
error: NULL]; error: NULL];
NSRange match = [regex rangeOfFirstMatchInString: self NSRange match = [regex rangeOfFirstMatchInString: self
options: NSMatchingReportCompletion options: NSMatchingCompleted
range: NSMakeRange(0, self.length)]; range: NSMakeRange(0, self.length)];
if (match.location != NSNotFound) { if (match.location != NSNotFound) {
NSString *rest = [self substringFromIndex: match.location + match.length]; NSString *rest = [self substringFromIndex: match.location + match.length];