polytag 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900c32f5bee188416a150a2801f8687d1aa2810f
-  data.tar.gz: 2f65f0c08c1eb95e6b09a7f84b241d142035bb3c
+  metadata.gz: b081aadd687235fc80ef0e6fe2ac99bdccf8edff
+  data.tar.gz: 559397b671a71e791ad423a0221260ca4112bb0c
 SHA512:
-  metadata.gz: 284b2a7f67495e320d116961c9a17d98802e8fdbc82587c4490efcac3fdb52fdb7e1f3ebf733b610d73b372b04484aa3fdea64a003f1aee14460819b2fe686c3
-  data.tar.gz: a141e950050b147fe47dae60b55d4ea225249326ea0624fc2aa3e411cb11e5a1b44f9a4f833bbe3086d971bace6c5d2eba042fedee9b48bfe225736d9b44e312
+  metadata.gz: a316be1f475ad261c166c43e3689091f70f4e98b881c195147400f71a62569eb7b3cd10add70f83965831d8a539a3075dedcd77d8f6e18d4e9613304384ae922
+  data.tar.gz: 8b37be6c30b19c9bf7ff2809bef05398f287fa36be499955c9765ceddea4b7669166932e84439a91f52faa44ca77274023e3fdf33361f09a8076d00c2839183a

data/lib/polytag.rb

@@ -7,10 +7,18 @@ require "polytag/tag_relation"
 module Polytag
   def self.included(base)
     base.extend(ClassMethods)
-    base.has_many :polytag_tag_relations, as: :tagged, class_name: '::Polytag::TagRelation'
-    base.has_many :polytag_tags, through: :polytag_tag_relations, class_name: '::Polytag::Tag'
-    base.__send__(:alias_method, :tag_relations, :polytag_tag_relations) unless base.method_defined?(:tag_relations)
-    base.__send__(:alias_method, :tags, :polytag_tags) unless base.method_defined?(:tags)
+    base.has_many :polytag_tag_relations, class_name: '::Polytag::TagRelation',
+                                          as: :tagged
+
+    base.has_many :tag_relations, class_name: '::Polytag::TagRelation',
+                                  as: :tagged
+
+    base.has_many :polytag_tags, class_name: '::Polytag::Tag',
+                                 through: :polytag_tag_relations
+
+    base.has_many :tags, class_name: '::Polytag::Tag',
+                         through: :polytag_tag_relations,
+                         source: :polytag_tag
   end
 
   def tag_group(_tag_group = nil)

data/lib/polytag/tag.rb

@@ -1,17 +1,21 @@
 class Polytag::Tag < ActiveRecord::Base
   self.table_name = :polytag_tags
   belongs_to :polytag_tag_group, class_name: '::Polytag::TagGroup'
+  belongs_to :tag_group, class_name: '::Polytag::TagGroup',
+                         foreign_key: :polytag_tag_group_id
+
   has_many :polytag_tag_relations, class_name: '::Polytag::TagRelation',
                                    foreign_key: :polytag_tag_id,
                                    dependent: :destroy
 
-  alias_method :tag_group, :polytag_tag_group
-  alias_method :relations, :polytag_tag_relations
+  has_many :relations, class_name: '::Polytag::TagRelation',
+                       foreign_key: :polytag_tag_id,
+                       dependent: :destroy
 
   # Indiscrimanetly get
   # the tagged models
   def tagged
-    polytag_tag_relations.tagged
+    polytag_tag_relations.tagged.flatten
   end
 
   # Cleanup group if there are

data/lib/polytag/tag_group.rb

@@ -1,11 +1,15 @@
 class Polytag::TagGroup < ActiveRecord::Base
   self.table_name = :polytag_tag_groups
+
   has_many :polytag_tag, class_name: '::Polytag::Tag',
                          foreign_key: :polytag_tag_group_id,
                          dependent: :destroy
 
+  has_many :tag, class_name: '::Polytag::Tag',
+                 foreign_key: :polytag_tag_group_id,
+                 dependent: :destroy
+
   belongs_to :owner, polymorphic: true
-  alias_method :tag, :polytag_tag
 
   # Cleanup tag if there are
   # no more relations left on the tag

data/lib/polytag/tag_group/owner.rb

@@ -1,8 +1,17 @@
 module Polytag::TagGroup::Owner
   def self.included(base)
-    base.has_many :polytag_tag_groups, as: :owner, class_name: '::Polytag::TagGroup'
-    base.has_many :polytag_owned_tags, through: :polytag_tag_groups, source: :polytag_tag, class_name: '::Polytag::Tag'
-    base.__send__(:alias_method, :tag_groups, :polytag_tag_groups) unless base.method_defined?(:tag_relations)
-    base.__send__(:alias_method, :owned_tags, :polytag_owned_tags) unless base.method_defined?(:owned_tags)
+    base.has_many :polytag_tag_groups, class_name: '::Polytag::TagGroup',
+                                       as: :owner
+
+    base.has_many :tag_groups, class_name: '::Polytag::TagGroup',
+                               as: :owner
+
+    base.has_many :polytag_owned_tags, class_name: '::Polytag::Tag',
+                                       through: :polytag_tag_groups,
+                                       source: :polytag_tag
+
+    base.has_many :owned_tags, class_name: '::Polytag::Tag',
+                               through: :polytag_tag_groups,
+                               source: :polytag_tag
   end
 end

data/lib/polytag/tag_relation.rb

@@ -1,8 +1,8 @@
 class Polytag::TagRelation < ActiveRecord::Base
   self.table_name = :polytag_tag_relations
   belongs_to :polytag_tag, class_name: '::Polytag::Tag'
+  belongs_to :tag, class_name: '::Polytag::Tag', foreign_key: :polytag_tag_id
   belongs_to :tagged, polymorphic: true
-  alias_method :tag, :polytag_tag
 
   # Cleanup tag if there are
   # no more relations left on the tag

data/lib/polytag/version.rb

@@ -1,3 +1,3 @@
 module Polytag
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytag
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kelly Becker