active_model_serializers_pg 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61aa96dfaadcdbb0304b0a8ea50b05468ad7474c6d3b740419c8bf525f28c01
-  data.tar.gz: 1d5dfd08ff5168add108de4854246f48ed564b0548d8a66155068d26d41f4805
+  metadata.gz: ee3c698a1508537d359551eb125a45c38bd0921dfd059ae49422dd7d114aa7f2
+  data.tar.gz: 677ac55b0c35a51ba03b042b34ed3fd560b57d223b6687ca020eaa3b131aabda
 SHA512:
-  metadata.gz: 32d433d676644d637de1cfda49d340f35221a6f1a08a5b8b74f605018e5f4169a45ec50bfcafe2c2fc20cb95e53cdaa98123e2b25b3246cafb276c2e68926301
-  data.tar.gz: d21913bd9baa516e016adcea39c28f4ce05446753553676485fd75cca1fbce1e36727df16bca2d6004b999ba6850d9ec14dc6bf29ac2f1c25660ee3b84dd31ae
+  metadata.gz: 82f91e03d0b6440e6b6002909b51e346c5e21293659ca0fc80b976df30bcfc089a294b1c4f42a7ca20c01b20d612203ead218ec3c268d5bd5bb4832652df923d
+  data.tar.gz: d906a81cde8076d6150f6466263619f5283d3f5e1e9bbcedaef938f8f5633e2fdd2d1366ef3ca18343669773ef09809cc837df3cc99719ecaefbdae8a94ff2a7

data/README.md

@@ -31,6 +31,13 @@ Or install it yourself as:
 
     gem install active_model_serializers_pg
 
+### Migrations
+
+This gem depends on a SQL function to dasherize hstore/json/jsonb columns, so you must add its migration to your project and run it, like this:
+
+    rails g active_model_serializers_pg
+    rake db:migrate
+
 ## Usage
 
 You can enable in-Postgres serialization for everything by putting this in a Rails initializer:
@@ -52,8 +59,10 @@ Here are some other details we support:
 - `belongs_to`, `has_one`, and `has_many` associations.
 - If you serialize an `enum` you get the string values, not integers.
 - You can serialize an `alias`'d association.
+- You can serialize an `alias_attribute`'d column.
 - We preserve SQL ordering from a model's `default_scope`.
 - We preserve SQL ordering attached to an association.
+- When dasherizing we also dasherize json/jsonb/hstore contents (like standard AMS).
 
 ### Methods in Serializers and Models
 
@@ -110,7 +119,7 @@ To work on active\_model\_serializers\_pg locally, follow these steps:
  4. Run `bundle exec rake db:create`, this will create the test database.
  5. Run `bundle exec rake db:migrate`, this will set up the database tables required
     by the test.
- 6. Run `bundle exec rake test:all` to run tests against all supported versions of Active Record (currently 5.0.x, 5.1.x, 5.2.x).
+ 6. Run `bundle exec rake test:all` to run tests against all supported versions of Active Record (currently 5.0.x, 5.1.x, 5.2.x, 6.0.x).
     You can also say `BUNDLE_GEMFILE=gemfiles/Gemfile.activerecord-5.2.x bundle exec rspec spec` to run against a specific version (and select specific tests).
 
 Commands for building/releasing/installing:

data/Rakefile

@@ -72,9 +72,17 @@ namespace :db do
   task :migrate => :load_db_settings do
     ActiveRecord::Base.establish_connection
 
+    ActiveRecord::Base.connection.execute "CREATE EXTENSION hstore"
+
     ActiveRecord::Base.connection.create_table :people, force: true do |t|
       t.string   "first_name"
       t.string   "last_name"
+      t.json     "options"
+      t.jsonb    "prefs"
+      t.hstore   "settings"
+      t.json     "selfies", array: true
+      t.jsonb    "portraits", array: true
+      t.hstore   "landscapes", array: true
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -131,6 +139,8 @@ namespace :db do
       t.datetime "updated_at"
     end
 
+    ActiveRecord::Base.connection.execute File.read(File.expand_path('../lib/generators/active_record/templates/jsonb_dasherize.sql', __FILE__))
+
     puts 'Database migrated'
   end
 end
@@ -141,7 +151,7 @@ namespace :test do
     # Escape current bundler environment
     Bundler.with_clean_env do
       # Currently only supports Active Record v5.0-v5.2
-      %w(5.0.x 5.1.x 5.2.x).each do |version|
+      %w(5.0.x 5.1.x 5.2.x 6.0.x).each do |version|
         sh "BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-#{version}' bundle install --quiet"
         sh "BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-#{version}' bundle exec rspec spec"
       end

data/active_model_serializers_pg.gemspec

@@ -19,12 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency     'active_model_serializers', '~> 0.10.8'
-  spec.add_runtime_dependency     'activerecord', '~> 5.0'
+  spec.add_runtime_dependency     'activerecord', '>= 5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'actionpack', '> 4.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'generator_spec'
   spec.add_development_dependency 'bourne', '~> 1.3.0'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'dotenv'

data/gemfiles/Gemfile.activerecord-5.0.x

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec :path => '..'
 
-gem "activerecord", "~>5.0.0"
+gem "rails", "~>5.0.0"

data/gemfiles/Gemfile.activerecord-5.1.x

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec :path => '..'
 
-gem "activerecord", "~>5.1.0"
+gem "rails", "~>5.1.0"

data/gemfiles/Gemfile.activerecord-5.2.x

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec :path => '..'
 
-gem "activerecord", "~>5.2.0"
+gem "rails", "~>5.2.0"

data/gemfiles/Gemfile.activerecord-6.0.x

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec :path => '..'
+
+gem "rails", "~>6.0.0"

data/lib/active_model_serializers/adapter/json_api_pg.rb

@@ -8,7 +8,7 @@ module ActiveModel
   class Serializer
     class CollectionSerializer
       def element_serializer
-        options[:serializer]
+        options && options[:serializer]
       end
     end
   end
@@ -23,7 +23,16 @@ module ActiveModelSerializers
       end
 
       def to_json(options={})
-        connection.select_value serializer_sql
+        if relation.nil?
+          ret = { data: [] }
+          if includes.any?
+            # TODO: Can included ever be non-empty when the main data is empty?
+            ret[:included] = []
+          end
+          ret.to_json
+        else
+          connection.select_value serializer_sql
+        end
       end
 
       def relation
@@ -32,6 +41,10 @@ module ActiveModelSerializers
 
       private
 
+      def includes
+        instance_options && instance_options[:include] || []
+      end
+
       def connection
         @connection ||= relation.connection
       end
@@ -42,8 +55,12 @@ module ActiveModelSerializers
         when ActiveRecord::Relation
           o
         when Array
-          # TODO: determine what class it is, even if the array is empty
-          o.first.class.where(id: o.map(&:id))
+          o2 = o.first
+          if o2.nil?
+            nil
+          else
+            o2.class.where(id: o.map(&:id))
+          end
         when ActiveRecord::Base
           o.class.where(id: o.id)
         else
@@ -60,7 +77,7 @@ module ActiveModelSerializers
       end
 
       def self.warn_about_collection_serializer
-          msg = "You are using an ordinary AMS CollectionSerializer with the json_api_pg adapter, which probably means Rails is pointlessly loading all your ActiveRecord instances *and* running the build JSON-building query in Postgres."
+          msg = "You are using an ordinary AMS CollectionSerializer with the json_api_pg adapter, which probably means Rails is pointlessly loading all your ActiveRecord instances *and* running the JSON-building query in Postgres."
           if Object.const_defined? 'Rails'
             Rails.logger.warn msg
           else
@@ -88,11 +105,11 @@ end
 # i.e. how you got here, not how you'd leave:
 # "Reflection" seems to be the internal ActiveRecord lingo
 # for a belongs_to or has_many relationship.
-# (The public documentation calls these "associations",
-# I think think older versions of Rails even used that internally,
+# (The public documentation calls these "associations".
+# I think older versions of Rails even used that internally,
 # but nowadays the method names use "reflection".)
 class JsonThing
-  attr_reader :ar_class, :full_name, :name, :serializer, :serializer_options, :json_key, :json_type, :reflection, :parent, :cte_name
+  attr_reader :ar_class, :full_name, :name, :serializer, :serializer_options, :json_key, :json_type, :reflection, :parent, :cte_name, :jbs_name
   delegate :table_name, :primary_key, to: :ar_class
   delegate :foreign_key, :belongs_to?, :has_many?, :has_one?, to: :reflection
 
@@ -113,6 +130,7 @@ class JsonThing
     @parent = parent_json_thing
 
     @cte_name = _cte_name
+    @jbs_name = _jbs_name
     @sql_methods = {}
   end
 
@@ -123,26 +141,17 @@ class JsonThing
     JsonThing.new(refl.klass, "#{full_name}.#{reflection_name}", nil, serializer_options, refl, self)
   end
 
-  # Gets the attributes (i.e. scalar fields) on the AR class
-  # as a Set of symbols.
-  # TODO: tests
-	def declared_attributes
-    @declared_attributes ||= Set.new(@ar_class.attribute_types.keys.map(&:to_sym))
-  end
-
   def enum?(field)
     @ar_class.attribute_types[field.to_s].is_a? ActiveRecord::Enum::EnumType
   end
 
