rrxcell 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6046fab2b9b6c239f6a76716b1a3a5159532eb9
-  data.tar.gz: 95614643bd2a05dc25200344745f6719e8a986b8
+  metadata.gz: 35618ff57d747cacd603dd2d4771f08c71a2bba4
+  data.tar.gz: e7bd1240b834f139594b606046729ed5feb8c430
 SHA512:
-  metadata.gz: c1bd9daa5fcded11c6c7c16eadc1b3aa44ce2e2c4e03e3edac1a551d9e0376cc367e3c62110d34a2476c858909ad1551d35baa8ff874aaa60478029b616322c8
-  data.tar.gz: d4926d02b35e2e25e10a4de29032e1ecdf2444e4d158bc36bf76ba2447743c5a8359951313bd15621a9e54a1d6ed049597f02c6f060cc19310b716f9075863be
+  metadata.gz: 060bbc3ee2ba1bf40907683b7a82fcf545c81c77c3fa70ca6e69ccb6b3bffde2bbd8d1317e3ed37336f5af41dd7337c810bc1ffa8e1459432d7b05c2632945e7
+  data.tar.gz: cfc5c9021e196c8ecd46d8fcb24280200aa4bd3e6632a3454546c8b01fae35c144fea127433a7032757ac351f9e506544efdf7624ffbae5555df092dfa713592

data/.gitignore

@@ -103,3 +103,6 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
+
+# excel temporary file
+~$*

data/README.md

@@ -25,7 +25,8 @@ require "rrxcell"
 
 #--------------------#
 # Excelx file with '.xlsx'
-path = File.expand_path("PATH/TO/FILE.xlsx")
+# Excel file with '.xls'
+path = File.expand_path("PATH/TO/FILE.xlsx") # or "PATH/TO/FILE.xls"
 book = Rrxcell.load(path)
 
 puts book.sheet(0).row(0).column(0).value
@@ -34,16 +35,18 @@ puts book.sheet(0).row(0).column(0).value
 puts book[0][1][2].value
 # => "Sheet1!C2"
 
-#--------------------#
-# Excelx file with '.xls'
-path = File.expand_path("PATH/TO/FILE.xls")
-book = Rrxcell.load(path)
+puts book.address("Sheet1!B2").value
+# => "Sheet1!B2"
 
-puts book.sheet(0).row(0).column(0).value
-# => "Sheet1!A1"
+puts book.sheet(0).address("B2").value
+# => "Sheet1!B2"
+
+puts book.sheet_names
+# => ["Sheet1"]
+
+puts book.sheet("Sheet1").address("AB3").value
+# => "Sheet1!AB3"
 
-puts book[0][1][2].value
-# => "Sheet1!C2"
 
 ```
 

data/lib/rrxcell/addressing.rb

@@ -0,0 +1,73 @@
+module Rrxcell::Addressing
+  ALPHABET_CHARCTORS = 26
+
+  class << self
+    def cell_address_to_column_position(cell_address)
+      v = 0
+      factor = 1
+      
+      column_string(cell_address).reverse.each_char do |char|
+        _v = char.downcase.ord - "a".ord + 1
+        v += ((_v * factor) - 1)
+        factor += ALPHABET_CHARCTORS
+      end
+
+      v
+    end
+    
+    def cell_address_to_row_column_position(cell_address)
+      [
+        cell_address_to_row_position(cell_address),
+        cell_address_to_column_position(cell_address)
+      ]
+    end
+    
+    def cell_address_to_row_position(cell_address)
+      row_string(cell_address).to_i - 1
+    end
+    
+    def cell_address_to_sheet_position(cell_address, book = nil)
+      validate_book!(book)
+      book.sheet_names.index(sheet_string(cell_address))
+    end
+    
+    def cell_address_to_sheet_row_column_position(cell_address, book = nil)
+      validate_book!(book)
+      [
+        cell_address_to_sheet_position(cell_address, book),
+        cell_address_to_row_column_position(cell_address)
+      ].flatten
+    end
+    
+    private
+      
+      def column_string(cell_address)
+        validate_cell_address!(cell_address)
+        cell_address.scan(/\!*([[:alpha:]]+)/).flatten.last
+      end
+      
+      def row_string(cell_address)
+        validate_cell_address!(cell_address)
+        cell_address.match(/[0-9]+\z/).to_s
+      end
+      
+      def sheet_string(cell_address)
+        validate_cell_address!(cell_address)
+        cell_address.scan(/\A(.+)\!/).flatten.first
+      end
+      
+      def validate_cell_address!(cell_address)
+        return true if cell_address.match(/\A[[:alpha:]]+[0-9]+\z/)
+        
+        unless cell_address.match(/\A.+\![[:alpha:]]+[0-9]+\z/)
+          raise "invalid address" 
+        end
+        true
+      end
+      
+      def validate_book!(book)
+        raise "invalid Rrxcell::Book" unless book.is_a?(Rrxcell::Book)
+        true
+      end
+  end
+end

data/lib/rrxcell/book.rb

@@ -6,16 +6,49 @@ class Rrxcell::Book
     @path = path
   end
   
-  def [](position)
-    sheet(position)
+  def [](position_or_sheet_name)
+    case position_or_sheet_name
+    when Numeric
+      sheet(position_or_sheet_name)
+    when String
+      sheet(sheet_position_by_name!(position_or_sheet_name))
+    else
+      raise "invalid sheet position"
+    end
+  end
+  
+  def address(cell_address)
+    sheet_position, row_position, column_position =
+      Rrxcell::Addressing.cell_address_to_sheet_row_column_position(cell_address, self)
+    
+    sheet(sheet_position).row(row_position).column(column_position)
   end
   
   def sheet(position)
     raise ShouldBeImplementedError
   end
   
+  def sheets
+    sheet_names.map { |s| sheet(sheet_names.index(s)) }
+  end
+  
+  def sheet_names
+    object.sheets
+  end
+  
   protected
   
     attr_reader :book
 
+  private
+  
+    def cell_address_to_sheet_row_column_position(cell_address)
+      validate_cell_address!(cell_address)
+    end
+    
+    def sheet_position_by_name!(name)
+      pos = sheet_names.index(name)
+      raise if pos.nil?
+      pos
+    end
 end

data/lib/rrxcell/cell.rb

@@ -1,5 +1,5 @@
 class Rrxcell::Cell
-  attr_reader :row
+  attr_reader :row, :position
   
   def initialize(row, position)
     super()
@@ -7,6 +7,18 @@ class Rrxcell::Cell
     @position = position
   end
   
+  def book
+    row.book
+  end
+  
+  def object
+    raise ShouldBeImplementedError
+  end
+  
+  def sheet
+    row.sheet
+  end
+  
   def value
     raise ShouldBeImplementedError
   end

data/lib/rrxcell/excel/book.rb

@@ -3,10 +3,10 @@ require "rrxcell/book"
 
 class Rrxcell::Excel::Book < Rrxcell::Book
   def object
-    @object ||= Roo::Excel.new(@path)
+    @object ||= Roo::Excel.new(path)
   end
   
-  def sheet(position)
-    Rrxcell::Excel::Sheet.new(self, position)
+  def sheet(sheet_position)
+    Rrxcell::Excel::Sheet.new(self, sheet_position)
   end
 end

data/lib/rrxcell/excel/cell.rb

@@ -2,7 +2,30 @@ require "rrxcell/excel"
 require "rrxcell/cell"
 
 class Rrxcell::Excel::Cell < Rrxcell::Cell
+  def type
+    book.object.celltype(row.position + 1 , position + 1, sheet.position)
+  end
+  
   def value
-    @row.sheet.book.object.cell(@row.position + 1, @position + 1, @row.sheet.position)
+    case type
+    when :time
+      value_as_time
+    else
+      raw_value
+    end
   end
+  
+  private
+  
+    def raw_value
+      book.object.cell(row.position + 1, position + 1, sheet.position)
+    end
+    
+    def value_as_time
+      h = (raw_value / 3600).to_i
+      m = (((raw_value / 60).to_i) % 60).to_i
+      s = (raw_value % 60).to_i
+      today = Date.today
+      Time.new(today.year, today.month, today.day, h, m, s)
+    end
 end

data/lib/rrxcell/excel/row.rb

@@ -2,11 +2,11 @@ require "rrxcell/excel"
 require "rrxcell/row"
 
 class Rrxcell::Excel::Row < Rrxcell::Row
-  def column(position)
-    Rrxcell::Excel::Cell.new(self, position)
+  def column(column_position)
+    Rrxcell::Excel::Cell.new(self, column_position)
   end
   
   def object
-    @sheet.object.row(@position)
+    sheet.object.row(position)
   end
 end

data/lib/rrxcell/excel/sheet.rb

@@ -3,10 +3,10 @@ require "rrxcell/sheet"
 
 class Rrxcell::Excel::Sheet < Rrxcell::Sheet
   def object
-    @object ||= @book.object.worksheets[@position]
+    @object ||= book.object.worksheets[position]
   end
   
-  def row(position)
-    Rrxcell::Excel::Row.new(self, position)
+  def row(row_position)
+    Rrxcell::Excel::Row.new(self, row_position)
   end
 end

data/lib/rrxcell/excelx/book.rb

@@ -3,7 +3,7 @@ require "rrxcell/book"
 
 class Rrxcell::Excelx::Book < Rrxcell::Book
   def object
-    @object ||= Roo::Excelx.new(@path)
+    @object ||= Roo::Excelx.new(path)
   end
   
   def sheet(position)

data/lib/rrxcell/excelx/cell.rb

@@ -2,7 +2,34 @@ require "rrxcell/excelx"
 require "rrxcell/cell"
 
 class Rrxcell::Excelx::Cell < Rrxcell::Cell
+  def type
+    sheet.object.celltype(row.position + 1 , position + 1)
+  end
+  
+  def object
+    sheet.object.cell(row.position + 1, position + 1)
+  end
+  
   def value
-    @row.object.at(@position)
+    case type
+    when :time
+      value_as_time
+    else
+      raw_value
+    end
   end
+  
+  private
+  
+    def raw_value
+      row.object.at(position)
+    end
+    
+    def value_as_time
+      h = (raw_value / 3600).to_i
+      m = (((raw_value / 60).to_i) % 60).to_i
+      s = (raw_value % 60).to_i
+      today = Date.today
+      Time.new(today.year, today.month, today.day, h, m, s)
+    end
 end

data/lib/rrxcell/excelx/row.rb

@@ -7,6 +7,6 @@ class Rrxcell::Excelx::Row < Rrxcell::Row
   end
   
   def object
-    @sheet.object.row(@position + 1)
+    sheet.object.row(position + 1)
   end
 end

data/lib/rrxcell/excelx/sheet.rb

@@ -3,10 +3,10 @@ require "rrxcell/sheet"
 
 class Rrxcell::Excelx::Sheet < Rrxcell::Sheet
   def object
-    @book.object.sheet(@position)
+    book.object.sheet(position)
   end
   
-  def row(position)
-    Rrxcell::Excelx::Row.new(self, position)
+  def row(row_position)
+    Rrxcell::Excelx::Row.new(self, row_position)
   end
 end

data/lib/rrxcell/row.rb

@@ -11,6 +11,10 @@ class Rrxcell::Row
     column(position)
   end
   
+  def book
+    sheet.book
+  end
+  
   def column(position)
     raise ShouldBeImplementedError
   end

data/lib/rrxcell/sheet.rb

@@ -7,11 +7,28 @@ class Rrxcell::Sheet
     @position = position
   end
   
-  def [](position)
-    row(position)
+  def [](row_position)
+    row(row_position)
   end
   
-  def row(position)
+  def address(cell_address)
+    row_position, column_position = Rrxcell::Addressing.cell_address_to_row_column_position(cell_address)
+    
+    row(row_position).column(column_position)
+  end
+  
+  def name
+    book.sheet_names[position]
+  end
+  
+  def object
     raise ShouldBeImplementedError
   end
+  
+  def row(row_position)
+    raise ShouldBeImplementedError
+  end
+  
+  private
+  
 end

data/lib/rrxcell/version.rb

@@ -1,3 +1,3 @@
 module Rrxcell
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrxcell
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - sekizo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - example/book.xls
 - example/book.xlsx
 - lib/rrxcell.rb
+- lib/rrxcell/addressing.rb
 - lib/rrxcell/book.rb
 - lib/rrxcell/cell.rb
 - lib/rrxcell/errors/should_be_implemented_error.rb