csv_row_model 0.1.0 → 0.1.1

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

@@ -7,7 +7,8 @@ module CsvRowModel
         included do
           extend ActiveModel::Callbacks
 
-          define_model_callbacks :yield
+          define_model_callbacks :each_iteration
+          define_model_callbacks :next
           define_model_callbacks :abort, :skip, only: :before
         end
       end

data/lib/csv_row_model/import/{single_model.rb → file_model.rb}

@@ -3,16 +3,10 @@ module CsvRowModel
   # represents just one model.
   # It needs CsvRowModel::Import
   module Import
-    module SingleModel
+    module FileModel
       extend ActiveSupport::Concern
 
       class_methods do
-
-        # @return [Symbol] returns type of import
-        def type
-          :single_model
-        end
-
         # Safe to override
         #
         # @param cell [String] the cell's string
@@ -33,6 +27,25 @@ module CsvRowModel
             end
           end
         end
+
+        def next(csv, context={}, previous=nil)
+          return csv.read_row unless csv.next_row
+
+          source_row = Array.new(header_matchers.size)
+
+          while csv.next_row
+            current_row = csv.read_row
+            current_row.each_with_index do |cell, position|
+              next if cell.blank?
+              index = index_header_match(cell)
+              next unless index
+              source_row[index] = current_row[position + 1]
+              break
+            end
+          end
+
+          new(source_row, context: context, previous: previous)
+        end
       end
     end
   end

data/lib/csv_row_model/import/presenter.rb

@@ -1,7 +1,7 @@
 module CsvRowModel
   module Import
     class Presenter
-      include Concerns::DeepClassVar
+      include Concerns::InheritedClassVar
       include Concerns::Inspect
       include ActiveWarnings
 
@@ -38,6 +38,12 @@ module CsvRowModel
         row_model.previous.try(:presenter)
       end
 
+      def attributes
+        self.class.attribute_names
+          .zip(self.class.attribute_names.map { |attribute_name| public_send(attribute_name) })
+          .to_h
+      end
+
       protected
 
       # add errors from row_model and remove each dependent attribute from errors if it's row_model_dependencies
@@ -76,14 +82,14 @@ module CsvRowModel
           Presenter
         end
 
-        # @return [Array<Symbol>] attribute names for the Mapper
+        # @return [Array<Symbol>] attribute names for the Presenter
         def attribute_names
           attributes.keys
         end
 
         # @return [Hash{Symbol => Array}] map of `attribute_name => [options, block]`
         def attributes
-          deep_class_var :@_mapper_attributes, {}, :merge
+          inherited_class_var :@_presenter_attributes, {}, :merge
         end
 
         # @param [Symbol] attribute_name name of attribute to find option
@@ -98,9 +104,9 @@ module CsvRowModel
           attributes[attribute_name].last
         end
 
-        # @return [Hash{Symbol => Array}] map of `dependency => [array of mapper attributes dependent on dependency]`
+        # @return [Hash{Symbol => Array}] map of `dependency => [array of presenter attributes dependent on dependency]`
         def dependencies
-          deep_class_cache(:@_mapper_dependencies) do
+          class_cache(:@_presenter_dependencies) do
             dependencies = {}
             attribute_names.each do |attribute_name|
               options(attribute_name)[:dependencies].each do |dependency|
@@ -118,10 +124,10 @@ module CsvRowModel
         end
 
         def merge_attribute(attribute_hash)
-          @_mapper_attributes ||= {}
-          clear_deep_class_cache(:@_mapper_attributes)
-          clear_deep_class_cache(:@_mapper_dependencies)
-          @_mapper_attributes.merge! attribute_hash
+          @_presenter_attributes ||= {}
+          deep_clear_class_cache(:@_presenter_attributes)
+          deep_clear_class_cache(:@_presenter_dependencies)
+          @_presenter_attributes.merge! attribute_hash
         end
 
         # Adds column to the row model

data/lib/csv_row_model/model.rb

@@ -9,7 +9,7 @@ module CsvRowModel
     extend ActiveSupport::Concern
 
     included do
-      include Concerns::DeepClassVar
+      include Concerns::InheritedClassVar
 
       include ActiveWarnings
       include Validators::ValidateAttributes

data/lib/csv_row_model/model/children.rb

@@ -44,13 +44,13 @@ module CsvRowModel
         #
         # @return [Hash] map of `relation_name => CsvRowModel::Import or CsvRowModel::Export class`
         def has_many_relationships
