caxlsx 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f41b32f0f196576b4a707597786ac9227f8f6f3c630754d1ec6dcec38137c3b
-  data.tar.gz: 8d000539c03e2ae7de7a2bd3d9610856abe77b26526e176ddc5e7460d062b98d
+  metadata.gz: 1ed41402c88039c2627ffba600babaf4891f260c120262d40a8ae2759ca9dca3
+  data.tar.gz: ed7540073afe8febc4435eb3bdf0503843e61ce3edb52c2df22fe79708727a2a
 SHA512:
-  metadata.gz: 3c3d57bec5dfdd911a3a052bfe42cdebe672b5f16b797ba43fa0d3dc906920532cc7ee5330aaab84f48112f3ed445c73de57546214cff71a30499d63a54bab81
-  data.tar.gz: 9bf3940c7dc4bdfcddee151ead1b0bf27b948e8fc0ba6c768ba966b81165446a0c0b0da581132018e75e019d665bdaaf4fe8eb055fb51174601b87320c8143be
+  metadata.gz: 6562cf90cfbf0b9a42012ac225a586e0900486e44930ca5c8ee3e6c3f4c2d3f6d66b8566ac81854f48106bf78732e076ee5cf2771d1cc2ba6abf2cf22dc966e2
+  data.tar.gz: fd1af696b89b4d4a6594e6ef4eb55d98a3170dfa23d9b96bf06de13692b0957bf4c0a329014b2c9be9ca05337845e83bad0b5644c14ac7862eb26ab981f41f7b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 CHANGELOG
 ---------
+- **April.1.17**:3.0.0-pre
+  - Support for ruby versions limited to officially supported version
+  - Updates to dependency gems, especially nokogiri and ruby-zip
+  - Patch options parsing for two cell anchor
+  - Remove support for depreciated worksheet members
 - **November.25.12**:1.3.4
   - Support for headers and footers for worksheets
   - bug fix: Properly escape hyperlink urls

data/README.md

@@ -1,38 +1,46 @@
+Notice: Community Axlsx organization
+===================================================
+All Axlsx related gems have been forked or moved to a community organization: http://github.com/caxlsx
+* Axlsx
+* acts_as_axlsx
+* axlsx_rails
+* activeadmin-axlsx
+
+The gems will be released as is as a starting point to allow releases of other gems that depend on these gems. Submit issues as usual. 
+
+Please consider helping develop and test these gems.
+
 Axlsx: Office Open XML Spreadsheet Generation
 ====================================
