discriminable 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d473ffb5de9687b61d3ee960207d15fdc8a3f4d29fbd1a7498740c7cef3e35
-  data.tar.gz: 5a184093d1cf560fd87284447b7047c4b82fc266a530d9c05e1b9755a8044573
+  metadata.gz: 63543cd5b47a63a6870368d2d16c9570e7cd0cebb53cfd296d717884c37fb4c3
+  data.tar.gz: b4417f8e33ff2d24a71a9ec436a26b66c38cab59395ed7fbb1182c818ff48439
 SHA512:
-  metadata.gz: 347d5b0e409d013e34d64ce6bce73bb8a72e93fb0a872bed81919a4a2aca7c4335ceb6de667fd6a6249a624bb2a8ff2393251107891df5667cfed62c819b386b
-  data.tar.gz: e716b423ca4bd46bd7b34cbcb2b310773344a6bf572d4b0c376f60e04cbafe0233d7ae0e68fa91ba27e3d9bb7156b0ba477dca205e850049c518ff264299bfe4
+  metadata.gz: e053310353bf54fcfbef35b32b5de0015f9b28903cb6dc04631bc04cfbaeec274359c0dc34d687eca7a9813eee36590f2c745e90d3c9587e381fceb9bb38886d
+  data.tar.gz: dbf905a1c5a7c7c10154ad5cc9eb73b67d81cd65513e5ac7a1ab33086dbfaee92a885b511942ecc37db4b8528a75283d270ec807db9c4982defb7ba7f2c814a8

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## [Unreleased]
 
+## [2.2.0](https://github.com/gregorw/discriminable/compare/v2.1.1...v2.2.0) (2022-04-16)
+
+
+### Features
+
+* Alternative syntax respecting open-closed principle ([8a8f885](https://github.com/gregorw/discriminable/commit/8a8f8857dc24753dc08f21b2bfbb7b4317b7ed5c))
+
+### [2.1.1](https://github.com/gregorw/discriminable/compare/v2.1.0...v2.1.1) (2022-04-15)
+
+
+### Bug Fixes
+
+* Subclass is not properly initialized on new objects ([c24706c](https://github.com/gregorw/discriminable/commit/c24706c9e8cd4c80ea20016e341f010a5a3c792b))
+* Use correct, i.e. first value, when using multiple states for same subclass ([3a05c0d](https://github.com/gregorw/discriminable/commit/3a05c0d3a76080a39f40b1d57ce2862316693f97))
+
+## [2.1.0](https://github.com/gregorw/discriminable/compare/v2.0.0...v2.1.0) (2022-04-01)
+
+
+### Features
+
+* discriminable booleans ([f2ce286](https://github.com/gregorw/discriminable/commit/f2ce2867db9b9f0504474d7237faa9caaab96624))
+
 ## [2.0.0](https://github.com/gregorw/discriminable/compare/v1.0.2...v2.0.0) (2022-03-31)
 
 

data/README.md

@@ -1,10 +1,20 @@
-[![Ruby](https://github.com/gregorw/discriminable/actions/workflows/main.yml/badge.svg)](https://github.com/gregorw/discriminable/actions/workflows/main.yml)
+
 
 # Discriminable
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/discriminable`. To experiment with that code, run `bin/console` for an interactive prompt.
+[![Gem Version](https://badge.fury.io/rb/discriminable.svg)](https://rubygems.org/gems/discriminable)
+[![CI](https://github.com/gregorw/discriminable/actions/workflows/main.yml/badge.svg)](https://github.com/gregorw/discriminable/actions/workflows/main.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/94041c5f946b64040368/maintainability)](https://codeclimate.com/github/gregorw/discriminable/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/94041c5f946b64040368/test_coverage)](https://codeclimate.com/github/gregorw/discriminable/test_coverage)
+
+Single table inheritance (STI) for Ruby on Rails models (ActiveRecord) using enum, boolean, string and integer column types.
+
+In other words, use any _existing_ model attribute for STI instead of storing class names in a `type` column.
+
+**Related work**
+
+The idea was originally described in [“Bye Bye STI, Hello Discriminable Model”](https://www.salsify.com/blog/engineering/bye-bye-sti-hello-discriminable-model) by Randy Burkes and this Gem has started out with [his code](https://gist.github.com/rlburkes/798e186acb2f93e787a5).
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -18,13 +28,45 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+class Order < ActiveRecord::Base
+  include Discriminable
+
+  enum state: { open: 0, completed: 1 }
+  discriminable state: { open: "Cart" }
+end
+
+class Cart < Order
+end
+
+Cart.create
+=> #<Cart id: 1, state: "open">
+Order.all
+=> #<ActiveRecord::Relation [#<Cart id: 1, state: "open">]>
+```
+
+### Alternative syntax
+
+Instead of defining subclass names within the parent you may prefer to be open for extension but closed for modification (open-closed principle) using the alternative syntax.
+
+```ruby
+class Order < ActiveRecord::Base
+  include Discriminable
+
+  enum state: { open: 0, completed: 1 }
+  discriminable_by :state
+end
 
-## Development
+class Cart < Order
+  discriminable_as :open
+end
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Cart.create
+=> #<Cart id: 1, state: "open">
+Order.all
+=> #<ActiveRecord::Relation [#<Cart id: 1, state: "open">]>
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/Rakefile

@@ -14,3 +14,8 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[test rubocop]
+
+# Release task
+# gem build *.gemspec
+# gem push *.gem
+# rm *.gem

data/TODO.md

@@ -1,2 +1,6 @@
+- [x] multiple values per subclass
+- [x] default to first value when using hash syntax
+- [x] open-closed principle
+- [ ] use `type` column with enum, int, string, etc.
+- [ ] test permitted attributes
 - [ ] `self.abstract_class = true`
-- [ ] …

data/lib/discriminable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Discriminable
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

data/lib/discriminable.rb

@@ -25,7 +25,9 @@ module Discriminable
 
   included do
     class_attribute :discriminable_map, instance_writer: false
-    class_attribute :discriminable_inverse, instance_writer: false
+    class_attribute :discriminable_inverse_map, instance_writer: false
+    class_attribute :discriminable_values, instance_writer: false
+    class_attribute :discriminable_as_descendant_value, instance_writer: false
   end
 
   # Specify the column to use for discrimination.
@@ -33,18 +35,49 @@ module Discriminable
     def discriminable(**options)
       raise "Subclasses should not override .discriminable" unless base_class?
 
-      discriminator, map = options.first
+      attribute, map = options.first
 
       self.discriminable_map = map.with_indifferent_access
-      self.discriminable_inverse = map.invert
-      self.inheritance_column = discriminator.to_s
+
+      # Use first key as default discriminator
+      # { a: "C", b: "C" }.invert => { "C" => :b }
+      # { a: "C", b: "C" }.to_a.reverse.to_h.invert => { "C" => :a }
+      self.discriminable_inverse_map = map.to_a.reverse.to_h.invert
+      self.inheritance_column = attribute.to_s
+    end
+
+    def discriminable_by(attribute)
+      raise "Subclasses should not override .discriminable_by" unless base_class?
+
+      self.discriminable_as_descendant_value = true
+      self.inheritance_column = attribute.to_s
+    end
+
+    def discriminable_as(*values)
+      raise "Only subclasses should specify .discriminable_as" if base_class?
+
+      self.discriminable_values = values.map do |value|
+        value.instance_of?(Symbol) ? value.to_s : value
+      end
     end
 
     def sti_name
-      discriminable_inverse[name]
+      if discriminable_as_descendant_value
+        self.discriminable_inverse_map ||= Hash.new do |map, value|
+          map[value] = name.constantize.discriminable_values&.first
+        end
+      end
+
+      discriminable_inverse_map[name]
     end
 
     def sti_class_for(value)
+      if discriminable_as_descendant_value
+        self.discriminable_map ||= Hash.new do |map, v|
+          map[v] = descendants.detect { |d| d.discriminable_values.include? v }&.name
+        end
+      end
+
       return self unless (type_name = discriminable_map[value])
 
       super type_name
@@ -57,7 +90,8 @@ module Discriminable
       attrs = attrs.to_h if attrs.respond_to?(:permitted?)
       return unless attrs.is_a?(Hash)
 
-      value = base_class.type_for_attribute(inheritance_column).cast(attrs[inheritance_column])
+      value = attrs.with_indifferent_access[inheritance_column]
+      value = base_class.type_for_attribute(inheritance_column).cast(value)
       sti_class_for(value)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discriminable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Gregor Wassmann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.26'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement