chronicle 0.0.5 → 0.0.6

data/lib/chronicle.rb

@@ -51,40 +51,103 @@ module Chronicle
       "3 minutes ago",
       "2 minutes ago",
       "1 minute ago",
-      "just now"
+      "just now",
+      "1 minute from now",
+      "2 minutes from now",
+      "3 minutes from now",
+      "5 minutes from now",
+      "10 minutes from now",
+      "20 minutes from now",
+      "30 minutes from now",
+      "1 hour from now",
+      "2 hours from now",
+      "3 hours from now",
+      "4 hours from now",
+      "5 hours from now",
+      "6 hours from now",
+      "7 hours from now",
+      "8 hours from now",
+      "1 day from now",
+      "2 days from now",
+      "3 days from now",
+      "4 days from now",
+      "5 days from now",
+      "6 days from now",
+      "1 week from now",
+      "2 weeks from now",
+      "3 weeks from now",
+      "1 month from now",
+      "2 months from now",
+      "3 months from now",
+      "4 months from now",
+      "5 months from now",
+      "6 months from now",
+      "7 months from now",
+      "1 year from now",
+      "2 years from now",
+      "3 years from now",
+      "4 years from now",
+      "5 years from now",
+      "6 years from now",
+      "7 years from now",
     ]
   end
-
+  
   class ChronicleHash < Hash
 
     def initialize(collection, options)
       
       eras = options[:eras]
-
-      # Make sure 'just now' is included, so no objects fall through the cracks
-      eras << "just now" unless eras.any? {|era| era =~ /now/i }
-    
+      
+      # Sort order, defaut is new to old
+      order = options[:order] || :desc
+      
+      # Remove objects with nil timestamps
+      collection = collection.reject {|obj| obj.send(options[:date_attr]).nil? }
+            
+      # Sort collection by date
+      collection = collection.sort_by {|obj| obj.send(options[:date_attr])}
+      collection = collection.reverse if order == :desc
+      
       # Ensure all eras can be parsed
       eras.each do |era|
         raise "Could not parse era: #{era}" if Chronic.parse(era).nil?
       end
+
+      if order == :desc && Time.now > collection.first.send(options[:date_attr])
+        eras << "just now" 
+      end
       
+      # Parse date strings
+      # { "7 years ago"=>2006-01-02 23:29:05 -0800, ... }
+      era_date_pairs = eras.inject({}) {|h,e| h[e] = Chronic.parse(e); h }
+          
       # Sort eras oldest to newest
       eras = eras.sort_by {|era| Chronic.parse(era) }
-
-      era_to_date = eras.inject({}) {|h,e| h[e] = Chronic.parse(e); h }
-
+      # .. or newest to oldest
+      eras = eras.reverse unless order == :desc
     
-      # Initialize all hash keys chronologically (newest to oldest)
-      eras.reverse.each {|era| self[era] = [] }
-
-      # Remove objects with nil timestamps
-      collection = collection.reject {|obj| obj.send(options[:date_attr]).nil? }
+      if order == :desc
 
-      # Find the oldest era in which each object was created
-      collection.sort_by {|obj| obj.send(options[:date_attr])}.reverse.each do |obj|
-        era = eras.find {|era| obj.send(options[:date_attr]) < era_to_date[era]  }
-        self[era] << obj
+        # Initialize all hash keys chronologically (newest to oldest)
+        eras.reverse.each {|era| self[era] = [] }
+        
+        # Find the oldest era in which each object was created
+        collection.each do |obj|
+          # puts ("\n #{obj.send(options[:date_attr])} < #{era_date_pairs[era]}")
+          era = eras.find {|era| obj.send(options[:date_attr]) < era_date_pairs[era]  }
+          self[era] << obj
+        end
+      else
+        
+        # Initialize all hash keys chronologically (oldest to newest)
+        eras.reverse.each {|era| self[era] = [] }
+        
+        # Find the newest era in which each object was created
+        collection.each do |obj|
+          era = eras.find {|era| obj.send(options[:date_attr]) > era_date_pairs[era]  }
+          self[era] << obj
+        end
       end
     
       # Remove keys for empty eras

data/lib/chronicle/version.rb

@@ -1,3 +1,3 @@
 module Chronicle
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/chronicle_spec.rb

@@ -56,7 +56,7 @@ describe Chronicle do
       @chronicle.keys.should == ['just now', '3 minutes ago', '35 days ago']
     end
     
-    it "raises an exception for eras that cannot be parse" do
+    it "raises an exception for eras that cannot be parsed" do
       expect { Chronicle.new(@things, :eras => ['63 eons hence']) }.to raise_error("Could not parse era: 63 eons hence")
     end
     
@@ -93,5 +93,40 @@ describe Chronicle do
     end
   
   end
+  
+  context "future dates" do
+    
+    before(:each) do
+      @things = [
+        double("thing", :created_at => Time.now + 39*@day),
+        double("thing", :created_at => Time.now + 8*@day),
+        double("thing", :created_at => Time.now + 9*@day),
+        double("thing", :created_at => Time.now + 3*@day),
+        double("thing", :created_at => Time.now + 9*@minute),
+      ]
+      @chronicle = Chronicle.new(@things, order: :asc)
+    end
+
+    it "doesn't have any empty eras" do
+      @chronicle.values.all? {|v| !v.empty? }.should == true
+    end
+      
+    it "sorts era keys from oldest to newest" do
+      @chronicle.keys.first.should == '5 minutes from now'
+      @chronicle.keys.last.should == '1 month from now'
+    end
+      
+    it "sorts objects in eras from oldest to newest" do
+      era = @chronicle['1 week from now']
+      era.size.should == 2
+      era.last.created_at.should be > era.first.created_at
+    end
+      
+    it "doesn't lose any items during processing" do
+      @chronicle.values.flatten.size.should == @things.size
+    end
+    
+  end
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronicle
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
@@ -104,12 +104,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4597408090393416326
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4597408090393416326
 requirements: []
 rubyforge_project: chronicle
 rubygems_version: 1.8.24