-  # Gets the reflections (aka associations) of the AR class
-  # as a Hash from symbol to a subclass of ActiveRecord::Reflection.
-  # TODO: tests
-  def declared_reflections
-    @declared_reflections ||= Hash[
-      @ar_class.reflections.map{|k, v|
-        [k.to_sym, v]
-      }
-    ]
+  # Checks for alias_attribute and gets to the real attribute name.
+  def unaliased(field_name)
+    ret = field_name
+    while field_name = @ar_class.attribute_aliases[field_name.to_s]
+      ret = field_name
+    end
+    ret
   end
 
   # TODO: tests
@@ -179,10 +188,38 @@ class JsonThing
     if parent.nil?
       't'
     else
-      "cte_#{Digest::SHA256.hexdigest(full_name).first(10)}"
+      "cte_#{_cte_name_human_part}_#{Digest::SHA256.hexdigest(full_name).first(10)}"
+    end
+  end
+
+  # Each thing has both a `cte_foo` CTE and a `jbs_foo` CTE.
+  # (jbs stands for "JSONBs" and is meant to take 3 chars like `cte`.)
+  # The former is just the relevant records,
+  # and the second builds the JSON object for each record.
+  # We need to split things into phases like this
+  # because of the JSON:API `relationships` item,
+  # which can contain references in *both directions*.
+  # In that case Postgres will object to our circular dependency.
+  # But with two phases, every jbs_* CTE only depends on cte_* CTEs.
+  def _jbs_name
+    if parent.nil?
+      't'
+    else
+      "jbs_#{_cte_name_human_part}_#{Digest::SHA256.hexdigest(full_name).first(10)}"
     end
   end
 
+  # Gets a more informative name for the CTE based on the include key.
+  # This makes reading the big SQL query easier, especially for debugging.
+  # Note that Postgres's max identifier length is 63 chars (unless you compile yourself),
+  # and we are spending 4+4+11=19 chars elsewhere on `rel_cte_XXX_1234567890`.
+  # So this method can't return more than 63-19=44 chars.
+  #
+  # Since we quote the CTE names, we don't actually need to remove dots in the name!
+  def _cte_name_human_part
+    @cte_name_human_part ||= full_name[0, 44]
+  end
+
   def _sql_method(field)
     m = "#{field}__sql".to_sym
     if ar_class.respond_to?(m)
@@ -321,6 +358,15 @@ end
 class JsonApiPgSql
   attr_reader :base_serializer, :base_relation
 
+  def self.json_column_type
+    # These classes may not exist, depending on the Rails version:
+    @@json_column_type = if Rails::VERSION::STRING >= '5.2'
+                           'ActiveRecord::Type::Json'
+                         else
+                           'ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Json'
+                         end.constantize
+  end
+
   def initialize(base_serializer, base_relation, instance_options, options)
     @base_relation = base_relation
     @instance_options = instance_options
@@ -397,10 +443,54 @@ class JsonApiPgSql
     elsif resource.has_sql_method?(field)
       resource.sql_method(field)
     else
-      %Q{"#{resource.table_name}"."#{field}"}
+      field = resource.unaliased(field)
+      # Standard AMS dasherizes json/jsonb/hstore columns,
+      # so we have to do the same:
+      if ActiveModelSerializers.config.key_transform == :dash
+        cl = resource.ar_class.attribute_types[field.to_s]
+        if column_is_jsonb? cl
+          %Q{jsonb_dasherize("#{resource.table_name}"."#{field}")}
+        elsif column_is_jsonb_array? cl
+          # TODO: Could be faster:
+          # If we made the jsonb_dasherize function smarter so it could handle jsonb[],
+          # we wouldn't have to build a json object from the array then cast to jsonb[].
+          %Q{jsonb_dasherize(array_to_json("#{resource.table_name}"."#{field}")::jsonb)}
+        elsif column_is_castable_to_jsonb? cl
+          # Fortunately we can cast hstore to jsonb,
+          # which gives us a solution that works whether or not the hstore extension is installed.
+          # Defining an hstore_dasherize function would work only if the extension were present.
+          %Q{jsonb_dasherize("#{resource.table_name}"."#{field}"::jsonb)}
+        elsif column_is_castable_to_jsonb_array? cl
+          # TODO: Could be faster (see above):
+          %Q{jsonb_dasherize(array_to_json("#{resource.table_name}"."#{field}"::jsonb[])::jsonb)}
+        else
+          %Q{"#{resource.table_name}"."#{field}"}
+        end
+      else
+        %Q{"#{resource.table_name}"."#{field}"}
+      end
     end
   end
 
+  def column_is_jsonb?(column_class)
+    column_class.is_a? ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb
+  end
+
+  def column_is_jsonb_array?(column_class)
+    column_class.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array) and
+      column_class.subtype.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb)
+  end
+
+  def column_is_castable_to_jsonb?(column_class)
+    column_class.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore) or
+      column_class.is_a?(self.class.json_column_type)
+  end
+
+  def column_is_castable_to_jsonb_array?(column_class)
+    column_class.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array) and
+      column_is_castable_to_jsonb?(column_class.subtype)
+  end
+
   def select_resource_relationship_links(resource, reflection)
     reflection.links.map {|link_name, link_parts|
       <<~EOQ
@@ -423,7 +513,7 @@ class JsonApiPgSql
       refl = resource.reflection
       <<~EOQ
         '#{resource.json_key}',
-         jsonb_build_object(#{refl.include_data ? %Q{'data', rel_#{resource.cte_name}.j} : ''}
+         jsonb_build_object(#{refl.include_data ? %Q{'data', "rel_#{resource.cte_name}".j} : ''}
                             #{refl.include_data && refl.links.any? ? ',' : ''}
                             #{refl.links.any? ? %Q{'links',  jsonb_build_object(#{select_resource_relationship_links(resource, refl)})} : ''})
       EOQ
@@ -456,11 +546,8 @@ class JsonApiPgSql
           # TODO: preserve the whole custom relation, not just ordering
           p = refl.ar_class.new
           ordering = nil
-          ActiveSupport::Deprecation.silence do
-            # TODO: Calling `orders` prints deprecation warnings, so find another way:
-            ordering = p.send(refl.name).orders
-            ordering = child_resource.ar_class.default_scoped.orders if ordering.empty?
-          end
+          ordering = p.send(refl.name).arel.orders
+          ordering = child_resource.ar_class.default_scoped.arel.orders if ordering.empty?
           ordering = ordering.map{|o|
             case o
             # TODO: The gsub is pretty awful....
@@ -521,39 +608,49 @@ class JsonApiPgSql
       # e.g. buyer and seller for User.
       # But we could group those and union just them, or even better do a DISTINCT ON (id).
       # Since we don't get the id here that could be another CTE.
-      "UNION SELECT j FROM #{th.cte_name}"
+      %Q{UNION SELECT j FROM "#{th.jbs_name}"}
     }
   end
 
   def include_cte_join_condition(resource)
     parent = resource.parent
     if resource.belongs_to?
-      %Q{#{parent.cte_name}."#{resource.foreign_key}" = "#{resource.table_name}"."#{resource.primary_key}"}
+      %Q{"#{parent.cte_name}"."#{resource.foreign_key}" = "#{resource.table_name}"."#{resource.primary_key}"}
     elsif resource.has_many? or resource.has_one?
-      %Q{#{parent.cte_name}."#{parent.primary_key}" = "#{resource.table_name}"."#{resource.foreign_key}"}
+      %Q{"#{parent.cte_name}"."#{parent.primary_key}" = "#{resource.table_name}"."#{resource.foreign_key}"}
     else
       raise "not supported relationship: #{resource.full_name}"
     end
   end
 
+  # See note in _jbs_name method for why we split each thing into two CTEs.
   def include_cte(resource)
-    # Sometimes options[:fields] has plural keys and sometimes singular,
-    # so try both:
     parent = resource.parent
     <<~EOQ
       SELECT  DISTINCT ON ("#{resource.table_name}"."#{resource.primary_key}")
-              "#{resource.table_name}".*,
-              #{select_resource(resource)} AS j
+              "#{resource.table_name}".*
       FROM    "#{resource.table_name}"
-      JOIN    #{parent.cte_name}
+      JOIN    "#{parent.cte_name}"
       ON      #{include_cte_join_condition(resource)}
-      #{join_resource_relationships(resource)}
       ORDER BY "#{resource.table_name}"."#{resource.primary_key}"
     EOQ
   end
 
+  # See note in _jbs_name method for why we split each thing into two CTEs.
+  def include_jbs(resource)
+    <<~EOQ
+      SELECT  "#{resource.table_name}".*,
+              #{select_resource(resource)} AS j
+      FROM    "#{resource.cte_name}" AS "#{resource.table_name}"
+      #{join_resource_relationships(resource)}
+    EOQ
+  end
+
   def includes
-    @instance_options[:include] || []
+    @includes ||= (@instance_options[:include] || []).sort_by do |inc|
+      # Sort these by length so we never have bad foreign references in the CTEs:
+      inc.size
+    end
   end
 
   # Takes a dotted field name (not including the base resource)
@@ -572,13 +669,25 @@ class JsonApiPgSql
       # Be careful: inc might have dots:
       th = get_json_thing_from_base(inc)
       <<~EOQ
-        #{th.cte_name} AS (
+        "#{th.cte_name}" AS (
           #{include_cte(th)}
         ),
       EOQ
     }.join("\n")
   end
 
+  def include_jbsses
+    includes.map { |inc|
+      # Be careful: inc might have dots:
+      th = get_json_thing_from_base(inc)
+      <<~EOQ
+        "#{th.jbs_name}" AS (
+          #{include_jbs(th)}
+        ),
+      EOQ
+    }.join("\n")
+  end
+
   def base_resource
     @json_things[:base]
   end
@@ -609,7 +718,7 @@ class JsonApiPgSql
     resource.serializer._attributes.select{|f|
       if ms.include? "include_#{f}?".to_sym
         ser = resource.serializer.new(nil, @options)
-        ser.send("include_#{f}?".to_sym) # TODO: call the method
+        ser.send("include_#{f}?".to_sym)
       else
         true
       end
@@ -623,7 +732,7 @@ class JsonApiPgSql
     resource.serializer._reflections.keys.select{|f|
       if ms.include? "include_#{f}?".to_sym
         ser = resource.serializer.new(nil, @options)
-        ser.send("include_#{f}?".to_sym) # TODO: call the method
+        ser.send("include_#{f}?".to_sym)
       else
         true
       end
@@ -656,6 +765,9 @@ class JsonApiPgSql
 
   def _attribute_fields_for(resource)
     attrs = Set.new(serializer_attributes(resource))
+    # JSON:API always excludes the `id`
+    # even if it's part of the serializer:
+    attrs = attrs - [resource.primary_key.to_sym]
     fields_for(resource).select { |f| attrs.include? f }.to_a
   end
 
@@ -687,14 +799,15 @@ class JsonApiPgSql
         #{join_resource_relationships(base_resource)}
       ),
       #{include_ctes}
-      all_ctes AS (
+      #{include_jbsses}
+      all_jbsses AS (
         SELECT  '{}'::jsonb AS j
         WHERE   1=0
         #{include_selects.join("\n")}
       ),
       inc AS (
         SELECT  COALESCE(jsonb_agg(j), '[]') AS j
-        FROM    all_ctes
+        FROM    all_jbsses
       )
 			SELECT	jsonb_build_object('data', t2.j
                                  #{maybe_included})

data/lib/active_model_serializers_pg/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelSerializersPg
-  VERSION = '0.0.3'
+  VERSION = '0.0.8'
 end

data/lib/generators/active_model_serializers_pg/active_model_serializers_pg_generator.rb

@@ -0,0 +1,20 @@
+require 'rails/generators'
+
+module ActiveModelSerializersPg
+  module Generators
+    class ActiveModelSerializersPgGenerator < Rails::Generators::NamedBase
+      Rails::Generators::ResourceHelpers
+
+      # The ORM generator assumes you're passing a name argument,
+      # but we don't need one, so we give it a default value:
+      argument :name, type: :string, default: "ignored"
+      source_root File.expand_path("../templates", __FILE__)
+
+      namespace :active_model_serializers_pg
+      hook_for :orm, required: true, name: "ignored"
+
+      desc "Creates an active_model_serialiers_pg database migration"
+
+    end
+  end
+end

data/lib/generators/active_record/active_model_serializers_pg_generator.rb

@@ -0,0 +1,43 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class ActiveModelSerializersPgGenerator < ActiveRecord::Generators::Base
+      argument :name, type: :string, default: "ignored"
+      source_root File.expand_path("../templates", __FILE__)
+
+      def write_migration
+        migration_template "migration.rb", "#{migration_path}/ams_pg_create_dasherize_functions.rb"
+      end
+
+      private
+
+      def read_sql(funcname)
+        File.read(File.join(File.expand_path('../templates', __FILE__), "#{funcname}.sql"))
+      end
+
+      def migration_exists?(table_name)
+        Dir.glob("#{File.join destination_root, migration_path}/[0-9]*_*.rb").grep(/\d+_ams_pg_create_dasherize_functions.rb$/).first
+      end
+
+      def migration_path
+        if Rails.version >= '5.0.3'
+          db_migrate_path
+        else
+          @migration_path ||= File.join "db", "migrate"
+        end
+      end
+
+      def migration_version
+        if Rails.version.start_with? '5'
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
+
+      def jsonb_dasherize
+        read_sql('jsonb_dasherize')
+      end
+
+    end
+  end
+end

data/lib/generators/active_record/templates/jsonb_dasherize.sql

@@ -0,0 +1,32 @@
+CREATE FUNCTION jsonb_dasherize(j jsonb)
+RETURNS jsonb
+IMMUTABLE
+AS
+$$
+DECLARE
+t text;
+ret jsonb;
+BEGIN
+  t := jsonb_typeof(j);
+  IF t = 'object' THEN
+    SELECT  COALESCE(jsonb_object_agg(REPLACE(k, '_', '-'), jsonb_dasherize(v)), '{}')
+    INTO    ret
+    FROM    jsonb_each(j) AS t(k, v);
+    RETURN ret;
+  ELSIF t = 'array' THEN
+    SELECT  COALESCE(jsonb_agg(jsonb_dasherize(elem)), '[]')
+    INTO    ret
+    FROM    jsonb_array_elements(j) AS t(elem);
+    RETURN ret;
+  ELSIF t IS NULL THEN
+    -- This should never happen internally
+    -- (thankfully, lest jsonb_set return NULL and destroy everything),
+    -- but only from a passed-in NULL.
+    RETURN NULL;
+  ELSE
+    -- string/number/null:
+    RETURN j;
+  END IF;
+END;
+$$
+LANGUAGE plpgsql;

data/lib/generators/active_record/templates/migration.rb

@@ -0,0 +1,11 @@
+class AmsPgCreateDasherizeFunctions < ActiveRecord::Migration<%= migration_version %>
+
+  def up
+    execute %q{<%= jsonb_dasherize %>}
+  end
+
+  def down
+    execute "DROP FUNCTION jsonb_dasherize(jsonb)"
+  end
+
+end

data/spec/generators/main_generator_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'generators/active_model_serializers_pg/active_model_serializers_pg_generator'
+
+describe ActiveModelSerializersPg::Generators::ActiveModelSerializersPgGenerator, type: :generator do
+  destination File.expand_path "../../../tmp", __FILE__
+
+  before :each do
+    prepare_destination
+  end
+
+  it "creates the migration file" do
+    run_generator
+    expect(destination_root).to have_structure {
+      directory "db" do
+        directory "migrate" do
+          migration "ams_pg_create_dasherize_functions" do
+            contains "class AmsPgCreateDasherizeFunctions"
+          end
+        end
+      end
+    }
+  end
+end

data/spec/serializer_spec.rb

@@ -25,7 +25,7 @@ describe 'ArraySerializer' do
           {
             id: @note.id.to_s,
             type: 'notes',
-            attributes: {id: @note.id, name: 'Title'},
+            attributes: {name: 'Title'},
             relationships: {tags: {data: [{id: @tag.id.to_s, type: 'tags'}]}},
           }
         ]
@@ -65,7 +65,7 @@ describe 'ArraySerializer' do
           {
             id: person.id.to_s,
             type: 'people',
-            attributes: { id: person.id, full_name: 'Test User', attendance_name: 'User, Test' },
+            attributes: { full_name: 'Test User', attendance_name: 'User, Test' },
           }
         ]
       }.to_json
@@ -80,7 +80,7 @@ describe 'ArraySerializer' do
           {
             id: person.id.to_s,
             type: 'people',
-            attributes: {id: person.id, full_name: 'Test User', attendance_name: 'ADMIN User, Test'}
+            attributes: {full_name: 'Test User', attendance_name: 'ADMIN User, Test'}
           }
         ]
       }.to_json
@@ -113,6 +113,42 @@ describe 'ArraySerializer' do
     end
   end
 
+  context 'serialize an array instead of a relation' do
+    let(:relation)   { [Note.where(name: 'Title').first] }
+    let(:controller) { NotesController.new }
+    let(:options)    { }
+
+    before do
+      @note = Note.create content: 'Test', name: 'Title'
+      @tag = Tag.create name: 'My tag', note: @note, popular: true
+    end
+
+    it 'generates the proper json output' do
+      json_expected = {
+        data: [
+          {
+            id: @note.id.to_s,
+            type: 'notes',
+            attributes: { name: 'Title', content: 'Test' },
+            relationships: { tags: { data: [{id: @tag.id.to_s, type: 'tags'}] } }
+          }
+        ]
+      }.to_json
+      expect(json_data).to eq json_expected
+    end
+  end
+
+  context 'serialize an empty array' do
+    let(:relation)   { [] }
+    let(:controller) { NotesController.new }
+    let(:options)    { }
+
+    it 'generates the proper json output' do
+      json_expected = { data: [] }.to_json
+      expect(json_data).to eq json_expected
+    end
+  end
+
   context 'serialize singular record' do
     let(:relation)   { Note.where(name: 'Title').first }
     let(:controller) { NotesController.new }
@@ -134,7 +170,6 @@ describe 'ArraySerializer' do
       }.to_json
       expect(json_data).to eq json_expected
     end
-
   end
 
   context 'with dasherized keys and types' do
@@ -174,6 +209,65 @@ describe 'ArraySerializer' do
     end
   end
 
+  context 'with dasherized json columns' do
+    let(:relation)   { Person.all }
+    let(:controller) { PeopleController.new }
+    let(:person)     {
+      Person.create first_name: 'Test',
+                    last_name: 'User',
+                    options:    { 'foo_foo': 'baz', bar: [{ 'jar_jar': 'binks' }] },
+                    prefs:      { 'foo_foo': 'baz', bar: [{ 'jar_jar': 'binks' }] },
+                    settings:   { 'foo_foo': 'bar' },
+                    selfies:    [ { 'photo_resolution': '200x200' } ],
+                    portraits:  [ { 'photo_resolution': '150x200' } ],
+                    landscapes: [ { 'photo_resolution': '200x150' } ]
+    }
+    let(:options)    { { each_serializer: PersonWithJsonSerializer } }
+
+    before do
+      @old_key_setting = ActiveModelSerializers.config.key_transform
+      ActiveModelSerializers.config.key_transform = :dash
+    end
+
+    after do
+      ActiveModelSerializers.config.key_transform = @old_key_setting
+    end
+
+    it 'generates the proper json output' do
+      json_expected = {
+        data: [
+          {
+            id: person.id.to_s,
+            type: 'people',
+            attributes: {
+              prefs: {
+                bar: [{ 'jar-jar' => 'binks'}],
+                'foo-foo' => 'baz',
+              },
+              options: {
+                bar: [{ 'jar-jar' => 'binks'}],
+                'foo-foo' => 'baz',
+              },
+              selfies: [
+                { 'photo-resolution' => '200x200' },
+              ],
+              settings: {
+                'foo-foo' => 'bar'
+              },
+              portraits: [
+                { 'photo-resolution' => '150x200' },
+              ],
+              landscapes: [
+                { 'photo-resolution' => '200x150' },
+              ],
+            },
+          }
+        ]
+      }.to_json
+      expect(json_data).to eq json_expected
+    end
+  end
+
   context 'with aliased association' do
     let(:relation)   { Tag.first }
     let(:controller) { TagsController.new }
@@ -195,7 +289,29 @@ describe 'ArraySerializer' do
       }.to_json
       expect(json_data).to eq json_expected
     end
