rubyXL 2.4.3 → 2.4.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (251) hide show
  1. data/Gemfile.lock +12 -12
  2. data/VERSION +1 -1
  3. data/lib/rubyXL/generic_storage.rb +4 -2
  4. data/lib/rubyXL/objects/ooxml_object.rb +2 -1
  5. data/lib/rubyXL/objects/theme.rb +2 -1
  6. data/lib/rubyXL/parser.rb +21 -20
  7. data/rdoc/README_rdoc.html +27 -27
  8. data/rdoc/RubyXL.html +1 -1
  9. data/rdoc/RubyXL/AExtension.html +1 -1
  10. data/rdoc/RubyXL/AExtensionStorageArea.html +1 -1
  11. data/rdoc/RubyXL/AdjustHandleList.html +1 -1
  12. data/rdoc/RubyXL/Alignment.html +1 -1
  13. data/rdoc/RubyXL/AlternateContent.html +1 -1
  14. data/rdoc/RubyXL/AutoFilter.html +1 -1
  15. data/rdoc/RubyXL/AutoFilterColumn.html +1 -1
  16. data/rdoc/RubyXL/BooleanNode.html +1 -1
  17. data/rdoc/RubyXL/BooleanValue.html +1 -1
  18. data/rdoc/RubyXL/Border.html +1 -1
  19. data/rdoc/RubyXL/BorderEdge.html +1 -1
  20. data/rdoc/RubyXL/Borders.html +1 -1
  21. data/rdoc/RubyXL/Break.html +1 -1
  22. data/rdoc/RubyXL/BreakList.html +1 -1
  23. data/rdoc/RubyXL/CT_AdjPoint2D.html +1 -1
  24. data/rdoc/RubyXL/CT_Color.html +1 -1
  25. data/rdoc/RubyXL/CT_ConnectionSite.html +1 -1
  26. data/rdoc/RubyXL/CT_ConnectionSiteList.html +1 -1
  27. data/rdoc/RubyXL/CT_FontCollection.html +1 -1
  28. data/rdoc/RubyXL/CT_GeomGuideList.html +1 -1
  29. data/rdoc/RubyXL/CT_Path2D.html +1 -1
  30. data/rdoc/RubyXL/CT_Path2DArcTo.html +1 -1
  31. data/rdoc/RubyXL/CT_Path2DCubicBezierTo.html +1 -1
  32. data/rdoc/RubyXL/CT_Path2DList.html +1 -1
  33. data/rdoc/RubyXL/CT_Path2DQuadBezierTo.html +1 -1
  34. data/rdoc/RubyXL/CT_Path2DTo.html +1 -1
  35. data/rdoc/RubyXL/CT_PolarAdjustHandle.html +1 -1
  36. data/rdoc/RubyXL/CT_SupplementalFont.html +1 -1
  37. data/rdoc/RubyXL/CT_TextFont.html +1 -1
  38. data/rdoc/RubyXL/CT_XYAdjustHandle.html +1 -1
  39. data/rdoc/RubyXL/CalculationChain.html +3 -3
  40. data/rdoc/RubyXL/CalculationChainCell.html +1 -1
  41. data/rdoc/RubyXL/CalculationProperties.html +1 -1
  42. data/rdoc/RubyXL/Cell.html +1 -1
  43. data/rdoc/RubyXL/CellSmartTag.html +1 -1
  44. data/rdoc/RubyXL/CellSmartTagProperty.html +1 -1
  45. data/rdoc/RubyXL/CellSmartTags.html +1 -1
  46. data/rdoc/RubyXL/CellStyle.html +1 -1
  47. data/rdoc/RubyXL/CellStyleXFs.html +1 -1
  48. data/rdoc/RubyXL/CellStyles.html +1 -1
  49. data/rdoc/RubyXL/CellValue.html +1 -1
  50. data/rdoc/RubyXL/CellWatch.html +1 -1
  51. data/rdoc/RubyXL/CellWatches.html +1 -1
  52. data/rdoc/RubyXL/CellXFs.html +1 -1
  53. data/rdoc/RubyXL/Chartsheet.html +1 -1
  54. data/rdoc/RubyXL/ChartsheetPageSetup.html +1 -1
  55. data/rdoc/RubyXL/ChartsheetProperties.html +1 -1
  56. data/rdoc/RubyXL/ChartsheetProtection.html +1 -1
  57. data/rdoc/RubyXL/ChartsheetView.html +1 -1
  58. data/rdoc/RubyXL/ChartsheetViews.html +1 -1
  59. data/rdoc/RubyXL/Color.html +3 -3
  60. data/rdoc/RubyXL/ColorFilter.html +1 -1
  61. data/rdoc/RubyXL/ColorScale.html +1 -1
  62. data/rdoc/RubyXL/ColorScheme.html +1 -1
  63. data/rdoc/RubyXL/ColorSet.html +1 -1
  64. data/rdoc/RubyXL/Colors.html +1 -1
  65. data/rdoc/RubyXL/ColumnRange.html +1 -1
  66. data/rdoc/RubyXL/ColumnRanges.html +1 -1
  67. data/rdoc/RubyXL/ConditionalFormatValue.html +1 -1
  68. data/rdoc/RubyXL/ConditionalFormatting.html +1 -1
  69. data/rdoc/RubyXL/ConditionalFormattingRule.html +1 -1
  70. data/rdoc/RubyXL/ContentTypeDefault.html +1 -1
  71. data/rdoc/RubyXL/ContentTypeOverride.html +1 -1
  72. data/rdoc/RubyXL/ContentTypes.html +17 -17
  73. data/rdoc/RubyXL/CoreProperties.html +1 -1
  74. data/rdoc/RubyXL/CustomColor.html +1 -1
  75. data/rdoc/RubyXL/CustomColorList.html +1 -1
  76. data/rdoc/RubyXL/CustomFilter.html +1 -1
  77. data/rdoc/RubyXL/CustomFilters.html +1 -1
  78. data/rdoc/RubyXL/CustomGeometry.html +1 -1
  79. data/rdoc/RubyXL/CustomProperties.html +1 -1
  80. data/rdoc/RubyXL/CustomProperty.html +1 -1
  81. data/rdoc/RubyXL/CustomSheetView.html +1 -1
  82. data/rdoc/RubyXL/CustomSheetViews.html +1 -1
  83. data/rdoc/RubyXL/CustomWorkbookView.html +1 -1
  84. data/rdoc/RubyXL/CustomWorkbookViews.html +1 -1
  85. data/rdoc/RubyXL/DXF.html +1 -1
  86. data/rdoc/RubyXL/DXFs.html +1 -1
  87. data/rdoc/RubyXL/DataBar.html +1 -1
  88. data/rdoc/RubyXL/DataConsolidate.html +1 -1
  89. data/rdoc/RubyXL/DataConsolidationReference.html +1 -1
  90. data/rdoc/RubyXL/DataConsolidationReferences.html +1 -1
  91. data/rdoc/RubyXL/DataValidation.html +1 -1
  92. data/rdoc/RubyXL/DataValidations.html +1 -1
  93. data/rdoc/RubyXL/DateGroupItem.html +1 -1
  94. data/rdoc/RubyXL/DefinedName.html +1 -1
  95. data/rdoc/RubyXL/DefinedNames.html +1 -1
  96. data/rdoc/RubyXL/DocumentProperties.html +7 -7
  97. data/rdoc/RubyXL/DynamicFilter.html +1 -1
  98. data/rdoc/RubyXL/EmbeddedControl.html +1 -1
  99. data/rdoc/RubyXL/EmbeddedControls.html +1 -1
  100. data/rdoc/RubyXL/Extension.html +1 -1
  101. data/rdoc/RubyXL/ExtensionStorageArea.html +1 -1
  102. data/rdoc/RubyXL/Extents.html +1 -1
  103. data/rdoc/RubyXL/ExternalReference.html +1 -1
  104. data/rdoc/RubyXL/ExternalReferences.html +1 -1
  105. data/rdoc/RubyXL/ExtraColorScheme.html +1 -1
  106. data/rdoc/RubyXL/ExtraColorSchemeList.html +1 -1
  107. data/rdoc/RubyXL/FieldItem.html +1 -1
  108. data/rdoc/RubyXL/FileRecoveryProperties.html +1 -1
  109. data/rdoc/RubyXL/FileSharing.html +1 -1
  110. data/rdoc/RubyXL/FileVersion.html +1 -1
  111. data/rdoc/RubyXL/Fill.html +1 -1
  112. data/rdoc/RubyXL/Fills.html +1 -1
  113. data/rdoc/RubyXL/FilterContainer.html +1 -1
  114. data/rdoc/RubyXL/FloatNode.html +1 -1
  115. data/rdoc/RubyXL/FloatValue.html +1 -1
  116. data/rdoc/RubyXL/Font.html +1 -1
  117. data/rdoc/RubyXL/FontScheme.html +1 -1
  118. data/rdoc/RubyXL/Fonts.html +1 -1
  119. data/rdoc/RubyXL/FormatScheme.html +1 -1
  120. data/rdoc/RubyXL/Formula.html +1 -1
  121. data/rdoc/RubyXL/FunctionGroup.html +1 -1
  122. data/rdoc/RubyXL/FunctionGroups.html +1 -1
  123. data/rdoc/RubyXL/GenericStorage.html +6 -6
  124. data/rdoc/RubyXL/GradientFill.html +1 -1
  125. data/rdoc/RubyXL/HSLColor.html +1 -1
  126. data/rdoc/RubyXL/HeaderFooterSettings.html +1 -1
  127. data/rdoc/RubyXL/Hyperlink.html +1 -1
  128. data/rdoc/RubyXL/Hyperlinks.html +1 -1
  129. data/rdoc/RubyXL/IconFilter.html +1 -1
  130. data/rdoc/RubyXL/IconSet.html +1 -1
  131. data/rdoc/RubyXL/IgnoredError.html +1 -1
  132. data/rdoc/RubyXL/IgnoredErrors.html +1 -1
  133. data/rdoc/RubyXL/IndexedColors.html +1 -1
  134. data/rdoc/RubyXL/InputCells.html +1 -1
  135. data/rdoc/RubyXL/IntegerNode.html +1 -1
  136. data/rdoc/RubyXL/IntegerValue.html +1 -1
  137. data/rdoc/RubyXL/LegacyCell.html +23 -23
  138. data/rdoc/RubyXL/LegacyWorkbook.html +21 -21
  139. data/rdoc/RubyXL/LegacyWorksheet.html +29 -29
  140. data/rdoc/RubyXL/MRUColors.html +1 -1
  141. data/rdoc/RubyXL/MergedCell.html +1 -1
  142. data/rdoc/RubyXL/MergedCells.html +1 -1
  143. data/rdoc/RubyXL/NumFmt.html +1 -1
  144. data/rdoc/RubyXL/NumberFormat.html +2 -2
  145. data/rdoc/RubyXL/NumberFormats.html +1 -1
  146. data/rdoc/RubyXL/OLEObject.html +1 -1
  147. data/rdoc/RubyXL/OLEObjects.html +1 -1
  148. data/rdoc/RubyXL/OLESize.html +1 -1
  149. data/rdoc/RubyXL/OOXMLContainerObject.html +1 -1
  150. data/rdoc/RubyXL/OOXMLObject.html +1 -1
  151. data/rdoc/RubyXL/OOXMLObjectClassMethods.html +12 -12
  152. data/rdoc/RubyXL/OOXMLObjectInstanceMethods.html +1 -1
  153. data/rdoc/RubyXL/OOXMLRelationshipsFile.html +1 -1
  154. data/rdoc/RubyXL/OOXMLTopLevelObject.html +1 -1
  155. data/rdoc/RubyXL/ObjectDefaults.html +1 -1
  156. data/rdoc/RubyXL/Offset.html +1 -1
  157. data/rdoc/RubyXL/OutlineProperties.html +1 -1
  158. data/rdoc/RubyXL/PageMargins.html +1 -1
  159. data/rdoc/RubyXL/PageSetup.html +1 -1
  160. data/rdoc/RubyXL/PageSetupProperties.html +1 -1
  161. data/rdoc/RubyXL/Pane.html +1 -1
  162. data/rdoc/RubyXL/Parser.html +25 -25
  163. data/rdoc/RubyXL/PatternFill.html +1 -1
  164. data/rdoc/RubyXL/PhoneticProperties.html +1 -1
  165. data/rdoc/RubyXL/PhoneticRun.html +1 -1
  166. data/rdoc/RubyXL/PivotArea.html +1 -1
  167. data/rdoc/RubyXL/PivotCache.html +1 -1
  168. data/rdoc/RubyXL/PivotCaches.html +1 -1
  169. data/rdoc/RubyXL/PivotReference.html +1 -1
  170. data/rdoc/RubyXL/PivotReferences.html +1 -1
  171. data/rdoc/RubyXL/PivotTableSelection.html +1 -1
  172. data/rdoc/RubyXL/PresetColor.html +1 -1
  173. data/rdoc/RubyXL/PresetGeometry.html +1 -1
  174. data/rdoc/RubyXL/PrintOptions.html +1 -1
  175. data/rdoc/RubyXL/ProtectedRange.html +1 -1
  176. data/rdoc/RubyXL/ProtectedRanges.html +1 -1
  177. data/rdoc/RubyXL/Protection.html +1 -1
  178. data/rdoc/RubyXL/RGBColorModelHex.html +1 -1
  179. data/rdoc/RubyXL/RGBColorModelPercentage.html +1 -1
  180. data/rdoc/RubyXL/RID.html +1 -1
  181. data/rdoc/RubyXL/RawOOXML.html +1 -1
  182. data/rdoc/RubyXL/Reference.html +5 -5
  183. data/rdoc/RubyXL/Relationship.html +1 -1
  184. data/rdoc/RubyXL/RichText.html +1 -1
  185. data/rdoc/RubyXL/RichTextRun.html +1 -1
  186. data/rdoc/RubyXL/RootRelationships.html +1 -1
  187. data/rdoc/RubyXL/Row.html +1 -1
  188. data/rdoc/RubyXL/RunProperties.html +1 -1
  189. data/rdoc/RubyXL/Scenario.html +1 -1
  190. data/rdoc/RubyXL/Scenarios.html +1 -1
  191. data/rdoc/RubyXL/SchemeColor.html +1 -1
  192. data/rdoc/RubyXL/Selection.html +1 -1
  193. data/rdoc/RubyXL/ShapeDefault.html +1 -1
  194. data/rdoc/RubyXL/ShapeGuide.html +1 -1
  195. data/rdoc/RubyXL/ShapeTextRectangle.html +1 -1
  196. data/rdoc/RubyXL/SharedStringsTable.html +3 -3
  197. data/rdoc/RubyXL/Sheet.html +1 -1
  198. data/rdoc/RubyXL/SheetCalculationProperties.html +1 -1
  199. data/rdoc/RubyXL/SheetData.html +1 -1
  200. data/rdoc/RubyXL/Sheets.html +1 -1
  201. data/rdoc/RubyXL/SmartTagProperties.html +1 -1
  202. data/rdoc/RubyXL/SmartTagType.html +1 -1
  203. data/rdoc/RubyXL/SmartTagTypes.html +1 -1
  204. data/rdoc/RubyXL/SmartTags.html +1 -1
  205. data/rdoc/RubyXL/SortCondition.html +1 -1
  206. data/rdoc/RubyXL/SortState.html +1 -1
  207. data/rdoc/RubyXL/Sqref.html +2 -2
  208. data/rdoc/RubyXL/Stop.html +1 -1
  209. data/rdoc/RubyXL/StringNode.html +1 -1
  210. data/rdoc/RubyXL/StringNodeW3C.html +1 -1
  211. data/rdoc/RubyXL/StringValue.html +1 -1
  212. data/rdoc/RubyXL/Stylesheet.html +1 -1
  213. data/rdoc/RubyXL/SystemColor.html +1 -1
  214. data/rdoc/RubyXL/TableParts.html +1 -1
  215. data/rdoc/RubyXL/TableStyle.html +1 -1
  216. data/rdoc/RubyXL/TableStyles.html +1 -1
  217. data/rdoc/RubyXL/Text.html +2 -2
  218. data/rdoc/RubyXL/Theme.html +1 -1
  219. data/rdoc/RubyXL/ThemeElements.html +1 -1
  220. data/rdoc/RubyXL/Top10.html +1 -1
  221. data/rdoc/RubyXL/TwoDTransform.html +1 -1
  222. data/rdoc/RubyXL/Variant.html +1 -1
  223. data/rdoc/RubyXL/Vector.html +1 -1
  224. data/rdoc/RubyXL/VectorValue.html +1 -1
  225. data/rdoc/RubyXL/VisualProperties.html +1 -1
  226. data/rdoc/RubyXL/WebPublishObject.html +1 -1
  227. data/rdoc/RubyXL/WebPublishObjects.html +1 -1
  228. data/rdoc/RubyXL/WebPublishingItem.html +1 -1
  229. data/rdoc/RubyXL/WebPublishingItems.html +1 -1
  230. data/rdoc/RubyXL/WebPublishingProperties.html +1 -1
  231. data/rdoc/RubyXL/Workbook.html +1 -1
  232. data/rdoc/RubyXL/WorkbookProperties.html +1 -1
  233. data/rdoc/RubyXL/WorkbookProtection.html +1 -1
  234. data/rdoc/RubyXL/WorkbookRelationships.html +1 -1
  235. data/rdoc/RubyXL/WorkbookView.html +1 -1
  236. data/rdoc/RubyXL/WorkbookViews.html +1 -1
  237. data/rdoc/RubyXL/Worksheet.html +1 -1
  238. data/rdoc/RubyXL/WorksheetDimensions.html +1 -1
  239. data/rdoc/RubyXL/WorksheetFormatProperties.html +1 -1
  240. data/rdoc/RubyXL/WorksheetProperties.html +1 -1
  241. data/rdoc/RubyXL/WorksheetProtection.html +1 -1
  242. data/rdoc/RubyXL/WorksheetView.html +1 -1
  243. data/rdoc/RubyXL/WorksheetViews.html +1 -1
  244. data/rdoc/RubyXL/XF.html +1 -1
  245. data/rdoc/created.rid +35 -35
  246. data/rdoc/index.html +2 -2
  247. data/rdoc/js/search_index.js +1 -1
  248. data/rdoc/table_of_contents.html +2 -2
  249. data/rubyXL.gemspec +5 -6
  250. metadata +89 -101
  251. checksums.yaml +0 -7
data/Gemfile.lock CHANGED
@@ -1,14 +1,14 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- activesupport (4.0.3)
5
- i18n (~> 0.6, >= 0.6.4)
4
+ activesupport (4.0.4)
5
+ i18n (~> 0.6, >= 0.6.9)
6
6
  minitest (~> 4.2)
7
7
  multi_json (~> 1.3)
8
8
  thread_safe (~> 0.1)
9
9
  tzinfo (~> 0.3.37)
10
10
  addressable (2.3.5)
11
- atomic (1.1.14)
11
+ atomic (1.1.16)
12
12
  builder (3.2.2)
13
13
  descendants_tracker (0.0.3)
14
14
  diff-lcs (1.2.5)
@@ -16,7 +16,7 @@ GEM
16
16
  faraday (0.9.0)
17
17
  multipart-post (>= 1.2, < 3)
18
18
  git (1.2.6)
19
- github_api (0.11.2)
19
+ github_api (0.11.3)
20
20
  addressable (~> 2.3)
21
21
  descendants_tracker (~> 0.0.1)
22
22
  faraday (~> 0.8, < 0.10)
@@ -25,7 +25,7 @@ GEM
25
25
  nokogiri (~> 1.6.0)
26
26
  oauth2
27
27
  hashie (2.0.5)
28
- highline (1.6.20)
28
+ highline (1.6.21)
29
29
  i18n (0.6.9)
30
30
  jeweler (2.0.1)
31
31
  builder
@@ -41,7 +41,7 @@ GEM
41
41
  multi_json (>= 1.5)
42
42
  mini_portile (0.5.2)
43
43
  minitest (4.7.5)
44
- multi_json (1.8.4)
44
+ multi_json (1.9.0)
45
45
  multi_xml (0.5.5)
46
46
  multipart-post (2.0.0)
47
47
  nokogiri (1.6.1)
@@ -60,11 +60,11 @@ GEM
60
60
  rspec-core (~> 2.14.0)
61
61
  rspec-expectations (~> 2.14.0)
62
62
  rspec-mocks (~> 2.14.0)
63
- rspec-core (2.14.7)
63
+ rspec-core (2.14.8)
64
64
  rspec-expectations (2.14.5)
65
65
  diff-lcs (>= 1.1.3, < 2.0)
66
- rspec-mocks (2.14.5)
67
- rubyzip (1.1.0)
66
+ rspec-mocks (2.14.6)
67
+ rubyzip (1.1.2)
68
68
  shoulda (3.5.0)
69
69
  shoulda-context (~> 1.0, >= 1.0.1)
70
70
  shoulda-matchers (>= 1.4.1, < 3.0)
