Permalink
Browse files

Cleaned up project

  • Loading branch information...
1 parent 48b7e54 commit 892fc153ac5eee8281a9d80d1bedabde2126ad7b Romes committed May 25, 2015
Showing 736 changed files with 762 additions and 396 deletions.
@@ -1,39 +0,0 @@
-<<<<<<< HEAD
-# OS X
-.DS_Store
-
-# Xcode
-build/
-=======
-# Xcode
-.DS_Store
-*/build/*
->>>>>>> 97ca4878aef8921bd4db1b454c60b06510b72237
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-<<<<<<< HEAD
-*.xccheckout
-profile
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-
-=======
-profile
-*.moved-aside
-DerivedData
-.idea/
-*.hmap
-*.xccheckout
-
-#CocoaPods
-Pods
->>>>>>> 97ca4878aef8921bd4db1b454c60b06510b72237
No changes.
@@ -1,21 +0,0 @@
-# OS X
-.DS_Store
-
-# Xcode
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-profile
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-
@@ -1,21 +0,0 @@
-# Xcode
-.DS_Store
-*/build/*
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-profile
-*.moved-aside
-DerivedData
-.idea/
-*.hmap
-*.xccheckout
-
-#CocoaPods
-Pods
View
@@ -0,0 +1,4 @@
+ci_service: travis_ci
+coverage_service: coveralls
+xcodeproj: HTMLPurifier.xcodeproj
+source_directory: HTMLPurifier
View
@@ -3,6 +3,15 @@ language: objective-c
xcode_project: HTMLPurifier.xcodeproj
xcode_scheme: HTMLPurifier
-##before_install: "git submodule init && git submodule update && sudo gem update --system && sudo gem install bundler && bundle install"
+before_install:
+ - sudo easy_install cpp-coveralls
+ - gem install slather
+ # - brew uninstall xctool
+ # - brew update
+ # - brew install xctool --HEAD
-##script: "bundle exec rake test --trace"
+script:
+ - xctool clean test ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES
+
+after_success:
+ - slather
View
@@ -1,5 +0,0 @@
-# HTMLPurifier CHANGELOG
-
-## 0.1.0
-
-Initial release.
View
@@ -1,7 +0,0 @@
-pod "HTMLPurifier", :path => "../"
-
-target "Demo" do
-end
-
-target "DemoTests" do
-end
View
@@ -1,25 +0,0 @@
-Pod::Spec.new do |s|
- s.name = "HTMLPurifier"
- s.version = "1.0.0"
- s.summary = "HTMLPurifier for Objective-C is a framework for standards-compliant HTML filtering."
- s.description = "HTMLPurifier for Objective-C is a framework for standards-compliant HTML filtering. Its main purpose is sanitization of untrusted HTML such as incoming emails or user-supplied markup."
- s.homepage = "https://mynigma.org"
- s.license = { :type => 'GPL with libgit2-style exception' }
- s.author = { 'Edward Z. Yang' => 'ezyang@cs.stanford.edu',
- 'Roman Priebe' => 'roman@mynigma.org',
- 'Lukas Neumann' => 'lukas@mynigma.org' }
- s.source = { :git => 'https://github.com/Mynigma/HTMLPurifier.git', :tag => '1.0.0' }
- s.social_media_url = 'https://www.facebook.com/mynigma'
-
- s.ios.deployment_target = '7.0'
- s.osx.deployment_target = '10.8'
- s.requires_arc = true
-
- s.source_files = 'Classes'
-
- s.ios.exclude_files = 'Classes/osx'
- s.osx.exclude_files = 'Classes/ios'
- s.public_header_files = 'Classes/**/*.h'
- # s.frameworks = 'SomeFramework', 'AnotherFramework'
- # s.dependency 'JSONKit', '~> 1.4'
-end
Oops, something went wrong.
@@ -30,7 +30,7 @@ - (NSString*)validateWithString:(NSString*)string config:(HTMLPurifier_Config*)c
{
string = [self parseCDATAWithString:string];
if ([string isEqual:@""]) {
- return NO;
+ return nil;
}
NSArray* parts = explode(@" ", string); // parseCDATA replaced \r, \t and \n
NSInteger length = parts.count;
@@ -44,17 +44,17 @@ - (NSString*)validateWithString:(NSString*)string config:(HTMLPurifier_Config*)c
}
NSInteger length = string.length;
if (length == 1) {
- return NO;
+ return nil;
}
if ([string characterAtIndex:length - 1] != '%') {
- return NO;
+ return nil;
}
NSString* number = [string substringWithRange:NSMakeRange(0, length-1)];
number = [self->numberDef validateWithString:number config:config context:context];
if (!number) {
- return NO;
+ return nil;
}
return [NSString stringWithFormat:@"%@%%", number];
}
@@ -14,7 +14,7 @@ @implementation HTMLPurifier_AttrDef_HTML_Bool
-(id) init
{
- name = NO;
+ name = nil;
return self;
}
File renamed without changes.
File renamed without changes.
@@ -38,7 +38,7 @@
/**
* @type string
*/
-@property NSString* typeString;
+//@property NSString* typeString;
@end
@@ -24,12 +24,12 @@
/**
* @type string
*/
-@property NSString* typeString;
+//@property NSString* typeString;
/**
* @type bool
*/
-@property BOOL allow_empty;
+//@property BOOL allow_empty;
/**
* Allowed child pattern as defined by the DTD.
@@ -22,12 +22,12 @@
/**
* @type bool
*/
-@property BOOL allow_empty;
+//@property BOOL allow_empty;
/**
* @type string
*/
-@property NSString* typeString;
+//@property NSString* typeString;
/**
@@ -21,7 +21,7 @@
/**
* @type bool
*/
-@property BOOL allow_empty;
+//@property BOOL allow_empty;
/**
* @type string
@@ -80,7 +80,7 @@ - (void)mergeIn:(HTMLPurifier_ElementDef*)def
if (def.content_model.length>0) {
self.content_model = [def.content_model stringByReplacingOccurrencesOfString:@"#SUPER" withString:self.content_model];
- self.child = NO;
+ self.child = nil;
}
if ([def.content_model_type length]>0) {
self.content_model_type = def.content_model_type;
Oops, something went wrong.

0 comments on commit 892fc15

Please sign in to comment.