data_list_converter 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a099d03a2435d188931e843e69866730ef6344a
-  data.tar.gz: 26827471d19e23d7a1b897ea50162ecba67e438d
+  metadata.gz: 57ef43477b818568a4b417b7dc080fa9ff34f2b6
+  data.tar.gz: efefefbd9ec732ef479c619c538ef3588d7c7cb0
 SHA512:
-  metadata.gz: 048fcbab9f4a789b94f590b8a462b9655b361da82a73ca2e70f732c422cc919d10a40f95c2e7573b7dd6aa420ae325c8ef43c4501e8eee3c338fc8c843048e44
-  data.tar.gz: d204980813037d59a7047d9d9a968e1affca8f1c593dabd944764b7a577b397947f25d727a47b8c5bed0c86e18898e43dd3ababf17f66281c7e029738bc3d189
+  metadata.gz: 3b840c8d7e3f6b49286168c72e3a6e9a449bcde332a9cfff0b85305d60477d0e0496f074a3acc34f44d3da6514e2542b665eb61f153dfbd292e817f411c45b7c
+  data.tar.gz: bb541e9b0c0f7ed0edde220df745c3fbc9515966a8534e23b90466e15b8dfc100204740f1a91c850d107c458eaf3ba7c5fbe458dff5b72cb23e8164bf295aa17

data/README.md

@@ -1,6 +1,6 @@
 # Data List Converter
 
-Data List Converter is a tool to convert data between different formats.
+Data List Converter is a tool for converting data between different formats.
 
 Example:
 
@@ -8,35 +8,53 @@ Example:
 data = [{name: 'James', age: '22'}, {name: 'Bob', age: '33'}]
 DataListConverter.convert(:item_data, :table_data, data)
 # => [["name", "age"], ["James", "22"], ["Bob", "33"]] 
-DataListConverter.convert(:item_data, :csv_file, data, csv_file: {filename: 'result.csv'})
-DataListConverter.convert(:item_data, :xls_file, data, csv_file: {filename: 'result.csv'})
 
+require 'data_list_converter/types/csv_file'
+DataListConverter.convert(:item_data, :csv_file, data, csv_file: {filename: 'result.csv'})
 DataListConverter.convert(:csv_file, :item_data, {filename: 'result.csv'}) == data
+
+require 'data_list_converter/types/xls_file'
+sheets_data = {sheet1: data, sheet2: data}
+DataListConverter.convert(:multi_sheet_item_data, :xls_file, sheets_data, xls_file: {filename: 'result.xls'})
+DataListConverter.convert(:xls_file, :multi_sheet_item_data, {filename: 'result.xls'}) == sheets_data
 ```
 
 You can also add filter to this process:
 
 ```ruby
-filter = :limit
-filter = {limit: {size: 2}}
-filter = [{limit: {size: 12}}, {count: {size: 4}}]
-convert(:item_iterator, :table_data, iter, table_iterator: {filter: filter})
+filters = [
+  # filter with default options
+  :limit,
+  # filter with options
+  {limit: {size: 2}},
+  # multiple filters
+  [{limit: {size: 12}},
+   {count: {size: 4}}],
+]
+filters.map do |filter|
+  data = [{name: "james"}] * 10
+  DataListConverter.convert(:item_data, :table_data, data, table_iterator: {filter: filter})
+end
 ```
 
-Please read [the source code](https://github.com/halida/data_list_converter/blob/master/lib/data_list_converter.rb) for more information,
-also you can check [test examples](https://github.com/halida/data_list_converter/blob/master/test/data_list_converter_test.rb).
+Please read [the source code](https://github.com/halida/data_list_converter/blob/master/lib/data_list_converter/) for more information,
+also you can check [test examples](https://github.com/halida/data_list_converter/blob/master/test/).
 
 ## Data Types
 
-- **item_data** like: `[{name: 'James', age: '22'}, ...]`
+- **item_data** like: `[{name: 'James', age: '22'}, ...]`, keys should be symbol.
 - **item_iterator** iterator for item_data, used like: iter.call{|item| out << item}
 - **table_data** like: `[["name", "age"], ["James", "22"], ["Bob", "33"], ...]`
 - **table_iterator** iterator for table_data
 - **csv_file** file in csv format
-- **xls_file** file in excel format
-- **multi_sheet_data** like: `{'sheet1' => [columns, row, row, ...], 'sheet2' => [columns, row, row, ...]}`
-- **multi_sheet_iterator** like: `{'sheet1' => table_iterator1, 'sheet2' => table_iterator2}`
-- **records** ActiveRecord records, usage: `DataListConverter.convert(:records, :item_data, query, item_iterator: {columns: [:name, :age]})`
+- **xls_file** file in excel format, should install `spreadsheet` gem, and `require 'data_list_converter/types/xls_file'`
+- **xlsx_file** file in excel xml format, should install `rubyXL` gem, and `require 'data_list_converter/types/xlsx_file'`
+- **multi_sheet** Contains several data with sheets:
+    - **multi_sheet_table_iterator**: like: `{sheet1: table_iterator1, sheet2: table_iterator2}`
+    - **multi_sheet_table_data**: like: `{sheet1: [['name', 'age'], ...], sheet2: ...}`
+    - **multi_sheet_item_iterator**: like: `{sheet1: item_iterator1, sheet2: item_iterator2}`
+    - **multi_sheet_item_data**: like: `{sheet1: [{name: 'James', age: 32}], sheet2: ...}`
+- **records** ActiveRecord records, usage: `DataListConverter.convert(:records, :item_data, Users.where(condition), item_iterator: {columns: [:name, :age]})`
 
 
 ## Filters
@@ -45,34 +63,34 @@ also you can check [test examples](https://github.com/halida/data_list_converter
 
 **item_iterator count**: count item_iterator items, usage: `DataListConverter.convert(:xls_file, :item_data, {filename: 'result.xls'}, item_iterator: {filter: {count: {size: 10}}})`, it will print current item counts every `size`.
 
+Please check more [test examples](https://github.com/halida/data_list_converter/blob/master/test/filters_test.rb)
+
 ## Extend
 
-You can add your data types and filters, example:
+You can add your own data types and filters, example:
 
 ```ruby
-DataListConverter.register_converter(
-  :records, :item_iterator, lambda { |records, options|
-    columns = options[:columns]
-    lambda { |&block|
-      records.find_each do |record|
-        item = columns.map do |column|
-          [column.first.to_sym, record.send(column[1])]
-        end.to_h
-        block.call(item)
-      end
-    }
-  })
-
-DataListConverter.register_filter(
-  :item_iterator, :limit, lambda { |proc, options|
-    limit_size = options[:size] || 10
-    lambda { |&block|
-      limit = 0
-      proc.call do |item|
-        block.call(item)
-        limit += 1
-        break if limit >= limit_size
-      end
-    }
-  })
+DataListConverter.register_converter(:records, :item_iterator) do |records, options|
+  columns = options[:columns]
+  lambda { |&block|
+    records.find_each do |record|
+      item = columns.map do |column|
+        [column.first.to_sym, record.send(column[1])]
+      end.to_h
+      block.call(item)
+    end
+  }
+end
+
+DataListConverter.register_filter(:item_iterator, :limit) do |proc, options|
+  limit_size = options[:size] || 10
+  lambda { |&block|
+    limit = 0
+    proc.call do |item|
+      block.call(item)
+      limit += 1
+      break if limit >= limit_size
+    end
+  }
+end
 ```

data/Rakefile

@@ -25,9 +25,9 @@ end
 
 task :build do
   sh 'rm -f *.gem'
-  sh 'gem build data_list_converter.gemspec'
+  sh 'bundle exec gem build data_list_converter.gemspec'
 end
 
 task :upload do
-  sh 'gem push *.gem'
+  sh 'bundle exec gem push *.gem'
 end

data/changelog.md

@@ -1,3 +1,10 @@
+## 0.3
+
+Refactor.
+
+- 0.3.1 sheet name should as symbol
+- 0.3.2 support xlsx cell format
+
 ## 0.2
 
 Add xlsx_file data type.
@@ -5,3 +12,4 @@ Add xlsx_file data type.
 ## 0.1
 
 First version.
+

data/data_list_converter.gemspec

@@ -1,8 +1,9 @@
 $:.push File.expand_path("../lib", __FILE__)
+require "data_list_converter/version"
 
 Gem::Specification.new do |s|
   s.name        = "data_list_converter"
-  s.version     = "0.3.2"
+  s.version     = DataListConverter::VERSION.dup
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["linjunhalida"]
   s.email       = ["linjunhalida@gmail.com"]

data/lib/data_list_converter/types/xlsx_file.rb

@@ -63,6 +63,7 @@ class DataListConverter
     book.worksheets.map do |sheet|
       iterator = lambda { |&block|
         sheet.each do |row|
+          next unless row
           block.call(row.cells.map(&:value))
         end
       }

data/lib/data_list_converter/version.rb

@@ -0,0 +1,3 @@
+class DataListConverter
+  VERSION = "0.3.3".freeze
+end

data/lib/data_list_converter.rb

@@ -1,11 +1,9 @@
 require 'data_list_converter/base'
+require 'data_list_converter/version'
 
 require 'data_list_converter/types/basic'
-require 'data_list_converter/types/csv_file'
 require 'data_list_converter/types/records'
 require 'data_list_converter/types/multi_sheet'
-require 'data_list_converter/types/xls_file' rescue LoadError
-require 'data_list_converter/types/xlsx_file' rescue LoadError
 
 require 'data_list_converter/filters/count'
 require 'data_list_converter/filters/limit'

data/test/types_test.rb

@@ -1,3 +1,7 @@
+require 'data_list_converter/types/csv_file'
+require 'data_list_converter/types/xls_file'
+require 'data_list_converter/types/xlsx_file'
+
 describe DataListConverter do
   before :all do
     @c = DataListConverter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_list_converter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - linjunhalida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -105,6 +105,7 @@ files:
 - lib/data_list_converter/types/records.rb
 - lib/data_list_converter/types/xls_file.rb
 - lib/data_list_converter/types/xlsx_file.rb
+- lib/data_list_converter/version.rb
 - test/base_test.rb
 - test/filters_test.rb
 - test/testdata.rb