csv_row_model 1.0.0.beta1 → 1.0.0.beta2

data/lib/csv_row_model/internal/model/dynamic_column_header.rb

@@ -0,0 +1,22 @@
+require 'csv_row_model/internal/model/header'
+require 'csv_row_model/internal/concerns/dynamic_column_shared'
+
+module CsvRowModel
+  module Model
+    class DynamicColumnHeader < Header
+      include DynamicColumnShared
+
+      def value
+        header_models.map { |header_model| header_proc.call(header_model) }
+      end
+
+      def header_proc
+        options[:header] || ->(header_model) { format_header(header_model) }
+      end
+
+      def format_header(header_model)
+        row_model_class.format_dynamic_column_header(header_model, column_name, column_index, context)
+      end
+    end
+  end
+end

data/lib/csv_row_model/internal/model/header.rb

@@ -0,0 +1,25 @@
+require 'csv_row_model/internal/concerns/column_shared'
+
+module CsvRowModel
+  module Model
+    class Header
+      include ColumnShared
+
+      attr_reader :column_name, :row_model_class, :context
+
+      def initialize(column_name, row_model_class, context)
+        @column_name = column_name
+        @row_model_class = row_model_class
+        @context = OpenStruct.new(context)
+      end
+
+      def value
+        options[:header] || formatted_header
+      end
+
+      def formatted_header
+        row_model_class.format_header(column_name, column_index, context)
+      end
+    end
+  end
+end

data/lib/csv_row_model/model/file_model.rb

@@ -8,7 +8,6 @@ module CsvRowModel
           alias_method :row_names, :column_names
           alias_method :rows, :columns
           alias_method :row, :column
-          alias_method :is_row_name?, :is_column_name?
         end
       end
     end

data/lib/csv_row_model/model.rb

@@ -1,25 +1,18 @@
-require 'csv_row_model/model/base'
-require 'csv_row_model/model/columns'
-require 'csv_row_model/model/children'
-require 'csv_row_model/model/dynamic_columns'
-require 'csv_row_model/model/comparison'
+require 'csv_row_model/concerns/model/base'
+require 'csv_row_model/concerns/model/attributes'
+require 'csv_row_model/concerns/model/children'
+require 'csv_row_model/concerns/model/dynamic_columns'
 
 module CsvRowModel
   # Base module for representing a RowModel---a model that represents row(s).
   module Model
     extend ActiveSupport::Concern
 
-    include InheritedClassVar
-
     include ActiveWarnings
-    include Validators::ValidateAttributes
 
     include Base
-
-    include Columns
+    include Attributes
     include Children
     include DynamicColumns
-
-    include Comparison
   end
 end

data/lib/csv_row_model/validators/{boolean_format.rb → boolean_format_validator.rb}

@@ -1,6 +1,6 @@
 class BooleanFormatValidator < ActiveModel::EachValidator # :nodoc:
   # inspired by https://github.com/MrJoy/to_bool/blob/5c9ed38e47c638725e33530ea1a8aec96281af20/lib/to_bool.rb#L23
-  FALSE_BOOLEAN_REGEX = /^(false|f|no|n|0|)$/i
+  FALSE_BOOLEAN_REGEX = /^(false|f|no|n|0)$/i
   TRUE_BOOLEAN_REGEX = /^(true|t|yes|y|1)$/i
 
   def validate_each(record, attribute, value)

data/lib/csv_row_model/validators/date_format_validator.rb

@@ -0,0 +1,7 @@
+class DateFormatValidator < ActiveModel::EachValidator # :nodoc:
+  def validate_each(record, attribute, value)
+    Date.parse(value)
+  rescue ArgumentError, TypeError
+    record.errors.add(attribute, 'is not a Date format')
+  end
+end

data/lib/csv_row_model/validators/date_time_format_validator.rb

@@ -0,0 +1,7 @@
+class DateTimeFormatValidator < ActiveModel::EachValidator # :nodoc:
+  def validate_each(record, attribute, value)
+    DateTime.parse(value)
+  rescue ArgumentError, TypeError
+    record.errors.add(attribute, 'is not a DateTime format')
+  end
+end

data/lib/csv_row_model/validators/float_format_validator.rb

@@ -0,0 +1,7 @@
+class FloatFormatValidator < ActiveModel::EachValidator # :nodoc:
+  def validate_each(record, attribute, value)
+    Float(value)
+  rescue ArgumentError, TypeError
+    record.errors.add(attribute, 'is not a Float format')
+  end
+end

data/lib/csv_row_model/validators/integer_format_validator.rb

@@ -0,0 +1,15 @@
+class IntegerFormatValidator < ActiveModel::EachValidator # :nodoc:
+  def validate_each(record, attribute, value)
+    Integer(value)
+  rescue ArgumentError
+    integer = value.to_i
+    return if integer == value.to_f && integer != 0
+    add_error(record, attribute)
+  rescue TypeError
+    add_error(record, attribute)
+  end
+
+  def add_error(record, attribute)
+    record.errors.add(attribute, 'is not a Integer format')
+  end
+end

data/lib/csv_row_model/version.rb

@@ -1,3 +1,3 @@
 module CsvRowModel
-  VERSION = "1.0.0.beta1"
+  VERSION = "1.0.0.beta2"
 end

data/lib/csv_row_model.rb

@@ -1,49 +1,28 @@
-autoload = false
-# autoload = true #uncomment for testing purposes only, not covered by rspec
-
 class Boolean; end unless defined? Boolean
 
 require 'csv_row_model/version'
 
+require 'csv'
 require 'active_model'
-require 'active_support/all'
 require 'active_warnings'
-require 'csv'
-
-require 'inherited_class_var'
-
-if autoload && defined?(Rails)
-  require 'csv_row_model/engine'
-else
-  require 'csv_row_model/concerns/inspect'
-  require 'csv_row_model/concerns/check_options'
-
-  require 'csv_row_model/validators/validate_attributes'
-
-  require 'csv_row_model/model'
-  require 'csv_row_model/model/file_model'
 
-  require 'csv_row_model/import'
-  require 'csv_row_model/import/file_model'
-  require 'csv_row_model/import/csv'
-  require 'csv_row_model/import/file'
+require 'csv_row_model/concerns/check_options'
 
+require 'csv_row_model/model'
+require 'csv_row_model/model/file_model'
 
-  require 'csv_row_model/export'
-  require 'csv_row_model/export/file'
-  require 'csv_row_model/export/file_model'
-end
+require 'csv_row_model/import'
+require 'csv_row_model/import/file_model'
+require 'csv_row_model/import/file'
 
-require 'csv_row_model/validators/default_change'
 
-require 'csv_row_model/validators/number_validator'
-require 'csv_row_model/validators/boolean_format'
-require 'csv_row_model/validators/date_time_format'
-require 'csv_row_model/validators/date_format'
-require 'csv_row_model/validators/float_format'
-require 'csv_row_model/validators/integer_format'
+require 'csv_row_model/export'
+require 'csv_row_model/export/file'
+require 'csv_row_model/export/file_model'
 
-module CsvRowModel
-  class RowModelClassNotDefined < StandardError; end
-  class AccessedInvalidAttribute < StandardError; end
-end
+require 'csv_row_model/validators/default_change_validator'
+require 'csv_row_model/validators/boolean_format_validator'
+require 'csv_row_model/validators/date_time_format_validator'
+require 'csv_row_model/validators/date_format_validator'
+require 'csv_row_model/validators/float_format_validator'
+require 'csv_row_model/validators/integer_format_validator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_row_model
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Steve Chung
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -74,47 +74,49 @@ files:
 - bin/setup
 - csv_row_model.gemspec
 - lib/csv_row_model.rb
+- lib/csv_row_model/concerns/attributes_base.rb
 - lib/csv_row_model/concerns/check_options.rb
+- lib/csv_row_model/concerns/dynamic_columns_base.rb
+- lib/csv_row_model/concerns/export/attributes.rb
+- lib/csv_row_model/concerns/export/base.rb
+- lib/csv_row_model/concerns/export/dynamic_columns.rb
+- lib/csv_row_model/concerns/hidden_module.rb
+- lib/csv_row_model/concerns/import/attributes.rb
+- lib/csv_row_model/concerns/import/base.rb
+- lib/csv_row_model/concerns/import/csv_string_model.rb
+- lib/csv_row_model/concerns/import/dynamic_columns.rb
+- lib/csv_row_model/concerns/import/represents.rb
 - lib/csv_row_model/concerns/inspect.rb
-- lib/csv_row_model/engine.rb
+- lib/csv_row_model/concerns/model/attributes.rb
+- lib/csv_row_model/concerns/model/base.rb
+- lib/csv_row_model/concerns/model/children.rb
+- lib/csv_row_model/concerns/model/dynamic_columns.rb
 - lib/csv_row_model/export.rb
