calexcer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df6ed64af2eb680363c5ed41f469665f6c5cc2b
-  data.tar.gz: e73d24868c0a7f6ea9831bbb4e99b4d60559d9e7
+  metadata.gz: f98e54bd83b46de7d07efb4004d76cc8578425fa
+  data.tar.gz: bf1fc14995328e751b844715f9ebfecba62bdbc1
 SHA512:
-  metadata.gz: 2d78a4dd9ba69a04ab71534f4258d9aefe7189aee4d542a385e1179a7b35366eded8dff788beb61aba24d028bf17fc4bfa9ecbc190717425d3bd29edcbd3f858
-  data.tar.gz: 78742f2bd713c52e415ebc18aef0e093d02cd9543eb1a7516f4885d05f40a7c4af4dd99ec10dc747a9236b78c724b18f7970328cbd5ee07d8c01fe027a2c916b
+  metadata.gz: 320703c057ab99929141cc9b1401b29b64967b50dfb39868b8e8313f76da4e6cfe4e9d25c5650ee87039f749c254676fe07e96ee816217fc5c9eac4f27eaaac9
+  data.tar.gz: 04899cefe67d440efb5e12c9fa01ca37c0b288fcfa5e063f38b8e2e19fd360ae94fe14097c8128725f0c59f94189e7d8b27a8f18e6dc7f00cdff11c25affc44a

data/lib/calexcer/hashable.rb

@@ -0,0 +1,23 @@
+module Calexcer
+  module Hashable    
+    def to_hash(*args)
+      raise Calexcer::MethodNotImplementedError
+    end
+    
+    def to_reversed_hash(*args)
+      _events = {}
+      self.to_hash(*args).each do |date, events|
+        events.each do |event|
+          unless event.nil?
+            _events[event] ||= []
+            _events[event] << date
+          end
+        end
+      end
+      
+      _events
+    end
+    alias_method :to_r_hash, :to_reversed_hash
+    alias_method :to_hashr, :to_reversed_hash
+  end
+end

data/lib/calexcer/loopable.rb

@@ -40,12 +40,12 @@ module Calexcer
         cell
       end
       
-      def loop(&block)
+      def loop(*args, &block)
         raise Calexcer::MethodNotImplementedError
       end
       
-      def loop_vertical(&block)
-        loop_will_start
+      def loop_vertical(*args, &block)
+        loop_will_start(*args)
         (self.col_start..self.col_end).each do |col|
           horizontal_loop_unit_will_start(col)
           (self.row_start..self.row_end).each do |row|
@@ -60,8 +60,8 @@ module Calexcer
         loop_did_end
       end
       
-      def loop_horizontal(&block)
-        loop_will_start
+      def loop_horizontal(*args, &block)
+        loop_will_start(*args)
         (self.row_start..self.row_end).each do |row|
           vertical_loop_unit_will_start(row)
           (self.col_start..self.col_end).each do |col|
@@ -76,8 +76,8 @@ module Calexcer
         loop_did_end
       end
         
-      def loop_will_start
-        dimensions
+      def loop_will_start(*args)
+        dimensions(*args)
       end
       
       def loop_did_end

data/lib/calexcer/sheet.rb

@@ -1,9 +1,11 @@
-require "calexcer/sheetable"
+require "calexcer/hashable"
 require "calexcer/cell"
 
 module Calexcer
   class Sheet
-    include Calexcer::Sheetable
+    include Calexcer::Hashable
+    
+    attr_reader :sheet
     
     def self.sheet_class_name(name)
       _name = []
@@ -22,9 +24,29 @@ module Calexcer
       cell_class.new(self.sheet[row, col])
     end
     
+    def [](row, col)
+      self.sheet[row, col]
+    end
+    
+    #--------------------#
+    protected
+      
+      attr_writer :sheet
+    
     #--------------------#
     private
       
+      def dimensions(*args)
+        arg = args.shift||{}
+        
+        @row_start, @row_end, @col_start, @col_end = self.sheet.dimensions
+        
+        @row_start =  arg[:row_start] || @row_start
+        @row_end =    arg[:row_end]   || @row_end
+        @col_start =  arg[:col_start] || @col_start
+        @col_end =    arg[:col_end]   || @col_end
+      end
+      
       def sheet_class(name)
         self.class.sheet_class_name(name)
       end

data/lib/calexcer/sheet/horizontal_sheet.rb

@@ -12,11 +12,11 @@ module Calexcer
       self.initialize_year_month(year: year, month: month)
     end
     
