apollo 1.2.0 → 1.3.0.beta.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0.beta.1

data/apollo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apollo}
-  s.version = "1.2.0"
+  s.version = "1.3.0.beta.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis D. Warlick, Jr."]
-  s.date = %q{2010-04-24}
+  s.date = %q{2010-05-25}
   s.email = %q{warlickt@operissystems.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -39,21 +39,21 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tekwiz/apollo}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A fork of workflow: a finite-state-machine-inspired API for modeling and interacting with what we tend to refer to as 'workflow'.}
   s.test_files = [
-    "test/couchtiny_example.rb",
+    "test/without_active_record_test.rb",
+     "test/couchtiny_example.rb",
      "test/main_test.rb",
-     "test/readme_example.rb",
      "test/test_helper.rb",
-     "test/without_active_record_test.rb"
+     "test/readme_example.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/apollo/active_record_extensions.rb

@@ -2,13 +2,22 @@ module Apollo
   module ActiveRecordExtensions
     module InstanceMethods
       def load_current_state
-        read_attribute(self.class.current_state_column)
+        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))
+        end
       end
 
       # On transition the new current state is immediately saved in the
       # database.
       def persist_current_state(new_value)
-        update_attribute self.class.current_state_column, new_value
+        if self.class.persist_string_state_name?
+          update_attribute self.class.current_state_column, new_value
+        else
+          update_attribute self.class.current_state_id_column, 
+                           self.class.state_name_to_id(new_value)
+        end
       end
 
       private
@@ -19,7 +28,12 @@ module Apollo
       # state. That's why it is important to save the string with the name of the
       # initial state in all the new records.
       def write_initial_state
-        write_attribute self.class.current_state_column, current_state.to_s
+        if self.class.persist_string_state_name?
+          write_attribute self.class.current_state_column, current_state.to_s
+        else
+          write_attribute self.class.current_state_id_column,
+                          self.class.state_name_to_id(current_state.to_s)
+        end
       end
     end
     
@@ -30,9 +44,33 @@ module Apollo
         surround  = (options[:surround]  or ['(',')'])
       
         str = state_machine.state_sets[set_name.to_sym].state_names
-        str = str.collect { |state_name| quotes + state_name + quotes }.join(join)
+        if persiste_string_state_name?
+          str = str.collect { |state_name| quotes + state_name + quotes }.join(join)
+        else
+          str = str.collect { |state_name| state_name_to_id(state_name) }.join(join)
+        end
         surround.first + str + surround.last
       end
+      
+      def persist_string_state_name?
+        self.column_names.include?(self.current_state_column)
+      end
+      
+      def state_id_to_name(state_id)
+        result = ActiveRecord::Base.connection.query "SELECT name FROM states WHERE klass = '#{self.to_s}' AND id = #{state_id}"
+        raise "Cannot find state." if result.empty?
+        result[0][0]
+      end
+      
+      def state_name_to_id(state_name)
+        result = ActiveRecord::Base.connection.query "SELECT id FROM states WHERE klass = '#{self.to_s}' AND name = '#{state_name}'"
+        raise "Cannot find state" if result.empty?
+        result[0][0]
+      end
+      
+      def current_state_id_column
+        self.current_state_column.to_s+"_id"
+      end
     end
   end
 end

metadata

@@ -1,12 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: apollo
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 62196401
+  prerelease: true
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  - beta
+  - 1
+  version: 1.3.0.beta.1
 platform: ruby
 authors: 
 - Travis D. Warlick, Jr.
@@ -14,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 -05:00
+date: 2010-05-25 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -57,29 +60,35 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "A fork of workflow: a finite-state-machine-inspired API for modeling and interacting with what we tend to refer to as 'workflow'."
 test_files: 
+- test/without_active_record_test.rb
 - test/couchtiny_example.rb
 - test/main_test.rb
-- test/readme_example.rb
 - test/test_helper.rb
-- test/without_active_record_test.rb
+- test/readme_example.rb