-- lib/csv_row_model/export/attributes.rb
-- lib/csv_row_model/export/base.rb
-- lib/csv_row_model/export/cell.rb
-- lib/csv_row_model/export/dynamic_column_cell.rb
-- lib/csv_row_model/export/dynamic_columns.rb
 - lib/csv_row_model/export/file.rb
 - lib/csv_row_model/export/file_model.rb
 - lib/csv_row_model/import.rb
-- lib/csv_row_model/import/attributes.rb
-- lib/csv_row_model/import/base.rb
-- lib/csv_row_model/import/cell.rb
-- lib/csv_row_model/import/csv.rb
-- lib/csv_row_model/import/csv_string_model.rb
-- lib/csv_row_model/import/dynamic_column_cell.rb
-- lib/csv_row_model/import/dynamic_columns.rb
 - lib/csv_row_model/import/file.rb
-- lib/csv_row_model/import/file/callbacks.rb
-- lib/csv_row_model/import/file/validations.rb
 - lib/csv_row_model/import/file_model.rb
-- lib/csv_row_model/import/representation.rb
-- lib/csv_row_model/import/represents.rb
+- lib/csv_row_model/internal/attribute_base.rb
+- lib/csv_row_model/internal/concerns/column_shared.rb
+- lib/csv_row_model/internal/concerns/dynamic_column_shared.rb
+- lib/csv_row_model/internal/dynamic_column_attribute_base.rb
+- lib/csv_row_model/internal/export/attribute.rb
+- lib/csv_row_model/internal/export/dynamic_column_attribute.rb
+- lib/csv_row_model/internal/import/attribute.rb
+- lib/csv_row_model/internal/import/csv.rb
+- lib/csv_row_model/internal/import/dynamic_column_attribute.rb
+- lib/csv_row_model/internal/import/representation.rb
+- lib/csv_row_model/internal/model/dynamic_column_header.rb
+- lib/csv_row_model/internal/model/header.rb
 - lib/csv_row_model/model.rb
-- lib/csv_row_model/model/base.rb
-- lib/csv_row_model/model/children.rb
-- lib/csv_row_model/model/columns.rb
-- lib/csv_row_model/model/comparison.rb
-- lib/csv_row_model/model/dynamic_column_cell.rb
-- lib/csv_row_model/model/dynamic_columns.rb
 - lib/csv_row_model/model/file_model.rb
-- lib/csv_row_model/validators/boolean_format.rb
-- lib/csv_row_model/validators/date_format.rb
-- lib/csv_row_model/validators/date_time_format.rb
-- lib/csv_row_model/validators/default_change.rb
-- lib/csv_row_model/validators/float_format.rb
-- lib/csv_row_model/validators/integer_format.rb
-- lib/csv_row_model/validators/number_validator.rb
-- lib/csv_row_model/validators/validate_attributes.rb
+- lib/csv_row_model/validators/boolean_format_validator.rb
+- lib/csv_row_model/validators/date_format_validator.rb
+- lib/csv_row_model/validators/date_time_format_validator.rb
+- lib/csv_row_model/validators/default_change_validator.rb
+- lib/csv_row_model/validators/float_format_validator.rb
+- lib/csv_row_model/validators/integer_format_validator.rb
 - lib/csv_row_model/version.rb
 homepage: https://github.com/s12chung/csv_row_model
 licenses:

data/lib/csv_row_model/engine.rb

@@ -1,5 +0,0 @@
-module CsvRowModel
-  class Engine < ::Rails::Engine
-    config.autoload_paths += %W[#{config.root}/lib/]
-  end
-end

data/lib/csv_row_model/export/attributes.rb

@@ -1,46 +0,0 @@
-require 'csv_row_model/export/cell'
-
-module CsvRowModel
-  module Export
-    module Attributes
-      extend ActiveSupport::Concern
-
-      included do
-        self.column_names.each { |*args| define_attribute_method(*args) }
-      end
-
-      def cell_objects
-        @cell_objects ||= array_to_block_hash(self.class.column_names) { |column_name| Cell.new(column_name, self) }
-      end
-
-      # @return [Hash] a map of `column_name => formatted_attributes`
-      def formatted_attributes
-        array_to_block_hash(self.class.column_names) { |column_name| formatted_attribute(column_name) }
-      end
-
-      def formatted_attribute(column_name)
-        cell_objects[column_name].try(:value)
-      end
-
-      def source_attribute(column_name)
-        cell_objects[column_name].try(:source_value)
-      end
-
-      class_methods do
-        protected
-        # See {Model#column}
-        def column(column_name, options={})
-          super
-          define_attribute_method(column_name)
-        end
-
-        # Define default attribute method for a column
-        # @param column_name [Symbol] the cell's column_name
-        def define_attribute_method(column_name)
-          return if method_defined? column_name
-          define_method(column_name) { source_model.public_send(column_name) }
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/export/cell.rb

@@ -1,24 +0,0 @@
-module CsvRowModel
-  module Export
-    class Cell
-      attr_reader :column_name, :row_model
-
-      def initialize(column_name, row_model)
-        @column_name = column_name
-        @row_model = row_model
-      end
-
-      def value
-        formatted_value
-      end
-
-      def formatted_value
-        @formatted_value ||= row_model.class.format_cell(source_value, column_name, row_model.class.index(column_name), row_model.context)
-      end
-
-      def source_value
-        row_model.public_send(column_name)
-      end
-    end
-  end
-end

data/lib/csv_row_model/export/dynamic_column_cell.rb

@@ -1,29 +0,0 @@
-module CsvRowModel
-  module Export
-    class DynamicColumnCell < CsvRowModel::Model::DynamicColumnCell
-      def unformatted_value
-        formatted_cells
-      end
-
-      def formatted_cells
-        cells.map.with_index.map do |cell, index|
-          row_model.class.format_cell(cell, column_name, dynamic_column_index + index, row_model.context)
-        end
-      end
-
-      def cells
-        header_models.map { |header_model| call_process_cell(header_model) }
-      end
-
-      def header_models
-        row_model.context.public_send(column_name)
-      end
-
-      class << self
-        def define_process_cell(row_model_class, column_name)
-          super { |header_model| header_model }
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/export/dynamic_columns.rb

@@ -1,46 +0,0 @@
-require 'csv_row_model/export/dynamic_column_cell'
-
-module CsvRowModel
-  module Export
-    module DynamicColumns
-      extend ActiveSupport::Concern
-
-      included do
-        self.dynamic_column_names.each { |*args| define_dynamic_attribute_method(*args) }
-      end
-
-      def cell_objects
-        @dynamic_column_cell_objects ||= super.merge(array_to_block_hash(self.class.dynamic_column_names) do |column_name|
-          DynamicColumnCell.new(column_name, self)
-        end)
-      end
-
-      # @return [Array] an array of public_send(column_name) of the CSV model
-      def to_row
-        super.flatten
-      end
-
-      # See Model::Export#formatted_attributes
-      def formatted_attributes
-        super.merge!(array_to_block_hash(self.class.dynamic_column_names) { |column_name| formatted_attribute(column_name) })
-      end
-
-      class_methods do
-        protected
-
-        # See {Model::DynamicColumns#dynamic_column}
-        def dynamic_column(column_name, options={})
-          super
-          define_dynamic_attribute_method(column_name)
-        end
-
-        # Define default attribute method for a dynamic_column
-        # @param column_name [Symbol] the cell's column_name
-        def define_dynamic_attribute_method(column_name)
-          define_method(column_name) { formatted_attribute(column_name) }
-          DynamicColumnCell.define_process_cell(self, column_name)
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/import/attributes.rb

@@ -1,66 +0,0 @@
-require 'csv_row_model/import/cell'
-
-module CsvRowModel
-  module Import
-    module Attributes
-      extend ActiveSupport::Concern
-
-      included do
-        self.column_names.each { |*args| define_attribute_method(*args) }
-      end
-
-      def cell_objects
-        @cell_objects ||= begin
-          csv_string_model.valid?
-          _cell_objects(csv_string_model.errors)
-        end
-      end
-
-      # @return [Hash] a map of `column_name => original_attribute(column_name)`
-      def original_attributes
-        array_to_block_hash(self.class.column_names) { |column_name| original_attribute(column_name) }
-      end
-
-      # @return [Object] the column's attribute before override
-      def original_attribute(column_name)
-        cell_objects[column_name].try(:value)
-      end
-
-      # return [Hash] a map changes from {.column}'s default option': `column_name -> [value_before_default, default_set]`
-      def default_changes
-        array_to_block_hash(self.class.column_names) { |column_name| cell_objects[column_name].default_change }.delete_if {|k, v| v.blank? }
-      end
-
-      protected
-      # to prevent circular dependency with csv_string_model
-      def _cell_objects(csv_string_model_errors={})
-        array_to_block_hash(self.class.column_names) do |column_name|
-          Cell.new(column_name, mapped_row[column_name], csv_string_model_errors[column_name], self)
-        end
-      end
-
-      class_methods do
-        protected
-        # See {Model#column}
-        def column(column_name, options={})
-          super
-          define_attribute_method(column_name)
-        end
-
-        def merge_options(column_name, options={})
-          original_options = columns[column_name]
-          csv_string_model_class.add_type_validation(column_name, columns[column_name]) unless original_options[:validate_type]
-          super
-        end
-
-        # Define default attribute method for a column
-        # @param column_name [Symbol] the cell's column_name
-        def define_attribute_method(column_name)
-          return if method_defined? column_name
-          csv_string_model_class.add_type_validation(column_name, columns[column_name])
-          define_method(column_name) { original_attribute(column_name) }
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/import/dynamic_column_cell.rb

@@ -1,37 +0,0 @@
-module CsvRowModel
-  module Import
-    class DynamicColumnCell < CsvRowModel::Model::DynamicColumnCell
-      attr_reader :source_headers, :source_cells
-
-      def initialize(column_name, source_headers, source_cells, row_model)
-        @source_headers = source_headers
-        @source_cells = source_cells
-        super(column_name, row_model)
-      end
-
-      def unformatted_value
-        formatted_cells.zip(formatted_headers).map do |formatted_cell, source_header|
-          call_process_cell(formatted_cell, source_header)
-        end
-      end
-
-      def formatted_cells
-        source_cells.map.with_index do |source_cell, index|
-          row_model.class.format_cell(source_cell, column_name, dynamic_column_index + index, row_model.context)
-        end
-      end
-
-      def formatted_headers
-        source_headers.map.with_index do |source_header, index|
-          row_model.class.format_dynamic_column_header(source_header, column_name, dynamic_column_index, index, row_model.context)
-        end
-      end
-
-      class << self
-        def define_process_cell(row_model_class, column_name)
-          super { |formatted_cell, source_header| formatted_cell }
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/import/dynamic_columns.rb

@@ -1,59 +0,0 @@
-require 'csv_row_model/import/dynamic_column_cell'
-
-module CsvRowModel
-  module Import
-    module DynamicColumns
-      extend ActiveSupport::Concern
-
-      included do
-        self.dynamic_column_names.each { |*args| define_dynamic_attribute_method(*args) }
-      end
-
-      def cell_objects
-        @dynamic_column_cell_objects ||= super.merge(array_to_block_hash(self.class.dynamic_column_names) do |column_name|
-          DynamicColumnCell.new(column_name, dynamic_column_source_headers, dynamic_column_source_cells, self)
-        end)
-      end
-
-      # @return [Hash] a map of `column_name => original_attribute(column_name)`
-      def original_attributes
-        super.merge!(array_to_block_hash(self.class.dynamic_column_names) { |column_name| original_attribute(column_name) })
-      end
-
-      # @return [Array] dynamic_column headers
-      def dynamic_column_source_headers
-        self.class.dynamic_column_source_headers source_header
-      end
-
-      # @return [Array] dynamic_column row data
-      def dynamic_column_source_cells
-        self.class.dynamic_column_source_cells source_row
-      end
-
-      class_methods do
-        def dynamic_column_source_headers(source_header)
-          dynamic_columns? ? source_header[columns.size..-1] : []
-        end
-
-        def dynamic_column_source_cells(source_row)
-          dynamic_columns? ? source_row[columns.size..-1] : []
-        end
-
-        protected
-
-        # See {Model#dynamic_column}
-        def dynamic_column(column_name, options={})
-          super
-          define_dynamic_attribute_method(column_name)
-        end
-
-        # Define default attribute method for a column
-        # @param column_name [Symbol] the cell's column_name
-        def define_dynamic_attribute_method(column_name)
-          define_method(column_name) { original_attribute(column_name) }
-          DynamicColumnCell.define_process_cell(self, column_name)
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/import/file/callbacks.rb

@@ -1,17 +0,0 @@
-module CsvRowModel
-  module Import
-    class File
-      module Callbacks
-        extend ActiveSupport::Concern
-
-        included do
-          extend ActiveModel::Callbacks
-
-          define_model_callbacks :each_iteration
-          define_model_callbacks :next
-          define_model_callbacks :abort, :skip, only: :before
-        end
-      end
-    end
-  end
-end