rubyXL 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757201515ef2f38f298f730bd69a48e0783f79b0
-  data.tar.gz: 90ec3bb349ee82d7513eac807fa327d01a8e3f6f
+  metadata.gz: d456590dae2fb8f78d0c34a547a4d00073567315
+  data.tar.gz: d40b3e93e2f3bcd1f2a358b9da3d095572fd6612
 SHA512:
-  metadata.gz: 28a03421fe9bb50618879a688d444d033cfdbe28047f68e2613e0667c0ce25ec223d5f04130f3abcf0f24c565a37668d7134430cd37bb70a746e0f22c55dec10
-  data.tar.gz: f5a03e54b0038aeeac4cdfc95c97a9eb25b8b836305c45b9fc5283781b343f213b1e8878b662c64b5a72f26b3e558ce177bd64eaf6abfa0c450bfb00f664c7e1
+  metadata.gz: d1c4a166c0793e0bd7ecc87e4755469d7f7c4f699f1fb1794ea4aaa883c80e2cf2255aae0d9b453f210b6cf69953ed7df3359af0d6e41547344a02ebc5b29845
+  data.tar.gz: 6963fba9480a4669bc829a303fae72416b7a03da5adefb82073cd327def5c89ec7f99de84706a37db21a6ff185fcee61231ee3f6d8ed64c72fe7c05ebc8984cc

data/VERSION

@@ -1 +1 @@
-3.3.3
+3.3.5

data/lib/rubyXL/cell.rb

@@ -114,73 +114,6 @@ module RubyXL
       self.raw_value = data
     end
 
-    # returns if font is italicized
-    def is_italicized()
-      validate_worksheet
-      get_cell_font.is_italic
-    end
-
-    # returns if font is bolded
-    def is_bolded()
-      validate_worksheet
-      get_cell_font.is_bold
-    end
-
-    def is_underlined()
-      validate_worksheet
-      get_cell_font.is_underlined
-    end
-
-    def is_struckthrough()
-      validate_worksheet
-      get_cell_font.is_strikethrough
-    end
-
-    def font_name()
-      validate_worksheet
-      get_cell_font.get_name
-    end
-
-    def font_size()
-      validate_worksheet
-      get_cell_font.get_size
-    end
-
-    def font_color()
-      validate_worksheet
-      get_cell_font.get_rgb_color || '000000'
-    end
-
-    # returns cell's fill color
-    def fill_color()
-      validate_worksheet
-      return workbook.get_fill_color(get_cell_xf)
-    end
-
-    # returns cell's horizontal alignment
-    def horizontal_alignment()
-      validate_worksheet
-      xf_obj = get_cell_xf
-      return nil if xf_obj.alignment.nil?
-      xf_obj.alignment.horizontal
-    end
-
-    # returns cell's vertical alignment
-    def vertical_alignment()
-      validate_worksheet
-      xf_obj = get_cell_xf
-      return nil if xf_obj.alignment.nil?
-      xf_obj.alignment.vertical
-    end
-
-    # returns cell's wrap
-    def text_wrap()
-      validate_worksheet
-      xf_obj = get_cell_xf
-      return nil if xf_obj.alignment.nil?
-      xf_obj.alignment.wrap_text
-    end
-
     def inspect
       str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}"
       str += " =#{self.formula.expression}" if self.formula

data/lib/rubyXL/convenience_methods.rb

@@ -233,37 +233,26 @@ module RubyXL
       border && border.get_edge_style(border_direction)
     end
 
-    def get_row_horizontal_alignment(row = 0)
-      return get_row_alignment(row, true)
-    end
-
-    def get_row_vertical_alignment(row = 0)
-      return get_row_alignment(row, false)
-    end
+    def get_row_alignment(row, is_horizontal)
+      validate_workbook
+      validate_nonnegative(row)
 
-    def get_row_border_top(row = 0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_border` instead."
-      return get_row_border(row, :top)
-    end
+      xf_obj = get_row_xf(row)
+      return nil if xf_obj.alignment.nil?
 
-    def get_row_border_left(row = 0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_border` instead."
-      return get_row_border(row, :left)
-    end
-
-    def get_row_border_right(row = 0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_border` instead."
-      return get_row_border(row, :right)
+      if is_horizontal then return xf_obj.alignment.horizontal
+      else                  return xf_obj.alignment.vertical
+      end
     end
 
-    def get_row_border_bottom(row = 0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_border` instead."
-      return get_row_border(row, :bottom)
+    def get_row_horizontal_alignment(row = 0)
+      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_alignment` instead."
+      return get_row_alignment(row, true)
     end
 
-    def get_row_border_diagonal(row = 0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_border` instead."
-      return get_row_border(row, :diagonal)
+    def get_row_vertical_alignment(row = 0)
+      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_alignment` instead."
+      return get_row_alignment(row, false)
     end
 
     def get_column_font_name(col = 0)
@@ -342,41 +331,6 @@ module RubyXL
       xf.alignment && xf.alignment.send(type)
     end
 
-    def get_column_horizontal_alignment(col=0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_column_alignment` instead."
-      get_column_alignment(col, :horizontal)
-    end
-
-    def get_column_vertical_alignment(col=0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_column_alignment` instead."
-      get_column_alignment(col, :vertical)
-    end
-
-    def get_column_border_top(col=0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_column_border` instead."
-      get_column_border(col, :top)
-    end
-
-    def get_column_border_left(col=0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_column_border` instead."
-      get_column_border(col, :left)
-    end
-
-    def get_column_border_right(col=0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_column_border` instead."
-      get_column_border(col, :right)
-    end
-
-    def get_column_border_bottom(col=0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_column_border` instead."
-      get_column_border(col, :bottom)
-    end
-
-    def get_column_border_diagonal(col=0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_column_border` instead."
-      get_column_border(col, :diagonal)
-    end
-
     def change_row_horizontal_alignment(row = 0, alignment = 'center')
       validate_workbook
       validate_nonnegative(row)
@@ -389,31 +343,6 @@ module RubyXL
       change_row_alignment(row) { |a| a.vertical = alignment }
     end
 
-    def change_row_border_top(row = 0, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_row_border` instead."
-      change_row_border(row, :top, weight)
-    end
-
-    def change_row_border_left(row = 0, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_row_border` instead."
-      change_row_border(row, :left, weight)
-    end
-
-    def change_row_border_right(row = 0, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_row_border` instead."
-      change_row_border(row, :right, weight)
-    end
-
-    def change_row_border_bottom(row = 0, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_row_border` instead."
-      change_row_border(row, :bottom, weight)
-    end
-
-    def change_row_border_diagonal(row = 0, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_row_border` instead."
-      change_row_border(row, :diagonal, weight)
-    end
-
     def change_row_border(row, direction, weight)
       validate_workbook
       ensure_cell_exists(row)
@@ -552,31 +481,6 @@ module RubyXL
       change_column_alignment(column_index) { |a| a.vertical = alignment }
     end
 
-    def change_column_border_top(column_index, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_column_border` instead."
-      change_column_border(column_index, :top, weight)
-    end
-
-    def change_column_border_left(column_index, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_column_border` instead."
-      change_column_border(column_index, :left, weight)
-    end
-
-    def change_column_border_right(column_index, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_column_border` instead."
-      change_column_border(column_index, :right, weight)
-    end
-
-    def change_column_border_bottom(column_index, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_column_border` instead."
-      change_column_border(column_index, :bottom, weight)
-    end
-
-    def change_column_border_diagonal(column_index, weight = 'thin')
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `change_column_border` instead."
-      change_column_border(column_index, :diagonal, weight)
-    end
-
     def change_column_border(column_index, direction, weight)
       validate_workbook
       ensure_cell_exists(0, column_index)
@@ -647,6 +551,67 @@ module RubyXL
       self.style_index = workbook.modify_border(self.style_index, direction, weight)
     end
 
+    def is_italicized()
+      validate_worksheet
+      get_cell_font.is_italic
+    end
+
+    def is_bolded()
+      validate_worksheet
+      get_cell_font.is_bold
+    end
+
+    def is_underlined()
+      validate_worksheet
+      get_cell_font.is_underlined
+    end
+
+    def is_struckthrough()
+      validate_worksheet
+      get_cell_font.is_strikethrough
+    end
+
+    def font_name()
+      validate_worksheet
+      get_cell_font.get_name
+    end
+
+    def font_size()
+      validate_worksheet
+      get_cell_font.get_size
+    end
+
+    def font_color()
+      validate_worksheet
+      get_cell_font.get_rgb_color || '000000'
+    end
+
+    def fill_color()
+      validate_worksheet
+      return workbook.get_fill_color(get_cell_xf)
+    end
+
+    def horizontal_alignment()
+      validate_worksheet
+      xf_obj = get_cell_xf
+      return nil if xf_obj.alignment.nil?
+      xf_obj.alignment.horizontal
+    end
+
+    def vertical_alignment()
+      validate_worksheet
+      xf_obj = get_cell_xf
+      return nil if xf_obj.alignment.nil?
+      xf_obj.alignment.vertical
+    end
+
+    def text_wrap()
+      validate_worksheet
+      xf_obj = get_cell_xf
+      return nil if xf_obj.alignment.nil?
+      xf_obj.alignment.wrap_text
+    end
+
   end
 
 end

data/lib/rubyXL/objects/font.rb

@@ -27,7 +27,7 @@ module RubyXL
     define_element_name 'font'
 
     def is_italic
-      i && i.val
+      i && (i.val || true)
     end
 
     def set_italic(val)
@@ -35,7 +35,7 @@ module RubyXL
     end
 
     def is_bold
-      b && b.val
+      b && (b.val || true)
     end
 
     def set_bold(val)
@@ -43,7 +43,7 @@ module RubyXL
     end
 
     def is_underlined
-      u && u.val
+      u && (u.val || true)
     end
 
     def set_underline(val)
@@ -51,7 +51,7 @@ module RubyXL
     end
 
     def is_strikethrough
-      strike && strike.val
+      strike && (strike.val || true)
     end
 
     def set_strikethrough(val)

data/lib/rubyXL/worksheet.rb

@@ -322,18 +322,6 @@ module LegacyWorksheet
     (row = sheet_data.rows[row]) && row.get_font
   end
 
-  def get_row_alignment(row, is_horizontal)
-    validate_workbook
-    validate_nonnegative(row)
-
-    xf_obj = get_row_xf(row)
-    return nil if xf_obj.alignment.nil?
-
-    if is_horizontal then return xf_obj.alignment.horizontal
-    else                  return xf_obj.alignment.vertical
-    end
-  end
-
   def column_font(col)
     validate_workbook
     validate_nonnegative(col)

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.3.3</title>
+<title>README - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.3.3</title>
+<title>module RubyXL - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 3.3.3</title>
+<title>class RubyXL::AExtension - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.3</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AdjustHandleList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AdjustHandleList - rubyXL 3.3.3</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Alignment.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Alignment - rubyXL 3.3.3</title>
+<title>class RubyXL::Alignment - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AlternateContent.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AlternateContent - rubyXL 3.3.3</title>
+<title>class RubyXL::AlternateContent - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Authors.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Authors - rubyXL 3.3.3</title>
+<title>class RubyXL::Authors - rubyXL 3.3.5</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";