Merge pull request #24 from Fivell/refactoring

refactoring

Author: Fivell

lib/active_admin_import/dsl.rb

@@ -42,18 +42,9 @@ module DSL
 
 
     def active_admin_import(options = {}, &block)
-      options.assert_valid_keys(*VALID_OPTIONS)
-
-      default_options = {
-          back: {action: :import},
-          csv_options: {},
-          template: "admin/import",
-          resource_class: config.resource_class,
-          resource_label: config.resource_label,
-          plural_resource_label: config.plural_resource_label,
-          headers_rewrites: {}
-      }
-      options = default_options.deep_merge(options)
+      options.assert_valid_keys(*Options::VALID_OPTIONS)
+
+      options = Options.options_for(config, options)
       params_key = ActiveModel::Naming.param_key(options[:template_object] || ActiveAdminImport::Model.new)
 
       collection_action :import, method: :get do
@@ -75,7 +66,7 @@ def active_admin_import(options = {}, &block)
       collection_action :do_import, method: :post do
         authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
 
-        @active_admin_import_model = options[:template_object] || ActiveAdminImport::Model.new
+        @active_admin_import_model = options[:template_object]
         @active_admin_import_model.assign_attributes(params[params_key].try(:deep_symbolize_keys) || {})
         #go back to form
         return render template: options[:template] unless @active_admin_import_model.valid?

lib/active_admin_import/model.rb

@@ -12,8 +12,8 @@ class Model
     validate :file_contents_present, if: proc { |me| me.file.present? }
 
 
-    before_validation :uncompress_file, if: proc { |me| me.archive? && me.allow_archive?  }
-    before_validation :encode_file,  if: proc { |me| me.force_encoding? && me.file.present? }
+    before_validation :uncompress_file, if: proc { |me| me.archive? && me.allow_archive? }
+    before_validation :encode_file, if: proc { |me| me.force_encoding? && me.file.present? }
 
     attr_reader :attributes
 
@@ -28,12 +28,7 @@ def assign_attributes(args = {}, new_record = false)
       @attributes.merge!(args)
       @new_record = new_record
       args.keys.each do |key|
-        key = key.to_sym
-        #generate methods for instance object by attributes
-        singleton_class.class_eval do
-          define_method(key) { self.attributes[key] } unless method_defined? key
-          define_method("#{key}=") { |new_value| @attributes[key] = new_value } unless method_defined? "#{key}="
-        end
+        define_methods_for(key.to_sym)
       end if args.is_a?(Hash)
     end
 
@@ -82,7 +77,7 @@ def file_path
     def encode_file
       data = File.read(file_path).encode(force_encoding, invalid: :replace, undef: :replace)
       File.open(file_path, 'w') do |f|
-          f.write(data)
+        f.write(data)
       end
     end
 
@@ -126,6 +121,28 @@ def file_type
         ''
       end
     end
+
+    protected
+
+    def define_methods_for(attr_name)
+      #generate methods for instance object by attributes
+      singleton_class.class_eval do
+        define_set_method(attr_name)
+        define_get_method(attr_name)
+      end
+    end
+
+
+    class <<self
+      def define_set_method(attr_name)
+        define_method(attr_name) { self.attributes[attr_name] } unless method_defined? attr_name
+      end
+
+      def define_get_method(attr_name)
+        define_method("#{attr_name}=") { |new_value| @attributes[attr_name] = new_value } unless method_defined? "#{attr_name}="
+      end
+    end
+
   end
 end
 

lib/active_admin_import/options.rb

@@ -1,6 +1,7 @@
 module ActiveAdminImport
 
-  VALID_OPTIONS = [
+  module Options
+    VALID_OPTIONS = [
         :back,
         :csv_options,
         :validate,
@@ -16,12 +17,27 @@ module ActiveAdminImport
         :template_object,
         :resource_class,
         :resource_label,
-        :plural_resource_label ,
+        :plural_resource_label,
         :headers_rewrites
-      ].freeze
+    ].freeze
 
 
+    def self.options_for(config, options= {})
+      options[:template_object] = ActiveAdminImport::Model.new  unless options.has_key? :template_object
 
+      {
+          back: {action: :import},
+          csv_options: {},
+          template: "admin/import",
+          resource_class: config.resource_class,
+          resource_label: config.resource_label,
+          plural_resource_label: config.plural_resource_label,
+          headers_rewrites: {}
+      }.deep_merge(options)
 
 
+
+    end
+
+  end
 end

spec/import_spec.rb

@@ -130,9 +130,9 @@ def upload_file!(name, ext='csv')
 
       context "without headers" do
         context "with known csv headers" do
-          before do
-            allow_any_instance_of(ActiveAdminImport::Model).to receive(:csv_headers).and_return(['Name', 'Last name', 'Birthday'])
-          end
+          let(:options) {
+            {template_object: ActiveAdminImport::Model.new(csv_headers: ['Name', 'Last name', 'Birthday'])}
+          }
 
           it "should import file" do
             upload_file!(:authors_no_headers)