activerecord-archiver 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97c0abdbfd631c850f338c67a44603dd0cce276b
-  data.tar.gz: d1cc6d9d1252274fa5116f023dc33155fcbb3bc5
+  metadata.gz: 2bdff8e8f67863ac5b05cfa5e3daa7840b75a8dc
+  data.tar.gz: 710d3165f5fdc54c300c821218194049e17832cb
 SHA512:
-  metadata.gz: 9f77bb6d5eae62249dec8de855acc796af1ec13b9834d0201d809413a0d8519242395db71dd5daf131315fb1501bfe8cd29b7e998419b1d20df9e7031144ec1f
-  data.tar.gz: 827510f31bbf47b063124136b6588232b7519b2734ed19bb604f4bfa87c29ba5797885e6b48c1aec2da7ee7c62c2b4e9a40b3b08f22c427baa4354a331697043
+  metadata.gz: c86715f1d5e18e6f10db8b77404bde002a7b5c87b64c8011d4c7665725063877e048f670cd8a1550e0e854029704465e2d2af2bd1254e08b58e83efab9972f08
+  data.tar.gz: 3e83f5603dbba48fe6049e4bcd30cc3656ce03a6fb8ad51c53896929c3a7ef9eae2cf334b8bdfb90ad8258fe51d1d228c2b989ca83e97796bd8124906f610632

data/lib/activerecord-archiver/archiver.rb

@@ -81,18 +81,35 @@ class ActiveRecordArchiver
     model.reflections.values.detect{|ref| ref.foreign_key == attribute}
   end
   
-  def self.cols_for_model model, all_models
+  def self.parse_array_option options, key
+    if options.is_a? Hash
+      case options[key]
+      when Array then options[key].map(&:to_s)
+      when nil then []
+      else [options[key].to_s] end
+    else [] end
+  end
+  
+  def self.id_warning model, col
+    "Warning: #{model}##{col.name} included in export." +
+      "  To exclude it use ActiveRecordArchiver.export(#{model.name.downcase.pluralize} => " +
+      "{:exclude => [:#{col.name}]})"
+  end
+  
+  def self.cols_for_model model, all_models, options={}
     model.columns.map do |col|
-      if col.primary
-        # omit primary keys
+      if (col.primary or
+          parse_array_option(options, :exclude).include? col.name)
+        # omit primary keys and excluded columns
         nil
-      elsif (relation = relation_from_key(model, col.name))
+      elsif (relation = relation_from_key(model, col.name)) and relation.belongs_to?
         # include belongs_to relations to included models
         if all_models.include? relation.klass
           relation.name
         else nil end
       else
-        warn "Warning: #{model}##{col.name} included in export" if col.name =~ /_id$/
+        # warn before adding an attribute ending in '_id'
+        warn id_warning(model, col) if col.name =~ /_id$/
         col.name
       end
     end.compact

data/lib/activerecord-archiver/export.rb

@@ -104,9 +104,12 @@ class ActiveRecordArchiver
     options.each_pair do |collection, cols|
       models_hash[collection.first.class] =
         [collection,
-         if cols == :all
-           cols_for_model(collection.first.class, models)
-         else cols end]
+         if cols.is_a? Array then cols
+         elsif cols == :all or cols.is_a? Hash
+           cols_for_model(collection.first.class, models, cols)
+         else
+           raise "unknown column specification: #{cols}"
+         end]
     end
     
     models_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-archiver
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sam Auciello