hat-trick 0.2.0 → 0.2.1

data/Changelog

@@ -1,3 +1,5 @@
+* 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.
+
 * 0.2.0    - Now calls before/after :each callbacks before the step-specific ones
 
 * 0.1.5    - Allow hide_button DSL method inside before / after blocks

data/lib/hat_trick/step.rb

@@ -2,12 +2,12 @@ require 'hat_trick/step_definition'
 
 module HatTrick
   class Step
-    attr_reader :step_def, :wizard
+    attr_reader :step_def, :wizard, :buttons
     attr_accessor :next_step, :redirect_from
     attr_writer :skipped
 
-    delegate :name, :fieldset, :add_button, :delete_button, :buttons, :to_sym,
-             :to_s, :run_after_callback, :run_before_callback, :include_data,
+    delegate :name, :fieldset, :to_sym, :to_s, :run_after_callback,
+             :run_before_callback, :include_data,
              :run_include_data_callback, :run_step_contents_callback,
              :include_data_key, :config, :step_contents, :last?, :first?,
              :to => :step_def
@@ -16,10 +16,22 @@ module HatTrick
 
     def initialize(step_def, wizard)
       @step_def = step_def
+      @buttons = step_def.buttons.dup
       @wizard = wizard
       @skipped = step_def.skipped?
     end
 
+    def add_button(button)
+      @buttons.delete_if do |b|
+        b.keys.first == button.keys.first && b[b.keys.first][:default]
+      end
+      @buttons << button
+    end
+
+    def delete_button(type)
+      @buttons.delete_if { |b| b.keys.first == type }
+    end
+
     def skipped?
       @skipped || (skipped_steps.include?(self.to_sym) && !visited?)
     end

data/lib/hat_trick/step_definition.rb

@@ -149,7 +149,14 @@ module HatTrick
     end
 
     def run_before_callback(context, model)
-      Rails.logger.info "Running before callback for #{name}"
+      log_msg = if model && model.respond_to?(:id)
+                  "Running before callback for #{name} with model id #{model.id}"
+                elsif model && model.is_a?(ActiveModel::Errors)
+                  "Running before callback for #{name} with errors on model id #{model.instance_variable_get(:@base).id}"
+                else
+                  "Running before callback for #{name}"
+                end
+      Rails.logger.info log_msg
       run_callbacks(before_callbacks, context, model)
     end
 

data/lib/hat_trick/version.rb

@@ -1,3 +1,3 @@
 module HatTrick
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/hat_trick/wizard.rb

@@ -22,6 +22,7 @@ module HatTrick
     end
 
     def model=(new_model)
+      Rails.logger.info "Setting model for #{object_id} to #{new_model.inspect}"
       @model = new_model
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hat-trick
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec