has_metadata_column 1.0.3 → 1.1.0

data/README.md

@@ -4,7 +4,7 @@ Has Metadata Column -- Keep your tables narrow
 |             |                                 |
 |:------------|:--------------------------------|
 | **Author**  | Tim Morgan                      |
-| **Version** | 1.0.2 (Oct 4, 2012)             |
+| **Version** | 1.1.0 (Jul 9, 2013)             |
 | **License** | Released under the MIT License. |
 
 About
@@ -32,7 +32,7 @@ does not get its little fingers all up in ActiveRecord's business.
 
 h2. Installation
 
-**Important Note:** This gem is only compatible with Ruby 1.9 and Rails 3.0.
+**Important Note:** This gem is only compatible with Ruby 1.9 and Rails 4.0.
 
 Merely add the gem to your Rails project's `Gemfile`:
 

data/has_metadata_column.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has_metadata_column"
-  s.version = "1.0.3"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2012-12-14"
+  s.date = "2013-07-09"
   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 = [
@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Schemaless metadata using JSON columns"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 4.0"])
       s.add_runtime_dependency(%q<boolean>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<redcarpet>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0"])
+      s.add_dependency(%q<rails>, [">= 4.0"])
       s.add_dependency(%q<boolean>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0"])
+    s.add_dependency(%q<rails>, [">= 4.0"])
     s.add_dependency(%q<boolean>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/lib/has_metadata_column.rb

@@ -20,7 +20,7 @@ module HasMetadataColumn
   extend ActiveSupport::Concern
 
   # Valid values for the `:type` option.
-  TYPES = [ String, Fixnum, Integer, Float, Hash, Array, TrueClass, FalseClass, Boolean, NilClass, Date, Time ]
+  TYPES = [String, Fixnum, Integer, Float, Hash, Array, TrueClass, FalseClass, Boolean, NilClass, Date, Time]
 
   # @private
   def self.metadata_typecast(value, type=nil)
@@ -110,7 +110,6 @@ module HasMetadataColumn
         alias_method_chain :attribute_method?, :metadata
         alias_method_chain :attribute, :metadata
         alias_method_chain :attribute_before_type_cast, :metadata
-        alias_method_chain :_attribute, :metadata
         alias_method_chain :attribute=, :metadata
         alias_method_chain :query_attribute, :metadata
         alias_method_chain :reload, :metadata
@@ -130,31 +129,35 @@ module HasMetadataColumn
 
           validate do |obj|
             value = obj.send(name)
-            errors.add(name, :incorrect_type) if !HasMetadataColumn.metadata_typecast(value, type).kind_of?(type) &&
-              (!options[:allow_nil] || (options[:allow_nil] && !value.nil?)) &&
-              (!options[:allow_blank] || (options[:allow_blank] && !value.blank?))
+            if !HasMetadataColumn.metadata_typecast(value, type).kind_of?(type) &&
+                (!options[:allow_nil] || (options[:allow_nil] && !value.nil?)) &&
+                (!options[:allow_blank] || (options[:allow_blank] && !value.blank?))
+              errors.add(name, :incorrect_type)
+            end
           end if type && type_validate
           validates(name, options) unless options.empty? or (options.keys - [:allow_nil, :allow_blank]).empty?
         end
       end
 
       if !respond_to?(:define_attribute_methods_with_metadata) && !superclass.respond_to?(:define_attribute_methods_with_metadata) &&
-        !respond_to?(:define_method_attribute_with_metadata) && !superclass.respond_to?(:define_method_attribute_with_metadata)
+          !respond_to?(:define_method_attribute_with_metadata) && !superclass.respond_to?(:define_method_attribute_with_metadata)
         class << self
           def define_attribute_methods_with_metadata
             define_attribute_methods_without_metadata
             metadata_column_fields.keys.each { |field| define_attribute_method field }
           end
+
           alias_method_chain :define_attribute_methods, :metadata
 
           def define_method_attribute_with_metadata(attr_name)
             return define_method_attribute_without_metadata(attr_name) unless metadata_column_fields.include?(attr_name.to_sym)
             attribute_method_matchers.each do |matcher|
               method_name = matcher.method_name(attr_name)
-              define_optimized_call generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
+              define_proxy_call true, generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
               attribute_method_matchers_cache.clear
             end
           end
+
           alias_method_chain :define_method_attribute, :metadata
         end
       end
@@ -163,10 +166,10 @@ 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]
-    metadata          = self.class.metadata_column_fields.keys
-    metadata          &= Array.wrap(options[:only]) if options[:only]
+    options          ||= Hash.new # the JSON encoder can sometimes give us nil options?
+    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
@@ -174,9 +177,9 @@ module HasMetadataColumn
 
   # @private
   def to_xml(options={})
-    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]
+    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
@@ -214,7 +217,7 @@ module HasMetadataColumn
 
   # @private
   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(', ')}>"
+    "#<#{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
@@ -275,11 +278,9 @@ module HasMetadataColumn
   def attribute_with_metadata=(attr, value)
     return send(:attribute_without_metadata=, attr, value) unless self.class.metadata_column_fields.include?(attr.to_sym)
 
-    options = self.class.metadata_column_fields[attr.to_sym] || {}
     attribute_will_change! attr
-    @_metadata_hash ||= {}
-    old             = @_metadata_hash[attr.to_s]
-    send :"#{self.class.metadata_column}=", @_metadata_hash.merge(attr.to_s => value).to_json
+    old = _metadata_hash[attr.to_s]
+    send :"#{self.class.metadata_column}=", _metadata_hash.merge(attr.to_s => value).to_json
     @_metadata_hash          = nil
     @_changed_metadata[attr] = old
     value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_metadata_column
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: boolean
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Schemaless metadata using JSON columns