has_metadata_column 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fe1f392ba5d8e28fcfa3961f48226ff67a7150
-  data.tar.gz: 49a78d081bbc71cf5142918018b4af1adc9ab4b4
+  metadata.gz: 790f5c7a05281203980c9ba2b8320cc64128304f
+  data.tar.gz: aba51f2f218997b2758e4efc898c2967bfc2ca45
 SHA512:
-  metadata.gz: 44662900d5ab1d8c6d8bd47849077bd51be7bf22bbe8f588e1545c9740da78c329a1bcd57ac0e552b38c7bba7ad3f1fb3cb771fe514235704dd24c7ce73e5f37
-  data.tar.gz: b61ac7b2115c382ac708e6444552349247ea25f5477c56a12c61fa6fafd2144ac190dac9125a4e4831e7e2430abc184fa01907c5ff3d1643f44eb904d328415d
+  metadata.gz: f7702944ad2ab9f954293e010b74b39eb747a4c31629c86958f9f56c98cba640a1789c384733c91db92725502c7ebb7d9fd76cb5de3c2ec46370a210293782a7
+  data.tar.gz: d6c22bc4ea916c4831104d4388c3392f462abc1fd0c756eeeb31a0d98323c8c16eb793da28b3f59de10badfdc510f19dce31b2f0997362e417b95960ebee15b3

data/has_metadata_column.gemspec

@@ -1,19 +1,19 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: has_metadata_column 1.1.5 ruby lib
+# stub: has_metadata_column 1.1.6 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "has_metadata_column"
-  s.version = "1.1.5"
+  s.name = "has_metadata_column".freeze
+  s.version = "1.1.6"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Tim Morgan"]
-  s.date = "2014-12-20"
-  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.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Tim Morgan".freeze]
+  s.date = "2016-07-04"
+  s.description = "Reduce your table width and migration overhead by moving non-indexed columns to a separate metadata column.".freeze
+  s.email = "git@timothymorgan.info".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -23,40 +23,43 @@ Gem::Specification.new do |s|
     "has_metadata_column.gemspec",
     "lib/has_metadata_column.rb"
   ]
-  s.homepage = "http://github.com/riscfuture/has_metadata_column"
-  s.licenses = ["MIT"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "2.4.5"
-  s.summary = "Schemaless metadata using JSON columns"
+  s.homepage = "http://github.com/riscfuture/has_metadata_column".freeze
+  s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9".freeze)
+  s.rubygems_version = "2.6.6".freeze
+  s.summary = "Schemaless metadata using JSON columns".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 4.2"])
-      s.add_runtime_dependency(%q<boolean>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<redcarpet>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>.freeze, [">= 5.0"])
+      s.add_runtime_dependency(%q<boolean>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_development_dependency(%q<redcarpet>.freeze, [">= 0"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_development_dependency(%q<activemodel-serializers-xml>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 4.2"])
-      s.add_dependency(%q<boolean>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<redcarpet>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rails>.freeze, [">= 5.0"])
+      s.add_dependency(%q<boolean>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_dependency(%q<redcarpet>.freeze, [">= 0"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<activemodel-serializers-xml>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 4.2"])
-    s.add_dependency(%q<boolean>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<redcarpet>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rails>.freeze, [">= 5.0"])
+    s.add_dependency(%q<boolean>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<yard>.freeze, [">= 0"])
+    s.add_dependency(%q<redcarpet>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<activemodel-serializers-xml>.freeze, [">= 0"])
   end
 end
 

data/lib/has_metadata_column.rb

@@ -19,6 +19,8 @@ end
 module HasMetadataColumn
   extend ActiveSupport::Concern
 
+  included { prepend Extensions }
+
   # Valid values for the `:type` option.
   TYPES = [String, Fixnum, Integer, Float, Hash, Array, TrueClass, FalseClass, Boolean, NilClass, Date, Time]
 
@@ -102,15 +104,6 @@ module HasMetadataColumn
         self.metadata_column_fields = fields.deep_clone
         class_attribute :metadata_column
         self.metadata_column = column || :metadata
-
-        # alias_method_chain :changed_attributes, :metadata_column
-        alias_method_chain :attribute_will_change!, :metadata_column
-        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 :query_attribute, :metadata
-        alias_method_chain :keys_for_partial_write, :metadata
       else
         raise "Cannot redefine existing metadata column #{self.metadata_column}" if column && column != self.metadata_column
         if metadata_column_fields.slice(*fields.keys) != fields
@@ -172,10 +165,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
@@ -183,9 +176,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
@@ -218,7 +211,7 @@ module HasMetadataColumn
       end
     end
 
-    super(pairs - fake_attributes)
+    super(pairs.except(*fake_attributes.keys))
   end
 
   # @private
@@ -229,19 +222,12 @@ module HasMetadataColumn
   # @private
   def reload(*)
     super.tap do
-      @_metadata_hash    = nil
+      @_metadata_hash = nil
     end
   end
 
   private
 
-  def attribute_will_change_with_metadata_column!(attr)
-    unless attribute_names.include?(attr)
-      send :"#{self.class.metadata_column}_will_change!"
-    end
-    attribute_will_change_without_metadata_column! attr
-  end
-
   def _metadata_hash
     @_metadata_hash ||= begin
       send(self.class.metadata_column) ? JSON.parse(send(self.class.metadata_column)) : {}
@@ -250,52 +236,61 @@ module HasMetadataColumn
     end
   end
 
-  ## ATTRIBUTE MATCHER METHODS
+  module Extensions
+    def attribute_will_change!(attr)
+      unless attribute_names.include?(attr)
+        send :"#{self.class.metadata_column}_will_change!"
+      end
+      super
+    end
 
-  def attribute_with_metadata(attr)
-    return attribute_without_metadata(attr) unless self.class.metadata_column_fields.include?(attr.to_sym)
+    ## ATTRIBUTE MATCHER METHODS
 
-    options = self.class.metadata_column_fields[attr.to_sym] || {}
-    default = options.include?(:default) ? options[:default] : nil
-    _metadata_hash.include?(attr) ? HasMetadataColumn.metadata_typecast(_metadata_hash[attr], options[:type]) : default
-  end
+    def attribute(attr)
+      return super unless self.class.metadata_column_fields.include?(attr.to_sym)
 
-  def attribute_before_type_cast_with_metadata(attr)
-    return attribute_before_type_cast_without_metadata(attr) unless self.class.metadata_column_fields.include?(attr.to_sym)
-    options = self.class.metadata_column_fields[attr.to_sym] || {}
-    default = options.include?(:default) ? options[:default] : nil
-    _metadata_hash.include?(attr) ? _metadata_hash[attr] : default
-  end
+      options = self.class.metadata_column_fields[attr.to_sym] || {}
+      default = options.include?(:default) ? options[:default] : nil
+      _metadata_hash.include?(attr) ? HasMetadataColumn.metadata_typecast(_metadata_hash[attr], options[:type]) : default
+    end
 
-  def _attribute_with_metadata(attr)
-    return _attribute_without_metadata(attr) unless self.class.metadata_column_fields.include?(attr.to_sym)
-    attribute_with_metadata attr
-  end
+    def attribute_before_type_cast(attr)
+      return super unless self.class.metadata_column_fields.include?(attr.to_sym)
+      options = self.class.metadata_column_fields[attr.to_sym] || {}
+      default = options.include?(:default) ? options[:default] : nil
+      _metadata_hash.include?(attr) ? _metadata_hash[attr] : default
+    end
 
-  def attribute_with_metadata=(attr, value)
-    return send(:attribute_without_metadata=, attr, value) unless self.class.metadata_column_fields.include?(attr.to_sym)
+    def _attribute(attr)
+      return super unless self.class.metadata_column_fields.include?(attr.to_sym)
+      attribute attr
+    end
 
-    attribute_will_change! attr
-    old = _metadata_hash[attr.to_s]
-    send :"#{self.class.metadata_column}=", _metadata_hash.merge(attr.to_s => value).to_json
-    @_metadata_hash          = nil
-    value
-  end
+    def attribute=(attr, value)
+      return super unless self.class.metadata_column_fields.include?(attr.to_sym)
 
-  def query_attribute_with_metadata(attr)
-    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
-    return !value.to_i.zero? if type.ancestors.include?(Numeric)
-    return !value.blank?
-  end
+      attribute_will_change! attr
+      old = _metadata_hash[attr.to_s]
+      send :"#{self.class.metadata_column}=", _metadata_hash.merge(attr.to_s => value).to_json
+      @_metadata_hash = nil
+      value
+    end
 
-  def attribute_method_with_metadata?(attr)
-    self.class.metadata_column_fields.include?(attr.to_sym) || attribute_method_without_metadata?(attr)
-  end
+    def query_attribute(attr)
+      return super 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
+      return !value.to_i.zero? if type.ancestors.include?(Numeric)
+      return !value.blank?
+    end
 
-  def keys_for_partial_write_with_metadata
-    keys_for_partial_write_without_metadata - self.class.metadata_column_fields.keys.map(&:to_s)
+    def attribute_method?(attr)
+      self.class.metadata_column_fields.include?(attr.to_sym) || super
+    end
+
+    def keys_for_partial_write
+      super - self.class.metadata_column_fields.keys.map(&:to_s)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_metadata_column
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: boolean
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel-serializers-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Schemaless metadata using JSON columns