parascope 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 148749dbca46560b2b152377b8095d27fec8a1a1
-  data.tar.gz: a449da808e60361c33b60b4ba524f272a5b83173
+  metadata.gz: 9ae9437f9c91dc9a6f126c16b6f3c4a2c745634d
+  data.tar.gz: 859be0e8b38ecc4e6af3d9fb0d379e464f54ab7e
 SHA512:
-  metadata.gz: 9f876d869db3495232e67154fa0bcdb6089f62cc855112deb986b019f6e112c2782cc0158ffd899a1139c095c2ee0bd602e55ee6d3b7557e663a67d9caf4413c
-  data.tar.gz: 000864ff20232cf0d0f85bc74f29febc476dfc6eb668324640962caed100578d7900cc2011b0790978d88be992eaaf80292ec729fdb7c5a46b2e17306eb9dcca
+  metadata.gz: 49ad2eccded8195f771ad943704a9df0fbf56c62fc52ca00474311140b366f42a98e093c55f1a5ae4c89151640747286f93464f6790ccef1a52918afd7ee15ae
+  data.tar.gz: 73c4988ec96e88e9973f6031d3ecd9bd48474777f3271d7f83ffd29c0ba7107dd278cc09c9dfe3ebd821684780d594b1647bd92ab2cc22670ce09c33a50e6a3d

data/CHANGELOG

@@ -1,5 +1,9 @@
 === master
 
+=== 1.0.3
+
+Explicitly apply query blocks in definition order
+
 === 1.0.2
 
 Remove base_scope application on sifted instance

data/lib/parascope/query.rb

@@ -73,7 +73,7 @@ module Parascope
 
     def resolved_scope!
       guard_all
-      klass.query_blocks.sort{ |a, b| a.index <=> b.index }.reduce(scope) do |scope, block|
+      klass.sorted_query_blocks.reduce(scope) do |scope, block|
         clone_with_scope(scope, block).apply_block!.scope
       end
     end

data/lib/parascope/query/api_methods.rb

@@ -48,5 +48,13 @@ module Parascope
     def guard_blocks
       @guard_blocks ||= []
     end
+
+    def sorted_query_blocks
+      query_blocks.sort do |a, b|
+        a.index == b.index \
+          ? query_blocks.index(a) <=> query_blocks.index(b)
+          : a.index <=> b.index
+      end
+    end
   end
 end

data/lib/parascope/version.rb

@@ -1,3 +1,3 @@
 module Parascope
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parascope
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Artem Kuzko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie