zodiac 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54b14cc9a9d4cc8ce59f0764a494921b943857d9
-  data.tar.gz: 1dfb4499a9969fba2e555c8c1c2872b5417e1add
+  metadata.gz: 164dfe801d088018440c262ddeb47e7468394f60
+  data.tar.gz: bdf43d66fc4fa388cf1e5d6091c5cb4dd4133ab2
 SHA512:
-  metadata.gz: 2b6cba96f3aa249b5613705320db9aa535ad6d8ef8df2eb745511176a606c9fc3bf369c92b6bcb367d970817160cce55ecac89f1d8b759498da861aa0cc44450
-  data.tar.gz: 342246bada416a98d2a5821b2b78a977fe8ea0f44030056f2ba1e18460a9b57360dadeac7d2248cae5543046ea314b090ca55e5505b00c599ac94946d80a8a26
+  metadata.gz: 2fab9c39c04aea506e35ab7a762ff92a42fb8744e2ed439bf611bd6103bc8995ea02a0d0a433648a3dd6b274d96c32fc9b7a05a3cfeddfa31756a06eb483a05c
+  data.tar.gz: a47df25dc5b50ee0c1b6584b389f87a0757c8ceab52c4dd0567ef3d9d6bf28aed19707d0c2e4971f046dc21c41807491d613cd5a1ee88b91eb407fbd44c310bc

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.5
+  - 2.2.0

data/README.md

@@ -1,4 +1,4 @@
-# zodiac [![Build Status](https://secure.travis-ci.org/7even/zodiac.png)](http://travis-ci.org/7even/zodiac)
+# zodiac [![Build Status](https://secure.travis-ci.org/7even/zodiac.png)](http://travis-ci.org/7even/zodiac) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/7even/zodiac)
 
 `zodiac` is a simple gem for getting a zodiac sign from a given date of birth. It extends `Time`, `Date` and `DateTime` objects with a `#zodiac_sign` method and can also extend `ActiveRecord::Base` with several instance (delegated to some date attribute of the model object) and class methods (allowing you to search for objects with a certain zodiac sign)
 
