emotions 0.2.2 → 0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b3ae5e838c6776b24d5c8f2cfaacc928561feb1d
+  data.tar.gz: 68c6d7912a1b2ac6ae002620738d54e9779bb824
+SHA512:
+  metadata.gz: 18c67e3d42f3651fc1b93a81bc9929e615baa0f4dac1f28ca29e705c215c9e511c8491cf247cd857ce79b67b7ce5bd434b7f2949f3b4efb62bebe1b606f4bbc4
+  data.tar.gz: 04abf2116166994f2e5198b39b12403b9066bac12d208416da9ba345d83c3a84de5e94c87f31e7f98045585c3b2726000681217e363543b09e232a533b3db17e

data/.travis.yml

@@ -5,3 +5,11 @@ rvm:
   - 1.9.3
 
 script: "echo 'DO IT' && bundle exec rake spec"
+
+notifications:
+  hipchat:
+    rooms:
+      secure: "a2x/YxxMGECIjhHO8xeTKJy4R1sKEqae/F/Ufg/KJFSuZ86UAraTKTsk8cLzU+pv/G59MxMmaRsMqoT9KhiGpOPILC0p/JlIlSHt39+wkoAxE3t0J0Lf6Ywzk3t7KC2RmyYvhlbEeKIGBYfkf51RdxWa1lHG0/hO6jWlxNnNOTw="
+    template:
+      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (<a href="%{build_url}">Build</a>/<a href="%{compare_url}">Changes</a>)'
+    format: 'html'

data/README.md

@@ -5,9 +5,9 @@
   <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>
+  <a href="https://rubygems.org/gems/emotions"><img src="http://img.shields.io/gem/v/emotions.svg" /></a>
+  <a href="https://codeclimate.com/github/mirego/emotions"><img src="http://img.shields.io/codeclimate/github/mirego/emotions.svg" /></a>
+  <a href="https://travis-ci.org/mirego/emotions"><img src="http://img.shields.io/travis/mirego/emotions.svg" /></a>
 </p>
 
 ---
@@ -26,7 +26,7 @@ And then execute:
 $ bundle
 ```
 
-Run the migration to add the `emotions` table:
+Run the migration to add the `emotions` table and the `Emotion` model:
 
 ```bash
 $ rails generate emotions:install
@@ -80,9 +80,11 @@ user.sad_about?(picure)
 # => true
 ```
 
+## Cache counters
+
 Most of the times, you would want to get a quick look at about how many users expressed a certain emotion towards a certain picture. That could be an expensive operation.
 
-However, if the *emotive* record has an `<emotion>_emotions_count` column, Emotions will populate its value with how many users expressed that emotion towards it.
+However, if the *emotive* record has an `<emotion>_emotions_count` column, Emotions will populate its value with how many emotional records expressed that emotion towards it.
 
 ```ruby
 user.happy_about!(picture)
