emotions 0.1 → 0.1.1

data/lib/emotions/emotional.rb

@@ -2,51 +2,53 @@ module Emotions
   module Emotional
     extend ActiveSupport::Concern
 
-    module ClassMethods
-      def acts_as_emotional
-        has_many :emotions, as: :emotional, class_name: 'Emotions::Emotion'
+    included do
+      has_many :emotions, as: :emotional, class_name: 'Emotions::Emotion'
+
+      Emotions.emotions.each do |emotion|
+        define_emotion_methods(emotion)
+      end
+    end
+
+    def _emotions_about(emotive)
+      self.emotions.where(emotive_id: emotive.id, emotive_type: emotive.class.name)
+    end
+
+    def emotions_about(emotive)
+      _emotions_about(emotive).map(&:emotion).map(&:to_sym)
+    end
 
+    def express!(emotion, emotive)
+      send("#{emotion}_about!", emotive)
+    end
+
+    def no_longer_express!(emotion, emotive)
+      send("no_longer_#{emotion}_about!", emotive)
+    end
+
+    module ClassMethods
+      def define_emotion_methods(emotion)
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def _emotions_about(emotive)
-            self.emotions.where(emotive_id: emotive.id, emotive_type: emotive.class.name)
+          def #{emotion}_about?(emotive)
+            #{emotion}_about(emotive).exists?
           end
 
-          def emotions_about(emotive)
-            _emotions_about(emotive).map(&:emotion).map(&:to_sym)
+          def #{emotion}_about?(emotive)
+            #{emotion}_about(emotive).exists?
           end
 
-          def express!(emotion, emotive)
-            send("\#{emotion}_about!", emotive)
+          def #{emotion}_about!(emotive)
+            #{emotion}_about(emotive).first_or_create!
           end
 
-          def no_longer_express!(emotion, emotive)
-            send("no_longer_\#{emotion}_about!", emotive)
+          def no_longer_#{emotion}_about!(emotive)
+            #{emotion}_about(emotive).destroy_all
           end
-        RUBY
 
-        Emotions.emotions.each do |emotion|
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{emotion}_about?(emotive)
-              #{emotion}_about(emotive).exists?
-            end
-
-            def #{emotion}_about?(emotive)
-              #{emotion}_about(emotive).exists?
-            end
-
-            def #{emotion}_about!(emotive)
-              #{emotion}_about(emotive).first_or_create!
-            end
-
-            def no_longer_#{emotion}_about!(emotive)
-              #{emotion}_about(emotive).destroy
-            end
-
-            def #{emotion}_about(emotive)
-              _emotions_about(emotive).where(emotion: #{emotion.to_s.inspect})
-            end
-          RUBY
-        end
+          def #{emotion}_about(emotive)
+            _emotions_about(emotive).where(emotion: #{emotion.to_s.inspect})
+          end
+        RUBY
       end
     end
   end

data/lib/emotions/emotive.rb

@@ -2,23 +2,25 @@ module Emotions
   module Emotive
     extend ActiveSupport::Concern
 
-    module ClassMethods
-      def acts_as_emotive
-        has_many :emotions, as: :emotive, class_name: 'Emotions::Emotion'
+    included do
+      has_many :emotions, as: :emotive, class_name: 'Emotions::Emotion'
+
+      Emotions.emotions.each do |emotion|
+        define_emotion_methods(emotion)
+      end
+    end
 
+    def emotional_about
+      self.emotions.includes(:emotional)
+    end
+
+    module ClassMethods
+      def define_emotion_methods(emotion)
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def emotional_about
-            self.emotions.includes(:emotional)
+          def #{emotion}_about
+            emotional_about.where(emotion: #{emotion.to_s.inspect})
           end
         RUBY
-
-        Emotions.emotions.each do |emotion|
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{emotion}_about
-              emotional_about.where(emotion: #{emotion.to_s.inspect})
-            end
-          RUBY
-        end
       end
     end
   end

data/lib/emotions/railtie.rb

@@ -5,8 +5,13 @@ module Emotions
   class Railtie < Rails::Railtie
     initializer "emotions.active_record" do |app|
       ActiveSupport.on_load :active_record do
-        include Emotions::Emotive
-        include Emotions::Emotional
+        def self.acts_as_emotive
+          self.send :include, Emotions::Emotive
+        end
+
+        def self.acts_as_emotional
+          self.send :include, Emotions::Emotional
+        end
       end
     end
   end

data/lib/emotions/version.rb

@@ -1,3 +1,3 @@
 module Emotions
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emotions
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -16871718108920318
+      hash: -4058484285824368663
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -16871718108920318
+      hash: -4058484285824368663
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23