hat-trick 0.2.2 → 0.3.0

data/Changelog

@@ -1,3 +1,7 @@
+* 0.3.0    - Add model_class DSL method to explicitly tell hat-trick which model to use.
+	   - Clean up validation_groups on models after each request.
+	   - Stop monkey-patching all of ActiveRecord::Base with hat-trick's model methods.
+
 * 0.2.2    - Lower logging severity to debug for all of the formerly info-level logging output.
 
 * 0.2.1    - Fix a bug where button_to data was shared across multiple users of the app. They are now user-specific, as they should be.

data/hat-trick.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "debugger"
 
-  s.add_runtime_dependency "rails", "~> 3.1"
+  s.add_runtime_dependency "rails", ">= 3.1"
   s.add_runtime_dependency "validation_group"
   s.add_runtime_dependency "gon"
 end

data/lib/hat_trick/controller_hooks.rb

@@ -22,6 +22,9 @@ module HatTrick
               end
               common_hook(*args) if respond_to?(:common_hook, :include_private)
               #{meth}_without_hat_trick(*args)
+              if hat_trick_wizard.model && hat_trick_wizard.model.respond_to?(:disable_validation_groups)
+                hat_trick_wizard.model.disable_validation_groups
+              end
             end
             private "#{meth}_with_hat_trick"
           RUBY_EVAL

data/lib/hat_trick/dsl.rb

@@ -80,8 +80,6 @@ module HatTrick
           include HatTrick::DSL::ControllerInstanceMethods
           include HatTrick::ControllerHooks
 
-          ::ActiveRecord::Base.send(:include, HatTrick::ModelMethods)
-
           config = HatTrick::Config.new
           @wizard_def = HatTrick::WizardDefinition.new(config)
 
@@ -97,6 +95,10 @@ module HatTrick
         self.configure_callback = block
       end
 
+      def model_class(klass)
+        klass.send(:include, HatTrick::ModelMethods)
+      end
+
       def button_label(type, label)
         wizard_def.config.send("#{type}_button_label=", label)
       end

data/lib/hat_trick/model_methods.rb

@@ -18,7 +18,9 @@ module HatTrick
     def self.set_current_validation_group_for(klass, validation_group_name, dynamic)
       self.validation_groups ||= {}
       validation_groups[klass.to_s.underscore] = validation_group_name
-      dynamic_validation_groups << validation_group_name if dynamic
+      if dynamic && !dynamic_validation_groups.include?(validation_group_name)
+        dynamic_validation_groups << validation_group_name
+      end
     end
 
     def self.current_validation_group_for(klass)
@@ -26,11 +28,26 @@ module HatTrick
       validation_groups[klass.to_s.underscore]
     end
 
+    def self.clear_current_validation_group_for(klass)
+      unless validation_groups.nil?
+        Rails.logger.debug "Clearing current validation groups for #{klass.to_s.underscore}"
+        validation_groups.delete klass.to_s.underscore
+      end
+    end
+
     def perform_validations_with_hat_trick(*args, &block)
       enable_current_validation_group
       perform_validations_without_hat_trick(*args, &block)
     end
 
+    def disable_validation_groups
+      if respond_to?(:disable_validation_group)
+        Rails.logger.debug "Disabling validation groups"
+        disable_validation_group
+      end
+      HatTrick::ModelMethods.clear_current_validation_group_for(self.class)
+    end
+
     def as_json_with_model_name(*args, &block)
       json = as_json_without_model_name(*args, &block)
       json.merge! :__name__ => self.class.to_s.underscore if json.respond_to?(:merge!)

data/lib/hat_trick/version.rb

@@ -1,3 +1,3 @@
 module HatTrick
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hat-trick
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,7 +64,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency