archive_tree 1.0.0.rc → 1.0.0.rc2

data/lib/archive_tree/action_view_extensions/draw_archive_tree.rb

@@ -1,7 +1,8 @@
 module ArchiveTree
   module ActionViewExtensions
 
-    # Defines the helper methods that will be included in the ActionView::Base in order to return the html representation of the archive tree
+    # Defines the helper methods that will be included in the ActionView::Base in 
+    # order to return the html representation of the archive tree
     module DrawArchiveTree
 
       # In the presence of records for a given model it draws the archive tree. Otherwise, returns an empty string

data/lib/archive_tree/core.rb

@@ -19,8 +19,8 @@ module ArchiveTree
       options.reverse_merge! ({ :year => Time.now.year })
 
       where("#{date_field} IS NOT NULL").
-      where("YEAR(#{date_field}) = ?", options[:year]).
-      where("MONTH(#{date_field}) = :month OR :month IS NULL", :month => options[:month])
+      where("EXTRACT(YEAR FROM #{date_field}) = :year", :year => options[:year]).
+      where("EXTRACT(MONTH FROM #{date_field}) = :month OR :month IS NULL", :month => options[:month])
     end
 
     # Constructs a single-level hash of years using the defined +date_field+ column.
@@ -37,7 +37,7 @@ module ArchiveTree
     def archived_years
       years = {}
       where("#{date_field} IS NOT NULL").
-      group("YEAR(#{date_field})").size.each { |year, count| years[year.to_i] = count }
+      group("EXTRACT(YEAR FROM #{date_field})").size.each { |year, count| years[year.to_i] = count }
 
       years
     end # archived_years
@@ -65,8 +65,8 @@ module ArchiveTree
       months  = {}
       month_format = options.delete(:month_names) || :int
 
-      where("YEAR(#{date_field}) = #{options[:year] || Time.now.year}").
-      group("MONTH(#{date_field})").size.each do |month, c|
+      where("EXTRACT(YEAR FROM #{date_field}) = #{options[:year] || Time.now.year}").
+      group("EXTRACT(MONTH FROM #{date_field})").size.each do |month, c|
         key = case month_format
         when :long
           Date::MONTHNAMES[month.to_i]
@@ -141,7 +141,7 @@ module ArchiveTree
 
         months.each do |month|
           tree[year][month] = {}
-          tree[year][month] = archive_node year, month
+          tree[year][month] = archive_node(:year => year, :month => month)
         end
       end
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - rc
-  version: 1.0.0.rc
+  - rc2
+  version: 1.0.0.rc2
 platform: ruby
 authors: 
 - Diogo Almeida
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 +01:00
+date: 2010-11-02 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency