oort 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d13ddbadfac1d2c1ae4f77c6c81ebac6339ddfdb14b3e41a40da8ba93e62ae2
-  data.tar.gz: fae5d70f39bc682f322c16f6e969b64e01794f9fdd87ed50264fb44ce3beb54a
+  metadata.gz: 6bf4b76facec9d22229f5bedbdfaa93120e7f4ca6f5e37f6f79d78cdc0f8ea74
+  data.tar.gz: 9c9a905cdaf773c79e383b68448183a8eeea2c8025bfd7214c661111cf467495
 SHA512:
-  metadata.gz: aa7621267ccc7d99735bd5548eb7dbdcce7c4b3e280540dd393d4cd45707b0b671f9213eb55c01023c42a710afed5f31163213eead118b0db35d22365cc9fac1
-  data.tar.gz: e0e6d7d5a3d2752ac7747439f28256aceb7183e773418836c05896b3f8ade18dbed010b41a54f05a08360f76c8039ac23c87e5900444867491e7405582552bd6
+  metadata.gz: c086ca2f59b8cfa75516e145b82d0f6284ae0a2b5adeb0ecd75eebcbc3f0587f50be0ccc28be460b18ac9d0a0944b08ea6ca61f7b24e131d5d3ecfe09347e2a8
+  data.tar.gz: 353af62388058aad2fab87d358abb219ba2b2b7b78bc824fcb13b50805b7392f4aae01359825b46a05b66290051a641940da4973cafc5cca208b4c85cb2e99fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oort (0.1.1)
+    oort (0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -82,4 +82,4 @@ DEPENDENCIES
   zeitwerk (~> 2.5)
 
 BUNDLED WITH
-   2.4.10
+   2.5.3

data/README.md

@@ -63,8 +63,18 @@ These callbacks automatically insert a new post at the first position and remove
 To change to order of a post, simply call `post.insert_at(12)`
 To remove a post, simply call `post.remove_from_reorderable`
 
-### Scope
-The `ordered_with` scope is also added to the post model. This allows a `user` object to have the following query:
+### Scopes
+You can add the `ordered_with` scope.
+
+```RUBY
+class Post < ActiveRecord::Base
+  include Oort::Scopes
+
+  belongs_to :user
+end
+```
+
+This allows a `user` object to have the following query:
 
 ```RUBY
 user.posts.ordered_with(user.posts_ordering)

data/Rakefile

@@ -7,6 +7,8 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/test_*.rb"]
+  t.verbose = true
+  t.warning = false
 end
 
 require "rubocop/rake_task"

data/lib/oort/callbacks.rb

@@ -32,7 +32,7 @@ module Oort
     def add_callbacks
       association_class.class_eval do
         after_create_commit :initial_insert_at
-        after_destroy :remove_from_reorderable
+        before_destroy :remove_from_reorderable
       end
     end
 

data/lib/oort/ordered.rb

@@ -7,10 +7,6 @@ module Oort
   module Ordered
     def self.included(base)
       base.extend ClassMethods
-      # base.include InstanceMethods
-
-      base.class_eval do
-      end
     end
 
     module ClassMethods
@@ -27,7 +23,6 @@ module Oort
 
         Inserts.call(**args.slice(:stored_in, :insert_method_name, :class_name))
         Removes.call(**args.slice(:stored_in, :remove_from_method_name, :class_name))
-        Scopes.call(**args.slice(:association_class))
         Callbacks.call(
           **args.slice(:association_class, :remove_from_method_name, :insert_method_name, :instance_name, :default)
         )

data/lib/oort/scopes.rb

@@ -1,30 +1,20 @@
 # frozen_string_literal: true
 
 module Oort
-  class Scopes
-    def self.call(association_class:)
-      new(association_class: association_class).call
-    end
-
-    def initialize(association_class:)
-      @association_class = association_class
-    end
-
-    def call
+  module Scopes
+    def self.included(base)
       # user = User.find(909)
       # user.posts.ordered_with(user.posts_ordered)
       # by default this will use posts.id::INTEGER
       # but you can pass in something else if you have joins and items
       # stored in another table
-      @association_class.class_eval do
-        scope :ordered_with, lambda { |ids, type = "#{table_name}.id::INTEGER"|
-          if ids.blank?
-            order(:id)
-          else
-            order(Arel.sql("array_position(ARRAY[#{ids.join(", ")}], #{type})"))
-          end
-        }
-      end
+      base.scope :ordered_with, lambda { |ids, type = "#{table_name}.id::INTEGER"|
+                                  if ids.blank?
+                                    order(:id)
+                                  else
+                                    order(Arel.sql("array_position(ARRAY[#{ids.join(", ")}], #{type})"))
+                                  end
+                                }
     end
   end
 end

data/lib/oort/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Oort
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oort
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - tobyond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies: []
 description: Rails sorting and ordering without deadlocks
 email:
@@ -40,7 +40,7 @@ files:
 - lib/oort/removes.rb
 - lib/oort/scopes.rb
 - lib/oort/version.rb
-- oort.gemspec
+- oort-0.1.2.gem
 - sig/oort.rbs
 homepage: https://github.com/tobyond/oort
 licenses:

data/oort.gemspec

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/oort/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "oort"
-  spec.version = Oort::VERSION
-  spec.authors = ["tobyond"]
-  spec.homepage = "https://github.com/tobyond/oort"
-
-  spec.summary = "Oort to sort, order"
-  spec.description = "Rails sorting and ordering without deadlocks"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.2.0"
-
-  spec.metadata["source_code_uri"] = "https://github.com/tobyond/oort"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "rspec"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end