separated if-statement and array assignment to avoid "multiple assign…

…ment in conditional" error in Ruby 1.9.1.
ohac · Feb 28, 2009 · c7e8873 · c7e8873
1 parent 70dfe63
commit c7e8873
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/lib/ditz/model.rb b/lib/ditz/model.rb
@@ -252,21 +252,24 @@ def create_interactively opts={}
       @fields.each do |name, field_opts|
         val = if opts[:with] && opts[:with][name]
           opts[:with][name]
-        elsif(found, v = generate_field_value(o, field_opts, generator_args, :interactive => true)) && found
-          v
         else
-          q = field_opts[:prompt] || name.to_s.capitalize
-          if field_opts[:multiline]
-            ## multiline options currently aren't allowed to have a default
-            ## value, so just ask.
-            ask_multiline_or_editor q
+          found, v = generate_field_value(o, field_opts, generator_args, :interactive => true)
+          if found
+            v
           else
-            default = if opts[:defaults_from] && opts[:defaults_from].respond_to?(name) && (x = opts[:defaults_from].send(name))
-              x
+            q = field_opts[:prompt] || name.to_s.capitalize
+            if field_opts[:multiline]
+              ## multiline options currently aren't allowed to have a default
+              ## value, so just ask.
+              ask_multiline_or_editor q
             else
-              default = generate_field_default o, field_opts, generator_args
+              default = if opts[:defaults_from] && opts[:defaults_from].respond_to?(name) && (x = opts[:defaults_from].send(name))
+                x
+              else
+                default = generate_field_default o, field_opts, generator_args
+              end
+              ask q, :default => default
             end
-            ask q, :default => default
           end
         end
         o.send "#{name}=", val
@@ -282,10 +285,13 @@ def create vals={}, generator_args=[]
       @fields.each do |fname, fopts|
         val = if(x = vals[fname] || vals[fname.to_s])
           x
-        elsif(found, x = generate_field_value(o, fopts, generator_args, :interactive => false)) && found
-          x
-        elsif !fopts[:nil_ok]
-          raise ModelError, "missing required field #{fname.inspect} on #{self.name} object (got #{vals.keys.inspect})"
+        else
+          found, x = generate_field_value(o, fopts, generator_args, :interactive => false)
+          if found
+            x
+          elsif !fopts[:nil_ok]
+            raise ModelError, "missing required field #{fname.inspect} on #{self.name} object (got #{vals.keys.inspect})"
+          end
         end
         o.send "#{fname}=", val if val
       end