emotions 0.2.1 → 0.2.2

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 1.9.3
+
+script: "echo 'DO IT' && bundle exec rake spec"

data/README.md

@@ -1,6 +1,16 @@
-# Emotions
-
-Emotions is a Ruby library that allows ActiveRecord records to express (and hopefully store) emotions about other records.
+<p align="center">
+  <a href="https://github.com/mirego/emotions">
+    <img src="http://i.imgur.com/9fhaEY4.png" alt="Emotions" />
+  </a>
+  <br />
+  Emotions is a Ruby library that allows ActiveRecord records to<br /> express (and hopefully store) emotions about other records.
+  <br /><br />
+  <a href="https://rubygems.org/gems/emotions"><img src="https://badge.fury.io/rb/emotions.png" /></a>
+  <a href="https://codeclimate.com/github/mirego/emotions"><img src="https://codeclimate.com/github/mirego/emotions.png" /></a>
+  <a href="https://travis-ci.org/mirego/emotions"><img src="https://travis-ci.org/mirego/emotions.png?branch=master" /></a>
+</p>
+
+---
 
 ## Installation
 
@@ -84,17 +94,24 @@ picture.happy_emotions_count
 # Quick lookup into the column and returns `1`
 ```
 
+Same thing for emotional records. If there’s a `happy_emotions_count` column in the `User` model, Emotions will update it each time a record expresses a happy emotion towards another record.
+
+```ruby
+user.happy_about!(picture)
+
+user.happy_about.count
+# SQL query that counts records and returns `1`
+
+user.happy_emotions_count
+# Quick lookup into the column and returns `1`
+```
+
 ## License
 
 `Emotions` is © 2013 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/emotions/blob/master/LICENSE.md) file.
 
 ## About Mirego
 
-Mirego is a team of passionate people who believe that work is a place where you can innovate and have fun.
-We proudly built mobile applications for
-[iPhone](http://mirego.com/en/iphone-app-development/ "iPhone application development"),
-[iPad](http://mirego.com/en/ipad-app-development/ "iPad application development"),
-[Android](http://mirego.com/en/android-app-development/ "Android application development"),
-[Blackberry](http://mirego.com/en/blackberry-app-development/ "Blackberry application development"),
-[Windows Phone](http://mirego.com/en/windows-phone-app-development/ "Windows Phone application development") and
-[Windows 8](http://mirego.com/en/windows-8-app-development/ "Windows 8 application development").
+Mirego is a team of passionate people who believe that work is a place where you can innovate and have fun. We proudly build mobile applications for [iPhone](http://mirego.com/en/iphone-app-development/ "iPhone application development"), [iPad](http://mirego.com/en/ipad-app-development/ "iPad application development"), [Android](http://mirego.com/en/android-app-development/ "Android application development"), [Blackberry](http://mirego.com/en/blackberry-app-development/ "Blackberry application development"), [Windows Phone](http://mirego.com/en/windows-phone-app-development/ "Windows Phone application development") and [Windows 8](http://mirego.com/en/windows-8-app-development/ "Windows 8 application development") in beautiful Quebec City.
+
+We also love [open-source software](http://open.mirego.com/) and we try to extract as much code as possible from our projects to give back to the community.

data/lib/emotions.rb

@@ -1,5 +1,6 @@
 require 'emotions/version'
 
+require 'ostruct'
 require 'active_record'
 require 'emotions/errors'
 require 'emotions/emotion'

data/lib/emotions/emotion.rb

@@ -6,23 +6,10 @@ module Emotions
     validates :emotional, presence: true
     validates :emotive, presence: true
 
-    validates_each :emotion do |record, attr, value|
-      unless Emotions.emotions.include?(value.try(:to_sym))
-        record.errors.add attr, I18n.t(:invalid, scope: [:errors, :messages])
-      end
-    end
-
-    validates_each :emotional do |record, attr, value|
-      if value.blank? || !value.class.try(:emotional?)
-        record.errors.add attr, I18n.t(:invalid, scope: [:errors, :messages])
-      end
-    end
-
-    validates_each :emotive do |record, attr, value|
-      if value.blank? || !value.class.try(:emotive?)
-        record.errors.add attr, I18n.t(:invalid, scope: [:errors, :messages])
-      end
-    end
+    # Custom validations
+    validate :ensure_valid_emotion_name
+    validate { ensure_valid_associated_record :emotional }
+    validate { ensure_valid_associated_record :emotive }
 
     # Associations
     belongs_to :emotional, polymorphic: true
@@ -34,8 +21,28 @@ module Emotions
 
   protected
 
+    # Update the `<emotion>_emotions_counter` for the emotive record
     def update_emotion_counter
       self.emotive.update_emotion_counter(self.emotion)
+      self.emotional.update_emotion_counter(self.emotion)
+    end
+
+    # Make sure we're using an allowed emotion name
+    def ensure_valid_emotion_name
+      unless Emotions.emotions.include?(self.emotion.try(:to_sym))
+        errors.add :emotion, I18n.t(:invalid, scope: [:errors, :messages])
+      end
+    end
+
+    # Make sure that both emotive and emotional records are actually able to
+    # express and/or receive emotions
+    def ensure_valid_associated_record(association)
+      value = send(association)
+      predicate = :"#{association}?"
+
+      if !value.class.respond_to?(predicate) || !value.class.send(predicate)
+        errors.add association, I18n.t(:invalid, scope: [:errors, :messages])
+      end
     end
   end
 end

data/lib/emotions/emotional.rb

@@ -54,6 +54,15 @@ module Emotions
       _emotions_about(emotive).where(emotion: emotion).first.tap { |e| e.try(:destroy) }
     end
 
+    # @private
+    def update_emotion_counter(emotion)
+      attribute = "#{emotion}_emotions_count"
+
+      if self.respond_to?(attribute)
+        self.update_attribute(attribute, send("#{emotion}_about").count)
+      end
+    end
+
     module ClassMethods
       # Return an `ActiveRecord::Relation` containing the emotional records
       # that expressed a specific emotion towards an emotive record
@@ -88,8 +97,9 @@ module Emotions
             no_longer_express! #{emotion.inspect}, emotive
           end
 
-          def #{emotion}_about(emotive)
-            _emotions_about(emotive).where(emotion: #{emotion.to_s.inspect})
+          def #{emotion}_about(emotive = nil)
+            relation = emotive.nil? ? self.emotions : _emotions_about(emotive)
+            relation.where(emotion: #{emotion.to_s.inspect})
           end
 
           alias #{emotion}? #{emotion}_about?

data/lib/emotions/version.rb

@@ -1,3 +1,3 @@
 module Emotions
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/emotions/emotion_spec.rb

@@ -61,10 +61,12 @@ describe Emotions::Emotion do
   describe :Callbacks do
     describe :update_emotion_counter_on_create do
       let(:picture) { Picture.create }
-      let(:emotion) { described_class.new(emotion: 'happy', emotional: User.create, emotive: picture) }
+      let(:user) { User.create }
+      let(:emotion) { described_class.new(emotion: 'happy', emotional: user, emotive: picture) }
 
       before do
         picture.should_receive(:update_emotion_counter).with('happy').once
+        user.should_receive(:update_emotion_counter).with('happy').once
         emotion.should_receive(:update_emotion_counter).once.and_call_original
       end
 
@@ -73,11 +75,13 @@ describe Emotions::Emotion do
 
     describe :update_emotion_counter_on_destroy do
       let(:picture) { Picture.create }
-      let(:emotion) { described_class.new(emotion: 'happy', emotional: User.create, emotive: picture) }
+      let(:user) { User.create }
+      let(:emotion) { described_class.new(emotion: 'happy', emotional: user, emotive: picture) }
 
       before do
         emotion.save!
         picture.should_receive(:update_emotion_counter).with('happy').once
+        user.should_receive(:update_emotion_counter).with('happy').once
         emotion.should_receive(:update_emotion_counter).once.and_call_original
       end
 

data/spec/emotions/emotional_spec.rb

@@ -5,7 +5,10 @@ describe Emotions::Emotional do
     emotions :happy, :sad
 
     run_migration do
-      create_table(:users, force: true)
+      create_table(:users, force: true) do |t|
+        t.integer :happy_emotions_count, default: 0
+        t.integer :sad_emotions_count, default: 0
+      end
       create_table(:pictures, force: true)
     end
 
@@ -140,6 +143,20 @@ describe Emotions::Emotional do
           it { expect{ user.no_longer_happy_about! user }.to_not raise_error }
         end
       end
+
+      describe :update_emotion_counter do
+        let(:user) { User.create }
+        let(:relation) do
+          double.tap { |double| double.stub(:count).and_return(42) }
+        end
+
+        before do
+          User.any_instance.stub(:happy_about).and_return(relation)
+          user.update_emotion_counter(:happy)
+        end
+
+        it { expect(user.reload.happy_emotions_count).to eql 42 }
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emotions
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,6 +101,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.md
 - README.md
@@ -137,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -739399527715835013
+      hash: 4067111532583262534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -739399527715835013
+      hash: 4067111532583262534
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23