csv_row_model 0.4.1 → 1.0.0.beta1

data/lib/csv_row_model/version.rb

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

data/lib/csv_row_model.rb

@@ -10,11 +10,13 @@ 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/inherited_class_var'
+  require 'csv_row_model/concerns/check_options'
 
   require 'csv_row_model/validators/validate_attributes'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_row_model
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Steve Chung
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -29,16 +29,30 @@ dependencies:
   name: active_warnings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: inherited_class_var
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: 
 email:
 - hello@stevenchung.ca
@@ -60,32 +74,37 @@ files:
 - bin/setup
 - csv_row_model.gemspec
 - lib/csv_row_model.rb
-- lib/csv_row_model/concerns/inherited_class_var.rb
+- lib/csv_row_model/concerns/check_options.rb
 - lib/csv_row_model/concerns/inspect.rb
-- lib/csv_row_model/concerns/invalid_options.rb
 - lib/csv_row_model/engine.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/presenter.rb
+- lib/csv_row_model/import/representation.rb
+- lib/csv_row_model/import/represents.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/csv_string_model.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
@@ -112,9 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/lib/csv_row_model/concerns/inherited_class_var.rb

@@ -1,121 +0,0 @@
-require 'csv_row_model/concerns/invalid_options'
-
-module CsvRowModel
-  module Concerns
-    module InheritedClassVar
-      extend ActiveSupport::Concern
-      include InvalidOptions
-
-      class_methods do
-        # Clears the cache for a variable
-        # @param variable_name [Symbol] variable_name to cache against
-        def clear_class_cache(variable_name)
-          instance_variable_set inherited_class_variable_name(variable_name), nil
-        end
-
-        protected
-
-        # @param variable_name [Symbol] class variable name
-        def inherited_class_hash(variable_name, options={})
-          options = check_and_merge_options(options, dependencies: [])
-
-          options[:dependencies].each do |dependency_name|
-            define_singleton_method dependency_name do
-              class_cache(hidden_variable_name(dependency_name)) do
-                send("_#{dependency_name}")
-              end
-            end
-          end
-
-          hidden_variable_name = hidden_variable_name(variable_name)
-          define_singleton_method variable_name do
-            inherited_class_var(hidden_variable_name, {}, :merge)
-          end
-          define_singleton_method "merge_#{variable_name}" do |merge_value|
-            value = instance_variable_get(hidden_variable_name) || instance_variable_set(hidden_variable_name, {})
-
-            deep_clear_class_cache(hidden_variable_name)
-            options[:dependencies].each {|dependency_name| deep_clear_class_cache(hidden_variable_name(dependency_name)) }
-
-            value.merge!(merge_value)
-          end
-        end
-
-        # @param variable_name [Symbol] class variable name based on
-        # @return [Symbol] the hidden variable name for class_cache
-        def hidden_variable_name(variable_name)
-          "@_#{variable_name}".to_sym
-        end
-
-        # @param included_module [Module] module to search for
-        # @return [Array<Module>] inherited_ancestors of included_module (including self)
-        def inherited_ancestors(included_module=CsvRowModel::Concerns::InheritedClassVar)
-          included_model_index = ancestors.index(included_module)
-          included_model_index == 0 ? [included_module] : ancestors[0..(included_model_index - 1)]
-        end
-
-        # @param accessor_method_name [Symbol] method to access the inherited_custom_class
-        # @param base_parent_class [Class] class that the custom class inherits from if there's no parent
-        # @return [Class] a custom class with the inheritance following self. for example:
-        #
-        # grandparent -> parent -> self
-        #
-        # grandparent has inherited_custom_class, but parent, doesn't.
-        #
-        # then: base_parent_class -> grandparent::inherited_custom_class -> self::inherited_custom_class
-        def inherited_custom_class(accessor_method_name, base_parent_class)
-          parent_class = inherited_ancestors[1..-1].find do |klass|
-            klass.respond_to?(accessor_method_name)
-          end.try(accessor_method_name)
-          parent_class ||= base_parent_class
-
-          klass = Class.new(parent_class)
-          # how else can i get the current scopes name...
-          klass.send(:define_singleton_method, :name, &eval("-> { \"#{name}#{base_parent_class.name.demodulize}\" }"))
-          klass
-        end
-
-        # @param variable_name [Symbol] class variable name (recommend :@_variable_name)
-        # @param default_value [Object] default value of the class variable
-        # @param merge_method [Symbol] method to merge values of the class variable
-        # @return [Object] a class variable merged across ancestors until inherited_class_module
-        def inherited_class_var(variable_name, default_value, merge_method)
-          class_cache(variable_name) do
-            value = default_value
-
-            inherited_ancestors.each do |ancestor|
-              ancestor_value = ancestor.instance_variable_get(variable_name)
-              value = ancestor_value.public_send(merge_method, value) if ancestor_value.present?
-            end
-
-            value
-          end
-        end
-
-        # @param variable_name [Symbol] variable_name to cache against
-        # @return [String] the cache variable name for the cache
-        def inherited_class_variable_name(variable_name)
-          "#{variable_name}_inherited_class_cache"
-        end
-
-        # Clears the cache for a variable and the same variable for all it's dependant descendants
-        # @param variable_name [Symbol] variable_name to cache against
-        def deep_clear_class_cache(variable_name)
-          ([self] + descendants).each do |descendant|
-            descendant.try(:clear_class_cache, variable_name)
-          end
-        end
-
-        # Memozies a inherited_class_variable_name
-        # @param variable_name [Symbol] variable_name to cache against
-        def class_cache(variable_name)
-          #
-          # equal to: (has @)inherited_class_variable_name ||= yield
-          #
-          cache_variable_name = inherited_class_variable_name(variable_name)
-          instance_variable_get(cache_variable_name) || instance_variable_set(cache_variable_name, yield)
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/import/presenter.rb