@@ -76,9 +76,9 @@ GEM
76
76
  multi_json
77
77
  simplecov-html (~> 0.8.0)
78
78
  simplecov-html (0.8.0)
79
- thread_safe (0.1.3)
80
- atomic
81
- tzinfo (0.3.38)
79
+ thread_safe (0.2.0)
80
+ atomic (>= 1.1.7, < 2)
81
+ tzinfo (0.3.39)
82
82
 
83
83
  PLATFORMS
84
84
  ruby
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.4.3
1
+ 2.4.4
@@ -17,7 +17,8 @@ module RubyXL
17
17
  dirpath = File.join(root_dir, @local_dir_path)
18
18
  if File.directory?(dirpath) then
19
19
  (Dir.new(dirpath).entries - ['.', '..', '.DS_Store', '_rels']).each { |filename|
20
- self[filename] = File.open(File.join(dirpath, filename), @mode).read
20
+ # Making sure that the file will be automatically closed immediately after it has been read
21
+ self[filename] = File.open(File.join(dirpath, filename), @mode) { |f| f.read }
21
22
  }
22
23
  end
23
24
 
@@ -26,7 +27,8 @@ module RubyXL
26
27
 
27
28
  def load_file(root_dir, filename)
28
29
  filepath = File.join(root_dir, @local_dir_path, filename)
