treaty 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34516da12bec1bd3df351363dacd13fc3e7e9c31806fef4a6aecf37be88754a8
-  data.tar.gz: 71bb387ce08aa6a3d42de04bef6e2c7e281089184e0815ad2679a9b87df30213
+  metadata.gz: 9a2906d1588e4080f19519805a175efdc8df6178b4ea830f775b9ee1ddbd198d
+  data.tar.gz: 6ee3d6267f2b7df3d506ec4fcb9c8c5c7ba6a51eb813f5480ea7bfff0aaef2d1
 SHA512:
-  metadata.gz: '0398e7fa2f958bb24331f239cedd5db66880e2e08f402b82659b63a99941176e42ff64c867bdcd5c2aae054e4b35410f132d44f37724046c14b5c6967e9c6e6a'
-  data.tar.gz: 25433a8f90b4e6ee4528e3fa933be6ad7a6443ad593b12c99b9cc2fb3a110723b92690a2bbb2843e7de14fc27f5e7b806008fd361c31bbd4c74bd2a906e18b7f
+  metadata.gz: 661e88b1f8cafb5912af30b56a31e1a39e499379bbc85edf966e0af53c22dee2907d6b4e3c6371564f2b4cbfd2f84f5f5cdbf8aff17ce909813548db0cc8b5a1
+  data.tar.gz: 4be479a20f9d77f59e4e6d09b67b052cf5fd474e87896d11307ece42d335d198f752a5af858f9f824d832f0507bb98add19d3b5ade406824c7cc662a07af08af

data/lib/treaty/context/callable.rb

@@ -3,18 +3,18 @@
 module Treaty
   module Context
     module Callable
-      def call!(controller:, params:)
+      def call!(version:, params:)
         context = send(:new)
 
-        _call!(context, controller:, params:)
+        _call!(context, version:, params:)
       end
 
       private
 
-      def _call!(context, controller:, params:)
+      def _call!(context, version:, params:)
         context.send(
           :_call!,
-          controller:,
+          version:,
           params:,
           collection_of_versions:
         )

data/lib/treaty/context/workspace.rb

@@ -6,12 +6,12 @@ module Treaty
       private
 
       def _call!(
-        controller:,
+        version:,
         params:,
         collection_of_versions:
       )
         call!(
-          controller:,
+          version:,
           params:,
           collection_of_versions:
         )

data/lib/treaty/controller/dsl.rb

@@ -13,7 +13,7 @@ module Treaty
 
         def treaty(action_name)
           define_method(action_name) do
-            treaty = treaty_class.call!(controller: self, params:)
+            treaty = treaty_class.call!(version: treaty_version, params:)
 
             render json: treaty.data, status: treaty.status
           end
@@ -32,6 +32,10 @@ module Treaty
           # TODO: Need to move `Treaty` to configuration.
           self.class.name.sub(/Controller$/, "::#{action_name.to_s.classify}Treaty")
         end
+
+        def treaty_version
+          Treaty::Engine.config.treaty.version.call(self)
+        end
       end
     end
   end

data/lib/treaty/exceptions/base.rb

@@ -15,7 +15,7 @@ module Treaty
     #
     # ```ruby
     # begin
-    #   Treaty::Base.call!(controller: self, params: params)
+    #   Treaty::Base.call!(version: treaty_version, params: params)
     # rescue Treaty::Exceptions::Base => e
     #   # Catches any Treaty-specific exception
     #   handle_treaty_error(e)

data/lib/treaty/request/attribute/validator.rb

@@ -8,10 +8,10 @@ module Treaty
           new(...).validate!
         end
 
-        def initialize(controller:, version_factory:)
+        def initialize(params:, version_factory:)
           super(version_factory:)
 
-          @controller = controller
+          @params = params
         end
 
         def validate!
@@ -22,9 +22,9 @@ module Treaty
 
         def request_data
           @request_data ||= begin
-            @controller.params.to_unsafe_h
+            @params.to_unsafe_h
           rescue NoMethodError
-            @controller.params
+            @params
           end
         end
 

data/lib/treaty/version.rb

@@ -3,7 +3,7 @@
 module Treaty
   module VERSION
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     PRE = nil
 

data/lib/treaty/versions/resolver.rb

@@ -7,8 +7,8 @@ module Treaty
         new(...).resolve!
       end
 
-      def initialize(controller:, collection_of_versions:)
-        @controller = controller
+      def initialize(current_version:, collection_of_versions:)
+        @current_version = current_version
         @collection_of_versions = collection_of_versions
       end
 
@@ -27,15 +27,10 @@ module Treaty
 
       private
 
-      def current_version
-        @current_version ||=
-          Treaty::Engine.config.treaty.version.call(@controller)
-      end
-
       def version_factory
         @version_factory ||=
           @collection_of_versions.find do |factory|
-            factory.version.version == current_version
+            factory.version.version == @current_version
           end
       end
 
@@ -45,7 +40,7 @@ module Treaty
       end
 
       def current_version_blank?
-        current_version.to_s.strip.empty?
+        @current_version.to_s.strip.empty?
       end
 
       ##########################################################################
@@ -57,12 +52,12 @@ module Treaty
 
       def raise_version_not_found!
         raise Treaty::Exceptions::Validation,
-              I18n.t("treaty.versioning.resolver.version_not_found", version: current_version)
+              I18n.t("treaty.versioning.resolver.version_not_found", version: @current_version)
       end
 
       def raise_version_deprecated!
         raise Treaty::Exceptions::Deprecated,
-              I18n.t("treaty.versioning.resolver.version_deprecated", version: current_version)
+              I18n.t("treaty.versioning.resolver.version_deprecated", version: @current_version)
       end
     end
   end

data/lib/treaty/versions/workspace.rb

@@ -5,16 +5,16 @@ module Treaty
     module Workspace
       private
 
-      def call!(controller:, **) # rubocop:disable Metrics/MethodLength
+      def call!(version:, params:, **) # rubocop:disable Metrics/MethodLength
         super
 
         version_factory = Resolver.resolve!(
-          controller:,
+          current_version: version,
           collection_of_versions: @collection_of_versions
         )
 
         validated_params = Request::Attribute::Validator.validate!(
-          controller:,
+          params:,
           version_factory:
         )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treaty
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Anton Sokolov