rubyXL-addressing 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 366a2c486d1f03f243734f41717c5ead0f479df6
-  data.tar.gz: fab7783dec00ce4309892f36cffb668101741eba
+  metadata.gz: b27386b029963ccb2f11d6e9324d41fb903f1c7a
+  data.tar.gz: 9f62f5a03c5212eed1d739256b26092a75404ef2
 SHA512:
-  metadata.gz: c8291d02ca52a48f944f33aa57dcd20071c07e4e34c05b7fcb3f24bfdc513e23d3b2c9477a3f4fede4989118af8c85522d0b30772605b45d89c151d3629934df
-  data.tar.gz: 9f0ee399e07d073cd0b81246752a19018e31db311041476aa69a17a77a5255f32785b74220b4677e835355c41bc423f9cc365ce451977d7b00fd2341a2b13f70
+  metadata.gz: 2c4469b190ff194cd6e5bc8475e07c1b7939d9eacf496b911a359d80b973a88104be3eb59cbc36ddba39781d78ab9607658a506ac657a5bb1bd5f82b3416e890
+  data.tar.gz: c82f77ee0daa53f1a6dd5c04d57c4dab75d6bb69706fb47f8c83f7cf74cb4af658990a338829e0056bd1b1241d9aabbdf24df85c572aa546783a99cd0d98ebf0

data/.rubocop.yml

@@ -12,6 +12,7 @@ Metrics/AbcSize:
 
 Metrics/ClassLength:
   Exclude:
+    - lib/rubyXL/address.rb
     - test/**/*_test.rb
 
 Metrics/LineLength:

data/lib/rubyXL/address.rb

@@ -1,7 +1,72 @@
 # frozen_string_literal: true
 
+require 'rubyXL/objects/reference'
+
 module RubyXL
   class Address
+    ROW_REF_FORMAT    = /\A[1-9]\d*\z/
+    COLUMN_REF_FORMAT = /\A[A-Z]+\z/
+
+    class << self
+      # @param [Integer] ind
+      # @return [String]
+      def row_ind2ref(ind)
+        validate_index(:row, ind)
+
+        (ind + 1).to_s.freeze
+      end
+
+      # @param [Integer] ind
+      # @return [String]
+      def column_ind2ref(ind)
+        validate_index(:column, ind)
+
+        ref = ''.dup
+        loop do
+          ref.prepend((ind % 26 + 65).chr)
+          ind = ind / 26 - 1
+          break if ind < 0
+        end
+        ref.freeze
+      end
+
+      # @param [String, Symbol] ref
+      # @return [Integer]
+      def row_ref2ind(ref)
+        message = "invalid row #{ref.inspect}"
+        raise ArgumentError, message unless ROW_REF_FORMAT =~ ref
+
+        ref.to_s.to_i - 1
+      end
+
+      # @param [String, Symbol] ref
+      # @return [Integer]
+      def column_ref2ind(ref)
+        message = "invalid column #{ref.inspect}"
+        raise ArgumentError, message unless COLUMN_REF_FORMAT =~ ref
+
+        ref.to_s.each_byte.reduce(0) { |a, e| a * 26 + (e - 64) } - 1
+      end
+
+      private
+
+      def normalize(row_or_column, value)
+        case value
+        when String, Symbol
+          value = public_send("#{row_or_column}_ref2ind", value)
+        else
+          validate_index(row_or_column, value)
+        end
+        value
+      end
+
+      def validate_index(row_or_column, index)
+        message = "invalid #{row_or_column} #{index.inspect}"
+        raise TypeError,     message unless index.is_a?(Integer)
+        raise ArgumentError, message unless index >= 0
+      end
+    end
+
     # @param [RubyXL::Worksheet] worksheet
     # @return [RubyXL::Worksheet]
     attr_writer :worksheet
@@ -13,7 +78,7 @@ module RubyXL
     def initialize(worksheet, ref: nil, row: nil, column: nil)
       @worksheet = worksheet
 
-      row, column = Reference.ref2ind(ref) if ref
+      row, column = RubyXL::Reference.ref2ind(ref) if ref
       self.row    = row
       self.column = column
     end
@@ -51,18 +116,18 @@ module RubyXL
     # @param [Integer, String, Symbol] row
     # @return [Integer, String, Symbol]
     def row=(row)
-      @row = Addressing.__send__(:normalize, :row, row)
+      @row = self.class.__send__(:normalize, :row, row)
     end
 
     # @param [Integer, String, Symbol] column
     # @return [Integer, String, Symbol]
     def column=(column)
-      @column = Addressing.__send__(:normalize, :column, column)
+      @column = self.class.__send__(:normalize, :column, column)
     end
 
     # @return [String]
     def ref
-      Reference.ind2ref(@row, @column)
+      RubyXL::Reference.ind2ref(@row, @column)
     end
 
     # @return [String]

data/lib/rubyXL/addressing.rb

@@ -1,75 +1,11 @@
 # frozen_string_literal: true
 
 require 'rubyXL/addressing/version'
-require 'rubyXL'
 
 module RubyXL
   autoload :Address, 'rubyXL/address'
 
   module Addressing
-    ROW_REF_FORMAT    = /\A[1-9]\d*\z/
-    COLUMN_REF_FORMAT = /\A[A-Z]+\z/
-
-    class << self
-      # @param [Integer] ind
-      # @return [String]
-      def row_ind2ref(ind)
-        validate_index(:row, ind)
-
-        (ind + 1).to_s.freeze
-      end
-
-      # @param [Integer] ind
-      # @return [String]
-      def column_ind2ref(ind)
-        validate_index(:column, ind)
-
-        ref = ''.dup
-        loop do
-          ref.prepend((ind % 26 + 65).chr)
-          ind = ind / 26 - 1
-          break if ind < 0
-        end
-        ref.freeze
-      end
-
-      # @param [String, Symbol] ref
-      # @return [Integer]
-      def row_ref2ind(ref)
-        message = "invalid row #{ref.inspect}"
-        raise ArgumentError, message unless ROW_REF_FORMAT =~ ref
-
-        ref.to_s.to_i - 1
-      end
-
-      # @param [String, Symbol] ref
-      # @return [Integer]
-      def column_ref2ind(ref)
-        message = "invalid column #{ref.inspect}"
-        raise ArgumentError, message unless COLUMN_REF_FORMAT =~ ref
-
-        ref.to_s.each_byte.reduce(0) { |a, e| a * 26 + (e - 64) } - 1
-      end
-
-      private
-
-      def normalize(row_or_column, value)
-        case value
-        when String, Symbol
-          value = public_send("#{row_or_column}_ref2ind", value)
-        else
-          validate_index(row_or_column, value)
-        end
-        value
-      end
-
-      def validate_index(row_or_column, index)
-        message = "invalid #{row_or_column} #{index.inspect}"
-        raise TypeError,     message unless index.is_a?(Integer)
-        raise ArgumentError, message unless index >= 0
-      end
-    end
-
     # @param [String, Symbol, Integer] ref_or_row is ref `'A1'`
     #                                             or row index `0`
     #                                             or row label `'1'`
@@ -78,12 +14,13 @@ module RubyXL
     # @return [RubyXL::Address]
     def addr(ref_or_row, column = nil)
       if column.nil?
-        Address.new(self, ref: ref_or_row)
+        RubyXL::Address.new(self, ref: ref_or_row)
       else
-        Address.new(self, row: ref_or_row, column: column)
+        RubyXL::Address.new(self, row: ref_or_row, column: column)
       end
     end
   end
-
-  Worksheet.include(Addressing)
 end
+
+require 'rubyXL'
+RubyXL::Worksheet.include(RubyXL::Addressing)

data/lib/rubyXL/addressing/version.rb

@@ -2,6 +2,6 @@
 
 module RubyXL
   module Addressing
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyXL-addressing
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Masaki Takeuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL