jeffp-wizardly 0.1.3 → 0.1.4

data/README.rdoc

@@ -61,7 +61,7 @@ Step 2: Tell your controller to act 'wizardly'.
 
 Step 3: Generate a 'wizardly' scaffold for your controller.
 
-  ./script/generate wizardly_scaffold :signup
+  ./script/generate wizardly_scaffold signup
 
 You are ready to go.
 

data/lib/validation_group.rb

@@ -1,6 +1,3 @@
-# Validation group code from Alex Kira's repository of validationgroup on Github
-# modifications made for wizardly integration
-# included herein until such time the code can be managed and released independantly with modifications
 module ValidationGroup
   module ActiveRecord
     module ActsMethods # extends ActiveRecord::Base
@@ -11,29 +8,29 @@ module ValidationGroup
           cattr_accessor :validation_group_classes
           self.validation_group_classes = {}
 					
-					def self.validation_group_order; @validation_group_order; end
-					def self.validation_groups(all_classes = false)
-						return (self.validation_group_classes[self] || {}) unless all_classes
-						klasses = ValidationGroup::Util.current_and_ancestors(self).reverse
-						returning Hash.new do |hash|
-							klasses.each do |klass|
-								hash.merge! self.validation_group_classes[klass]
-							end
-						end
-					end
+          def self.validation_group_order; @validation_group_order; end
+          def self.validation_groups(all_classes = false)
+            return (self.validation_group_classes[self] || {}) unless all_classes
+            klasses = ValidationGroup::Util.current_and_ancestors(self).reverse
+            returning Hash.new do |hash|
+              klasses.each do |klass|
+                hash.merge! self.validation_group_classes[klass]
+              end
+            end
+          end
         end
       end
 
       def validation_group(name, options={})
         self_groups = (self.validation_group_classes[self] ||= {})
         self_groups[name.to_sym] = options[:fields] || []
-				@validation_group_order ||= []
-				@validation_group_order << name.to_sym
+        @validation_group_order ||= []
+        @validation_group_order << name.to_sym
 
         unless included_modules.include?(InstanceMethods)
           attr_reader :current_validation_group, :current_validation_fields
           include InstanceMethods
-					alias_method_chain :valid?, :validation_group
+          alias_method_chain :valid?, :validation_group
         end
       end
     end
@@ -41,16 +38,16 @@ module ValidationGroup
     module InstanceMethods # included in every model which calls validation_group
 			
       def enable_validation_group(group)
-        # Check if given validation group is defined for current class
-        # or one of its ancestors
+        # Check if given validation group is defined for current class or one of
+        # its ancestors
         group_classes = self.class.validation_group_classes
         found = ValidationGroup::Util.current_and_ancestors(self.class).
-					find do |klass|
-						group_classes[klass] && group_classes[klass].include?(group)
-					end
+          find do |klass|
+          group_classes[klass] && group_classes[klass].include?(group)
+        end
         if found
           @current_validation_group = group
-					@current_validation_fields = group_classes[found][group]
+          @current_validation_fields = group_classes[found][group]
         else
           raise ArgumentError, "No validation group of name :#{group}"
         end
@@ -58,35 +55,32 @@ module ValidationGroup
 
       def disable_validation_group
         @current_validation_group = nil
-				@current_validation_fields = nil
+        @current_validation_fields = nil
       end
 			
-			#can be used
-			def should_validate?(attribute)
-				@current_validation_fields && @current_validation_fields.include?(attribute.to_sym)
-			end
+      def should_validate?(attribute)
+	!self.validation_group_enabled? || (@current_validation_fields && @current_validation_fields.include?(attribute.to_sym))
+      end
 
       def validation_group_enabled?
         respond_to?(:current_validation_group) && !current_validation_group.nil?
       end
 			
-			#alias_method_chain :valid?, :validation_group
-			def valid_with_validation_group?(group=nil)
-				self.enable_validation_group(group) if group
-				valid_without_validation_group?
-			end
+      # eliminates need to use :enable_validation_group before :valid? call --
+      # nice
+      def valid_with_validation_group?(group=nil)
+        self.enable_validation_group(group) if group
+        valid_without_validation_group?
+      end
     end
 
     module Errors # included in ActiveRecord::Errors
       def add_with_validation_group(attribute,
-                                    msg = @@default_error_messages[:invalid], *args,
-                                    &block)
-        add_error = true
-        if @base.validation_group_enabled?
-					add_error = false unless @base.current_validation_fields.include?(attribute.to_sym)
-				end
-				add_without_validation_group(attribute, msg, *args, &block) if add_error
-			end
+          msg = @@default_error_messages[:invalid], *args,
+          &block)
+        add_error = @base.respond_to?(:should_validate?) ? @base.should_validate?(attribute.to_sym) : true
+        add_without_validation_group(attribute, msg, *args, &block) if add_error
+      end
 			
       def self.included(base) #:nodoc:
         base.class_eval do
@@ -97,8 +91,8 @@ module ValidationGroup
   end
 
   module Util
-    # Return array consisting of current and its superclasses
-    # down to and including base_class.
+    # Return array consisting of current and its superclasses down to and
+    # including base_class.
     def self.current_and_ancestors(current)
       returning [] do |klasses|
         klasses << current

data/rails_generators/wizardly_controller/wizardly_controller_generator.rb

@@ -5,8 +5,8 @@ class WizardlyControllerGenerator < Rails::Generator::Base
   
   def initialize(runtime_args, runtime_options = {})
     super
-    @controller_name = @args[0].underscore
-    @model_name = @args[1].underscore
+    @controller_name = @args[0].sub(/^:/, '').underscore
+    @model_name = @args[1].sub(/^:/, '').underscore
     @completed_redirect = @args[2]
     @canceled_redirect = @args[3]
     opts = {}

data/rails_generators/wizardly_scaffold/wizardly_scaffold_generator.rb

@@ -15,7 +15,7 @@ class WizardlyScaffoldGenerator < Rails::Generator::Base
   
   def initialize(runtime_args, runtime_options = {})
     super
-    name = @args[0].underscore.sub(/_controller$/, '').camelize + 'Controller'
+    name = @args[0].sub(/^:/, '').underscore.sub(/_controller$/, '').camelize + 'Controller'
     
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(name)
     @controller_class_name_without_nesting = base_name.camelize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeffp-wizardly
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeff Patmon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-02 00:00:00 -07:00
+date: 2009-08-04 00:00:00 -07:00
 default_executable: 
 dependencies: []