acts_as_status_for 2.0.2 → 2.1.0

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.1.0

data/acts_as_status_for.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_status_for}
-  s.version = "2.0.2"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Curtis Schofield"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-06-29}
   s.description = %q{Given a list of datetime _at attributes }
   s.email = %q{github.com@robotarmyma.de}
   s.extra_rdoc_files = [

data/lib/acts_as_status_for.rb

@@ -20,11 +20,42 @@ module ActsAsStatusFor
     def log_error(state)
       STDERR.puts "Arel could not find #{state}_at in the database - skipping installation of acts_as_status"
     end
+
+
+    #
+    # having the state means that the
+    # state is not nil and the state_at is greater than all the other states not nil
+    #
+    def construct_have_state_arel_condition(state)
+      has_condition = self.arel_table["#{state}_at".to_sym].not_eq(nil)
+      (on_at_events - [state]).each do | unstate |
+        has_condition     = has_condition.and(self.arel_table["#{state}_at".to_sym].
+                                              gt(self.arel_table["#{unstate}_at".to_sym]).
+                                              or(self.arel_table["#{unstate}_at".to_sym].eq(nil)))
+      end
+      has_condition
+    end
+
+    #
+    # not having the state means that the 
+    # state is nil or the state_at is less or equal to all the other non nil states
+    #
+    def construct_not_have_state_arel_condition(state)
+      has_not_condition = self.arel_table["#{state}_at".to_sym].eq(nil)
+      (on_at_events - [state]).each do | unstate |
+        has_not_condition = has_not_condition.or(self.arel_table["#{state}_at".to_sym].
+                                                 lteq(self.arel_table["#{unstate}_at".to_sym]).
+                                                 and(self.arel_table["#{unstate}_at".to_sym].not_eq(nil)))
+      end
+      has_not_condition
+    end
     def install_scopes
-      on_at_events.each do |state|
+      on_at_events.each do | state |
         if self.arel_table["#{state}_at".to_sym] then
-          scope "#{state}".to_sym, where(self.arel_table["#{state}_at".to_sym].not_eq(nil))
-          scope "not_#{state}".to_sym, where(self.arel_table["#{state}_at".to_sym].eq(nil))
+          has_condition     = construct_have_state_arel_condition(state)
+          has_not_condition = construct_not_have_state_arel_condition(state)
+          scope "#{state}".to_sym, where(has_condition)
+          scope "not_#{state}".to_sym, where(has_not_condition)
         else
           log_error(state)
           @all_status_marks_exist = @all_status_marks_exist && false
@@ -70,7 +101,7 @@ module ActsAsStatusFor
     def current_status
       status.split(' ').first or ''
     end
-    
+
     def status=(event_string)
       case event_string
       when ''
@@ -86,13 +117,13 @@ module ActsAsStatusFor
       end
     end
     alias :current_status= :status=
-    def status
-      status_time = {}
-      self.class.on_at_events.each do | event |
-        time = self.send("#{event}_at")
+      def status
+        status_time = {}
+        self.class.on_at_events.each do | event |
+          time = self.send("#{event}_at")
         status_time[event] = time unless time.nil?
+        end
+        status_time.sort { |a,b| b.last <=> a.last }.collect(&:first).join(' ')
       end
-      status_time.sort { |a,b| b.last <=> a.last }.collect(&:first).join(' ')
-    end
   end
 end

data/spec/acts_as_status_for_spec.rb

@@ -109,14 +109,29 @@ describe ActsAsStatusFor do
       subject.status = ''
       subject.status.should == ''
     end
-    {
+
+    describe "audit trail is independent of scope" do
+      it "should recognize only the most recent" do
+        subject.featured_at = 3.days.ago
+        subject.on_hold_at = 1.days.ago
+        subject.archived_at = Time.now
+        subject.save
+        subject.class.archived.should     include(subject)
+        subject.class.not_on_hold.should  include(subject)
+        subject.class.on_hold.should_not  include(subject)
+        subject.class.not_featured.should include(subject)
+        subject.class.featured.should_not include(subject)
+      end
+    end
+
+    (ClassFinderMethods = {
       # class finder method 
       #          => [ list of event states that belong to finder]
       #
       :featured  => [:featured],
       :on_hold   => [:on_hold],
       :archived  => [:archived]
-    }.each do |scope,states|
+    }).each do |scope,states|
       states.each do |state|
         it "can be used to set events" do
           subject.status = state.to_s

metadata

@@ -2,7 +2,7 @@
 name: acts_as_status_for
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors: 
 - Curtis Schofield
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-06-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 556641777155012256
+      hash: -3085350057681311933
       segments: 
       - 0
       version: "0"