+  end
+
+  context 'with aliased attribute' do
+    let(:relation)   { Tag.first }
+    let(:controller) { TagsController.new }
+    let(:options)    { { serializer: TagWithAliasedNameSerializer } }
+
+    before do
+      @note = Note.create content: 'Test', name: 'Title'
+      @tag = Tag.create name: 'My tag', note: @note, popular: true
+    end
 
+    it 'generates the proper json output' do
+      json_expected = {
+        data: {
+          id: @tag.id.to_s,
+          type: 'tags',
+          attributes: { 'aliased_name' => 'My tag' },
+          relationships: { note: { data: {id: @note.id.to_s, type: 'notes'} } }
+        }
+      }.to_json
+      expect(json_data).to eq json_expected
+    end
   end
 
   context 'serialize single record with custom serializer' do
@@ -213,7 +329,7 @@ describe 'ArraySerializer' do
         data: {
           id: @note.id.to_s,
           type: 'notes',
-          attributes: { id: @note.id, name: 'Title' },
+          attributes: { name: 'Title' },
           relationships: { tags: { data: [{id: @tag.id.to_s, type: 'tags'}] } }
         }
       }.to_json
@@ -367,7 +483,7 @@ describe 'ArraySerializer' do
           {
             id: tag.id.to_s,
             type: 'tags',
-            attributes: { id: tag.id, name: 'My tag' },
+            attributes: { name: 'My tag' },
             relationships: { note: { data: { id: note.id.to_s, type: 'notes' } } },
           }
         ],
@@ -405,7 +521,7 @@ describe 'ArraySerializer' do
           {
             id: reviewer.id.to_s,
             type: 'users',
-            attributes: { id: reviewer.id, name: 'Peter' },
+            attributes: { name: 'Peter' },
             relationships: {
               offers: { data: [] },
               reviewed_offers: { data: [{id: offer.id.to_s, type: 'offers'}] },
@@ -414,7 +530,7 @@ describe 'ArraySerializer' do
           {
             id: user.id.to_s,
             type: 'users',
-            attributes: { id: user.id, name: 'John' },
+            attributes: { name: 'John' },
             relationships: {
               offers: { data: [{id: offer.id.to_s, type: 'offers'}] },
               reviewed_offers: { data: [] },
@@ -465,7 +581,7 @@ describe 'ArraySerializer' do
           {
             id: tag.id.to_s,
             type: 'tag_with_notes',
-            attributes: { id: tag.id, name: 'My tag' },
+            attributes: { name: 'My tag' },
             relationships: { note: { data: { id: note.id.to_s, type: 'notes' } } },
           }
         ]
@@ -524,7 +640,7 @@ describe 'ArraySerializer' do
           {
             id: @user.id.to_s,
             type: 'users',
-            attributes: {id: @user.id, name: 'John', mobile: '51111111'},
+            attributes: {name: 'John', mobile: '51111111'},
             relationships: {
               offers: {data: []},
               address: {data: {id: address.id.to_s, type: 'addresses'}},
@@ -544,7 +660,7 @@ describe 'ArraySerializer' do
           {
             id: @user.id.to_s,
             type: 'users',
-            attributes: {id: @user.id, name: 'John'},
+            attributes: {name: 'John'},
             relationships: {
               offers: {data: []},
               reviewed_offers: {data: []},
@@ -572,7 +688,7 @@ describe 'ArraySerializer' do
           {
             id: note.id.to_s,
             type: 'notes',
-            attributes: {id: note.id},
+            attributes: {},
             relationships: {
               sorted_tags: {
                 data: [
@@ -608,7 +724,7 @@ describe 'ArraySerializer' do
           {
             id: note.id.to_s,
             type: 'notes',
-            attributes: {id: note.id},
+            attributes: {},
             relationships: {
               custom_sorted_tags: {
                 data: [

data/spec/spec_helper.rb

@@ -1,11 +1,12 @@
-require 'active_record'
-require 'action_controller'
+require 'rails/all'
 require 'rspec'
+require 'rspec/rails'
 require 'bourne'
 require 'database_cleaner'
 require 'active_model_serializers'
 require 'action_controller/serialization'
 require 'active_model_serializers_pg'
+require 'generator_spec'
 if ENV['TEST_UNPATCHED_AMS']
   ActiveModelSerializers.config.adapter = :json_api
 else
@@ -24,6 +25,17 @@ end
 require 'dotenv'
 Dotenv.load
 
+# Need this or Rails.application is nil just below:
+module TestApp
+  class Application < ::Rails::Application
+    config.root = File.dirname(__FILE__)
+  end
+end
+
+# Need this line or `hook_for` in our generators is ignored,
+# so our migration generator doesn't run:
+Rails.application.load_generators
+
 ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
 
 class TestController < ActionController::Base
@@ -56,6 +68,16 @@ class PersonSerializer < ActiveModel::Serializer
   end
 end
 
+class PersonWithJsonSerializer < ActiveModel::Serializer
+  attributes :id,
+    :options,     # json
+    :prefs,       # jsonb
+    :settings,    # hstore
+    :selfies,     # json[]
+    :portraits,   # jsonb[]
+    :landscapes   # hstore[]
+end
+
 class Note < ActiveRecord::Base
   has_many :tags
   has_many :sorted_tags
@@ -126,6 +148,7 @@ end
 class Tag < ActiveRecord::Base
   belongs_to :note
   alias :aliased_note :note
+  alias_attribute :aliased_name, :name
 end
 
 class SortedTag < Tag
@@ -164,6 +187,11 @@ class TagWithAliasedNoteSerializer < ActiveModel::Serializer
   has_one :aliased_note
 end
 
+class TagWithAliasedNameSerializer < ActiveModel::Serializer
+  attributes :aliased_name
+  has_one :note
+end
+
 class User < ActiveRecord::Base
   has_many :offers, foreign_key: :created_by_id, inverse_of: :created_by
   has_many :reviewed_offers, foreign_key: :reviewed_by_id, inverse_of: :reviewed_by, class_name: 'Offer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_pg
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Paul A. Jungwirth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -28,14 +28,14 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  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: generator_spec
+  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: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -168,10 +196,16 @@ files:
 - gemfiles/Gemfile.activerecord-5.0.x
 - gemfiles/Gemfile.activerecord-5.1.x
 - gemfiles/Gemfile.activerecord-5.2.x
+- gemfiles/Gemfile.activerecord-6.0.x
 - lib/active_model_serializers/adapter/json_api_pg.rb
 - lib/active_model_serializers_pg.rb
 - lib/active_model_serializers_pg/collection_serializer.rb
 - lib/active_model_serializers_pg/version.rb
+- lib/generators/active_model_serializers_pg/active_model_serializers_pg_generator.rb
+- lib/generators/active_record/active_model_serializers_pg_generator.rb
+- lib/generators/active_record/templates/jsonb_dasherize.sql
+- lib/generators/active_record/templates/migration.rb
+- spec/generators/main_generator_spec.rb
 - spec/serializer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/pjungwir/active_model_serializers_pg
@@ -193,10 +227,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Harness the power of PostgreSQL when crafting JSON reponses
 test_files:
+- spec/generators/main_generator_spec.rb
 - spec/serializer_spec.rb
 - spec/spec_helper.rb