birthday 0.0.2 → 0.1.0

data/README.md

@@ -8,23 +8,33 @@ After the gem has been properly tested, it will be released on RubyGems, and wil
 
     gem install birthday
 
+or in your Gemfile:
+
+    gem 'birthday', '~> 0.1.0'
+
 ## Synopsis
 
 Read [a blog post about the gem](http://blog.railslove.com/2011/10/17/birthday-gem-easy-anniversaries-handling-ruby/) at Railslove blog to get a comprehensive guide to usage of this gem.
 
 You can create your own adapters for the ORM adapters we're not supporting yet by writing a class with a class method `scope_hash`, which will return a hash normally used in `active_record` scopes.
 
-    class SqliteAdapter
-      def self.scope_hash(field, date_start, date_end)
-        # do some magic and return scope hash you can use
-        # field is the field used in the database
-        # date_start and date_end can be anything that responds to .to_date method
+    module Railslove
+      module Acts
+        module Birthday
+          module Adapter
+            class SqliteAdapter
+              def self.scope_hash(field, date_start, date_end)
+                # do some magic and return scope hash you can use
+                # field is the field used in the database
+                # date_start and date_end can be anything that responds to .to_date method
+              end
+            end
+          end
+        end
       end
     end
 
-and then create an initializer file with this content, referencing the class you wrote:
-
-    ::Railslove::Acts::Birthday::BaseAdapter.birthday_adapter = SqliteAdapter
+With this namespacing (`Railslove::Acts::Birthday::Adapter`) and naming the class after `active_record`'s ORM adapter (like `SqliteAdapter` in the example above) you can automatically use your own adapters with this gem.
 
 ### To do
 
@@ -46,6 +56,7 @@ Copyright (c) 2011 Railslove
 ## Main contributors
 
 * [@Holek (Mike Połtyn)](http://github.com/Holek)
+* [@Bumi (Michael Bumann)](http://github.com/bumi)
 
 ## License
 

data/lib/birthday.rb

@@ -1,8 +1,4 @@
 require "railslove/acts/birthday/birthday"
-require "railslove/acts/birthday/adapters/mysql_adapter"
-require "railslove/acts/birthday/adapters/mysql2_adapter"
-require "railslove/acts/birthday/adapters/postgresql_adapter"
 require "railslove/acts/birthday/version"
 
 ActiveRecord::Base.send :include, ::Railslove::Acts::Birthday
-::Railslove::Acts::Birthday::BaseAdapter.birthday_adapter = "Railslove::Acts::Birthday::#{ActiveRecord::Base.connection.class.name.split("::").last}".constantize

data/lib/railslove/acts/birthday/adapter.rb

@@ -0,0 +1,17 @@
+# Birthday
+module Railslove
+  module Acts #:nodoc:
+    module Birthday #:nodoc:
+      module Adapter
+        autoload :MysqlAdapter, 'railslove/acts/birthday/adapter/mysql_adapter'
+        autoload :Mysql2Adapter, 'railslove/acts/birthday/adapter/mysql2_adapter'
+        autoload :PostgreSQLAdapter, 'railslove/acts/birthday/adapter/postgresql_adapter'
+
+        def self.adapter_for(connection)
+          "Railslove::Acts::Birthday::Adapter::#{connection.class.name.demodulize}".constantize
+        end
+
+      end
+    end
+  end
+end

data/lib/railslove/acts/birthday/adapter/mysql2_adapter.rb

@@ -0,0 +1,12 @@
+# Birthday
+require 'railslove/acts/birthday/adapter/mysql_adapter'
+module Railslove
+  module Acts #:nodoc:
+    module Birthday #:nodoc:
+      module Adapter
+        class Mysql2Adapter < MysqlAdapter
+        end
+      end
+    end
+  end
+end

data/lib/railslove/acts/birthday/adapter/mysql_adapter.rb

@@ -0,0 +1,28 @@
+# Birthday
+module Railslove
+  module Acts #:nodoc:
+    module Birthday #:nodoc:
+      module Adapter
+        class MysqlAdapter
+          def self.scope_hash(field, date_start, date_end)
+            date_start = date_start.to_date
+            if ((date_end.respond_to?(:empty?) && date_end.empty?) || !date_end)
+              where_sql = "DATE_FORMAT(`#{field}`, '%m%d') = \"#{date_start.strftime('%m%d')}\""
+            else
+              date_end = date_end.to_date
+              if date_end.strftime('%m%d') < date_start.strftime('%m%d')
+                where_sql = "(DATE_FORMAT(`#{field}`, '%m%d') >= \"0101\""
+                where_sql << " AND DATE_FORMAT(`#{field}`, '%m%d') <= \"#{date_start.strftime('%m%d')}\")"
+                where_sql << " OR (DATE_FORMAT(`#{field}`, '%m%d') >= \"#{date_end.strftime('%m%d')}\""
+                where_sql << " AND DATE_FORMAT(`#{field}`, '%m%d') <= \"1231\")"
+              else
+                where_sql = "DATE_FORMAT(`#{field}`, '%m%d') >= \"#{date_start.strftime('%m%d')}\" AND DATE_FORMAT(`#{field}`, '%m%d') <= \"#{date_end.strftime('%m%d')}\""
+              end
+            end
+            { :conditions => where_sql }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/railslove/acts/birthday/adapter/postgresql_adapter.rb

@@ -0,0 +1,26 @@
+# Birthday
+module Railslove
+  module Acts #:nodoc:
+    module Birthday #:nodoc:
+      module Adapter
+        class PostgreSQLAdapter
+          def self.scope_hash(field, date_start, date_end)
+            date_start = date_start.to_date
+            if ((date_end.respond_to?(:empty?) && date_end.empty?) || !date_end)
+              where_sql = "to_char(\"#{field}\", 'MMDD') = '#{date_start.strftime('%m%d')}'"
+            else
+              date_end = date_end.to_date
+              if date_end.strftime('%m%d') < date_start.strftime('%m%d')
+                where_sql = "to_char(\"#{field}\", 'MMDD') BETWEEN '0101' AND '#{date_end.strftime('%m%d')}'"
+                where_sql << "OR to_char(\"#{field}\", 'MMDD') BETWEEN '#{date_start.strftime('%m%d')}' AND '1231'"
+              else
+                where_sql = "to_char(\"#{field}\", 'MMDD') BETWEEN '#{date_start.strftime('%m%d')}' AND '#{date_end.strftime('%m%d')}'"
+              end
+            end
+            { :conditions => where_sql }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/railslove/acts/birthday/birthday.rb

@@ -3,16 +3,6 @@ module Railslove
   module Acts #:nodoc:
     module Birthday #:nodoc:
 
-      class BaseAdapter
-        def self.birthday_adapter
-          @@birthday_adapter
-        end
-
-        def self.birthday_adapter=(value)
-          @@birthday_adapter = value
-        end
-      end
-
       def self.included(base)
         base.extend ClassMethods
       end
@@ -35,8 +25,7 @@ module Railslove
         #   person.birthday_today? => true/false
         #   person.created_at_age => 2
         #   person.created_at_today? => true/false
-        def acts_as_birthday(*args)
-          birthday_fields = args.to_a.flatten.compact.map(&:to_sym)
+        def acts_as_birthday(*birthday_fields)
 
           scope_method = ActiveRecord::VERSION::MAJOR == 3 ? 'scope' : 'named_scope'
 
@@ -44,7 +33,7 @@ module Railslove
             self.send(scope_method, :"find_#{field.to_s.pluralize}_for", lambda{ |*scope_args|
               raise ArgumentError if scope_args.empty? or scope_args.size > 2
               date_start, date_end = *scope_args
-              ::Railslove::Acts::Birthday::BaseAdapter.birthday_adapter.scope_hash(field, date_start, date_end)
+              ::Railslove::Acts::Birthday::Adapter.adapter_for(self.connection).scope_hash(field, date_start, date_end)
             })
 
             class_eval %{

data/lib/railslove/acts/birthday/version.rb

@@ -1,7 +1,7 @@
 module Railslove
   module Acts
     module Birthday
-      VERSION = "0.0.2"
+      VERSION = "0.1.0"
     end
   end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Mike Po\xC5\x82tyn"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -150,9 +150,10 @@ files:
 - Rakefile
 - birthday.gemspec
 - lib/birthday.rb
-- lib/railslove/acts/birthday/adapters/mysql2_adapter.rb
-- lib/railslove/acts/birthday/adapters/mysql_adapter.rb
-- lib/railslove/acts/birthday/adapters/postgresql_adapter.rb
+- lib/railslove/acts/birthday/adapter.rb
+- lib/railslove/acts/birthday/adapter/mysql2_adapter.rb
+- lib/railslove/acts/birthday/adapter/mysql_adapter.rb
+- lib/railslove/acts/birthday/adapter/postgresql_adapter.rb
 - lib/railslove/acts/birthday/birthday.rb
 - lib/railslove/acts/birthday/version.rb
 - spec/birthday_spec.rb

data/lib/railslove/acts/birthday/adapters/mysql2_adapter.rb

@@ -1,9 +0,0 @@
-# Birthday
-module Railslove
-  module Acts #:nodoc:
-    module Birthday #:nodoc:
-      class Mysql2Adapter < MysqlAdapter
-      end
-    end
-  end
-end

data/lib/railslove/acts/birthday/adapters/mysql_adapter.rb

@@ -1,26 +0,0 @@
-# Birthday
-module Railslove
-  module Acts #:nodoc:
-    module Birthday #:nodoc:
-      class MysqlAdapter < BaseAdapter
-        def self.scope_hash(field, date_start, date_end)
-          date_start = date_start.to_date
-          if ((date_end.respond_to?(:empty?) && date_end.empty?) || !date_end)
-            where_sql = "DATE_FORMAT(`#{field}`, '%m%d') = \"#{date_start.strftime('%m%d')}\""
-          else
-            date_end = date_end.to_date
-            if date_end.strftime('%m%d') < date_start.strftime('%m%d')
-              where_sql = "(DATE_FORMAT(`#{field}`, '%m%d') >= \"0101\""
-              where_sql << " AND DATE_FORMAT(`#{field}`, '%m%d') <= \"#{date_start.strftime('%m%d')}\")"
-              where_sql << " OR (DATE_FORMAT(`#{field}`, '%m%d') >= \"#{date_end.strftime('%m%d')}\""
-              where_sql << " AND DATE_FORMAT(`#{field}`, '%m%d') <= \"1231\")"
-            else
-              where_sql = "DATE_FORMAT(`#{field}`, '%m%d') >= \"#{date_start.strftime('%m%d')}\" AND DATE_FORMAT(`#{field}`, '%m%d') <= \"#{date_end.strftime('%m%d')}\""
-            end
-          end
-          { :conditions => where_sql }
-        end
-      end
-    end
-  end
-end

data/lib/railslove/acts/birthday/adapters/postgresql_adapter.rb

@@ -1,24 +0,0 @@
-# Birthday
-module Railslove
-  module Acts #:nodoc:
-    module Birthday #:nodoc:
-      class PostgreSQLAdapter < BaseAdapter
-        def self.scope_hash(field, date_start, date_end)
-          date_start = date_start.to_date
-          if ((date_end.respond_to?(:empty?) && date_end.empty?) || !date_end)
-            where_sql = "to_char(\"#{field}\", 'MMDD') = '#{date_start.strftime('%m%d')}'"
-          else
-            date_end = date_end.to_date
-            if date_end.strftime('%m%d') < date_start.strftime('%m%d')
-              where_sql = "to_char(\"#{field}\", 'MMDD') BETWEEN '0101' AND '#{date_end.strftime('%m%d')}'"
-              where_sql << "OR to_char(\"#{field}\", 'MMDD') BETWEEN '#{date_start.strftime('%m%d')}' AND '1231'"
-            else
-              where_sql = "to_char(\"#{field}\", 'MMDD') BETWEEN '#{date_start.strftime('%m%d')}' AND '#{date_end.strftime('%m%d')}'"
-            end
-          end
-          { :conditions => where_sql }
-        end
-      end
-    end
-  end
-end