recite_csv 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d78da3c0debc0e3962fa02b0344c7df3980d2275
-  data.tar.gz: a7373574d333c472c031f040749bf9089f1eeed0
+SHA256:
+  metadata.gz: 7a4537328a0288a5ab2128f56327322eee068031d5afaab03706734bb179041e
+  data.tar.gz: 0b5a4fce48b66f8e93225952c042d21aba89e90fcad4144ffc1e466c7e1c352c
 SHA512:
-  metadata.gz: 5f6a549d6c8f69a0c086bf3faae9f8943a6046ba85b81eecfb904ea30abdd0819fdddf4b4992ad25d330f287cb4ee25cc71d572cfcc048fdc1fca43598b142f7
-  data.tar.gz: d0de9224da6de39c8ce014a558acb281627f3bed7df122e34727f541d8487caf2a09c20411f9869fea3906374e0a94ccd3292c4e8e7781dba605a4a44d419b8a
+  metadata.gz: 2b7f88122616980eacfc4a859aeb6fff0c3e801b96594318992653142b630e597fa41eed2926650898b5020432173219e721c2e10cbbba71a8816e65f4d98924
+  data.tar.gz: a85827717185419d59cb08a23fa22f847a8ec9e0a3049b410e0972d22beb1deaa67133dd24d32675e304ef49ecbf45e9dc889e43a3d62d03f1e68f0245c089da

data/.travis.yml

@@ -1,10 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 before_install: gem install bundler -v 1.14.6
 script:
-  - bundle install
   - bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Unreleased
 
+
+## 0.1.2 (2018-02-23)
+
+### Changes
+
+* Change `Row::Base` to an abstract class
+* Add support Ruby v2.5
+* Add file options to `Reader::Core#each`
+
+### Misc
+
+* Change to use `Hash#each_pair` instead of `Hash#each`
+
+
 ## 0.1.1 (2017-12-03)
 
 ### Changes

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Yuji Hanamura
+Copyright (c) 2017-2018 Yuji Hanamura
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,6 +4,7 @@ ReciteCSV helps to build a class for CSV reader.
 
 [![Gem Version](https://badge.fury.io/rb/recite_csv.svg)](https://badge.fury.io/rb/recite_csv)
 [![Build Status](https://travis-ci.org/yujideveloper/recite_csv.svg?branch=master)](https://travis-ci.org/yujideveloper/recite_csv)
+[![Maintainability](https://api.codeclimate.com/v1/badges/eb04cab6d55b0c7a1f7f/maintainability)](https://codeclimate.com/github/yujideveloper/recite_csv/maintainability)
 
 ## Installation
 
@@ -88,7 +89,7 @@ end
 Define custom methods of row object using `row_methods`.
 
 ``` ruby
-class Quz
+class Qux
   include ReciteCSV::Reader::Builder.new(col1: "COL1", col2: "COL2")
 
   row_methods do
@@ -102,14 +103,39 @@ class Quz
   end
 end
 
-Quz.new("./example.csv").each do |row|
-  row.class # => Quz::Row
+Qux.new("./example.csv").each do |row|
+  row.class # => Qux::Row
   row.col1
   row.col2
   row.custom_method
 end
 ```
 
+Specify file mode and encoding.
+
+``` ruby
+class Quux
+  include ReciteCSV::Reader::Builder.new(col1: "COL1", col2: "COL2")
+end
+
+Quux.new("./example.csv", file_options: "rb:UTF-8").each do |row|
+  # do something
+end
+```
+
+Convert encoding.
+
+``` ruby
+class Corge
+  include ReciteCSV::Reader::Builder.new(col1: "COL1", col2: "COL2")
+end
+
+Corge.new("./example.csv", file_options: ["rb:Shift_JIS:UTF-8", invalid: :replace, undef: :replace]).each do |row|
+  # do something
+end
+```
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/console

@@ -3,13 +3,6 @@
 
 require "bundler/setup"
 require "recite_csv"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
 require "pry"
+
 Pry.start

data/lib/recite_csv/header/definition.rb

@@ -20,7 +20,8 @@ module ReciteCSV
 
         def self.new(*)
           if self == Base
-            raise ::NotImplementedError, "#{self} is an abstract class and cannot be instantiated."
+            raise ::NotImplementedError,
+                  "#{self} is an abstract class and cannot be instantiated."
           end
           super
         end
@@ -31,7 +32,7 @@ module ReciteCSV
 
         class ColumnMethodsBuilder < ::Module
           def initialize(raw_definition)
-            raw_definition.each do |method_name, header_name|
+            raw_definition.each_pair do |method_name, header_name|
               define_method method_name do
                 self[header_name]
               end
@@ -65,8 +66,12 @@ module ReciteCSV
       module_function
 
       def dispatch(header_definition)
-        _, definition_class = DEFINITIONS.find { |klass, _| header_definition.is_a? klass }
-        raise ::ArgumentError, "Unexpected header definition type" unless definition_class
+        _, definition_class = DEFINITIONS.find do |klass, _|
+          header_definition.is_a? klass
+        end
+        unless definition_class
+          raise ::ArgumentError, "Unexpected header definition type"
+        end
         definition_class.new(header_definition)
       end
     end

data/lib/recite_csv/reader/builder.rb

@@ -20,7 +20,8 @@ module ReciteCSV
       def included(class_or_module)
         class_or_module.include Core
         class_or_module.const_set(:Row, @row_class)
-        class_or_module.const_set(:DEFAULT_CSV_OPTIONS, @definition.default_csv_options)
+        class_or_module.const_set(:DEFAULT_CSV_OPTIONS,
+                                  @definition.default_csv_options)
         class_or_module.extend DSL
       end
     end

data/lib/recite_csv/reader/core.rb

@@ -7,22 +7,43 @@ module ReciteCSV
     module Core
       include Enumerable
 
-      attr_reader :file, :csv_options
+      attr_reader :file, :file_options, :csv_options
 
-      def initialize(file, csv_options = {})
+      def initialize(file, options = {})
         @file = file
-        @csv_options = (csv_options || {}).merge(self.class::DEFAULT_CSV_OPTIONS)
+        @file_options = options.delete(:file_options) || {}
+        @csv_options =
+          (options || {}).merge(self.class::DEFAULT_CSV_OPTIONS)
       end
 
-      def each
+      def each(&block)
         if block_given?
-          ::CSV.foreach(self.file, self.csv_options) do |raw_row|
-            yield self.class::Row.new(raw_row)
-          end
+          _each(&block)
         else
           self.to_enum
         end
       end
+
+      private
+
+      def _each(&block)
+        f = if self.file.is_a?(::String)
+              ::File.open(self.file, *Array(self.file_options))
+            else
+              self.file
+            end
+        begin
+          _foreach(f, &block)
+        ensure
+          f.close if self.file.is_a?(::String)
+        end
+      end
+
+      def _foreach(f)
+        ::CSV.new(f, self.csv_options).each do |raw_row|
+          yield self.class::Row.new(raw_row)
+        end
+      end
     end
   end
 end

data/lib/recite_csv/row/base.rb

@@ -12,6 +12,14 @@ module ReciteCSV
       def [](key)
         self._raw_data[key]
       end
+
+      def self.new(*)
+        if self == Base
+          raise ::NotImplementedError,
+                "#{self} is an abstract class and cannot be instantiated."
+        end
+        super
+      end
     end
   end
 end

data/lib/recite_csv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReciteCSV
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recite_csv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yuji Hanamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ReciteCSV helps to build a class for CSV reader.