@@ -1,153 +0,0 @@
-module CsvRowModel
-  module Import
-    class Presenter
-      include Concerns::InheritedClassVar
-      include Concerns::Inspect
-      include ActiveWarnings
-
-      inherited_class_hash :attributes, dependencies: %i[dependencies]
-
-      attr_reader :row_model
-
-      delegate :context, to: :row_model
-
-      def initialize(row_model)
-        @row_model = row_model
-      end
-
-      # Safe to override.
-      #
-      # @return [Boolean] returns true, if this instance should be skipped
-      def skip?
-        !valid?
-      end
-
-      # Safe to override.
-      #
-      # @return [Boolean] returns true, if the entire csv file should stop reading
-      def abort?
-        false
-      end
-
-      def valid?(*args)
-        super
-        filter_errors
-        errors.empty?
-      end
-
-      # @return [Presenter] returns the presenter of the previous row_model
-      def previous
-        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
-      # are in the errors
-      def filter_errors
-        using_warnings? ? row_model.using_warnings { _filter_errors } : _filter_errors
-      end
-
-      def _filter_errors
-        row_model.valid?
-        self.class.attribute_names.each do |attribute_name|
-          next unless errors.messages[attribute_name] &&
-            row_model.errors.messages.slice(*self.class.options(attribute_name)[:dependencies]).present?
-          errors.delete attribute_name
-        end
-
-        errors.messages.reverse_merge!(row_model.errors.messages)
-      end
-
-      # @param [Array] Array of column_names to check
-      # @return [Boolean] if column_names are present
-      def row_model_present?(*column_names)
-        column_names.each { |column_name| return false if row_model.public_send(column_name).blank? }
-        true
-      end
-
-      # @param [Symbol] attribute_name the attribute to check
-      # @return [Boolean] if the dependencies are valid
-      def valid_dependencies?(attribute_name)
-        row_model_present?(*self.class.options(attribute_name)[:dependencies])
-      end
-
-      # equal to: @method_name ||= yield
-      # @param [Symbol] method_name method_name in description
-      # @return [Object] the memoized result
-      def memoize(method_name)
-        variable_name = "@#{method_name}"
-        instance_variable_get(variable_name) || instance_variable_set(variable_name, yield)
-      end
-
-      class << self
-        # @return [Array<Symbol>] attribute names for the Presenter
-        def attribute_names
-          attributes.keys
-        end
-
-        # @param [Symbol] attribute_name name of attribute to find option
-        # @return [Hash] options for the attribute_name
-        def options(attribute_name)
-          attributes[attribute_name].first
-        end
-
-        # @param [Symbol] attribute_name name of attribute to find block
-        # @return [Proc, Lambda] block called for attribute
-        def block(attribute_name)
-          attributes[attribute_name].last
-        end
-
-        protected
-        # @return [Hash{Symbol => Array}] map of `dependency => [array of presenter attributes dependent on dependency]`
-        def _dependencies
-          dependencies = {}
-          attribute_names.each do |attribute_name|
-            options(attribute_name)[:dependencies].each do |dependency|
-              dependencies[dependency] ||= []
-              dependencies[dependency] << attribute_name
-            end
-          end
-          dependencies
-        end
-
-        def inspect_methods
-          @inspect_methods ||= %i[row_model].freeze
-        end
-
-        # Adds column to the row model
-        #
-        # @param [Symbol] attribute_name name of attribute to add
-        # @param [Proc] block to calculate the attribute
-        # @param options [Hash]
-        # @option options [Hash] :memoize whether to memoize the attribute (default: true)
-        # @option options [Hash] :dependencies the dependcies it has with the underlying row_model (default: [])
-        def attribute(attribute_name, options={}, &block)
-          options = check_and_merge_options(options, memoize: true, dependencies: [])
-
-          merge_attributes(attribute_name.to_sym => [options, block])
-          define_attribute_method(attribute_name)
-        end
-
-        # Define the attribute_method
-        # @param [Symbol] attribute_name name of attribute to add
-        def define_attribute_method(attribute_name)
-          define_method("__#{attribute_name}", &block(attribute_name))
-
-          define_method(attribute_name) do
-            return unless valid_dependencies?(attribute_name)
-            self.class.options(attribute_name)[:memoize] ?
-              memoize(attribute_name) { public_send("__#{attribute_name}") } :
-              public_send("__#{attribute_name}")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/csv_row_model/model/csv_string_model.rb

@@ -1,7 +0,0 @@
-module CsvRowModel
-  module Model
-    class CsvStringModel < OpenStruct
-      include ActiveWarnings
-    end
-  end
-end