activerecord-bixformer 0.3.17 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a553dd137e4cb28794ed4ee3dc0d23021c6a6a5
-  data.tar.gz: 4e95330e0d2e63fd593f0edff3f2308675b5a877
+  metadata.gz: b7480345d2a5db1dcd0809914ddaba4bbe4de9cc
+  data.tar.gz: eda722ac022f0565ae4b3a84e6ddafc727f049ba
 SHA512:
-  metadata.gz: 5267c6cb19fdc3033fa5b1c237cccfa8f54690ae3747cb21552b69b549c1db2b1d4d924f5ae4e1c80ecf7b4aa0363f8fef15a7b6cc682444a796a4a405fa7ba8
-  data.tar.gz: d03a119e6beac47d8dd0bc54216280bde2820ef8676e2e80edfe040e5bb8b090a5782206e0f880919a695c0549840acd27795388ee9623f864224a3498126815
+  metadata.gz: 4c0d417aa86d387084d73e7b0f21a5bb2216419ecccf473624fa1b455495539a37ac3cba99a5c14027eb3640a1f9ed7b552858181f29d80592a61db1932e46f9
+  data.tar.gz: dba239a89c70239e002a504fb85042a8c3a92aee9084d57f625f41fa16db2cd9e82fdc3cc71f9d40b341b9b102e822c36e81458fa012a2f34d3ea9398aba186d

data/lib/activerecord-bixformer/attribute/base.rb

@@ -23,7 +23,7 @@ module ActiveRecord
         private
 
         def record_attribute_value(record)
-          return nil if @name.match(/\A_/)
+          return nil if @name.match(/\A_/) && ! record.respond_to?(@name)
 
           record.__send__(@name)
         end

data/lib/activerecord-bixformer/attribute/boolean.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     module Attribute
       class Boolean < ::ActiveRecord::Bixformer::Attribute::Base
         def export(record)
-          true_value = (@options.is_a?(::Hash) && @options[:true]) || 'true'
+          true_value  = (@options.is_a?(::Hash) && @options[:true]) || 'true'
           false_value = (@options.is_a?(::Hash) && @options[:false]) || 'false'
 
           record_attribute_value(record).present? ? true_value : false_value
@@ -12,7 +12,7 @@ module ActiveRecord
         def import(value)
           return nil if value.blank?
 
-          true_value = (@options.is_a?(::Hash) && @options[:true]) || 'true'
+          true_value  = (@options.is_a?(::Hash) && @options[:true]) || 'true'
           false_value = (@options.is_a?(::Hash) && @options[:false]) || 'false'
 
           case value
@@ -21,7 +21,7 @@ module ActiveRecord
           when false_value
             false
           else
-            raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
+            raise ::ActiveRecord::Bixformer::AttributeError.new(self, value) if @options[:raise]
           end
         end
       end

data/lib/activerecord-bixformer/attribute/booletania.rb

@@ -18,7 +18,7 @@ module ActiveRecord
 
           return boolean_of[value] if boolean_of.key?(value)
 
-          raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
+          raise ::ActiveRecord::Bixformer::AttributeError.new(self, value) if @options[:raise]
         end
       end
     end

data/lib/activerecord-bixformer/attribute/date.rb

@@ -23,7 +23,7 @@ module ActiveRecord
 
           return result if result
 
-          raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
+          raise ::ActiveRecord::Bixformer::AttributeError.new(self, value) if @options[:raise]
         end
 
         private

data/lib/activerecord-bixformer/attribute/enumerize.rb

@@ -14,7 +14,7 @@ module ActiveRecord
           return nil if value.blank?
 
           @model.activerecord_constant.__send__(@name).options.to_h[value.strip] or
-            raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
+            raise ::ActiveRecord::Bixformer::AttributeError.new(self, value) if @options[:raise]
         end
       end
     end

data/lib/activerecord-bixformer/attribute/integer.rb

@@ -0,0 +1,42 @@
+module ActiveRecord
+  module Bixformer
+    module Attribute
+      class Integer < ::ActiveRecord::Bixformer::Attribute::Base
+        def import(value)
+          return nil if value.blank?
+
+          unless value.strip.match(/\A[0-9]+\z/)
+            if @options[:raise]
+              raise ::ActiveRecord::Bixformer::AttributeError.new(self, value, :not_an_integer)
+            else
+              return nil
+            end
+          end
+
+          numeric_value = value.to_i
+
+          [
+            [:greater_than,             -> (o, n) { n >  o }],
+            [:greater_than_or_equal_to, -> (o, n) { n >= o }],
+            [:less_than,                -> (o, n) { n <  o }],
+            [:less_than_or_equal_to,    -> (o, n) { n <= o }],
+          ].each do |restrict_name, validator|
+            restrict_value = @options[restrict_name]
+
+            next unless restrict_value.is_a?(::Integer)
+
+            next if validator.call(restrict_value, numeric_value)
+
+            if @options[:raise]
+              raise ::ActiveRecord::Bixformer::AttributeError.new(self, value, restrict_name, count: restrict_value)
+            else
+              return nil
+            end
+          end
+
+          numeric_value
+        end
+      end
+    end
+  end
+end

data/lib/activerecord-bixformer/attribute/time.rb

@@ -23,7 +23,7 @@ module ActiveRecord
 
           return result if result
 
-          raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
+          raise ::ActiveRecord::Bixformer::AttributeError.new(self, value) if @options[:raise]
         end
 
         private

data/lib/activerecord-bixformer/autoload.rb

@@ -9,7 +9,6 @@ module ActiveRecord
     autoload :Errors,                         'activerecord-bixformer/error'
     autoload :ImportError,                    'activerecord-bixformer/error'
     autoload :AttributeError,                 'activerecord-bixformer/error'
-    autoload :DataInvalid,                    'activerecord-bixformer/error'
 
     module Attribute
       autoload :Base,                'activerecord-bixformer/attribute/base'
@@ -18,6 +17,7 @@ module ActiveRecord
       autoload :Date,                'activerecord-bixformer/attribute/date'
       autoload :Enumerize,           'activerecord-bixformer/attribute/enumerize'
       autoload :FormattedForeignKey, 'activerecord-bixformer/attribute/formatted_foreign_key'
+      autoload :Integer,             'activerecord-bixformer/attribute/integer'
       autoload :Override,            'activerecord-bixformer/attribute/override'
       autoload :String,              'activerecord-bixformer/attribute/string'
       autoload :Time,                'activerecord-bixformer/attribute/time'

data/lib/activerecord-bixformer/error.rb

@@ -21,10 +21,10 @@ module ActiveRecord
     end
 
     class AttributeError < ::StandardError
-      def initialize(attribute, value, type)
+      def initialize(attribute, value, type = :invalid, options = {})
         @attribute = attribute.model.translate(attribute.name)
 
-        super(generate_message(attribute, type, value))
+        super(generate_message(attribute, type, value, options))
       end
 
       def full_message
@@ -34,7 +34,7 @@ module ActiveRecord
       private
 
       # implemented with referencing to https://github.com/rails/rails/blob/517cf249c369d4bca40b1f590ca641d8b717985e/activemodel/lib/active_model/errors.rb#L462
-      def generate_message(attribute, type, value)
+      def generate_message(attribute, type, value, options)
         model_klass = attribute.model.activerecord_constant
         model_scope = model_klass.i18n_scope
 
@@ -58,21 +58,15 @@ module ActiveRecord
 
         key = defaults.shift
 
-        options = {
+        options = options.merge(
           default: defaults,
           model: model_klass.model_name.human,
           attribute: model_klass.human_attribute_name(attribute.name),
           value: value
-        }
+        )
 
         I18n.translate(key, options)
       end
     end
-
-    class DataInvalid < AttributeError
-      def initialize(attribute, value)
-        super(attribute, value, :invalid)
-      end
-    end
   end
 end

data/lib/activerecord-bixformer/model/base.rb

@@ -39,6 +39,7 @@ module ActiveRecord
 
           @preferred_skip_attributes = @plan.pickup_value_for(self, :preferred_skip_attributes, [])
           @default_values            = @plan.pickup_value_for(self, :default_values, {})
+          @sort_indexes              = @plan.pickup_value_for(self, :sort_indexes, {})
 
           # At present, translation function is only i18n
           @translator = ::ActiveRecord::Bixformer::Translator::I18n.new
@@ -193,6 +194,25 @@ module ActiveRecord
 
           values
         end
+
+        def sortable_value(attribute, value)
+          index = @sort_indexes[attribute.name] || @plan.entry_attribute_size
+
+          { index: index, value: value }
+        end
+
+        def sort(sortable_values)
+          sortable_values_size = sortable_values.size.to_f
+
+          sortable_values.sort_by.with_index(0) do |v, i|
+            # Enumerable#sort は安定ではないので、 sort_by を使って、
+            # 明示的にユニークで必ず増加する数値を加えることで、同じ index だった場合に
+            # 順序が変わらないことを保証する
+            v[:index] + i / sortable_values_size
+          end.map do |v|
+            v[:value]
+          end
+        end
       end
     end
   end

data/lib/activerecord-bixformer/model/csv/base.rb

@@ -25,10 +25,7 @@ module ActiveRecord
           end
 
           def csv_titles
-            [
-              *@attributes.map { |attr| csv_title(attr.name) },
-              *@associations.flat_map(&:csv_titles)
-            ]
+            sort(sortable_csv_titles)
           end
 
           def csv_title(attribute_name)
@@ -75,6 +72,13 @@ module ActiveRecord
               association.import(csv_body_row, self_record_id)
             end
           end
+
+          def sortable_csv_titles
+            [
+              *@attributes.map { |attr| sortable_value(attr, csv_title(attr.name)) },
+              *@associations.flat_map { |assoc| assoc.__send__(:sortable_csv_titles) }
+            ]
+          end
         end
       end
     end

data/lib/activerecord-bixformer/model/csv/indexed.rb

@@ -44,14 +44,6 @@ module ActiveRecord
             super
           end
 
-          def csv_titles
-            (1..options[:size]).flat_map do |index|
-              update_translator(index)
-
-              super
-            end
-          end
-
           def csv_title(attribute_name)
             # TODO: indexed 以外の複数を扱うクラスがあった時の対処が必要
             if parents.find { |parent| parent.is_a?(::ActiveRecord::Bixformer::Model::Csv::Indexed) }
@@ -63,6 +55,14 @@ module ActiveRecord
 
           private
 
+          def sortable_csv_titles
+            (1..options[:size]).flat_map do |index|
+              update_translator(index)
+
+              super
+            end
+          end
+
           def update_translator(index)
             @translator.model_arguments = { index: index }
 

data/lib/activerecord-bixformer/model/csv/mapped.rb

@@ -46,14 +46,6 @@ module ActiveRecord
             end
           end
 
-          def csv_titles
-            @options[:in].flat_map do |key|
-              update_translator(key)
-
-              super
-            end
-          end
-
           def translate(attribute_name)
             # TODO: mapped 以外の複数を扱うクラスがあった時の対処が必要
             if parents.find { |parent| parent.is_a?(::ActiveRecord::Bixformer::Model::Csv::Mapped) }
@@ -65,6 +57,14 @@ module ActiveRecord
 
           private
 
+          def sortable_csv_titles
+            @options[:in].flat_map do |key|
+              update_translator(key)
+
+              super
+            end
+          end
+
           def update_translator(key)
             key = @options[:translate] ? @options[:translate].call(key) : key
 

data/lib/activerecord-bixformer/plan.rb

@@ -14,6 +14,7 @@ module ActiveRecord
         class_attribute :__bixformer_unique_attributes
         class_attribute :__bixformer_required_condition
         class_attribute :__bixformer_default_values
+        class_attribute :__bixformer_sort_indexes
         class_attribute :__bixformer_translation_config
 
         self.__bixformer_entry                     = {}
@@ -22,6 +23,7 @@ module ActiveRecord
         self.__bixformer_unique_attributes         = []
         self.__bixformer_required_condition        = {}
         self.__bixformer_default_values            = {}
+        self.__bixformer_sort_indexes              = {}
         self.__bixformer_translation_config        = { scope: :bixformer, extend_scopes: [] }
       end
 
@@ -36,7 +38,7 @@ module ActiveRecord
 
         [
           :entry, :preferred_skip_attributes, :required_attributes, :unique_attributes,
-          :required_condition, :default_values, :translation_config
+          :required_condition, :default_values, :sort_indexes, :translation_config
         ].each do |config_name|
           define_method "bixformer_#{config_name}" do |v|
             self.__send__("__bixformer_#{config_name}=", v)

data/lib/activerecord-bixformer/plan_accessor.rb

@@ -100,6 +100,16 @@ module ActiveRecord
         [type, arguments]
       end
 
+      def entry_attribute_size
+        counter = -> (v) do
+          (v[:attributes] || {}).keys.size + (v[:associations] || {}).values.inject(0) do |sum, assoc_v|
+            sum + counter.call(assoc_v)
+          end
+        end
+
+        @entry_attribute_size ||= counter.call(compile_config_value(:entry))
+      end
+
       private
 
       def compile_config_value(config_name)

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.3.17"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.4.0
 platform: ruby
 authors:
 - Hiroaki Otsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -229,6 +229,7 @@ files:
 - lib/activerecord-bixformer/attribute/date.rb
 - lib/activerecord-bixformer/attribute/enumerize.rb
 - lib/activerecord-bixformer/attribute/formatted_foreign_key.rb
+- lib/activerecord-bixformer/attribute/integer.rb
 - lib/activerecord-bixformer/attribute/override.rb
 - lib/activerecord-bixformer/attribute/string.rb
 - lib/activerecord-bixformer/attribute/time.rb