@@ -94,7 +96,7 @@ 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.
+Same thing for emotional records. If there’s a `<emotion>_emotions_count` column in the emotional model, Emotions will update it each time one of its records expresses that emotion towards another record.
 
 ```ruby
 user.happy_about!(picture)
@@ -112,6 +114,6 @@ user.happy_emotions_count
 
 ## 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 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.
+[Mirego](http://mirego.com) is a team of passionate people who believe that work is a place where you can innovate and have fun. We're a team of [talented people](http://life.mirego.com) who imagine and build beautiful Web and mobile applications. We come together to share ideas and [change the world](http://mirego.org).
 
-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.
+We also [love open-source software](http://open.mirego.com) and we try to give back to the community as much as we can.

data/lib/emotions.rb

@@ -27,6 +27,10 @@ module Emotions
         self.send :include, Emotions::Emotional
       end
 
+      def self.acts_as_emotion
+        self.send :include, Emotions::Emotion
+      end
+
       def self.emotional?
         @emotional ||= self.ancestors.include?(Emotions::Emotional)
       end

data/lib/emotions/emotion.rb

@@ -1,23 +1,25 @@
 module Emotions
-  class Emotion < ActiveRecord::Base
-    self.table_name = 'emotions'
-
-    # Validations
-    validates :emotional, presence: true
-    validates :emotive, presence: true
-
-    # 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
-    belongs_to :emotive, polymorphic: true
-
-    # Callbacks
-    after_create :update_emotion_counter
-    after_destroy :update_emotion_counter
+  module Emotion
+    extend ActiveSupport::Concern
+
+    included do
+      # Validations
+      validates :emotional, presence: true
+      validates :emotive, presence: true
+
+      # 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
+      belongs_to :emotive, polymorphic: true
+
+      # Callbacks
+      after_create :update_emotion_counter
+      after_destroy :update_emotion_counter
+    end
 
   protected
 

data/lib/emotions/emotional.rb

@@ -3,7 +3,7 @@ module Emotions
     extend ActiveSupport::Concern
 
     included do
-      has_many :emotions, as: :emotional, class_name: 'Emotions::Emotion', dependent: :destroy
+      has_many :emotions, as: :emotional, class_name: '::Emotion', dependent: :destroy
 
       Emotions.emotions.each do |emotion|
         define_emotion_methods(emotion)

data/lib/emotions/emotive.rb

@@ -3,7 +3,7 @@ module Emotions
     extend ActiveSupport::Concern
 
     included do
-      has_many :emotions, as: :emotive, class_name: 'Emotions::Emotion', dependent: :destroy
+      has_many :emotions, as: :emotive, class_name: '::Emotion', dependent: :destroy
 
       Emotions.emotions.each do |emotion|
         define_emotion_methods(emotion)

data/lib/emotions/version.rb

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

data/lib/generators/emotions/install_generator.rb

@@ -20,6 +20,10 @@ module Emotions
       def create_migration_file
         migration_template 'migration.rb', 'db/migrate/add_emotions.rb'
       end
+
+      def create_model_file
+        template "model.rb", "app/models/emotion.rb"
+      end
     end
   end
 end

data/lib/generators/emotions/templates/model.rb

@@ -0,0 +1,3 @@
+class Emotion < ActiveRecord::Base
+  acts_as_emotion
+end

data/spec/emotions/emotion_spec.rb

@@ -18,7 +18,7 @@ describe Emotions::Emotion do
 
   describe :Validations do
     describe :validate_presence_of_emotional do
-      subject { described_class.new(emotion: 'happy', emotive: Picture.create) }
+      subject { Emotion.new(emotion: 'happy', emotive: Picture.create) }
       before { subject.valid? }
 
       it { should_not be_valid }
@@ -26,7 +26,7 @@ describe Emotions::Emotion do
     end
 
     describe :validate_presence_of_emotive do
-      subject { described_class.new(emotion: 'happy', emotional: User.create) }
+      subject { Emotion.new(emotion: 'happy', emotional: User.create) }
       before { subject.valid? }
 
       it { should_not be_valid }
@@ -34,7 +34,7 @@ describe Emotions::Emotion do
     end
 
     describe :validate_inclusion_of_emotion do
-      subject { described_class.new(emotion: 'mad', emotional: User.create, emotive: Picture.create) }
+      subject { Emotion.new(emotion: 'mad', emotional: User.create, emotive: Picture.create) }
       before { subject.valid? }
 
       it { should_not be_valid }
@@ -42,7 +42,7 @@ describe Emotions::Emotion do
     end
 
     describe :validate_class_of_emotive do
-      subject { described_class.new(emotion: 'happy', emotional: User.create, emotive: User.create) }
+      subject { Emotion.new(emotion: 'happy', emotional: User.create, emotive: User.create) }
       before { subject.valid? }
 
       it { should_not be_valid }
@@ -50,7 +50,7 @@ describe Emotions::Emotion do
     end
 
     describe :validate_class_of_emotional do
-      subject { described_class.new(emotion: 'happy', emotional: Picture.create, emotive: Picture.create) }
+      subject { Emotion.new(emotion: 'happy', emotional: Picture.create, emotive: Picture.create) }
       before { subject.valid? }
 
       it { should_not be_valid }
@@ -62,7 +62,7 @@ describe Emotions::Emotion do
     describe :update_emotion_counter_on_create do
       let(:picture) { Picture.create }
       let(:user) { User.create }
-      let(:emotion) { described_class.new(emotion: 'happy', emotional: user, emotive: picture) }
+      let(:emotion) { Emotion.new(emotion: 'happy', emotional: user, emotive: picture) }
 
       before do
         picture.should_receive(:update_emotion_counter).with('happy').once
@@ -76,7 +76,7 @@ describe Emotions::Emotion do
     describe :update_emotion_counter_on_destroy do
       let(:picture) { Picture.create }
       let(:user) { User.create }
-      let(:emotion) { described_class.new(emotion: 'happy', emotional: user, emotive: picture) }
+      let(:emotion) { Emotion.new(emotion: 'happy', emotional: user, emotive: picture) }
 
       before do
         emotion.save!

data/spec/emotions/emotional_spec.rb

@@ -67,7 +67,7 @@ describe Emotions::Emotional do
       let(:picture) { Picture.create }
 
       context 'with valid emotive and emotion' do
-        it { expect{ user.express! :happy, picture }.to change{ Emotions::Emotion.count }.from(0).to(1) }
+        it { expect{ user.express! :happy, picture }.to change{ Emotion.count }.from(0).to(1) }
         it { expect{ user.express! :happy, picture }.to change{ user.happy_about? picture }.from(false).to(true) }
       end
 
@@ -85,7 +85,7 @@ describe Emotions::Emotional do
       before { user.happy_about!(picture) }
 
       context 'with valid emotive and emotion' do
-        it { expect{ user.no_longer_express! :happy, picture }.to change{ Emotions::Emotion.count }.from(1).to(0) }
+        it { expect{ user.no_longer_express! :happy, picture }.to change{ Emotion.count }.from(1).to(0) }
         it { expect{ user.no_longer_express! :happy, picture }.to change{ user.happy_about? picture }.from(true).to(false) }
       end
 
@@ -118,8 +118,7 @@ describe Emotions::Emotional do
         let(:picture) { Picture.create }
 
         context 'with valid emotive' do
-          it { expect(user.happy_about! picture).to be_instance_of(Emotions::Emotion) }
-          it { expect{ user.happy_about! picture }.to change{ Emotions::Emotion.count }.from(0).to(1) }
+          it { expect{ user.happy_about! picture }.to change{ Emotion.count }.from(0).to(1) }
           it { expect{ user.happy_about! picture }.to change{ user.happy_about? picture }.from(false).to(true) }
         end
 
@@ -133,8 +132,7 @@ describe Emotions::Emotional do
         let(:picture) { Picture.create }
 
         context 'with valid emotive' do
-          it { expect(user.no_longer_happy_about! picture).to be_instance_of(Emotions::Emotion) }
-          it { expect{ user.no_longer_happy_about! picture }.to change{ Emotions::Emotion.count }.from(1).to(0) }
+          it { expect{ user.no_longer_happy_about! picture }.to change{ Emotion.count }.from(1).to(0) }
           it { expect{ user.no_longer_happy_about! picture }.to change{ user.happy_about? picture }.from(true).to(false) }
         end
 

data/spec/spec_helper.rb

@@ -22,6 +22,11 @@ RSpec.configure do |config|
 
     # Run our migration
     run_default_migration
+
+    # Create Emotion model
+    spawn_model 'Emotion', ActiveRecord::Base do
+      acts_as_emotion
+    end
   end
 
   config.after(:each) do

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: emotions
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: '0.3'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Emotions is a Ruby library that allows ActiveRecord records to express
@@ -99,9 +88,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -117,6 +106,7 @@ files:
 - lib/generators/emotions/USAGE
 - lib/generators/emotions/install_generator.rb
 - lib/generators/emotions/templates/migration.rb
+- lib/generators/emotions/templates/model.rb
 - spec/emotions/emotion_spec.rb
 - spec/emotions/emotional_spec.rb
 - spec/emotions/emotive_spec.rb
@@ -126,33 +116,26 @@ files:
 homepage: https://github.com/mirego/emotions
 licenses:
 - BSD 3-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4067111532583262534
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4067111532583262534
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Emotions is a Ruby library that allows ActiveRecord records to express (and
   hopefully store) emotions about other records.
 test_files: