Permalink
Browse files

Copied all the changes from the old generating branch.

Something broke while copying the project over from the old computer, so the simplest way to fix this was to pull from GitHub and copy all the files from the local backup...
  • Loading branch information...
1 parent 9a499e4 commit 7d6a323e579ea6d44f1059a41e2f049daa2145bc @tomaz committed Nov 14, 2010
Showing with 17,959 additions and 330 deletions.
  1. +2 −4 Application/GBAppledocApplication.h
  2. +16 −11 Application/GBAppledocApplication.m
  3. +25 −0 Application/GBApplicationSettingsProvider.h
  4. +186 −0 Application/GBApplicationSettingsProvider.m
  5. +101 −0 Application/GBApplicationSettingsProviding.h
  6. +44 −0 Application/GBApplicationStringsProvider.h
  7. +80 −0 Application/GBApplicationStringsProvider.m
  8. +3 −2 Common/GBLog.h
  9. +36 −8 Common/NSString+GBString.h
  10. +51 −10 Common/NSString+GBString.m
  11. 0 Common/ThirdParty/DDLog/DDLog.h
  12. 0 Common/ThirdParty/DDLog/DDLog.m
  13. +10 −0 Common/ThirdParty/MGTemplateEngine/DeepMutableCopy.h
  14. +44 −0 Common/ThirdParty/MGTemplateEngine/ICUTemplateMatcher.h
  15. +192 −0 Common/ThirdParty/MGTemplateEngine/ICUTemplateMatcher.m
  16. +105 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateEngine.h
  17. +676 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateEngine.m
  18. +14 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateFilter.h
  19. +41 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateMarker.h
  20. +15 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateStandardFilters.h
  21. +56 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateStandardFilters.m
  22. +24 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateStandardMarkers.h
  23. +634 −0 Common/ThirdParty/MGTemplateEngine/MGTemplateStandardMarkers.m
  24. +12 −0 Common/ThirdParty/MGTemplateEngine/NSArray_DeepMutableCopy.h
  25. +42 −0 Common/ThirdParty/MGTemplateEngine/NSArray_DeepMutableCopy.m
  26. +12 −0 Common/ThirdParty/MGTemplateEngine/NSDictionary_DeepMutableCopy.h
  27. +43 −0 Common/ThirdParty/MGTemplateEngine/NSDictionary_DeepMutableCopy.m
  28. +56 −0 Generating/GBGenerator.h
  29. +156 −0 Generating/GBGenerator.m
  30. +98 −0 Generating/GBTemplateReader.h
  31. +136 −0 Generating/GBTemplateReader.m
  32. +87 −0 Generating/GBTemplateVariablesProvider.h
  33. +255 −0 Generating/GBTemplateVariablesProvider.m
  34. +64 −0 Generating/GBTemplateWriter.h
  35. +130 −0 Generating/GBTemplateWriter.m
  36. BIN Libraries/GHUnit.framework/GHUnit
  37. BIN Libraries/GHUnit.framework/GHUnit
  38. +0 −1 Libraries/GHUnit.framework/Headers
  39. +0 −1 Libraries/GHUnit.framework/Resources
  40. BIN Libraries/GHUnit.framework/Versions/A/GHUnit
  41. +0 −1 Libraries/GHUnit.framework/Versions/Current
  42. BIN Libraries/GHUnit.framework/Versions/Current/GHUnit
  43. +43 −0 Libraries/GHUnit.framework/Versions/Current/Headers/BWSplitView.h
  44. +139 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHAsyncTestCase.h
  45. +46 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHMockNSHTTPURLResponse.h
  46. +162 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHMockNSURLConnection.h
  47. +132 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHNSInvocation+Utils.h
  48. +133 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHNSInvocationProxy.h
  49. +59 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHNSLocale+Mock.h
  50. +100 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHNSObject+Invocation.h
  51. +40 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTest+JUnitXML.h
  52. +181 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTest.h
  53. +23 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestApp.h
  54. +141 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestCase.h
  55. +38 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestGroup+JUnitXML.h
  56. +151 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestGroup.h
  57. +1,010 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestMacros.h
  58. +42 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestOperation.h
  59. +26 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestOutlineViewModel.h
  60. +159 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestRunner.h
  61. +114 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestSuite.h
  62. +103 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestViewController.h
  63. +163 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestViewModel.h
  64. +41 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTestWindowController.h
  65. +144 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHTesting.h
  66. +36 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHUNSObject+Swizzle.h
  67. +51 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GHUnit.h
  68. +105 −0 Libraries/GHUnit.framework/Versions/Current/Headers/GTMStackTrace.h
  69. +88 −0 Libraries/GHUnit.framework/Versions/Current/Headers/NSException+GHTestFailureExceptions.h
  70. +67 −0 Libraries/GHUnit.framework/Versions/Current/Headers/NSValue+GHValueFormatter.h
  71. BIN Libraries/GHUnit.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
  72. BIN Libraries/GHUnit.framework/Versions/Current/Resources/GHTestApp.nib
  73. BIN Libraries/GHUnit.framework/Versions/Current/Resources/GHTestView.nib
  74. BIN Libraries/GHUnit.framework/Versions/Current/Resources/GHTestWindow.nib
  75. +4 −0 Libraries/GHUnit.framework/Versions/Current/Resources/GHUnit-Debug.xcconfig
  76. +15 −0 Libraries/GHUnit.framework/Versions/Current/Resources/GHUnit.xcconfig
  77. BIN Libraries/GHUnit.framework/Versions/Current/Resources/GradientSplitViewDimpleBitmap.tif
  78. BIN Libraries/GHUnit.framework/Versions/Current/Resources/GradientSplitViewDimpleVector.pdf
  79. +22 −0 Libraries/GHUnit.framework/Versions/Current/Resources/Info.plist
  80. +43 −0 Libraries/GHUnit.framework/headers/BWSplitView.h
  81. +139 −0 Libraries/GHUnit.framework/headers/GHAsyncTestCase.h
  82. +46 −0 Libraries/GHUnit.framework/headers/GHMockNSHTTPURLResponse.h
  83. +162 −0 Libraries/GHUnit.framework/headers/GHMockNSURLConnection.h
  84. +132 −0 Libraries/GHUnit.framework/headers/GHNSInvocation+Utils.h
  85. +133 −0 Libraries/GHUnit.framework/headers/GHNSInvocationProxy.h
  86. +59 −0 Libraries/GHUnit.framework/headers/GHNSLocale+Mock.h
  87. +100 −0 Libraries/GHUnit.framework/headers/GHNSObject+Invocation.h
  88. +40 −0 Libraries/GHUnit.framework/headers/GHTest+JUnitXML.h
  89. +181 −0 Libraries/GHUnit.framework/headers/GHTest.h
  90. +23 −0 Libraries/GHUnit.framework/headers/GHTestApp.h
  91. +141 −0 Libraries/GHUnit.framework/headers/GHTestCase.h
  92. +38 −0 Libraries/GHUnit.framework/headers/GHTestGroup+JUnitXML.h
  93. +151 −0 Libraries/GHUnit.framework/headers/GHTestGroup.h
  94. +1,010 −0 Libraries/GHUnit.framework/headers/GHTestMacros.h
  95. +42 −0 Libraries/GHUnit.framework/headers/GHTestOperation.h
  96. +26 −0 Libraries/GHUnit.framework/headers/GHTestOutlineViewModel.h
  97. +159 −0 Libraries/GHUnit.framework/headers/GHTestRunner.h
  98. +114 −0 Libraries/GHUnit.framework/headers/GHTestSuite.h
  99. +103 −0 Libraries/GHUnit.framework/headers/GHTestViewController.h
  100. +163 −0 Libraries/GHUnit.framework/headers/GHTestViewModel.h
  101. +41 −0 Libraries/GHUnit.framework/headers/GHTestWindowController.h
  102. +144 −0 Libraries/GHUnit.framework/headers/GHTesting.h
  103. +36 −0 Libraries/GHUnit.framework/headers/GHUNSObject+Swizzle.h
  104. +51 −0 Libraries/GHUnit.framework/headers/GHUnit.h
  105. +105 −0 Libraries/GHUnit.framework/headers/GTMStackTrace.h
  106. +88 −0 Libraries/GHUnit.framework/headers/NSException+GHTestFailureExceptions.h
  107. +67 −0 Libraries/GHUnit.framework/headers/NSValue+GHValueFormatter.h
  108. BIN Libraries/GHUnit.framework/resources/English.lproj/InfoPlist.strings
  109. BIN Libraries/GHUnit.framework/resources/GHTestApp.nib
  110. BIN Libraries/GHUnit.framework/resources/GHTestView.nib
  111. BIN Libraries/GHUnit.framework/resources/GHTestWindow.nib
  112. +4 −0 Libraries/GHUnit.framework/resources/GHUnit-Debug.xcconfig
  113. +15 −0 Libraries/GHUnit.framework/resources/GHUnit.xcconfig
  114. BIN Libraries/GHUnit.framework/resources/GradientSplitViewDimpleBitmap.tif
  115. BIN Libraries/GHUnit.framework/resources/GradientSplitViewDimpleVector.pdf
  116. +22 −0 Libraries/GHUnit.framework/resources/Info.plist
  117. +0 −1 Libraries/OCHamcrest.framework/Headers
  118. +52 −0 Libraries/OCHamcrest.framework/Headers/HCAllOf.h
  119. +52 −0 Libraries/OCHamcrest.framework/Headers/HCAnyOf.h
  120. +30 −0 Libraries/OCHamcrest.framework/Headers/HCBaseDescription.h
  121. +21 −0 Libraries/OCHamcrest.framework/Headers/HCBaseMatcher.h
  122. +87 −0 Libraries/OCHamcrest.framework/Headers/HCBoxNumber.h
  123. +56 −0 Libraries/OCHamcrest.framework/Headers/HCDescribedAs.h
  124. +46 −0 Libraries/OCHamcrest.framework/Headers/HCDescription.h
  125. +48 −0 Libraries/OCHamcrest.framework/Headers/HCHasDescription.h
  126. +37 −0 Libraries/OCHamcrest.framework/Headers/HCInvocationMatcher.h
  127. +66 −0 Libraries/OCHamcrest.framework/Headers/HCIs.h
  128. +61 −0 Libraries/OCHamcrest.framework/Headers/HCIsAnything.h
  129. +48 −0 Libraries/OCHamcrest.framework/Headers/HCIsCloseTo.h
  130. +51 −0 Libraries/OCHamcrest.framework/Headers/HCIsCollectionContaining.h
  131. +60 −0 Libraries/OCHamcrest.framework/Headers/HCIsCollectionOnlyContaining.h
  132. +43 −0 Libraries/OCHamcrest.framework/Headers/HCIsDictionaryContaining.h
  133. +41 −0 Libraries/OCHamcrest.framework/Headers/HCIsDictionaryContainingKey.h
  134. +41 −0 Libraries/OCHamcrest.framework/Headers/HCIsDictionaryContainingValue.h
  135. +47 −0 Libraries/OCHamcrest.framework/Headers/HCIsEqual.h
  136. +44 −0 Libraries/OCHamcrest.framework/Headers/HCIsEqualIgnoringCase.h
  137. +45 −0 Libraries/OCHamcrest.framework/Headers/HCIsEqualIgnoringWhiteSpace.h
  138. +185 −0 Libraries/OCHamcrest.framework/Headers/HCIsEqualToNumber.h
  139. +41 −0 Libraries/OCHamcrest.framework/Headers/HCIsIn.h
  140. +47 −0 Libraries/OCHamcrest.framework/Headers/HCIsInstanceOf.h
  141. +55 −0 Libraries/OCHamcrest.framework/Headers/HCIsNil.h
  142. +56 −0 Libraries/OCHamcrest.framework/Headers/HCIsNot.h
  143. +47 −0 Libraries/OCHamcrest.framework/Headers/HCIsSame.h
  144. +52 −0 Libraries/OCHamcrest.framework/Headers/HCMatcher.h
  145. +36 −0 Libraries/OCHamcrest.framework/Headers/HCMatcherAssert.h
  146. +248 −0 Libraries/OCHamcrest.framework/Headers/HCNumberAssert.h
  147. +80 −0 Libraries/OCHamcrest.framework/Headers/HCOrderingComparison.h
  148. +28 −0 Libraries/OCHamcrest.framework/Headers/HCRequireNonNilString.h
  149. +29 −0 Libraries/OCHamcrest.framework/Headers/HCSelfDescribing.h
  150. +42 −0 Libraries/OCHamcrest.framework/Headers/HCStringContains.h
  151. +40 −0 Libraries/OCHamcrest.framework/Headers/HCStringDescription.h
  152. +42 −0 Libraries/OCHamcrest.framework/Headers/HCStringEndsWith.h
  153. +42 −0 Libraries/OCHamcrest.framework/Headers/HCStringStartsWith.h
  154. +19 −0 Libraries/OCHamcrest.framework/Headers/HCSubstringMatcher.h
  155. +24 −0 Libraries/OCHamcrest.framework/Headers/HCWrapInMatcher.h
  156. +45 −0 Libraries/OCHamcrest.framework/Headers/OCHamcrest.h
  157. BIN Libraries/OCHamcrest.framework/OCHamcrest
  158. BIN Libraries/OCHamcrest.framework/OCHamcrest
  159. +0 −1 Libraries/OCHamcrest.framework/Resources
  160. +22 −0 Libraries/OCHamcrest.framework/Resources/Info.plist
  161. BIN Libraries/OCHamcrest.framework/Resources/InfoPlist.strings
  162. 0 Libraries/OCHamcrest.framework/Versions/A/Headers/HCInvocationMatcher.h
  163. BIN Libraries/OCHamcrest.framework/Versions/A/OCHamcrest
  164. +0 −1 Libraries/OCHamcrest.framework/Versions/Current
  165. +52 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCAllOf.h
  166. +52 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCAnyOf.h
  167. +30 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCBaseDescription.h
  168. +21 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCBaseMatcher.h
  169. +87 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCBoxNumber.h
  170. +56 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCDescribedAs.h
  171. +46 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCDescription.h
  172. +48 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCHasDescription.h
  173. +37 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCInvocationMatcher.h
  174. +66 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIs.h
  175. +61 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsAnything.h
  176. +48 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsCloseTo.h
  177. +51 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsCollectionContaining.h
  178. +60 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsCollectionOnlyContaining.h
  179. +43 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsDictionaryContaining.h
  180. +41 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsDictionaryContainingKey.h
  181. +41 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsDictionaryContainingValue.h
  182. +47 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsEqual.h
  183. +44 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsEqualIgnoringCase.h
  184. +45 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsEqualIgnoringWhiteSpace.h
  185. +185 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsEqualToNumber.h
  186. +41 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsIn.h
  187. +47 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsInstanceOf.h
  188. +55 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsNil.h
  189. +56 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsNot.h
  190. +47 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCIsSame.h
  191. +52 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCMatcher.h
  192. +36 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCMatcherAssert.h
  193. +248 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCNumberAssert.h
  194. +80 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCOrderingComparison.h
  195. +28 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCRequireNonNilString.h
  196. +29 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCSelfDescribing.h
  197. +42 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCStringContains.h
  198. +40 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCStringDescription.h
  199. +42 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCStringEndsWith.h
  200. +42 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCStringStartsWith.h
  201. +19 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCSubstringMatcher.h
  202. +24 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/HCWrapInMatcher.h
  203. +45 −0 Libraries/OCHamcrest.framework/Versions/Current/Headers/OCHamcrest.h
  204. BIN Libraries/OCHamcrest.framework/Versions/Current/OCHamcrest
  205. +22 −0 Libraries/OCHamcrest.framework/Versions/Current/Resources/Info.plist
  206. BIN Libraries/OCHamcrest.framework/Versions/Current/Resources/InfoPlist.strings
  207. +0 −1 Libraries/OCMock.framework/Headers
  208. +15 −0 Libraries/OCMock.framework/Headers/NSNotificationCenter+OCMAdditions.h
  209. +26 −0 Libraries/OCMock.framework/Headers/OCMArg.h
  210. +48 −0 Libraries/OCMock.framework/Headers/OCMConstraint.h
  211. +10 −0 Libraries/OCMock.framework/Headers/OCMock.h
  212. +32 −0 Libraries/OCMock.framework/Headers/OCMockObject.h
  213. +27 −0 Libraries/OCMock.framework/Headers/OCMockRecorder.h
  214. BIN Libraries/OCMock.framework/OCMock
  215. BIN Libraries/OCMock.framework/OCMock
  216. +0 −1 Libraries/OCMock.framework/Resources
  217. +26 −0 Libraries/OCMock.framework/Resources/Info.plist
  218. +15 −0 Libraries/OCMock.framework/Resources/License.txt
  219. +0 −1 Libraries/OCMock.framework/Versions/A/A
  220. +0 −1 Libraries/OCMock.framework/Versions/A/Headers/Headers
  221. BIN Libraries/OCMock.framework/Versions/A/OCMock
  222. +0 −1 Libraries/OCMock.framework/Versions/A/Resources/Resources
  223. +0 −1 Libraries/OCMock.framework/Versions/Current
  224. +15 −0 Libraries/OCMock.framework/Versions/Current/Headers/NSNotificationCenter+OCMAdditions.h
  225. +26 −0 Libraries/OCMock.framework/Versions/Current/Headers/OCMArg.h
  226. +48 −0 Libraries/OCMock.framework/Versions/Current/Headers/OCMConstraint.h
  227. +10 −0 Libraries/OCMock.framework/Versions/Current/Headers/OCMock.h
  228. +32 −0 Libraries/OCMock.framework/Versions/Current/Headers/OCMockObject.h
  229. +27 −0 Libraries/OCMock.framework/Versions/Current/Headers/OCMockRecorder.h
  230. BIN Libraries/OCMock.framework/Versions/Current/OCMock
  231. +26 −0 Libraries/OCMock.framework/Versions/Current/Resources/Info.plist
  232. +15 −0 Libraries/OCMock.framework/Versions/Current/Resources/License.txt
  233. +6 −0 Model/GBAdoptedProtocolsProvider.m
  234. +3 −0 Model/GBClassData.h
  235. +1 −0 Model/GBClassData.m
  236. +1 −1 Model/GBComment.h
  237. +18 −12 Model/GBComment.m
  238. +1 −1 Model/GBCommentArgument.m
  239. +3 −5 Model/GBCommentParagraph.m
  240. +6 −0 Model/GBIvarsProvider.m
  241. +1 −1 Model/GBMethodArgument.h
  242. +6 −6 Model/GBMethodArgument.m
  243. +49 −3 Model/GBMethodData.h
  244. +103 −7 Model/GBMethodData.m
  245. +41 −1 Model/GBMethodsProvider.h
  246. +61 −10 Model/GBMethodsProvider.m
  247. +21 −0 Model/GBModelBase.h
  248. +3 −1 Model/GBModelBase.m
  249. +6 −2 Model/GBParagraphDecoratorItem.m
  250. +2 −2 Model/GBParagraphItem.h
  251. +1 −0 Model/GBParagraphItem.m
  252. +7 −1 Model/GBParagraphLinkItem.h
  253. +7 −0 Model/GBParagraphLinkItem.m
  254. +5 −0 Model/GBParagraphListItem.m
  255. +21 −0 Model/GBParagraphSpecialItem.m
  256. +4 −0 Model/GBParagraphTextItem.m
  257. +1 −1 Model/GBSourceInfo.h
  258. +1 −1 Model/GBSourceInfo.m
  259. +3 −3 Model/GBStore.m
  260. +15 −15 Model/GBStoreProviding.h
  261. +34 −24 Parsing/GBObjectiveCParser.m
  262. +9 −2 Parsing/GBParser.h
  263. +6 −1 Parsing/GBParser.m
  264. +2 −3 Parsing/GBTokenizer.m
  265. +46 −13 Processing/GBCommentsProcessor.m
  266. +33 −9 Processing/GBProcessor.m
  267. +236 −0 Templates/object-template.html
  268. +198 −0 Templates/styles.css
  269. +158 −0 Testing/GBApplicationSettingsProviderTesting.m
  270. +1 −1 Testing/GBCategoryDataTesting.m
  271. +1 −1 Testing/GBClassDataTesting.m
  272. +1 −1 Testing/GBIvarDataTesting.m
  273. +231 −2 Testing/GBMethodDataTesting.m
  274. +186 −39 Testing/GBMethodsProviderTesting.m
  275. +8 −8 Testing/GBModelBaseTesting.m
  276. +82 −0 Testing/GBObjectiveCParser-MethodsParsingTesting.m
  277. +1 −0 Testing/GBObjectsAssertor.h
  278. +41 −0 Testing/GBObjectsAssertor.m
  279. +0 −83 Testing/GBProcessor-AdoptedProtocolsTesting.m
  280. +232 −0 Testing/GBProcessor-KnownObjectsTesting.m
  281. +1 −1 Testing/GBProtocolDataTesting.m
  282. +17 −17 Testing/GBStoreTesting.m
  283. +149 −0 Testing/GBTemplateReaderTesting.m
  284. +32 −0 Testing/GBTemplateVariablesProvider-CommonTesting.m
  285. +209 −0 Testing/GBTemplateVariablesProvider-ObjectSpecificationsTesting.m
  286. +142 −0 Testing/GBTemplateWriterTesting.m
  287. +1 −0 Testing/GBTestObjectsRegistry.m
  288. +193 −5 appledoc.xcodeproj/project.pbxproj
@@ -14,12 +14,10 @@
This is the principal tool class. It represents the entry point for the application. The main promises of the class are parsing and validating of command line arguments and initiating documentation generation. Generation is divided into several distinct phases:
- 1. Parsing data from source files: This is the initial phase where input directories and files are parsed into a memory representation (i.e. objects) suitable for subsequent handling. This is where the source code files are parsed and validated for possible file or object-level incosistencies. This step is driven by `GBParser` class.
-
+ 1. Parsing data from source files: This is the initial phase where input directories and files are parsed into a memory representation (i.e. objects) suitable for subsequent handling. This is where the source code files are parsed and validated for possible file or object-level incosistencies. This step is driven by `GBParser` class.
2. Post-processing of the data parsed in the previous step: At this phase, we already have in-memory representation of all source code objects, so we can post-process and validate things such as links to other objects etc. We can also update in-memory representation with this data and therefore prepare everything for the final phase. This step is driven by `GBProcessor` class.
-
3. Generating output: This is the final phase where we use in-memory data to generate output. This step is driven by `GBGenerator` class.
*/
-@interface GBAppledocApplication : NSObject <GBApplicationSettingsProviding, DDCliApplicationDelegate>
+@interface GBAppledocApplication : NSObject <DDCliApplicationDelegate>
@end
@@ -12,6 +12,8 @@
#import "GBStore.h"
#import "GBParser.h"
#import "GBProcessor.h"
+#import "GBGenerator.h"
+#import "GBApplicationSettingsProvider.h"
#import "GBAppledocApplication.h"
static NSString *kGBArgIgnorePath = @"ignore";
@@ -26,6 +28,7 @@ @interface GBAppledocApplication ()
- (void)initializeLoggingSystem;
- (void)validateArguments:(NSArray *)arguments;
+@property (retain) GBApplicationSettingsProvider *settings;
@property (assign) NSString *logformat;
@property (assign) NSString *verbose;
@property (assign) BOOL version;
@@ -52,10 +55,9 @@ @implementation GBAppledocApplication
- (id)init {
self = [super init];
if (self) {
+ self.settings = [GBApplicationSettingsProvider provider];
self.logformat = @"1";
self.verbose = @"2";
- self.ignoredPaths = [NSMutableSet set];
- self.commentComponents = [GBCommentComponentsProvider provider];
}
return self;
}
@@ -81,22 +83,25 @@ - (int)application:(DDCliApplication *)app runWithArguments:(NSArray *)arguments
GBAbsoluteTime startTime = GetCurrentTime();
GBLogNormal(@"Parsing source files...");
- GBParser *parser = [[GBParser alloc] initWithSettingsProvider:self];
+ GBParser *parser = [GBParser parserWithSettingsProvider:self.settings];
[parser parseObjectsFromPaths:arguments toStore:store];
GBAbsoluteTime parseTime = GetCurrentTime();
NSUInteger timeForParsing = SubtractTime(parseTime, startTime) * 1000.0;
+ GBLogInfo(@"Finished parsing in %ldms.\n", timeForParsing);
GBLogNormal(@"Processing parsed data...");
- GBProcessor *processor = [[GBProcessor alloc] initWithSettingsProvider:self];
+ GBProcessor *processor = [GBProcessor processorWithSettingsProvider:self.settings];
[processor processObjectsFromStore:store];
GBAbsoluteTime processTime = GetCurrentTime();
NSUInteger timeForProcessing = SubtractTime(processTime, parseTime) * 1000.0;
+ GBLogInfo(@"Finished processing in %ldms.\n", timeForProcessing);
-// GBLogNormal(@"Generating output...");
-// GBGenerator *generator = [[GBGenerator alloc] init];
-// [generator generateOutputFromProcessor:processor];
+ GBLogNormal(@"Generating output...");
+ GBGenerator *generator = [GBGenerator generatorWithSettingsProvider:self.settings];
+ [generator generateOutputFromStore:store];
GBAbsoluteTime generateTime = GetCurrentTime();
NSUInteger timeForGeneration = SubtractTime(generateTime, processTime) * 1000.0;
+ GBLogInfo(@"Finished generating in %ldms.\n", timeForGeneration);
NSUInteger timeForEverything = timeForParsing + timeForProcessing + timeForGeneration;
GBLogNormal(@"Finished in %ldms.", timeForEverything);
@@ -153,18 +158,17 @@ - (NSString *)description {
- (void)setIgnore:(NSString *)path {
if ([path hasPrefix:@"*"]) path = [path substringFromIndex:1];
- [self.ignoredPaths addObject:path];
+ [self.settings.ignoredPaths addObject:path];
}
@synthesize logformat;
@synthesize verbose;
@synthesize version;
@synthesize help;
-#pragma mark Application settings provider implementation
+#pragma mark Properties
-@synthesize ignoredPaths;
-@synthesize commentComponents;
+@synthesize settings;
@end
@@ -193,6 +197,7 @@ - (void)printHelp {
ddprintf(@"- ParseKit by Todd Ditchendorf\n");
ddprintf(@"- RegexKitLite by John Engelhart\n");
ddprintf(@"- Timing functions from Apple examples\n");
+ ddprintf(@"- MGTemplateEnding by Matt Legend Gemmell\n");
ddprintf(@"\n");
ddprintf(@"We'd like to thank all authors for their contribution!");
}
@@ -0,0 +1,25 @@
+//
+// GBApplicationSettingsProvider.h
+// appledoc
+//
+// Created by Tomaz Kragelj on 3.10.10.
+// Copyright (C) 2010, Gentle Bytes. All rights reserved.
+//
+
+#import "GBApplicationSettingsProviding.h"
+
+/** Main application settings provider.
+
+ This object implements `GBApplicationStringsProviding` interface and is used by `GBAppledocApplication` to prepare application-wide settings including factory defaults, global and session values. The main purpose of the class is to simplify `GBAppledocApplication` class by decoupling it from the actual settings providing implementation.
+ */
+@interface GBApplicationSettingsProvider : NSObject <GBApplicationSettingsProviding>
+
+///---------------------------------------------------------------------------------------
+/// @name Initialization & disposal
+///---------------------------------------------------------------------------------------
+
+/** Returns autoreleased instance of the class.
+ */
++ (id)provider;
+
+@end
@@ -0,0 +1,186 @@
+//
+// GBApplicationSettingsProvider.m
+// appledoc
+//
+// Created by Tomaz Kragelj on 3.10.10.
+// Copyright (C) 2010, Gentle Bytes. All rights reserved.
+//
+
+#import "GBDataObjects.h"
+#import "GBApplicationSettingsProvider.h"
+
+@interface GBApplicationSettingsProvider ()
+
+- (BOOL)isTopLevelStoreObject:(id)object;
+- (NSString *)outputPathForObject:(id)object withExtension:(NSString *)extension;
+- (NSString *)relativePathPrefixFromObject:(GBModelBase *)source toObject:(GBModelBase *)destination;
+- (NSString *)htmlReferenceForTopLevelObject:(GBModelBase *)object fromTopLevelObject:(GBModelBase *)source;
+- (NSString *)htmlReferenceForMember:(GBModelBase *)member prefixedWith:(NSString *)prefix;
+- (NSString *)htmlExtension;
+
+@end
+
+#pragma mark -
+
+@implementation GBApplicationSettingsProvider
+
+#pragma mark Initialization & disposal
+
++ (id)provider {
+ return [[[self alloc] init] autorelease];
+}
+
+- (id)init {
+ self = [super init];
+ if (self) {
+ self.outputPath = @"~/Downloads/examples/objc/AppledocHtml";
+ self.templatesPath = @"~/Downloads/examples/objc/AppledocHtml";
+ self.ignoredPaths = [NSMutableSet set];
+ self.commentComponents = [GBCommentComponentsProvider provider];
+ self.stringTemplates = [GBApplicationStringsProvider provider];
+ }
+ return self;
+}
+
+#pragma mark Template paths handling
+
+- (NSString *)cssClassTemplatePath {
+ return @"../../styles.css";
+}
+
+- (NSString *)cssCategoryTemplatePath {
+ return @"../../styles.css";
+}
+
+- (NSString *)cssProtocolTemplatePath {
+ return @"../../styles.css";
+}
+
+#pragma mark HTML paths and references handling
+
+- (NSString *)htmlOutputPath {
+ return [self.outputPath stringByAppendingPathComponent:@"html"];
+}
+
+- (NSString *)htmlOutputPathForObject:(GBModelBase *)object {
+ NSParameterAssert(object != nil);
+ NSParameterAssert([self isTopLevelStoreObject:object]);
+ NSString *inner = [self outputPathForObject:object withExtension:[self htmlExtension]];
+ return [self.htmlOutputPath stringByAppendingPathComponent:inner];
+}
+
+- (NSString *)htmlReferenceNameForObject:(GBModelBase *)object {
+ NSParameterAssert(object != nil);
+ if ([self isTopLevelStoreObject:object])
+ return [self htmlReferenceForObject:object fromSource:object];
+ return [self htmlReferenceForMember:object prefixedWith:@""];
+}
+
+- (NSString *)htmlReferenceForObject:(GBModelBase *)object fromSource:(GBModelBase *)source {
+ NSParameterAssert(object != nil);
+ NSParameterAssert(source != nil);
+
+ // Generate hrefs from member to other objects:
+ if (![self isTopLevelStoreObject:source]) {
+ GBModelBase *sourceParent = source.parentObject;
+
+ // To the parent or another top-level object.
+ if ([self isTopLevelStoreObject:object]) return [self htmlReferenceForObject:object fromSource:sourceParent];
+
+ // To same or another member of the same parent.
+ if (object.parentObject == sourceParent) return [self htmlReferenceForMember:object prefixedWith:@"#"];
+
+ // To a member of another top-level object.
+ NSString *path = [self htmlReferenceForObject:object.parentObject fromSource:sourceParent];
+ NSString *memberReference = [self htmlReferenceForMember:object prefixedWith:@"#"];
+ return [NSString stringWithFormat:@"%@%@", path, memberReference];
+ }
+
+ // From top-level object to samo or another top level object.
+ if (object == source || [self isTopLevelStoreObject:object]) {
+ return [self htmlReferenceForTopLevelObject:object fromTopLevelObject:source];
+ }
+
+ // From top-level object to another top-level object member.
+ NSString *memberPath = [self htmlReferenceForMember:object prefixedWith:@"#"];
+ if (object.parentObject != source) {
+ NSString *objectPath = [self htmlReferenceForTopLevelObject:object.parentObject fromTopLevelObject:source];
+ return [NSString stringWithFormat:@"%@%@", objectPath, memberPath];
+ }
+
+ // From top-level object to one of it's members.
+ return memberPath;
+}
+
+- (NSString *)htmlReferenceForTopLevelObject:(GBModelBase *)object fromTopLevelObject:(GBModelBase *)source {
+ NSString *path = [self outputPathForObject:object withExtension:[self htmlExtension]];
+ if ([object isKindOfClass:[source class]]) return [path lastPathComponent];
+ NSString *prefix = [self relativePathPrefixFromObject:source toObject:object];
+ return [prefix stringByAppendingPathComponent:path];
+}
+
+- (NSString *)htmlReferenceForMember:(GBModelBase *)member prefixedWith:(NSString *)prefix {
+ NSParameterAssert(member != nil);
+ NSParameterAssert(prefix != nil);
+ if ([member isKindOfClass:[GBMethodData class]]) {
+ GBMethodData *method = (GBMethodData *)member;
+ return [NSString stringWithFormat:@"%@//api/name/%@", prefix, method.methodSelector];
+ }
+ return @"";
+}
+
+- (NSString *)htmlExtension {
+ return @"html";
+}
+
+#pragma mark Paths helper methods
+
+- (NSString *)outputPathForObject:(id)object withExtension:(NSString *)extension {
+ NSString *basePath = nil;
+ NSString *name = nil;
+ if ([object isKindOfClass:[GBClassData class]]) {
+ basePath = @"Classes";
+ name = [object nameOfClass];
+ }
+ else if ([object isKindOfClass:[GBCategoryData class]]) {
+ basePath = @"Categories";
+ name = [object idOfCategory];
+ }
+ else if ([object isKindOfClass:[GBProtocolData class]]) {
+ basePath = @"Protocols";
+ name = [object nameOfProtocol];
+ }
+
+ if (basePath == nil || name == nil) return nil;
+ basePath = [basePath stringByAppendingPathComponent:name];
+ return [basePath stringByAppendingPathExtension:extension];
+}
+
+- (NSString *)relativePathPrefixFromObject:(GBModelBase *)source toObject:(GBModelBase *)destination {
+ if ([source isKindOfClass:[destination class]]) return @"";
+ return @"../";
+}
+
+#pragma mark Helper methods
+
+- (BOOL)isTopLevelStoreObject:(id)object {
+ if ([object isKindOfClass:[GBClassData class]] || [object isKindOfClass:[GBCategoryData class]] || [object isKindOfClass:[GBProtocolData class]])
+ return YES;
+ return NO;
+}
+
+#pragma mark Overriden methods
+
+- (NSString *)description {
+ return [self className];
+}
+
+#pragma mark Properties
+
+@synthesize outputPath;
+@synthesize templatesPath;
+@synthesize ignoredPaths;
+@synthesize commentComponents;
+@synthesize stringTemplates;
+
+@end
Oops, something went wrong.

0 comments on commit 7d6a323

Please sign in to comment.