activerecord-bixformer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525850c477621e80252c030d003cdfafedb124ad
-  data.tar.gz: c1b5d75f0fedc2d7cd5b0506f7d4d17e5ee3ec40
+  metadata.gz: 00e9b24b92407ae36d6e54ec0baea46b42b8d6dd
+  data.tar.gz: 78ab0a18aa7407a29ec2e367d325cacf38ccb7e2
 SHA512:
-  metadata.gz: fdb0105819005d89f3c70ef030c2ce2316683f981687f7cf35a038074b7771646c4ed9f0350a00b7624a3f6711ef3d4a9ab20fc6636f6f934b98f4fe72e9bcfc
-  data.tar.gz: 4d8a6bab8708bfd6fb640ed0baaa7665db1dd66ac53207d0011dfceb4af18da9d821a751d14172e1f9e76628cc454881cd29ba924d595c25e7750390d0547c58
+  metadata.gz: 9711f06d78d4f34e51f6aa606dcd354ec35ecbf19788cf901510c64c45cfb7de06816bf293cb3ecdfa0cdc17b46f40a1e6c7311a372a6fe9e7d77142345a39d3
+  data.tar.gz: b60e586431292a13c98ae4c74579552e86eb6d6d6b900cfaebedcaa2f04808aeac7ceba0d25a15f41310b5805eef44f25179183b9797d3f4c2154409e53a4c9d

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

@@ -39,12 +39,6 @@ module ActiveRecord
             ]
           end
 
-          def parse_self_data_source(csv_row)
-            csv_row
-          end
-
-          private
-
           def csv_title(attribute_name)
             @translator.translate_attribute(attribute_name)
           end

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

@@ -39,6 +39,14 @@ module ActiveRecord
             end
           end
 
+          def csv_title(attribute_name)
+            if parents.find { |parent| parent.is_a?(::ActiveRecord::Bixformer::Model::Csv::Indexed) }
+              parents.map { |parent| parent.translator.translate_model }.join + super
+            else
+              super
+            end
+          end
+
           private
 
           def update_translator(index)
@@ -48,14 +56,6 @@ module ActiveRecord
               [attr.name, { index: index }]
             end.to_h
           end
-
-          def csv_title(attribute_name)
-            if parents.find { |parent| parent.is_a?(::ActiveRecord::Bixformer::Model::Csv::Indexed) }
-              parents.map { |parent| parent.translator.translate_model }.join + super
-            else
-              super
-            end
-          end
         end
       end
     end

data/lib/activerecord-bixformer/plan_accessor.rb

@@ -12,7 +12,7 @@ module ActiveRecord
       end
 
       def value_of(config_name)
-        @plan.__send__(config_name)
+        @plan.__send__(config_name).dup
       end
 
       def pickup_value_for(model, config_name, default_value = nil)
@@ -120,10 +120,15 @@ module ActiveRecord
       end
 
       def module_load_namespaces(module_type)
+        module_type_namespace = module_type.to_s.camelize
+
+        plan_namespace = @plan.class.__bixformer_namespace
+        plan_namespace = "#{plan_namespace.camelize}::#{module_type_namespace}" if plan_namespace
+
         [
-          @plan.class.__bixformer_namespace,
-          "::ActiveRecord::Bixformer::#{module_type.to_s.camelize}::#{@plan.__bixformer_format.camelize}",
-          "::ActiveRecord::Bixformer::#{module_type.to_s.camelize}",
+          plan_namespace,
+          "::ActiveRecord::Bixformer::#{module_type_namespace}::#{@plan.__bixformer_format.camelize}",
+          "::ActiveRecord::Bixformer::#{module_type_namespace}",
         ].compact
       end
     end

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hiroaki Otsu