apollo 1.3.0.beta.3 → 1.3.0.beta.4

data/VERSION

@@ -1 +1 @@
-1.3.0.beta.3
+1.3.0.beta.4

data/apollo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apollo}
-  s.version = "1.3.0.beta.3"
+  s.version = "1.3.0.beta.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis D. Warlick, Jr.", "Charlie Savage", "Blake Chambers"]
-  s.date = %q{2010-06-01}
+  s.date = %q{2010-06-15}
   s.email = ["warlickt@operissystems.com", "cfis@zerista.com", "chambb1@gmail.com"]
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/apollo.rb

@@ -36,6 +36,8 @@ module Apollo
 
   class NoTransitionAllowed < Exception; end
 
+  class StateNotFound < Exception; end
+
   class ApolloError < Exception; end
 
   class ApolloDefinitionError < Exception; end
@@ -93,6 +95,10 @@ module Apollo
       @current_state = new_value.to_s
     end
 
+    def default_state
+      self.class.state_machine.default_state
+    end
+
     def halted?
       @halted
     end
@@ -211,7 +217,7 @@ module Apollo
     #
     # Default ActiveRecord implementation uses a 'current_state' database column.
     def load_current_state
-      @current_state if instance_variable_defined? :@current_state
+      (instance_variable_defined?(:@current_state) ? @current_state : nil) || default_state
     end
   end
 

data/lib/apollo/active_record_extensions.rb

@@ -2,11 +2,14 @@ module Apollo
   module ActiveRecordExtensions
     module InstanceMethods
       def load_current_state
-        if self.class.persist_string_state_name?
+        result = if self.class.persist_string_state_name?
           read_attribute(self.class.current_state_column)
         else
-          self.class.state_id_to_name(read_attribute(self.class.current_state_id_column))
+          id = read_attribute(self.class.current_state_id_column)
+          self.class.state_id_to_name(id) if id
         end
+
+        result || self.default_state
       end
 
       def current_state=(new_value)

data/lib/apollo/specification.rb

@@ -9,6 +9,16 @@ module Apollo
       instance_eval(&specification)
     end
 
+    # TODO - Possibly allow passing of a block here to
+    # allow users more control over the default state
+    # under certain conditions
+    def default_state(state_name = nil)
+      return @default_state unless state_name
+
+      validate_state_name(state_name)
+      @default_state = state_name
+    end
+
     private
 
     def state(name, meta = {:meta => {}}, &events_and_etc)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: apollo
 version: !ruby/object:Gem::Version 
-  hash: 62196405
+  hash: 62196411
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
   - beta
-  - 3
-  version: 1.3.0.beta.3
+  - 4
+  version: 1.3.0.beta.4
 platform: ruby
 authors: 
 - Travis D. Warlick, Jr.
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -05:00
+date: 2010-06-15 00:00:00 -05:00
 default_executable: 
 dependencies: []