@@ -101,18 +101,22 @@ rails generate zodiac:migration Person custom_sign_id
 * it (Italian) - thanks [lucapette](https://github.com/lucapette)
 * es (Spanish) - thanks [jazminschroeder](https://github.com/jazminschroeder)
 * de (German) - thanks [contradictioned](https://github.com/contradictioned)
+* zh-CN (Chinese) - thanks [lufeihaidao](https://github.com/lufeihaidao)
+* fr (French) - thanks [Belibaste](https://github.com/Belibaste)
+* lv (Latvian) - thanks [ExClouds](https://github.com/ExClouds)
 
 ## Changelog
 
-* 0.1 Initial version with Time/Date/DateTime extension and [:ru, :en] locales
-* 0.1.1 Added Brazilian Portuguese locale (thanks [jeffrydegrande](https://github.com/jeffrydegrande))
-* 0.2 Added ActiveRecord support (scopes, predicate methods and delegating `#zodiac_sign` to date-of-birth attribute)
-* 0.2.1 Added Japanese locale (thanks [hamakn](https://github.com/hamakn))
-* 0.2.2 Added Italian locale (thanks [lucapette](https://github.com/lucapette))
-* 0.2.3 Added Spanish locale (thanks [jazminschroeder](https://github.com/jazminschroeder))
-* 0.2.4 Correct leap-year dates handling (thanks [BastienDuplessier](https://github.com/BastienDuplessier))
-* 0.2.5 Added German locale (thanks [contradictioned](https://github.com/contradictioned))
-* 0.2.6 Added rails 4.0 support (thanks [travisp](https://github.com/travisp))
+* 0.1 Initial version with Time/Date/DateTime extension and [:ru, :en] locales.
+* 0.1.1 Added Brazilian Portuguese locale (thanks [jeffrydegrande](https://github.com/jeffrydegrande)).
+* 0.2 Added ActiveRecord support (scopes, predicate methods and delegating `#zodiac_sign` to date-of-birth attribute).
+* 0.2.1 Added Japanese locale (thanks [hamakn](https://github.com/hamakn)).
+* 0.2.2 Added Italian locale (thanks [lucapette](https://github.com/lucapette)).
+* 0.2.3 Added Spanish locale (thanks [jazminschroeder](https://github.com/jazminschroeder)).
+* 0.2.4 Correct leap-year dates handling (thanks [BastienDuplessier](https://github.com/BastienDuplessier)).
+* 0.2.5 Added German locale (thanks [contradictioned](https://github.com/contradictioned)).
+* 0.2.6 Added rails 4.0 support (thanks [travisp](https://github.com/travisp)).
+* 0.2.7 Added Chinese, French & Latvian locales, added `Zodiac::Date#zodiac_sign_symbol`.
 
 ## Roadmap
 

data/lib/locales/fr.yml

@@ -0,0 +1,14 @@
+fr:
+  zodiac:
+    aries:        Bélier
+    taurus:       Taureau
+    gemini:       Gémeaux
+    cancer:       Cancer
+    leo:          Lion
+    virgo:        Vierge
+    libra:        Balance
+    scorpio:      Scorpion
+    sagittarius:  Sagittaire
+    capricorn:    Capricorne
+    aquarius:     Verseau
+    pisces:       Poisson

data/lib/locales/lv.yml

@@ -0,0 +1,14 @@
+lv:
+  zodiac:
+    aries:        Auns
+    taurus:       Vērsis
+    gemini:       Dvīņi
+    cancer:       Vēzis
+    leo:          Lauva
+    virgo:        Jaunava
+    libra:        Svari
+    scorpio:      Skorpions
+    sagittarius:  Strēlnieks
+    capricorn:    Mežāzis
+    aquarius:     Ūdensvīrs
+    pisces:       Zivis

data/lib/locales/zh-CN.yml

@@ -0,0 +1,14 @@
+zh-CN:
+  zodiac:
+    aries:        牡羊座
+    taurus:       金牛座
+    gemini:       双子座
+    cancer:       巨蟹座
+    leo:          狮子座
+    virgo:        处女座
+    libra:        天秤座
+    scorpio:      天蝎座
+    sagittarius:  射手座
+    capricorn:    魔羯座
+    aquarius:     水瓶座
+    pisces:       双鱼座

data/lib/zodiac/activerecord.rb

@@ -37,7 +37,7 @@ module Zodiac
           end
           
           # Person.by_zodiac(7 || :libra) == Person.where(zodiac_sign_id: 7)
-          scope :by_zodiac, lambda { |sign|
+          scope :by_zodiac, ->(sign) do
             case sign
             when Symbol
               where(self.zodiac_sign_id_field => Zodiac::Finder::SIGN_IDS[sign])
@@ -46,7 +46,7 @@ module Zodiac
             else
               raise ArgumentError, "Invalid attribute type #{sign.class} for #{self}.by_zodiac"
             end
-          }
+          end
           
           # Person.gemini == Person.by_zodiac(3)
           Zodiac.each_sign do |symbol, integer|

data/lib/zodiac/date.rb

@@ -12,6 +12,12 @@ module Zodiac
       Finder.sign_id_for(month: self.month, day: self.day)
     end
     
+    def zodiac_sign_symbol
+      raise "#{self} should respond_to #month and #day" unless respond_to?(:month) && respond_to?(:day)
+      
+      Finder.sign_symbol_for(month: self.month, day: self.day)
+    end
+    
     Zodiac.each_sign do |symbol, integer|
       define_method("#{symbol}?") do        # def libra?
         self.zodiac_sign_id == integer      #   self.zodiac_sign_id == 7
@@ -21,5 +27,5 @@ module Zodiac
 end
 
 [Time, Date, DateTime].each do |date_class|
-  date_class.send(:include, Zodiac::Date) 
+  date_class.send(:include, Zodiac::Date)
 end

data/lib/zodiac/finder.rb

@@ -30,36 +30,38 @@ module Zodiac
     }
     
     SIGN_IDS = {
-      :aries        => 1,
-      :taurus       => 2,
-      :gemini       => 3,
-      :cancer       => 4,
-      :leo          => 5,
-      :virgo        => 6,
-      :libra        => 7,
-      :scorpio      => 8,
-      :sagittarius  => 9,
-      :capricorn    => 10,
-      :aquarius     => 11,
-      :pisces       => 12
+      aries:       1,
+      taurus:      2,
+      gemini:      3,
+      cancer:      4,
+      leo:         5,
+      virgo:       6,
+      libra:       7,
+      scorpio:     8,
+      sagittarius: 9,
+      capricorn:   10,
+      aquarius:    11,
+      pisces:      12
     }
     
-    def self.sign_for(date)
-      I18n.t!("zodiac.#{self.sign_symbol_for date}")
-    end
-    
-    def self.sign_id_for(date)
-      SIGN_IDS[self.sign_symbol_for date]
-    end
-  private
-    def self.sign_symbol_for(date)
-      RANGES.each do |range, sign|
-        if range.days.cover? date_for(date[:month], date[:day])
-          return sign
-        end
+    class << self
+      def sign_for(date)
+        I18n.t!("zodiac.#{self.sign_symbol_for date}")
       end
       
-      raise ArgumentError
+      def sign_id_for(date)
+        SIGN_IDS[self.sign_symbol_for date]
+      end
+      
+      def sign_symbol_for(date)
+        RANGES.each do |range, sign|
+          if range.days.cover? date_for(date[:month], date[:day])
+            return sign
+          end
+        end
+        
+        raise ArgumentError
+      end
     end
   end
 end

data/lib/zodiac/version.rb

@@ -1,3 +1,3 @@
 module Zodiac
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
-# bootstrap ActiveRecord
-require 'active_record'
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'spec/support/test.sqlite3')
+require_relative './support/active_record'
 
 require 'zodiac'
 require 'pry'
 
-require File.expand_path('../support/person.rb', __FILE__)
-require File.expand_path('../support/lite_person.rb', __FILE__)
-require File.expand_path('../support/custom_person.rb', __FILE__)
+require_relative './support/person'
+require_relative './support/lite_person'
+require_relative './support/custom_person'

data/spec/support/active_record.rb

@@ -0,0 +1,25 @@
+require 'active_record'
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+
+ActiveRecord::Migration.create_table :lite_people do |t|
+  t.string  :name
+  t.date    :dob
+  
+  t.timestamps
+end
+
+ActiveRecord::Migration.create_table :people do |t|
+  t.string  :name
+  t.date    :dob
+  t.integer :zodiac_sign_id
+  
+  t.timestamps
+end
+
+ActiveRecord::Migration.create_table :custom_people do |t|
+  t.string  :name
+  t.date    :dob
+  t.integer :custom_sign_id
+  
+  t.timestamps
+end

data/spec/support/custom_person.rb

@@ -1,3 +1,3 @@
 class CustomPerson < ActiveRecord::Base
-  zodiac_reader :dob, :sign_id_attribute => :custom_sign_id
+  zodiac_reader :dob, sign_id_attribute: :custom_sign_id
 end

data/spec/zodiac/activerecord_spec.rb

@@ -4,10 +4,10 @@ describe Zodiac::ActiveRecord do
   describe "class methods" do
     context "standard model" do
       before(:each) do
-        @gemini1 = Person.create :dob => Time.gm(1982, 5, 27)
-        @gemini2 = Person.create :dob => Time.gm(1987, 5, 29)
-        @libra   = Person.create :dob => Time.gm(1984, 9, 27)
-        @nobody  = Person.create :dob => nil
+        @gemini1 = Person.create dob: Date.new(1982, 5, 27)
+        @gemini2 = Person.create dob: Date.new(1987, 5, 29)
+        @libra   = Person.create dob: Date.new(1984, 9, 27)
+        @nobody  = Person.create dob: nil
       end
       
       describe ".zodiac_reader" do
@@ -54,10 +54,10 @@ describe Zodiac::ActiveRecord do
     
     context "custom model" do
       before(:each) do
-        @gemini1 = CustomPerson.create :dob => Time.gm(1982, 5, 27)
-        @gemini2 = CustomPerson.create :dob => Time.gm(1987, 5, 29)
-        @libra   = CustomPerson.create :dob => Time.gm(1984, 9, 27)
-        @nobody  = CustomPerson.create :dob => nil
+        @gemini1 = CustomPerson.create dob: Date.new(1982, 5, 27)
+        @gemini2 = CustomPerson.create dob: Date.new(1987, 5, 29)
+        @libra   = CustomPerson.create dob: Date.new(1984, 9, 27)
+        @nobody  = CustomPerson.create dob: nil
       end
       
       describe ".zodiac_reader" do
@@ -88,10 +88,10 @@ describe Zodiac::ActiveRecord do
   
   describe "instance_methods" do
     before(:each) do
-      dob          = Time.gm(1955, 2, 24)
-      @person      = Person.create(:name => 'Steve', :dob => dob)
-      @lite_person = LitePerson.create(:name => 'Steve lite', :dob => dob)
-      @nobody      = Person.create(:name => 'Nobody', :dob => nil)
+      dob          = Date.new(1955, 2, 24)
+      @person      = Person.create(name: 'Steve', dob: dob)
+      @lite_person = LitePerson.create(name: 'Steve lite', dob: dob)
+      @nobody      = Person.create(name: 'Nobody', dob: nil)
     end
     
     describe "#zodiac_sign" do
@@ -145,7 +145,7 @@ describe Zodiac::ActiveRecord do
     
     describe "before_save callback" do
       before(:each) do
-        @new_dob = Time.gm(1955, 10, 28)
+        @new_dob = Date.new(1955, 10, 28)
       end
       
       context "on a migrated model" do

data/spec/zodiac/date_spec.rb

@@ -21,6 +21,10 @@ module Zodiac
           @date.zodiac_sign_id.should == 7
         end
         
+        it "provides #zodiac_sign_symbol" do
+          @date.zodiac_sign_symbol.should == :libra
+        end
+        
         Zodiac.each_sign do |symbol, integer|
           method_name = "#{symbol}?"
           it "provides ##{method_name}" do

data/spec/zodiac/finder_spec.rb

@@ -13,13 +13,19 @@ describe Zodiac::Finder do
   
   describe ".sign_for" do
     it "returns correct zodiac sign" do
-      subject.sign_for(:month => 9, :day => 27).should == I18n.t('zodiac.libra')
+      subject.sign_for(month: 9, day: 27).should == I18n.t('zodiac.libra')
     end
   end
   
   describe ".sign_id_for" do
     it "returns correct sign id" do
-      subject.sign_id_for(:month => 9, :day => 27).should == 7
+      subject.sign_id_for(month: 9, day: 27).should == 7
+    end
+  end
+  
+  describe ".sign_symbol_for" do
+    it "returns correct sign symbol" do
+      subject.sign_symbol_for(month: 9, day: 27).should == :libra
     end
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: zodiac
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Vsevolod Romashov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: funtimes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds methods for getting a zodiac sign from any Date/Time object containing
@@ -131,8 +131,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -143,20 +143,23 @@ files:
 - lib/locales/de.yml
 - lib/locales/en.yml
 - lib/locales/es.yml
+- lib/locales/fr.yml
 - lib/locales/it.yml
 - lib/locales/ja.yml
+- lib/locales/lv.yml
 - lib/locales/pt-BR.yml
 - lib/locales/ru.yml
+- lib/locales/zh-CN.yml
 - lib/zodiac.rb
 - lib/zodiac/activerecord.rb
 - lib/zodiac/date.rb
 - lib/zodiac/finder.rb
 - lib/zodiac/version.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb
 - spec/support/custom_person.rb
 - spec/support/lite_person.rb
 - spec/support/person.rb
-- spec/support/test.sqlite3
 - spec/zodiac/activerecord_spec.rb
 - spec/zodiac/date_spec.rb
 - spec/zodiac/finder_spec.rb
@@ -170,26 +173,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Zodiac sign calculator for any date
 test_files:
 - spec/spec_helper.rb
+- spec/support/active_record.rb
 - spec/support/custom_person.rb
 - spec/support/lite_person.rb
 - spec/support/person.rb
-- spec/support/test.sqlite3
 - spec/zodiac/activerecord_spec.rb
 - spec/zodiac/date_spec.rb
 - spec/zodiac/finder_spec.rb
+has_rdoc: