lib/pragma.rb in pragma-2.1.1 vs lib/pragma.rb in pragma-2.2.0

@@ -10,24 +10,30 @@
 
 require 'pragma/version'
 
 require 'pragma/decorator/error'
 
-require 'pragma/operation/filter/base'
-require 'pragma/operation/filter/equals'
-require 'pragma/operation/filter/like'
-require 'pragma/operation/filter/ilike'
+require 'pragma/filter/base'
+require 'pragma/filter/equals'
+require 'pragma/filter/like'
+require 'pragma/filter/ilike'
+require 'pragma/filter/where'
+require 'pragma/filter/scope'
 
-require 'pragma/operation/macro/classes'
-require 'pragma/operation/macro/decorator'
-require 'pragma/operation/macro/filtering'
-require 'pragma/operation/macro/ordering'
-require 'pragma/operation/macro/pagination'
-require 'pragma/operation/macro/policy'
-require 'pragma/operation/macro/model'
-require 'pragma/operation/macro/contract/build'
-require 'pragma/operation/macro/contract/validate'
-require 'pragma/operation/macro/contract/persist'
+require 'pragma/operation/filter'
+
+require 'pragma/macro/classes'
+require 'pragma/macro/decorator'
+require 'pragma/macro/filtering'
+require 'pragma/macro/ordering'
+require 'pragma/macro/pagination'
+require 'pragma/macro/policy'
+require 'pragma/macro/model'
+require 'pragma/macro/contract/build'
+require 'pragma/macro/contract/validate'
+require 'pragma/macro/contract/persist'
+
+require 'pragma/operation/macro'
 
 require 'pragma/operation/index'
 require 'pragma/operation/show'
 require 'pragma/operation/create'
 require 'pragma/operation/update'