rubyXL-addressing 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a251d2a6809a53c0336e2f33fb94fe7f323a946a
-  data.tar.gz: 6456b655fb52580ef39afca0b0bcb2c91e4047df
+  metadata.gz: 0631645fffcb1b80f72b10339b3150d1e1b5e187
+  data.tar.gz: e66ca645218f47ace24fa1341205807f68ecf9e9
 SHA512:
-  metadata.gz: 3b7e5352f1a0e0630932b0f4e9683754db30d5c66cb649f9bdd03d6a47ca5183a7775634f75fcce00862b9e7875da001b8933525d5dc1dfbbac3c073d355d06f
-  data.tar.gz: e62d77e745c40b33311abe10c46c486f78579c81f91147b1107e954af432aa708b85c0e347a1b9ab09b575ca65ba9702182b3ea0f83946021868b5325d064450
+  metadata.gz: 37ce540e93dda95bc1f9faef6f36b1214bbb817d74c92de09fb12184ad0e0cbb139026c92c5331e3d197a25d4f26f7d5d0d3651a0a6c0119738b2721b222dcbf
+  data.tar.gz: a4b54aa278663be11b1ca8aa356431da95aed9db3f933262b102181d248154e3d1a0059c48845169bb55e408e4646115463151e11661a844d61dcfce5591120d

data/.rubocop.yml

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

data/README.md

@@ -2,8 +2,10 @@
 
 Addressing for [rubyXL](https://github.com/weshatheleopard/rubyXL)
 
+[![Gem Version](https://badge.fury.io/rb/rubyXL-addressing.svg)](https://badge.fury.io/rb/rubyXL-addressing)
 [![Build Status](https://travis-ci.org/m4i/rubyXL-addressing.svg?branch=master)](https://travis-ci.org/m4i/rubyXL-addressing)
 [![Test Coverage](https://codeclimate.com/github/m4i/rubyXL-addressing/badges/coverage.svg)](https://codeclimate.com/github/m4i/rubyXL-addressing/coverage)
+[![Code Climate](https://codeclimate.com/github/m4i/rubyXL-addressing/badges/gpa.svg)](https://codeclimate.com/github/m4i/rubyXL-addressing)
 [![Dependency Status](https://gemnasium.com/m4i/rubyXL-addressing.svg)](https://gemnasium.com/m4i/rubyXL-addressing)
 
 ## Installation
@@ -79,7 +81,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rubyXL-addressing. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/m4i/rubyXL-addressing. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/rubyXL/address.rb

@@ -2,55 +2,6 @@
 
 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)
-        message = "invalid row #{ind.inspect}"
-        raise TypeError,     message unless ind.is_a?(Integer)
-        raise ArgumentError, message unless ind >= 0
-
-        (ind + 1).to_s.freeze
-      end
-
-      # @param [Integer] ind
-      # @return [String]
-      def column_ind2ref(ind)
-        message = "invalid column #{ind.inspect}"
-        raise TypeError,     message unless ind.is_a?(Integer)
-        raise ArgumentError, message unless ind >= 0
-
-        ref = ''.dup
-        loop do
-          ref.prepend((ind % 26 + 65).chr)
-          ind /= 26
-          break if (ind -= 1) < 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
-    end
-
     # @param [RubyXL::Worksheet] worksheet
     # @return [RubyXL::Worksheet]
     attr_writer :worksheet
@@ -100,27 +51,13 @@ module RubyXL
     # @param [Integer, String, Symbol] row
     # @return [Integer, String, Symbol]
     def row=(row)
-      case row
-      when Integer
-        return @row = row if row >= 0
-      when String, Symbol
-        return self.row = self.class.row_ref2ind(row)
-      end
-
-      raise ArgumentError, "invalid row #{row.inspect}"
+      @row = Addressing.__send__(:normalize, 'row', row)
     end
 
     # @param [Integer, String, Symbol] column
     # @return [Integer, String, Symbol]
     def column=(column)
-      case column
-      when Integer
-        return @column = column if column >= 0
-      when String, Symbol
-        return self.column = self.class.column_ref2ind(column)
-      end
-
-      raise ArgumentError, "invalid column #{column.inspect}"
+      @column = Addressing.__send__(:normalize, 'column', column)
     end
 
     # @return [String]

data/lib/rubyXL/addressing.rb

@@ -7,6 +7,69 @@ 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'`

data/lib/rubyXL/addressing/version.rb

@@ -2,6 +2,6 @@
 
 module RubyXL
   module Addressing
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

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