statesman_mongoid 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 150c388e7dc52a4d1cd5f7dc8aec635bb70d254ecbab0928e151463ac9ca43d1
-  data.tar.gz: 4db6ce07d5bca4cb8bb8f60cd07e0165072d23c977b1b165e7358e150eb580e5
+  metadata.gz: e026f69df2640019768b793fbbf588052ee15fca01cc1062d805ccaf0601bb35
+  data.tar.gz: 5ae0bea5ecc9b360244784191863a7003d974ac1f46d44f859ee860269d1f440
 SHA512:
-  metadata.gz: 172df6b8fe89efababe619552ed5391765b7e18f38998f7cebf7fa00861a05a770436659b23c0ce4f59435643ac32ae5d1f8eb48bcb3a6d19fb01f68a7e65424
-  data.tar.gz: 15460af6a52050507a9d8443ab696ce89a74a9bca276351ee78decaaed5279f476eac3d0ba3f8e6104cf4b5884100b5a43dccf7d4af59d4282048527e523cf55
+  metadata.gz: 858083c254432838c46df2c32f1bd0421e6aa1cf7c9172bee49b7fda1abd87fef5cab3b3bec7ffcf5cc042b8b5706ad06a4f7eb26c46f60ee2b4facc81069f91
+  data.tar.gz: 9759390d1a84d8b898504f74dfd461eafde888e4accd6117bc5e9f939c53398e72616acbec32e4a1d44591262b56d4fc02161d701c854467d1d9ef2acd514e24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    statesman_mongoid (0.3.0)
+    statesman_mongoid (0.4.1)
       statesman (~> 10.0)
 
 GEM

data/README.md

@@ -1,10 +1,10 @@
 # Statesman Mongoid
 
-Restored mongoid adapters for [Statesman](https://github.com/gocardless/statesman).
+Mongoid adapters for [Statesman](https://github.com/gocardless/statesman). 
 
-TODO: Restore generators and test units
+TODO: Restore & update specs
 
-NOTE: This is an early salvage of the dropped mongoid support with a refitted queries adapter, a couple of fixes and some manual testing, use at your own risk and feel free to contribute.
+NOTE: Restored Statesman's mongoid support with some fixes & updates. This project is in an early stage, please report any bugs or missing features. Use at your own risk and feel free to contribute.
 
 ## Installation
 
@@ -33,6 +33,11 @@ Statesman::Adapters::MongoidTransition
 Statesman::Adapters::MongoidQueries
 ```
 
+Generator:
+```
+rails generate statesman:mongoid_transition Order OrderTransition
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/generators/statesman/mongoid_transition_generator.rb

@@ -0,0 +1,27 @@
+# Extracted from commit b9906ee1cf0ac6c1bbdd56c003ffe407c2f59833
+
+require "rails/generators"
+require "generators/statesman/generator_helpers"
+
+module Statesman
+  class MongoidTransitionGenerator < Rails::Generators::Base
+    include Statesman::GeneratorHelpers
+
+    desc "Create a Mongoid-based transition model with the required attributes"
+
+    argument :parent, type: :string, desc: "Your parent model name"
+    argument :klass, type: :string, desc: "Your transition model name"
+
+    source_root File.expand_path("templates", __dir__)
+
+    def create_model_file
+      template("mongoid_transition_model.rb.erb", model_file_name)
+    end
+
+    private
+
+    def collection_name
+      klass.underscore.pluralize
+    end
+  end
+end

data/lib/generators/statesman/templates/mongoid_transition_model.rb.erb

@@ -0,0 +1,7 @@
+class <%= klass %>
+  include Statesman::Adapters::MongoidTransition
+
+  index({ sort_key: 1 })
+
+  belongs_to :<%= parent %><%= class_name_option %>, index: true
+end

data/lib/statesman/adapters/mongoid.rb

@@ -1,4 +1,4 @@
-# Restored mongoid support, untouched
+# Restored mongoid support with feature parity
 # Extracted from commit b9906ee1cf0ac6c1bbdd56c003ffe407c2f59833
 
 module Statesman

data/lib/statesman/adapters/mongoid_queries.rb

@@ -94,14 +94,43 @@ module Statesman
 
         def states_where(states)
           ids = aggregate_ids_for_most_recent(states, inclusive_match: true)
+
+          if initial_state.to_s.in?(states.map(&:to_s))
+            all_ids = aggregate_ids_for_all_state(states)
+            ids += model.where(_id: { '$nin' => all_ids }).pluck(:id)
+          end
+
           model.where(_id: { '$in' => ids })
         end
 
         def states_where_not(states)
           ids = aggregate_ids_for_most_recent(states, inclusive_match: false)
+
+          unless initial_state.to_s.in?(states.map(&:to_s))
+            all_ids = aggregate_ids_for_all_state(states)
+            ids += model.where(_id: { '$nin' => all_ids }).pluck(:id)
+          end
+
           model.where(_id: { '$in' => ids })
         end
 
+        def aggregate_ids_for_all_state(states)
+          aggregation = [
+            # Group by foreign key
+            {
+              '$group': {
+                _id: "$#{model_foreign_key}",
+                model_foreign_key => { '$first': "$#{model_foreign_key}" },
+              },
+            },
+            # Trim response to only the foreign key
+            { '$project': { _id: 0 } },
+          ]
+
+          # Hit the database and return a flat array of ids
+          transition_class.collection.aggregate(aggregation).pluck(model_foreign_key)
+        end
+
         def aggregate_ids_for_most_recent(states, inclusive_match: true)
           aggregation = [
             # Sort most recent

data/lib/statesman_mongoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StatesmanMongoid
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statesman_mongoid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - oz-tal
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statesman
@@ -36,6 +36,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/generators/statesman/mongoid_transition_generator.rb
+- lib/generators/statesman/templates/mongoid_transition_model.rb.erb
 - lib/statesman/adapters/mongoid.rb
 - lib/statesman/adapters/mongoid_queries.rb
 - lib/statesman/adapters/mongoid_transition.rb