takenoko 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9585a154baef8437a43f497bc18de665f1824fc
-  data.tar.gz: 8dab39802e20d59c6e97177d6916bb21af10a58a
+  metadata.gz: 08ef0bb4b3b7c4482ec4470db97b30bb6fb85c35
+  data.tar.gz: 3483c0bbf4a6ed35fde43cda1a2b592042e657d0
 SHA512:
-  metadata.gz: 3987057c1ee11165f6e757ddedc808f9764cfb2c3281320406a34a203414048af4e32368f511d94985853300c12666e35ba513841089b50a78aeb88f1cea1c1a
-  data.tar.gz: 9cd9bb7943f4a9583229c8e8c8131c9c0917291cfa620c3217bf5b26613a0267749ae60b28519da8f2dbd92b613cc8b844c9da42408408d14c10ec71eb5a4cfd
+  metadata.gz: baaa50a24ac0d47750bdaf42e9e756d4d84cce59bf2418a812766146b3fdff57bd2f36ce781328f585e91a52badb85831c4a603c5d5cc1e321fb4a303ea5f0bc
+  data.tar.gz: 54a9d7da4fe0e43e3edf3de9ad359f2c300300e91db231f6923e1dd4ccc1d955ab17b6855e29b5dd75e0475a0d8d77a0b2e132ad36aabac390b7ed88f4ab4cfb

data/lib/takenoko.rb

@@ -22,7 +22,7 @@ module Takenoko
 
   mattr_accessor :file_extension
   @@file_extension = :csv
-  SUPPORTED_FILE_EXT = [:csv,:yaml,:json]
+  SUPPORTED_FILE_EXT = [:csv,:yaml,:json, :yml]
 
   mattr_accessor :export_file_location
   @@export_file_location = "db/spreadsheet"

data/lib/takenoko/exporter.rb

@@ -41,9 +41,11 @@ module Takenoko
 
     [:yaml,:json].each do |output|
       define_method "convert_to_#{output}" do |table|
-        table[:rows].public_send("to_#{output}")
+        table[:rows].map{|r| r.to_hash}.public_send("to_#{output}")
       end
     end
+
+    alias convert_to_yml convert_to_yaml
   end
 
 end

data/lib/takenoko/google_client.rb

@@ -28,40 +28,38 @@ module Takenoko
         hash = HashWithIndifferentAccess.new
         table['columns_mapping'].each do |key,val|
           begin
-            hash[key] = r.public_send(val)
+            val = r.public_send(val)
           rescue Exception => e
             if key == 'id'
-              hash[key] = r.row_num - 1
+              val = r.row_num - 1
             else
-              hash[key] = nil
+              val = nil
             end
           end
+          hash[key.to_sym] = format_row val
         end
         hash
-      end.reject do |row|
-        begin
-          table[:enable_postprocess] && !postprocess_class.public_send("spreadsheet_row_valid?",row)
-        rescue NoMethodError => e
-          Rails.logger.warn e.message
-          false
-        end
-      end.map do |row|
-        begin
-          table[:enable_postprocess] ? postprocess_class.public_send("postprocess_spreadsheet_row",row) : row
-        rescue NoMethodError => e
-          Rails.logger.warn e.message
-          row
-        end
       end
 
-      table[:rows] = rows
-      if table[:enable_postprocess]
-        begin
-          table = postprocess_class.public_send("postprocess_spreadsheet_table",table) 
-        rescue NoMethodError => e
-          Rails.logger.warn e.message
+      if(table[:enable_postprocess])
+        rows.reject do |row|
+          if postprocess_class.respond_to? "spreadsheet_row_valid?"
+            postprocess_class.public_send("spreadsheet_row_valid?",row)
+          end
+        end.map do |row|
+          if postprocess_class.respond_to? "postprocess_spreadsheet_row"
+            row = postprocess_class.public_send("postprocess_spreadsheet_row",row)
+          end
         end
+
+        table[:rows] = rows
+        if postprocess_class.respond_to? "postprocess_spreadsheet_table"
+          table = postprocess_class.public_send("postprocess_spreadsheet_table",table)
+        end
+      else
+        table[:rows] = rows
       end
+
       return table
     end
 
@@ -119,5 +117,10 @@ module Takenoko
       table[:header] = table[:columns_mapping].keys
       return table
     end
+
+    def format_row(v)
+      return nil unless v
+      ((float = Float(v)) && (float % 1.0 == 0) ? float.to_i : float) rescue v
+    end
   end
 end

data/lib/takenoko/version.rb

@@ -1,3 +1,3 @@
 module Takenoko
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takenoko
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - KhiemNS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,7 +89,7 @@ files:
 - lib/tasks/takenoko.rake
 - test/takenoko_test.rb
 - test/test_helper.rb
-homepage: https://github.com/khiemns54/takenoko/tree/release/0.2.6
+homepage: https://github.com/khiemns54/takenoko/tree/release/0.2.7
 licenses: []
 metadata: {}
 post_install_message: