has_metadata_column 1.0.2 → 1.0.3

data/has_metadata_column.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has_metadata_column"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2012-10-04"
+  s.date = "2012-12-14"
   s.description = "Reduce your table width and migration overhead by moving non-indexed columns to a separate metadata column."
   s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [

data/lib/has_metadata_column.rb

@@ -164,15 +164,21 @@ module HasMetadataColumn
   # @private
   def as_json(options={})
     options           ||= Hash.new # the JSON encoder can sometimes give us nil options?
-    options[:except]  = Array.wrap(options[:except]) + [ self.class.metadata_column ]
-    options[:methods] = Array.wrap(options[:methods]) + self.class.metadata_column_fields.keys - options[:except].map(&:to_sym)
+    options[:except]  = Array.wrap(options[:except]) + [self.class.metadata_column]
+    metadata          = self.class.metadata_column_fields.keys
+    metadata          &= Array.wrap(options[:only]) if options[:only]
+    metadata          -= Array.wrap(options[:except])
+    options[:methods] = Array.wrap(options[:methods]) + metadata
     super options
   end
 
   # @private
   def to_xml(options={})
-    options[:except]  = Array.wrap(options[:except]) + [ self.class.metadata_column ]
-    options[:methods] = Array.wrap(options[:methods]) + self.class.metadata_column_fields.keys - options[:except].map(&:to_sym)
+    options[:except]  = Array.wrap(options[:except]) + [self.class.metadata_column]
+    metadata          = self.class.metadata_column_fields.keys
+    metadata          &= Array.wrap(options[:only]) if options[:only]
+    metadata          -= Array.wrap(options[:except])
+    options[:methods] = Array.wrap(options[:methods]) + metadata
     super options
   end
 
@@ -210,11 +216,11 @@ module HasMetadataColumn
   def inspect
     "#<#{self.class.to_s} #{attributes.except(self.class.metadata_column.to_s).merge(_metadata_hash.try(:stringify_keys) || {}).map { |k, v| "#{k}: #{v.inspect}" }.join(', ')}>"
   end
-  
+
   # @private
   def reload_with_metadata
-    res = reload_without_metadata
-    @_metadata_hash = nil
+    res                = reload_without_metadata
+    @_metadata_hash    = nil
     @_changed_metadata = nil
     res
   end
@@ -235,6 +241,8 @@ module HasMetadataColumn
   def _metadata_hash
     @_metadata_hash ||= begin
       send(self.class.metadata_column) ? JSON.parse(send(self.class.metadata_column)) : {}
+    rescue ActiveModel::MissingAttributeError
+      {}
     end
   end
 
@@ -270,9 +278,9 @@ module HasMetadataColumn
     options = self.class.metadata_column_fields[attr.to_sym] || {}
     attribute_will_change! attr
     @_metadata_hash ||= {}
-    old = @_metadata_hash[attr.to_s]
+    old             = @_metadata_hash[attr.to_s]
     send :"#{self.class.metadata_column}=", @_metadata_hash.merge(attr.to_s => value).to_json
-    @_metadata_hash = nil
+    @_metadata_hash          = nil
     @_changed_metadata[attr] = old
     value
   end
@@ -281,7 +289,7 @@ module HasMetadataColumn
     return query_attribute_without_metadata(attr) unless self.class.metadata_column_fields.include?(attr.to_sym)
     return false unless (value = send(attr))
     options = self.class.metadata_column_fields[attr.to_sym] || {}
-    type = options[:type] || String
+    type    = options[:type] || String
     return !value.to_i.zero? if type.ancestors.include?(Numeric)
     return !value.blank?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_metadata_column
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails