Merge remote-tracking branch 'upstream/master' into add_states_on_one…

…_line - also fix typo and move arg deconstruction to private method
aasm · alto · Mar 19, 2016 · Dec 2, 2015 · Mar 16, 2016 · Mar 16, 2016
commit 4355aafa64e8fc97f4d9f06cc67357ea48c81ab6
diff --git a/lib/aasm/base.rb b/lib/aasm/base.rb
@@ -78,31 +78,23 @@ def initial_state(new_initial_state=nil)
     # [0] state
     # [1..] state
     def state(*args)
-      if args.last.is_a?(Hash) && args.size == 2
-        names = [args.first]
-        options = args.last
-      elsif
-        names = args
-        options = {}
-      else
-        raise "count not parse states: #{args}"
-      end
-
+      names, options = interpret_state_args(args)
+      puts names.inspect
+      puts options.inspect
       names.each do |name|
-        @state_machine.add_state(name, @klass, options)
+        @state_machine.add_state(name, klass, options)
 
-        if @klass.instance_methods.include?("#{name}?")
-          warn "#{@klass.name}: The aasm state name #{name} is already used!"
+        if klass.instance_methods.include?("#{name}?")
+          warn "#{klass.name}: The aasm state name #{name} is already used!"
         end
 
-        @klass.class_eval <<-EORUBY, __FILE__, __LINE__ + 1
-        def #{name}?
-          aasm(:#{@name}).current_state == :#{name}
+        aasm_name = @name
+        klass.send :define_method, "#{name}?", ->() do
+          aasm(:"#{aasm_name}").current_state == :"#{name}"
         end
-      EORUBY
 
-        unless @klass.const_defined?("STATE_#{name.upcase}")
-          @klass.const_set("STATE_#{name.upcase}", name)
+        unless klass.const_defined?("STATE_#{name.upcase}")
+          klass.const_set("STATE_#{name.upcase}", name)
         end
       end
     end
@@ -184,6 +176,7 @@ def from_states_for_state(state, options={})
       if options[:transition]
         @state_machine.events[options[:transition]].transitions_to_state(state).flatten.map(&:from).flatten
       else
+
         events.map {|e| e.transitions_to_state(state)}.flatten.map(&:from).flatten
       end
     end
@@ -202,5 +195,14 @@ def configure(key, default_value)
       end
     end
 
+    def interpret_state_args(args)
+      if args.last.is_a?(Hash) && args.size == 2
+        [[args.first], args.last]
+      elsif args.size > 0
+        [args, {}]
+      else
+        raise "count not parse states: #{args}"
+      end
+    end
   end
 end