-          deep_class_var :@_has_many_relationships, {}, :merge
+          inherited_class_var :@_has_many_relationships, {}, :merge
         end
 
         protected
         def merge_has_many_relationships(relation_hash)
           @_has_many_relationships ||= {}
-          clear_deep_class_cache(:@_has_many_relationships)
+          deep_clear_class_cache(:@_has_many_relationships)
           @_has_many_relationships.merge! relation_hash
         end
 

data/lib/csv_row_model/model/columns.rb

@@ -22,7 +22,7 @@ module CsvRowModel
 
         # @return [Hash] column names mapped to their options
         def columns
-          deep_class_var(:@_columns, {}, :merge)
+          inherited_class_var(:@_columns, {}, :merge)
         end
 
         # @param [Symbol] column_name name of column to find option
@@ -37,11 +37,34 @@ module CsvRowModel
           column_names.index column_name
         end
 
+        # @param [Symbol] column_name name of column to check
+        # @return [Boolean] true if it's a column name
+        def is_column_name? column_name
+          column_name.is_a?(Symbol) && index(column_name)
+        end
+
+
+        # @return [Array] column headers for the row model
+        def headers
+          @headers ||= begin
+            columns.map do |name, options|
+              options[:header] || format_header(name)
+            end
+          end
+        end
+
+        # Safe to override
+        #
+        # @return [String] formatted header
+        def format_header(column_name)
+          column_name
+        end
+
         protected
 
         def merge_columns(column_hash)
           @_columns ||= {}
-          clear_deep_class_cache(:@_columns)
+          deep_clear_class_cache(:@_columns)
           @_columns.merge!(column_hash)
         end
 

data/lib/csv_row_model/model/csv_string_model.rb

@@ -1,16 +1,7 @@
 module CsvRowModel
   module Model
-    class CsvStringModel
+    class CsvStringModel < OpenStruct
       include ActiveWarnings
-
-      def initialize(source)
-        @source = source.symbolize_keys
-      end
-
-      def method_missing(name, *args, &block)
-        return super unless @source.keys.include? name
-        @source[name]
-      end
     end
   end
 end

data/lib/csv_row_model/model/{single_model.rb → file_model.rb}

@@ -1,6 +1,6 @@
 module CsvRowModel
   module Model
-    module SingleModel
+    module FileModel
       extend ActiveSupport::Concern
 
       included do
@@ -9,6 +9,7 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module CsvRowModel
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_row_model
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -40,7 +40,7 @@ dependencies:
         version: 0.1.2
 description: 
 email:
-- steve.chung7@gmail.com
+- hello@stevenchung.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -60,12 +60,12 @@ files:
 - bin/setup
 - csv_row_model.gemspec
 - lib/csv_row_model.rb
-- lib/csv_row_model/concerns/deep_class_var.rb
+- lib/csv_row_model/concerns/inherited_class_var.rb
 - lib/csv_row_model/concerns/inspect.rb
 - lib/csv_row_model/engine.rb
 - lib/csv_row_model/export.rb
-- lib/csv_row_model/export/csv.rb
-- lib/csv_row_model/export/single_model.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/csv.rb
@@ -73,13 +73,13 @@ files:
 - 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/presenter.rb
-- lib/csv_row_model/import/single_model.rb
 - lib/csv_row_model/model.rb
 - lib/csv_row_model/model/children.rb
 - lib/csv_row_model/model/columns.rb
 - lib/csv_row_model/model/csv_string_model.rb
-- lib/csv_row_model/model/single_model.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/default_change.rb

data/lib/csv_row_model/export/csv.rb

@@ -1,43 +0,0 @@
-require 'csv'
-
-module CsvRowModel
-  module Export
-    class Csv
-      attr_reader :export_model_class, :csv, :file
-
-      # @param [Export] export_model export model class
-      def initialize(export_model_class)
-        @export_model_class = export_model_class
-        @file = Tempfile.new("#{export_model_class}.csv")
-      end
-
-      def header
-        export_model_class.column_headers
-      end
-
-      def append_header
-        csv << header
-      end
-
-      def append_model(model, context={})
-        export_model_class.new(model, context).to_rows.each do |row|
-          csv << row
-        end
-      end
-
-      def generate(with_header: true)
-        CSV.open(file.path,"wb") do |csv|
-          @csv = csv
-          append_header if with_header && !export_model_class.single_model?
-          yield self
-        end
-      ensure
-        @csv = nil
-      end
-
-      def to_s
-        file.read
-      end
-    end
-  end
-end