29
- self[filename] = File.open(filepath, @mode).read if File.readable?(filepath)
30
+ # Making sure that the file will be automatically closed immediately after it has been read
31
+ self[filename] = (File.open(filepath, @mode) { |f| f.read }) if File.readable?(filepath)
30
32
  self
31
33
  end
32
34
 
@@ -413,7 +413,8 @@ module RubyXL
413
413
  def self.parse_file(dirpath)
414
414
  full_path = File.join(dirpath, xlsx_path)
415
415
  return nil unless File.exist?(full_path)
416
- parse(File.open(full_path, 'r'))
416
+ # Making sure that the file will be automatically closed immediately after it has been read
417
+ File.open(full_path, 'r') { |f| parse(f) }
417
418
  end
418
419
 
419
420
  # Saves the contents of the object as XML to respective location in <tt>.xslx</tt> zip container.
@@ -586,7 +586,8 @@ module RubyXL
586
586
 
587
587
  obj = self.new
588
588
 
589
- obj.raw_xml = File.open(full_path, 'r').read
589
+ # Making sure that the file will be automatically closed immediately after it has been read
590
+ obj.raw_xml = File.open(full_path, 'r') { |f| f.read }
590
591
  obj
591
592
  end
592
593
 
data/lib/rubyXL/parser.rb CHANGED
@@ -82,26 +82,27 @@ module RubyXL
82
82
  wb.sheets.each_with_index { |sheet, i|
83
83
  sheet_rel = wb.relationship_container.find_by_rid(sheet.r_id)
84
84
 
85
- sheet_file = File.open(File.join(dir_path, 'xl', sheet_rel.target))
86
-
87
- case File::basename(sheet_rel.type)
88
- when 'worksheet' then
89
- sheet_obj = RubyXL::Worksheet.parse(sheet_file)
90
- sheet_obj.sheet_data.rows.each { |r|
91
- next if r.nil?
92
- r.worksheet = sheet
93
- r.cells.each { |c| c.worksheet = sheet_obj unless c.nil? }
94
- }
95
- when 'chartsheet' then
96
- sheet_obj = RubyXL::Chartsheet.parse(sheet_file)
97
- end
98
-
99
- sheet_obj.workbook = wb
100
- sheet_obj.sheet_name = sheet.name
101
- sheet_obj.sheet_id = sheet.sheet_id
102
- sheet_obj.state = sheet.state
103
-
104
- wb.worksheets[i] = sheet_obj
85
+ # Making sure that the file will be automatically closed immediately after it has been read
86
+ File.open(File.join(dir_path, 'xl', sheet_rel.target)) { |sheet_file|
87
+ case File::basename(sheet_rel.type)
88
+ when 'worksheet' then
89
+ sheet_obj = RubyXL::Worksheet.parse(sheet_file)
90
+ sheet_obj.sheet_data.rows.each { |r|
91
+ next if r.nil?
92
+ r.worksheet = sheet
93
+ r.cells.each { |c| c.worksheet = sheet_obj unless c.nil? }
94
+ }
95
+ when 'chartsheet' then
96
+ sheet_obj = RubyXL::Chartsheet.parse(sheet_file)
97
+ end
98
+
99
+ sheet_obj.workbook = wb
100
+ sheet_obj.sheet_name = sheet.name
101
+ sheet_obj.sheet_id = sheet.sheet_id
102
+ sheet_obj.state = sheet.state
103
+
104
+ wb.worksheets[i] = sheet_obj
105
+ }
105
106
  }
106
107
 
107
108
  FileUtils.remove_entry_secure(dir_path)
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>README - rubyXL 2.4.3</title>
7
+ <title>README - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="./fonts.css" rel="stylesheet">
10
10
  <link href="./rdoc.css" rel="stylesheet">
@@ -124,7 +124,7 @@
124
124
 
125
125
  <h2 id="label-To+Use%3A">To Use:<span><a href="#label-To+Use%3A">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
126
126
 
127
- <pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL&#39;</span> <span class="ruby-comment"># Assuming rubygems is already required</span>
127
+ <pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">'rubyXL'</span> <span class="ruby-comment"># Assuming rubygems is already required</span>
128
128
  </pre>
129
129
 
130
130
  <h3 id="label-Parsing+an+existing+workbook">Parsing an existing workbook<span><a href="#label-Parsing+an+existing+workbook">&para;</a> <a href="#documentation">&uarr;</a></span></h3>
@@ -141,7 +141,7 @@
141
141
 
142
142
  <pre>workbook.worksheets[0] # Returns first worksheet
143
143
  workbook[0] # Returns first worksheet
144
- workbook[&#39;Sheet1&#39;] # Finds and returns worksheet titled &quot;Sheet1&quot;</pre>
144
+ workbook['Sheet1'] # Finds and returns worksheet titled &quot;Sheet1&quot;</pre>
145
145
 
146
146
  <h4 id="label-Accessing+just+the+values">Accessing just the values<span><a href="#label-Accessing+just+the+values">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
147
147
 
@@ -225,12 +225,12 @@ worksheet.get_column_border_right(0)</pre>
225
225
 
226
226
  <h4 id="label-Adding+Worksheets">Adding Worksheets<span><a href="#label-Adding+Worksheets">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
227
227
 
228
- <pre>worksheet = workbook.add_worksheet(&#39;Sheet2&#39;)</pre>
228
+ <pre>worksheet = workbook.add_worksheet('Sheet2')</pre>
229
229
 
230
230
  <h4 id="label-Adding+Cells">Adding Cells<span><a href="#label-Adding+Cells">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
231
231
 
232
- <pre>worksheet.add_cell(0, 0, &#39;A1&#39;) # Sets cell A1 to string &quot;A1&quot;
233
- worksheet.add_cell(0, 1, &#39;&#39;, &#39;A1&#39;) # Sets formula in the cell B1 to &#39;=A1&#39;</pre>
232
+ <pre>worksheet.add_cell(0, 0, 'A1') # Sets cell A1 to string &quot;A1&quot;
233
+ worksheet.add_cell(0, 1, '', 'A1') # Sets formula in the cell B1 to '=A1'</pre>
234
234
 
235
235
  <h4 id="label-Changing+Cells">Changing Cells<span><a href="#label-Changing+Cells">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
236
236
 
@@ -240,21 +240,21 @@ worksheet.add_cell(0, 1, &#39;&#39;, &#39;A1&#39;) # Sets formula in the cell B
240
240
 
241
241
  <pre>worksheet.sheet_data[0][0].change_font_bold(true) # Makes A1 bold
242
242
  worksheet.change_row_italics(0,true) # Makes first row italicized
243
- worksheet.change_column_font_name(0, &#39;Courier&#39;) # Makes first column have font Courier</pre>
243
+ worksheet.change_column_font_name(0, 'Courier') # Makes first column have font Courier</pre>
244
244
 
245
245
  <h4 id="label-Changing+Fills+++++">Changing Fills <span><a href="#label-Changing+Fills+++++">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
246
246
 
247
- <pre>worksheet.sheet_data[0][0].change_fill(&#39;0ba53d&#39;) # Sets A1 to have fill #0ba53d
248
- worksheet.change_row_fill(0, &#39;0ba53d&#39;) # Sets first row to have fill #0ba53d
249
- worksheet.change_column_fill(0, &#39;0ba53d&#39;) # Sets first column to have fill #0ba53d</pre>
247
+ <pre>worksheet.sheet_data[0][0].change_fill('0ba53d') # Sets A1 to have fill #0ba53d
248
+ worksheet.change_row_fill(0, '0ba53d') # Sets first row to have fill #0ba53d
249
+ worksheet.change_column_fill(0, '0ba53d') # Sets first column to have fill #0ba53d</pre>
250
250
 
251
251
  <h4 id="label-Changing+Borders">Changing Borders<span><a href="#label-Changing+Borders">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
252
252
 
253
253
  <pre># Possible weights: hairline, thin, medium, thick
254
254
  # Possible &quot;directions&quot;: top, bottom, left, right, diagonal
255
- worksheet.sheet_data[0][0].change_border_top(&#39;thin&#39;) # Sets A1 to have a top, thin border
256
- worksheet.change_row_border_left(0, &#39;hairline&#39;) # Sets first row to have a left, hairline border
257
- worksheet.change_column_border_diagonal(0, &#39;medium&#39;) # Sets first column to have diagonal, medium border</pre>
255
+ worksheet.sheet_data[0][0].change_border_top('thin') # Sets A1 to have a top, thin border
256
+ worksheet.change_row_border_left(0, 'hairline') # Sets first row to have a left, hairline border
257
+ worksheet.change_column_border_diagonal(0, 'medium') # Sets first column to have diagonal, medium border</pre>
258
258
 
259
259
  <h4 id="label-Changing+Alignment">Changing Alignment<span><a href="#label-Changing+Alignment">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
260
260
 
@@ -262,17 +262,17 @@ worksheet.change_column_border_diagonal(0, &#39;medium&#39;) # Sets first column
262
262
 
263
263
  <p>center, distributed, justify, left, right</p>
264
264
 
265
- <pre>worksheet.sheet_data[0][0].change_horizontal_alignment(&#39;center&#39;) # Sets A1 to be centered
266
- worksheet.change_row_horizontal_alignment(0, &#39;justify&#39;) # Sets first row to be justified
267
- worksheet.change_column_horizontal_alignment(0, &#39;right&#39;) # Sets first column to be right-aligned</pre>
265
+ <pre>worksheet.sheet_data[0][0].change_horizontal_alignment('center') # Sets A1 to be centered
266
+ worksheet.change_row_horizontal_alignment(0, 'justify') # Sets first row to be justified
267
+ worksheet.change_column_horizontal_alignment(0, 'right') # Sets first column to be right-aligned</pre>
268
268
 
269
269
  <h5 id="label-Vertical">Vertical<span><a href="#label-Vertical">&para;</a> <a href="#documentation">&uarr;</a></span></h5>
270
270
 
271
271
  <p>bottom, center, distributed, top</p>
272
272
 
273
- <pre>worksheet.sheet_data[0][0].change_vertical_alignment(&#39;bottom&#39;) # Sets A1 to be bottom aligned
274
- worksheet.change_row_vertical_alignment(0, &#39;distributed&#39;) # Sets first row to be distributed vertically
275
- worksheet.change_column_vertical_alignment(0, &#39;top&#39;) # Sets first column to be top aligned</pre>
273
+ <pre>worksheet.sheet_data[0][0].change_vertical_alignment('bottom') # Sets A1 to be bottom aligned
274
+ worksheet.change_row_vertical_alignment(0, 'distributed') # Sets first row to be distributed vertically
275
+ worksheet.change_column_vertical_alignment(0, 'top') # Sets first column to be top aligned</pre>
276
276
 
277
277
  <h4 id="label-Changing+Row+Height">Changing Row Height<span><a href="#label-Changing+Row+Height">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
278
278
 
@@ -359,8 +359,8 @@ worksheet.delete_cell(0, 0) # Deletes A1, does not shift cells</pre>
359
359
 
360
360
  <h3 id="label-Miscellaneous">Miscellaneous<span><a href="#label-Miscellaneous">&para;</a> <a href="#documentation">&uarr;</a></span></h3>
361
361
 
362
- <pre>Reference.ind2ref(0,0) == &#39;A1&#39; # Converts row and column index to Excel-style cell reference
363
- Reference.ref2ind(&#39;A1&#39;) == [0, 0] # Converts Excel-style cell reference to row and column index</pre>
362
+ <pre>Reference.ind2ref(0,0) == 'A1' # Converts row and column index to Excel-style cell reference
363
+ Reference.ref2ind('A1') == [0, 0] # Converts Excel-style cell reference to row and column index</pre>
364
364
 
365
365
  <h2 id="label-For+more+information">For more information<span><a href="#label-For+more+information">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
366
366
 
@@ -368,11 +368,11 @@ Reference.ref2ind(&#39;A1&#39;) == [0, 0] # Converts Excel-style cell reference
368
368
 
369
369
  <h2 id="label-Contributing+to+rubyXL">Contributing to rubyXL<span><a href="#label-Contributing+to+rubyXL">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
370
370
  <ul><li>
371
- <p>Check out the latest master to make sure the feature hasn&#39;t been
372
- implemented or the bug hasn&#39;t been fixed yet</p>
371
+ <p>Check out the latest master to make sure the feature hasnt been
372
+ implemented or the bug hasnt been fixed yet</p>
373
373
  </li><li>
374
- <p>Check out the issue tracker to make sure someone already hasn&#39;t
375
- requested it and/or contributed it</p>
374
+ <p>Check out the issue tracker to make sure someone already hasnt requested
375
+ it and/or contributed it</p>
376
376
  </li><li>
377
377
  <p>Fork the project</p>
378
378
  </li><li>
@@ -380,8 +380,8 @@ requested it and/or contributed it</p>
380
380
  </li><li>
381
381
  <p>Commit and push until you are happy with your contribution</p>
382
382
  </li><li>
383
- <p>Make sure to add tests for it. This is important so I don&#39;t break it in
384
- a future version unintentionally.</p>
383
+ <p>Make sure to add tests for it. This is important so I dont break it in a
384
+ future version unintentionally.</p>
385
385
  </li><li>
386
386
  <p>Please try not to mess with the Rakefile, version, or history. If you want
387
387
  to have your own version, or is otherwise necessary, that is fine, but
data/rdoc/RubyXL.html CHANGED
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>module RubyXL - rubyXL 2.4.3</title>
7
+ <title>module RubyXL - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="./fonts.css" rel="stylesheet">
10
10
  <link href="./rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::AExtension - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::AExtension - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::AExtensionStorageArea - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::AExtensionStorageArea - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::AdjustHandleList - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::AdjustHandleList - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::Alignment - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::Alignment - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::AlternateContent - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::AlternateContent - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::AutoFilter - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::AutoFilter - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::AutoFilterColumn - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::AutoFilterColumn - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::BooleanNode - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::BooleanNode - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::BooleanValue - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::BooleanValue - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::Border - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::Border - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::BorderEdge - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::BorderEdge - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::Borders - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::Borders - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::Break - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::Break - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">
@@ -4,7 +4,7 @@
4
4
  <head>
5
5
  <meta charset="UTF-8">
6
6
 
7
- <title>class RubyXL::BreakList - rubyXL 2.4.3</title>
7
+ <title>class RubyXL::BreakList - rubyXL 2.4.4</title>
8
8
 
9
9
  <link href="../fonts.css" rel="stylesheet">
10
10
  <link href="../rdoc.css" rel="stylesheet">