-    def to_hash(ignore_header: true)
+    def to_hash(*args)
       self.events = {}
       self.dates = {}
       
-      self.loop do |cell|
+      self.loop(*args) do |cell|
         case cell.value
         when Date
           self.cell_as_date(cell.value)
@@ -52,8 +52,8 @@ module Calexcer
         end
       end
       
-      def loop(&block)
-        self.loop_horizontal(&block)
+      def loop(*args, &block)
+        self.loop_horizontal(*args, &block)
       end
       
       def horizontal_loop_unit_will_start(col)

data/lib/calexcer/sheet/vertical_sheet.rb

@@ -10,11 +10,13 @@ module Calexcer
       self.initialize_year_month(year: year, month: month)
     end
     
-    def to_hash(ignore_header: true)
-      self.ignore_header = ignore_header
+    def to_hash(*args)
+      hash_args = args.shift||{}
+      
+      self.ignore_header = hash_args[:ignore_header]||true
       self.events = {}
       
-      self.loop do |cell|
+      self.loop(hash_args) do |cell|
         if (self.ignore_header) && (! cell.value.nil?)
           self.ignore_header = false
         else
@@ -52,8 +54,8 @@ module Calexcer
         self.add_event(self.current_date, string)
       end
       
-      def loop(&block)
-        self.loop_vertical(&block)
+      def loop(*args, &block)
+        self.loop_vertical(*args, &block)
       end
       
       def vertical_loop_unit_will_start(row)

data/lib/calexcer/version.rb

@@ -1,3 +1,3 @@
 module Calexcer
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/calexcer/book_spec.rb

@@ -23,9 +23,9 @@ describe Calexcer::Book do
       expect(calexcer.sheets).to be_a(Array)
     end
     
-    example "includes Calexcer::Sheetable" do
+    example "includes Calexcer::Sheet" do
       calexcer.sheets.each do |sheet|
-        expect(sheet).to be_a(Calexcer::Sheetable)
+        expect(sheet).to be_a(Calexcer::Sheet)
       end
     end
   end

data/spec/lib/calexcer/cell_spec.rb

@@ -6,6 +6,7 @@ describe Calexcer::Cell do
   let(:sheet) { calexcer.sheets.first }
   
   let(:target) { described_class.new(sheet[0, 0], year: 2014, month: 8) }
+  
   describe "#value" do
     context "nill cell" do
       before { allow(target).to receive(:cell) { nil } }

data/spec/lib/calexcer/{sheetable_spec.rb → hashable_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Calexcer::Sheetable do
+describe Calexcer::Hashable do
   let(:sample) { Calexcer::Samples[:vertical] }
   let(:calexcer) { Calexcer::Book.new(sample) }
   let(:sheet) { calexcer.sheets.first }

data/spec/lib/calexcer/sheet/horizontal_sheet_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "lib/shared_spec/shared_hashable_spec"
 
 describe Calexcer::HorizontalSheet do
   let(:sample) { Calexcer::Samples[:horizontal] }
@@ -20,6 +21,9 @@ describe Calexcer::HorizontalSheet do
       expect(events[Date.new(2014, 8, 3)]).to be_include("sunday game")
       expect(events[Date.new(2014, 8, 31)]).to be_include("live")
     end
+    
+    it_behaves_like "specified dimensions"
+    
   end
   
   describe "#to_reversed_hash" do

data/spec/lib/calexcer/sheet/vertical_sheet_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "lib/shared_spec/shared_hashable_spec"
 
 describe Calexcer::VerticalSheet do
   let(:sample) { Calexcer::Samples[:vertical] }
@@ -25,6 +26,9 @@ describe Calexcer::VerticalSheet do
     example "block to get non-events" do
       expect(sheet.to_hash.collect{|k,v| v}.flatten).not_to be_include("Description of the calendar")
     end
+    
+    it_behaves_like "specified dimensions"
+    
   end # describe "#to_hash"
   
   describe "#to_reversed_hash" do

data/spec/lib/calexcer/sheet_spec.rb

@@ -5,8 +5,8 @@ describe Calexcer::Sheet do
   let(:calexcer) { Calexcer::Book.new(sample) }
   let(:sheet) { calexcer.sheets.first }
   
-  example "sheetable" do
-    expect(sheet).to be_a(Calexcer::Sheetable)
+  example "Hashable" do
+    expect(sheet).to be_a(Calexcer::Hashable)
   end
   
   describe ".sheet_class_name" do

data/spec/lib/shared_spec/shared_hashable_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+shared_examples "specified dimensions" do
+  let(:specified_dimension) { 50 }
+  
+  example "specified row start" do
+    expect do
+      sheet.to_hash(row_start: specified_dimension)
+    end.to change{ sheet.__send__(:row_start) }.from(nil).to(specified_dimension)
+  end
+  
+  example "specified row end" do
+    expect do
+      sheet.to_hash(row_end: specified_dimension)
+    end.to change{ sheet.__send__(:row_end) }.from(nil).to(specified_dimension)
+  end
+  
+  example "specified col start" do
+    expect do
+      sheet.to_hash(col_start: specified_dimension)
+    end.to change{ sheet.__send__(:col_start) }.from(nil).to(specified_dimension)
+  end
+  
+  example "specified col end" do
+    expect do
+      sheet.to_hash(col_end: specified_dimension)
+    end.to change{ sheet.__send__(:col_end) }.from(nil).to(specified_dimension)
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calexcer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - sekizo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -134,21 +134,22 @@ files:
 - lib/calexcer/book.rb
 - lib/calexcer/cell.rb
 - lib/calexcer/errors/method_not_implemented_error.rb
+- lib/calexcer/hashable.rb
 - lib/calexcer/loopable.rb
 - lib/calexcer/sheet.rb
 - lib/calexcer/sheet/horizontal_sheet.rb
 - lib/calexcer/sheet/vertical_sheet.rb
-- lib/calexcer/sheetable.rb
 - lib/calexcer/version.rb
 - spec/lib/calexcer/book_spec.rb
 - spec/lib/calexcer/cell_spec.rb
+- spec/lib/calexcer/hashable_spec.rb
 - spec/lib/calexcer/loopable_spec.rb
 - spec/lib/calexcer/sheet/horizontal_sheet_spec.rb
 - spec/lib/calexcer/sheet/vertical_sheet_merged_cell_spec.rb
 - spec/lib/calexcer/sheet/vertical_sheet_spec.rb
 - spec/lib/calexcer/sheet_spec.rb
-- spec/lib/calexcer/sheetable_spec.rb
 - spec/lib/calexcer_spec.rb
+- spec/lib/shared_spec/shared_hashable_spec.rb
 - spec/sample/horizontal_calendar.xls
 - spec/sample/vertical_calendar.xls
 - spec/sample/vertical_calendar_merged_cell.xls
@@ -180,13 +181,14 @@ summary: Convert excel sheet to object as calendar.
 test_files:
 - spec/lib/calexcer/book_spec.rb
 - spec/lib/calexcer/cell_spec.rb
+- spec/lib/calexcer/hashable_spec.rb
 - spec/lib/calexcer/loopable_spec.rb
 - spec/lib/calexcer/sheet/horizontal_sheet_spec.rb
 - spec/lib/calexcer/sheet/vertical_sheet_merged_cell_spec.rb
 - spec/lib/calexcer/sheet/vertical_sheet_spec.rb
 - spec/lib/calexcer/sheet_spec.rb
-- spec/lib/calexcer/sheetable_spec.rb
 - spec/lib/calexcer_spec.rb
+- spec/lib/shared_spec/shared_hashable_spec.rb
 - spec/sample/horizontal_calendar.xls
 - spec/sample/vertical_calendar.xls
 - spec/sample/vertical_calendar_merged_cell.xls

data/lib/calexcer/sheetable.rb

@@ -1,46 +0,0 @@
-module Calexcer
-  module Sheetable    
-    attr_reader :sheet
-    
-    def to_hash(ignore_header: true)
-      raise Calexcer::MethodNotImplementedError
-    end
-    
-    def to_reversed_hash(ignore_header: true)
-      _events = {}
-      self.to_hash(ignore_header: ignore_header).each do |date, events|
-        events.each do |event|
-          unless event.nil?
-            _events[event] ||= []
-            _events[event] << date
-          end
-        end
-      end
-      
-      _events
-    end
-    alias_method :to_r_hash, :to_reversed_hash
-    alias_method :to_hashr, :to_reversed_hash
-    
-    #--------------------#
-    protected
-      
-      attr_writer :sheet
-    
-    #--------------------#
-    private
-      
-      def dimensions
-        @row_start, @row_end, @col_start, @col_end = self.sheet.dimensions
-      end
-      
-      def method_missing(name, *args, &block)
-        begin
-          self.sheet.__send__(name, *args, &block)
-        rescue => e
-          super
-        end
-      end
-    
-  end
-end