-[![Build Status](https://secure.travis-ci.org/randym/axlsx.png?branch=master)](http://travis-ci.org/randym/axlsx/)
+[![Build Status](https://secure.travis-ci.org/randym/axlsx.svg?branch=master)](http://travis-ci.org/randym/axlsx/)
 
-If you are using axlsx for comercial purposes, or just want to show your
+If you are using axlsx for commercial purposes, or just want to show your
 appreciation for the gem, please don't hesitate to make a donation.
 
-[![Click here to lend your support to: axlsx and make a donation at www.pledgie.com !](http://www.pledgie.com/campaigns/17814.png?skin_name=chrome)](http://www.pledgie.com/campaigns/17814)
-
 **IRC**:[irc.freenode.net / #axlsx](irc://irc.freenode.net/axlsx)
 
-**Git**:[http://github.com/randym/axlsx](http://github.com/randym/axlsx)
-
-**Twitter**: [https://twitter.com/#!/morgan_randy](https://twitter.com/#!/morgan_randy)
+**Git**:[http://github.com/caxlsx/axlsx](http://github.com/randym/axlsx)
 
 **Google Group**: [https://groups.google.com/forum/?fromgroups#!forum/axlsx](https://groups.google.com/forum/?fromgroups#!forum/axlsx)
 
 **Author**: Randy Morgan
 
-**Copyright**: 2011 - 2013
+**Copyright**: 2011 - 2017
 
 **License**: MIT License
 
-**Latest Version**: 2.0.1
+**Latest Version**: 3.0.0
 
-**Ruby Version**: 1.9.2, 1.9.3, 2.0.0
+**Ruby Version**: 2.2.7, 2.3.4, 2.4.1
 
 **JRuby Version**: 1.9 modes
 
-**Rubinius Version**: rubinius 2.0.0dev * lower versions may run, this gem always tests against head.
+**Rubinius Version**: rubinius 3 * lower versions may run, this gem always tests against head.
 
 **Release Date**: September 12th 2013
 
 If you are working in rails, or with active record see:
-[acts_as_xlsx](http://github.com/randym/acts_as_xlsx)
+[acts_as_xlsx](http://github.com/caxlsx/acts_as_xlsx)
 
 acts_as_xlsx is a simple ActiveRecord mixin that lets you generate a workbook with:
 
@@ -42,7 +50,7 @@ Posts.where(created_at > Time.now-30.days).to_xlsx
 
 ** and **
 
-* http://github.com/straydogstudio/axlsx_rails
+* http://github.com/caxlsx/axlsx_rails
 Axlsx_Rails provides an Axlsx renderer so you can move all your spreadsheet code from your controller into view files. Partials are supported so you can organize any code into reusable chunks (e.g. cover sheets, common styling, etc.) You can use it with acts_as_xlsx, placing the to_xlsx call in a view and add ':package => xlsx_package' to the parameter list. Now you can keep your controllers thin!
 
 There are guides for using axlsx and acts_as_xlsx here:
@@ -50,9 +58,9 @@ There are guides for using axlsx and acts_as_xlsx here:
 
 If you are working with ActiveAdmin see:
 
-[activeadmin_axlsx](http://github.com/randym/activeadmin_axlsx)
+[activeadmin-axlsx](http://github.com/caxlsx/activeadmin-axlsx)
 
-It provies a plugin and dsl for generating downloadable reports.
+It provides a plugin and dsl for generating downloadable reports.
 
 The examples directory contains a number of more specific examples as
 well.
@@ -63,7 +71,7 @@ Synopsis
 Axlsx is an Office Open XML Spreadsheet generator for the Ruby programming language.
 With Axlsx you can create excel worksheets with charts, images (with links), automated and fixed column widths, customized styles, functions, tables, conditional formatting, print options, comments, merged cells, auto filters, file and stream serialization  as well as full schema validation. Axlsx excels at helping you generate beautiful Office Open XML Spreadsheet documents without having to understand the entire ECMA specification.
 
-![Screen 1](https://github.com/randym/axlsx/raw/master/examples/sample.png)
+![Screen 1](https://github.com/caxlsx/axlsx/raw/master/examples/sample.png)
 
 
 
@@ -142,7 +150,7 @@ Axlsx::Package.new do |p|
 end
 ```
 
-Please see the [examples](https://github.com/randym/axlsx/tree/master/examples/example.rb) for more.
+Please see the [examples](https://github.com/caxlsx/axlsx/tree/master/examples/example.rb) for more.
 
 {include:file:examples/example.rb}
 
@@ -153,7 +161,7 @@ There is much, much more you can do with this gem. If you get stuck, grab me on
 
 This gem is 100% documented with YARD, an exceptional documentation library. To see documentation for this, and all the gems installed on your system use:
 
-     gem install yard
+     gem install yard kramdown
 
      yard server -g
 
@@ -164,7 +172,10 @@ This gem has 100% test coverage using test/unit. To execute tests for this gem,
 
 #Change log
 ---------
-
+- **
+  - Added Cell#name so you you can quickly create a defined name for a single cell in your workbook.
+  - Added full book view and sheet state management. This means you can specify how the workbook renders as well as manage sheet visibility.
+  - Added smoothing management for line charts series
 - **September.12.13**:2.0.1
   - Unpinned rubyzip version
 - **September.12.13**:2.0.0
@@ -228,16 +239,15 @@ related to themes, which axlsx does not implement at this time.
    - you must set 'use_shared_strings' to true. This is most
      conveniently done just before rendering by calling Package.use_shared_strings = true prior to serialization.
 
-```ruby
-p = Axlsx::Package.new
-p.workbook.add_worksheet(:name => "Basic Worksheet") do |sheet|
-  sheet.add_row ["First Column", "Second", "Third"]
-  sheet.add_row [1, 2, 3]
-end
-p.use_shared_strings = true
-p.serialize('simple.xlsx')
-```
-
+  ```ruby
+  p = Axlsx::Package.new
+  p.workbook.add_worksheet(:name => "Basic Worksheet") do |sheet|
+    sheet.add_row ["First Column", "Second", "Third"]
+    sheet.add_row [1, 2, 3]
+  end
+  p.use_shared_strings = true
+  p.serialize('simple.xlsx')
+  ```
    - charts do not render
 
 
@@ -246,11 +256,9 @@ p.serialize('simple.xlsx')
 Open source software is a community effort. None of this could have been
 done without the help of these awesome folks.
 
-[contributors](https://github.com/randym/axlsx/graphs/contributors)
+[contributors](https://github.com/caxlsx/axlsx/graphs/contributors)
 
-#Copyright and License
+#License
 ----------
 
-Axlsx © 2011-2013 by [Randy Morgan](mailto:digial.ipseity@gmail.com).
-
 Axlsx is licensed under the MIT license. Please see the LICENSE document for more information.

data/Rakefile

@@ -9,19 +9,17 @@ task :benchmark do
 end
 
 task :gendoc do
-  #puts 'yard doc generation disabled until JRuby build native extensions for redcarpet or yard removes the dependency.'
-    system "yardoc"
-    system "yard stats --list-undoc"
+  system "yardoc"
+  system "yard stats --list-undoc"
 end
 
-task :test do
-     require 'rake/testtask'
-     Rake::TestTask.new do |t|
-       t.libs << 'test'
-       t.test_files = FileList['test/**/tc_*.rb']
-       t.verbose = false
-       t.warning = true
-     end
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/tc_*.rb']
+  t.verbose = false
+  t.warning = true
 end
 
 task :release => :build do

data/examples/auto_filter.rb

@@ -10,7 +10,16 @@ Axlsx::Package.new do |p|
     sheet.add_row ["19.1", "1 min 32 sec", "about 10 hours ago", "1.8.7"]
     sheet.add_row ["19.2", "1 min 28 sec", "about 10 hours ago", "1.9.2"]
     sheet.add_row ["19.3", "1 min 35 sec", "about 10 hours ago", "1.9.3"]
-    sheet.auto_filter = 'A2:D5' 
+    sheet.auto_filter = 'A2:D5'
+    sheet.auto_filter.add_column 3, :filters, :filter_items => ['1.9.2']
+  end
+  p.workbook.add_worksheet(:name => "Table 2") do |sheet|
+    sheet.add_row ["Build Matrix"]
+    sheet.add_row ["Build", "Duration", "Finished", "Rvm"]
+    sheet.add_row ["19.1", "1 min 32 sec", "about 10 hours ago", "1.8.7"]
+    sheet.add_row ["19.2", "1 min 28 sec", "about 10 hours ago", "1.9.2"]
+    sheet.add_row ["19.3", "1 min 35 sec", "about 10 hours ago", "1.9.3"]
+    sheet.auto_filter = 'A2:D5'
     sheet.auto_filter.add_column 3, :filters, :filter_items => ['1.9.2']
   end
 end.serialize('auto_filter.xlsx')

data/examples/conditional_formatting/example_conditional_formatting.rb

@@ -9,10 +9,11 @@ book = p.workbook
 # define your regular styles
 percent = book.styles.add_style(:format_code => "0.00%", :border => Axlsx::STYLE_THIN_BORDER)
 money = book.styles.add_style(:format_code => '0,000', :border => Axlsx::STYLE_THIN_BORDER)
+status = book.styles.add_style(:border => Axlsx::STYLE_THIN_BORDER)
 
 # define the style for conditional formatting
-profitable = book.styles.add_style( :fg_color => "FF428751", :type => :dxf )
-unprofitable = wb.styles.add_style( :fg_color => "FF0000", :type => :dxf )
+profitable = book.styles.add_style( :fg_color => "428751", :type => :dxf )
+unprofitable = book.styles.add_style( :fg_color => "FF0000", :type => :dxf )
 
 book.add_worksheet(:name => "Cell Is") do |ws|
 
@@ -28,7 +29,7 @@ book.add_worksheet(:name => "Cell Is") do |ws|
 # Apply conditional formatting to range B3:B100 in the worksheet
   ws.add_conditional_formatting("B3:B100", { :type => :cellIs, :operator => :greaterThan, :formula => "100000", :dxfId => profitable, :priority => 1 })
 # Apply conditional using the between operator; NOTE: supply an array to :formula for between/notBetween
-  sheet.add_conditional_formatting("C3:C100", { :type => :cellIs, :operator => :between, :formula => ["0.00%","100.00%"], :dxfId => unprofitable, :priority => 1 })
+  ws.add_conditional_formatting("C3:C100", { :type => :cellIs, :operator => :between, :formula => ["0.00%","100.00%"], :dxfId => unprofitable, :priority => 1 })
 end
 
 book.add_worksheet(:name => "Color Scale") do |ws|
@@ -71,4 +72,18 @@ book.add_worksheet(:name => "Icon Set") do |ws|
   ws.add_conditional_formatting("B3:B100", { :type => :iconSet, :dxfId => profitable, :priority => 1, :icon_set => icon_set })
 end
 
+book.add_worksheet(:name => "Contains Text") do |ws|
+  ws.add_row ["Previous Year Quarterly Profits (JPY)"]
+  ws.add_row ["Quarter", "Profit", "% of Total", "Status"]
+  offset = 3
+  rows = 20
+  offset.upto(rows + offset) do |i|
+    ws.add_row ["Q#{i}", 10000*((rows/2-i) * (rows/2-i)), "=100*B#{i}/SUM(B3:B#{rows+offset})", (10000*((rows/2-i) * (rows/2-i))) > 100000 ? "PROFIT" : "LOSS"], :style=>[nil, money, percent, status]
+  end
+
+# Apply conditional formatting to range D3:D100 in the worksheet
+  ws.add_conditional_formatting("D3:D100", { :type => :containsText, :operator => :equal, :text => "PROFIT", :dxfId => profitable, :priority => 1 })
+  ws.add_conditional_formatting("D3:D100", { :type => :containsText, :operator => :equal, :text => "LOSS", :dxfId => unprofitable, :priority => 1 })
+end
+
 p.serialize('example_conditional_formatting.xlsx')

data/examples/data_validation.rb

@@ -4,47 +4,64 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'axlsx'
 
 p = Axlsx::Package.new
-p.workbook.add_worksheet do |ws| 
-  ws.add_data_validation("A10", { 
-    :type => :whole, 
-    :operator => :between, 
-    :formula1 => '5', 
-    :formula2 => '10', 
-    :showErrorMessage => true, 
-    :errorTitle => 'Wrong input', 
-    :error => 'Only values between 5 and 10', 
-    :errorStyle => :information, 
-    :showInputMessage => true, 
-    :promptTitle => 'Be carful!', 
-    :prompt => 'Only values between 5 and 10'})
-  
-  ws.add_data_validation("B10", { 
-    :type => :textLength, 
-    :operator => :greaterThan, 
-    :formula1 => '10', 
-    :showErrorMessage => true, 
-    :errorTitle => 'Text is too long', 
-    :error => 'Max text length is 10 characters', 
-    :errorStyle => :stop, 
-    :showInputMessage => true, 
-    :promptTitle => 'Text length', 
-    :prompt => 'Max text length is 10 characters'})
-  
-  8.times do |i|
-    ws.add_row [nil, nil, i*2]
+p.workbook.add_worksheet do |ws|
+
+  ws.add_row ["between", "lessThan", "bound list", "raw list"]
+
+  4.times do |i|
+    ws.add_row [nil, nil, nil, nil, (i+1) * 2]
   end
-  
-  ws.add_data_validation("C10", { 
-    :type => :list, 
-    :formula1 => 'C1:C8', 
+
+  ws.add_data_validation("A2:A5", {
+    :type => :whole,
+    :operator => :between,
+   :formula1 => '5',
+    :formula2 => '10',
+    :showErrorMessage => true,
+    :errorTitle => 'Wrong input',
+    :error => 'Only values between 5 and 10',
+    :errorStyle => :information,
+    :showInputMessage => true,
+    :promptTitle => 'Be careful!',
+    :prompt => %{We really want a value between 5 and 10,
+but it is OK if you want to break the rules.
+}})
+
+ ws.add_data_validation("B1:B5", {
+   :type => :textLength,
+   :operator => :lessThan,
+   :formula1 => '10',
+   :showErrorMessage => true,
+   :errorTitle => 'Text is too long',
+   :error => 'Max text length is 10 characters',
+   :errorStyle => :stop,
+   :showInputMessage => true,
+   :promptTitle => 'Text length',
+   :prompt => 'Max text length is 10 characters'})
+
+  ws.add_data_validation("C2:C5", {
+   :type => :list,
+   :formula1 => 'E2:E5',
+   :showDropDown => false,
+   :showErrorMessage => true,
+   :errorTitle => '',
+   :error => 'Only values from E2:E5',
+   :errorStyle => :stop,
+   :showInputMessage => true,
+   :promptTitle => '',
+   :prompt => 'Only values from E2:E5'})
+
+  ws.add_data_validation("D2:D5", {
+    :type => :list,
+    :formula1 => '"Red, Orange, NavyBlue"',
     :showDropDown => false,
-    :showErrorMessage => true, 
-    :errorTitle => '', 
-    :error => 'Only values from C1:C8', 
-    :errorStyle => :stop, 
-    :showInputMessage => true, 
-    :promptTitle => '', 
-    :prompt => 'Only values from C1:C8'})
+    :showErrorMessage => true,
+    :errorTitle => '',
+    :error => 'Please use the dropdown selector to choose the value',
+    :errorStyle => :stop,
+    :showInputMessage => true,
+    :prompt => '& Choose the value from the dropdown'})
+
 end
 
-p.serialize 'data_validation.xlsx'
+p.serialize 'data_validation.xlsx'

data/examples/example.rb

@@ -14,6 +14,7 @@ examples << :surrounding_border
 examples << :deep_custom_borders
 examples << :row_column_style
 examples << :fixed_column_width
+examples << :height
 examples << :outline_level
 examples << :merge_cells
 examples << :images
@@ -21,6 +22,7 @@ examples << :format_dates
 examples << :mbcs
 examples << :formula
 examples << :auto_filter
+examples << :sheet_protection
 examples << :data_types
 examples << :override_data_types
 examples << :hyperlinks
@@ -40,13 +42,17 @@ examples << :printing
 examples << :header_footer
 examples << :comments
 examples << :panes
+examples << :book_view
 examples << :sheet_view
+examples << :hiding_sheets
 examples << :conditional_formatting
 examples << :streaming
 examples << :shared_strings
 examples << :no_autowidth
 examples << :cached_formula
 examples << :page_breaks
+examples << :rich_text
+examples << :tab_color
 
 p = Axlsx::Package.new
 wb = p.workbook
@@ -207,6 +213,7 @@ if examples.include? :row_column_style
     head = s.add_style :bg_color => "00", :fg_color => "FF"
     percent = s.add_style :num_fmt => 9
     wb.add_worksheet(:name => "Columns and Rows") do |sheet|
+      # Note: you must add rows to the document *BEFORE* applying column styles to them
       sheet.add_row ['col 1', 'col 2', 'col 3', 'col 4', 'col5']
       sheet.add_row [1, 2, 0.3, 4, 5.0]
       sheet.add_row [1, 2, 0.2, 4, 5.0]
@@ -243,6 +250,21 @@ if examples.include? :fixed_column_width
   end
 end
 
+
+##Specifying Row height
+
+#```ruby
+if examples.include? :height
+  wb.styles do |s|
+    head = s.add_style :bg_color => "00", :fg_color => "FF"
+    wb.add_worksheet(:name => "fixed row height") do |sheet|
+      sheet.add_row ["This row will have a fixed height", "It will overwite the default row height"], :height => 30
+      sheet.add_row ["This row can have a different height too"], :height => 10, :style => head
+    end
+  end
+end
+
+
 #```ruby
 if examples.include? :outline_level
   wb.add_worksheet(name: 'outline_level') do |sheet|
@@ -279,13 +301,23 @@ if examples.include? :images
   wb.add_worksheet(:name => "Image with Hyperlink") do |sheet|
     img = File.expand_path('../image1.jpeg', __FILE__)
     # specifying the :hyperlink option will add a hyper link to your image.
+    #
     # @note - Numbers does not support this part of the specification.
+
     sheet.add_image(:image_src => img, :noSelect => true, :noMove => true, :hyperlink=>"http://axlsx.blogspot.com") do |image|
       image.width=720
       image.height=666
       image.hyperlink.tooltip = "Labeled Link"
-      image.start_at 2, 2
+      image.start_at 0, 0
     end
+
+    # position in block
+    sheet.add_image(:image_src => img, :noSelect => true, :noMove => true, :hyperlink=>"http://axlsx.blogspot.com") do |image|
+      image.start_at 22, 14
+      image.end_at 23, 17
+    end
+    # all in one go
+    sheet.add_image(:image_src => img, :start_at => [15, 33], :end_at => [20, 37], :noSelect => true, :noMove => true, :hyperlink=>"http://axlsx.blogspot.com")
   end
 end
 #```
@@ -470,7 +502,7 @@ if examples.include? :line_chart
     sheet.add_chart(Axlsx::LineChart, :title => "Simple Line Chart", :rotX => 30, :rotY => 20) do |chart|
       chart.start_at 0, 21
       chart.end_at 10, 41
-      chart.add_series :data => sheet["A3:A6"], :title => sheet["A2"], :color => "FF0000"
+      chart.add_series :data => sheet["A3:A6"], :title => sheet["A2"], :color => "FF0000", :show_marker => true, :smooth => true
       chart.add_series :data => sheet["B3:B6"], :title => sheet["B2"], :color => "00FF00"
       chart.catAxis.title = 'X Axis'
       chart.valAxis.title = 'Y Axis'
@@ -554,6 +586,7 @@ if examples.include? :defined_name
   wb.add_worksheet(:name => 'defined name') do |sheet|
     sheet.add_row [1, 2, 17, '=FOOBAR']
     wb.add_defined_name("'defined name'!$C1", :local_sheet_id => sheet.index, :name => 'FOOBAR')
+    wb.add_defined_name("'defined name'!$A$1:$C$1", :local_sheet_id => sheet.index, :name => '_xlnm.Print_Area')
   end
 end
 
@@ -561,10 +594,17 @@ end
 if examples.include? :sheet_protection
   unlocked = wb.styles.add_style :locked => false
   wb.add_worksheet(:name => 'Sheet Protection') do |sheet|
-    sheet.sheet_protection.password = 'fish'
-    sheet.add_row [1, 2 ,3] # These cells will be locked
-    sheet.add_row [4, 5, 6], :style => unlocked # these cells will not!
+    sheet.sheet_protection do |protection|
+      protection.password = 'fish'
+      protection.auto_filter = false
+    end
+
+    sheet.add_row [1, 2 ,3],  :style => unlocked # These cells will be locked
+    sheet.add_row [4, 5, 6]
+    sheet.add_row [7, 8, 9]
+    sheet.auto_filter = "A1:C3"
   end
+
 end
 
 ##Specify page margins and other options for printing
@@ -644,12 +684,33 @@ if examples.include? :sheet_view
   end
 end
 
+## Book Views
+#
+## Book views let you specify which sheet the show as active when the user opens the work book as well as a bunch of other
+## tuning values for the UI @see Axlsx::WorkbookView
+## ```ruby
+if examples.include? :book_view
+  # when you open example.xml the second sheet is selected, and the horizontal scroll bar is much smaller showing more sheets
+  wb.add_view tab_ratio: 800, active_tab: 1
+end
 
+## Hiding Sheets
+##
+## Sheets can be hidden with the state attribute
+if examples.include? :hiding_sheets
+  wb.add_worksheet name: 'hidden', state: :hidden do |sheet|
+    sheet.add_row ['you cant see me!']
+  end
+  wb.add_worksheet name: 'very hidden', state: :very_hidden do |sheet|
+    sheet.add_row ['you really cant see me!']
+  end
+end
 # conditional formatting
 #
 if examples.include? :conditional_formatting
   percent = wb.styles.add_style(:format_code => "0.00%", :border => Axlsx::STYLE_THIN_BORDER)
   money = wb.styles.add_style(:format_code => '0,000', :border => Axlsx::STYLE_THIN_BORDER)
+  status = wb.styles.add_style(:border => Axlsx::STYLE_THIN_BORDER)
 
   # define the style for conditional formatting
   profitable = wb.styles.add_style( :fg_color => "FF428751", :type => :dxf )
@@ -713,6 +774,19 @@ if examples.include? :conditional_formatting
     icon_set = Axlsx::IconSet.new
     sheet.add_conditional_formatting("B3:B100", { :type => :iconSet, :dxfId => profitable, :priority => 1, :icon_set => icon_set })
   end
+
+  wb.add_worksheet(:name => "Contains Text") do |sheet|
+    sheet.add_row ["Previous Year Quarterly Profits (JPY)"]
+    sheet.add_row ["Quarter", "Profit", "% of Total", "Status"]
+    offset = 3
+    rows = 20
+    offset.upto(rows + offset) do |i|
+      sheet.add_row ["Q#{i}", 10000*((rows/2-i) * (rows/2-i)), "=100*B#{i}/SUM(B3:B#{rows+offset})", (10000*((rows/2-i) * (rows/2-i))) > 100000 ? "PROFIT" : "LOSS"], :style=>[nil, money, percent, status]
+    end
+  # Apply conditional formatting to range D3:D100 in the worksheet to match words.
+    sheet.add_conditional_formatting("D3:D100", { :type => :containsText, :operator => :equal, :text => "PROFIT", :dxfId => profitable, :priority => 1 })
+    sheet.add_conditional_formatting("D3:D100", { :type => :containsText, :operator => :equal, :text => "LOSS", :dxfId => unprofitable, :priority => 1 })
+  end
 end
 
 # Page Breaks
@@ -763,8 +837,7 @@ if examples.include? :no_autowidth
 end
 #```
 
-
-
+#```ruby
 if examples.include? :cached_formula
   p = Axlsx::Package.new
   p.use_shared_strings = true
@@ -774,4 +847,39 @@ if examples.include? :cached_formula
   end
   p.serialize 'cached_formula.xlsx'
 end
+#```
+
+#```ruby
+if examples.include? :rich_text
+  p = Axlsx::Package.new
+  p.use_shared_strings = true
+  wb = p.workbook
+  wrap_text = wb.styles.add_style({:alignment => {:horizontal => :center, :vertical => :center, :wrap_text => true}}  )
+  rt = Axlsx::RichText.new
+  rt.add_run('I\'m bold, ', :b => true)
+  rt.add_run('I\'m italic, ', :i => true)
+  rt.add_run('I\'m strike' + "\n", :strike => true)
+  rt.add_run('I\'m bold, italic and strike' + "\n", :b => true, :i => true, :strike => true)
+  rt.add_run('I\'m style-less :D')
+  wb.add_worksheet(:name => "RichText") do | sheet |
+    sheet.add_row [rt], :style => wrap_text
+  end
+  p.serialize 'rich_text.xlsx'
+end
+#```
+
+##Change tab color of sheet
+
+#```ruby
+if examples.include? :tab_color
+  p = Axlsx::Package.new
+  p.use_shared_strings = true
+  wb = p.workbook
+  wb.add_worksheet(:name => "Change Tab Color") do |sheet|
+    sheet.add_row ["Check", "out", "the", "Tab Color", "below!"]
+    sheet.sheet_pr.tab_color = "FFFF6666"
+  end
+  p.serialize 'tab_color.xlsx'
+end
+##```