valideizer 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c9873beccb05b1760cfb433e7acc9191c73776f33cce63b5a96139ef812e3f
-  data.tar.gz: ffd61b47280fa87acaed4023b569885e2ef533e6aeab71c60ca084903c58ce51
+  metadata.gz: a303937cb368ebd84c661f16297d7823d2dcdd23f0763fec9e6ac1f356b62e1b
+  data.tar.gz: db3b32062956c8a85140a632d2daa30f6b35b8b5234aad1519b9d3f7668aba3f
 SHA512:
-  metadata.gz: f9e9dd294281414dde34499bc54268b7299d4cedae4b1ced82f1c47616a9f0c17683d7724dcf30ad86ef507d2e5798fad822f84b06b593ddd32dfafb42087aa6
-  data.tar.gz: c7e2f067f4d67fe00e02f1c989fe3e7e7081143eb63d2288e10622b9c653b6630cec770bb8f3868c56343436ec4d4f2a54530cfbc4c5e64cbe50fceb0f7bcc8b
+  metadata.gz: d6bdae686791daf67fce95ede359ad23641179d18b225d81862dcc3e5c6460356f5b84a4b9e1e74bc40554558dbeea03efeb575510d6b9151b4685c544be763d
+  data.tar.gz: 53715aa5607f084972b8fcc718aad19f560b0fa8f20fa09104ac7f9d8e975ae3baadddbc58755d675700646a5498f71e993d8209c0fcc7d3e5c8adf40e995b6b

data/lib/valideizer/holder.rb

@@ -0,0 +1,13 @@
+module Valideizer
+  class Holder
+    include Singleton
+
+    attr_acessor :valideizers
+    attr_acessor :callback_method
+    attr_acessor :callback_controller
+
+    def initialize
+      @valideizers = {}
+    end
+  end
+end

data/lib/valideizer/rails.rb

@@ -1,32 +1,49 @@
 require 'valideizer/core'
+require 'valideizer/holder'
 
 module Valideizer
   module Rails
-    def valideize(method, &options_block)
-      @valideizers = {} unless @valideizers.present?
+    class << self
+      def valideize(method, &options_block)
+        holder.valideizers[controller_name] = {} if holder.valideizers[controller_name].nil?
 
-      @valideizers[method] = Valideizer::Core.new
-      @valideizers[method].instance_exec(options_block)
-    end
+        raise "Action #{method} is not defined in #{controller_name}" unless action_methods.include? method.to_s
+
+        if holder.valideizers[controller_name][method].nil?
+          holder.valideizers[controller_name][method] = Valideizer::Core.new
+        end
 
-    def valideize!
-      valideizer = @valideizers[action_name]
-      if valideizer.present? && @valideizer_callback.present?
-        redirect_to(controller: controller_name,
-          action: @valideizer_callback, errors: valideizer.errors) unless validiezer.valideize?(params)
+        valideizer = holder.valideizers[controller_name][method]
+        valideizer.instance_exec(options_block)
       end
-    end
 
-    def valideized?(params)
-      @valideizers[action_name].valideized? params
-    end
+      def valideize!
+        valideizer = holder.valideizers[controller_name][action_name]
 
-    def valideizer_errors
-      @valideizers[action_name].errors
-    end
+        if valideizer.present? && $valideizer_callback.present?
+          redirect_to(controller: controller_name,
+            action: @valideizer_callback, errors: valideizer.errors) unless validiezer.valideize?(params)
+        end
+      end
+
+      def valideized?(params)
+        holder.valideizers[controller_name][action_name].valideized?(params)
+      end
+
+      def valideizer_errors
+        holder.valideizers[controller_name][action_name].errors
+      end
 
-    def valideizer_callback(method_name)
-      @valideizer_callback = method_name
+      def valideizer_callback(method_name)
+        holder.callback_controller = controller_name
+        holder.callback_method     = method_name
+      end
+
+      private
+
+      def holder
+        Valideizer::Holder.instance
+      end
     end
   end
 end

data/lib/valideizer/version.rb

@@ -1,3 +1,3 @@
 module Valideizer
-  VERSION = "1.0.3"
+  VERSION = "1.0.5"
 end

data/lib/valideizer.rb

@@ -3,6 +3,7 @@ require_relative 'valideizer/rules.rb'
 require_relative 'valideizer/rails.rb'
 require_relative 'valideizer/version.rb'
 require_relative 'valideizer/error_printer.rb'
+require_relative 'valideizer/holder.rb'
 
 module Valideizer; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valideizer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Arthur 'ArtK0DE' Korochansky
@@ -34,6 +34,7 @@ files:
 - lib/valideizer.rb
 - lib/valideizer/core.rb
 - lib/valideizer/error_printer.rb
+- lib/valideizer/holder.rb
 - lib/valideizer/rails.rb
 - lib/valideizer/rules.rb
 - lib/valideizer/version.rb