servactory 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321c1d5afff2d05fca47c222254ed759bcab36acce61f346d4a141f936e25fa7
-  data.tar.gz: 9820d66f4f2985665b3552583c2f84eddeb6860cb588c5444da7f32d32bf6c89
+  metadata.gz: e8baf1ff3aab8a43c92e83987cb5f4cfbc426be9aacabf5fe63dd01e133c891e
+  data.tar.gz: 0af5e8fe8bf02fe5f15c68655e298b2d097b402764d231045683907afa35ded3
 SHA512:
-  metadata.gz: 3db3d15d89132bcb65afe6d25f278cb59e3c40f1cae70a02bb9f8af681356dc2aa14e05017c03088a10baf6b1de22833aaa3b70fb6f3138027cb283a279b77cb
-  data.tar.gz: 1d01c55aba13762649115010a8cb3ca99489773abc8d48236529139318f9f12e636de08b8b66c417157918ff44b7223d0d9bd9a0f9faa9663aef1e908a869d79
+  metadata.gz: aa8ffc01e6bab482d397f07e18847ec5d0b70bbd1e94bf7ff1ab6f080efca2502547ee92db3b663ba2bac15c2c6add762094ab37d9c47b73eb7b66f8f3ed9b10
+  data.tar.gz: a15fc2c38e21b6637ff5b9f1273006c0aae2dfe5d8d084390a18e2ce262329510fe80ab2bc16d47f18f3da8a40c5f5daea0533ad4b611a0e9ce8868eacf87b8f

data/lib/servactory/methods/collection.rb

@@ -5,10 +5,14 @@ module Servactory
     class Collection
       # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
       extend Forwardable
-      def_delegators :@collection, :<<, :each, :merge, :empty?
+      def_delegators :@collection, :<<, :each, :merge, :sort_by, :size, :empty?
 
-      def initialize(*)
-        @collection = Set.new
+      def initialize(collection = Set.new)
+        @collection = collection
+      end
+
+      def sorted_by_position
+        Collection.new(sort_by(&:position))
       end
     end
   end

data/lib/servactory/methods/dsl.rb

@@ -16,8 +16,12 @@ module Servactory
 
         private
 
-        def make(name, **options)
-          collection_of_methods << Method.new(name, **options)
+        def make(name, position: nil, **options)
+          collection_of_methods << Method.new(
+            name,
+            position: position.presence || next_position,
+            **options
+          )
         end
 
         def method_missing(shortcut_name, *args, &block)
@@ -34,6 +38,10 @@ module Servactory
           Servactory.configuration.method_shortcuts.include?(shortcut_name) || super
         end
 
+        def next_position
+          collection_of_methods.size + 1
+        end
+
         def collection_of_methods
           @collection_of_methods ||= Collection.new
         end

data/lib/servactory/methods/method.rb

@@ -4,11 +4,13 @@ module Servactory
   module Methods
     class Method
       attr_reader :name,
+                  :position,
                   :condition,
                   :is_condition_opposite
 
-      def initialize(name, **options)
+      def initialize(name, position:, **options)
         @name = name
+        @position = position
 
         @is_condition_opposite = false
         @condition = options.fetch(:if, nil)

data/lib/servactory/methods/workbench.rb

@@ -18,7 +18,7 @@ module Servactory
       def run!
         return try_to_use_call if collection_of_methods.empty?
 
-        collection_of_methods.each do |make_method|
+        collection_of_methods.sorted_by_position.each do |make_method|
           next if unnecessary_for?(make_method)
 
           context.send(make_method.name)

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 1
     MINOR = 6
-    PATCH = 3
+    PATCH = 4
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport