polytag 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2a311af9d80377774aaae39a925d1e090a0a4e
-  data.tar.gz: 1898ea870946ff0e349786a074697642198c7fa5
+  metadata.gz: a6d4b2e842f885c1ac09bcf1cc4660712164f336
+  data.tar.gz: 52c8c36367c902a736735c68de3fb224cb94a4f4
 SHA512:
-  metadata.gz: 76a6da2782ca55f9677283cc988fb3a711faa3f52ccdc5d03d59ae52d8eafd7eb25b1b25c0512c4c0c1aeb0fc9339aa592b108bda41d4654c0fb0f2ec9683173
-  data.tar.gz: 02247eed75021f18523e7ec4107cb4f268dfe8c369714312f93a52ea8821d3c4928ecfadebd2b4696f689ea07e681f417069c69b834f69e51857d9f778ee1b85
+  metadata.gz: 55e8dac4832358fa356f6573e5d67252e547a309826641782cacc224b6dec2645245cd8b7ca9d90d212a9d0bfead1eae88cf1c067def7c705e6bc44cca01c7db
+  data.tar.gz: a64fe6106e4c2b6aaaeef87ed9c04f87857e1cab3663dcab4f53fe52312d7200230e37924386a2e21eb671d8aea794f23e7d4f3fd29f7a7291150b95579ec369

data/README.md

@@ -1,5 +1,7 @@
 # Polytag
 
+![CircleCI Build Status](https://circleci.com/gh/JIFFinc/polytag.png)
+
 Adds the ability to easily add tags with optional tag groups to models.
 
 ## Installation

data/circle.yml

@@ -0,0 +1,3 @@
+database:
+  override:
+    - echo "Using SQLite3 in memory"

data/lib/polytag.rb

@@ -8,24 +8,42 @@ module Polytag
     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)
-    base.__send__(:alias_method, :tags, :polytag_tags)
+    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)
   end
 
-  def tag_group(tag_group = {})
-    tag_group.empty? ? @__polytag_tag_group__ : @__polytag_tag_group__ = Polytag::TagGroup.search_by_hash(tag_group).first_or_create
+  def tag_group(_tag_group = nil)
+    @__polytag_tag_group_hash__ ||= {}
+
+    if _tag_group
+      @__polytag_tag_group_hash__.merge!(_tag_group)
+      @__polytag_tag_group__ = Polytag::TagGroup.search_by_hash(@__polytag_tag_group_hash__).first_or_create
+    else
+      @__polytag_tag_group_hash__ = {} if _tag_group.is_a?(Hash) && _tag_group.empty?
+      @__polytag_tag_group__
+    end
   end
 
   def add_tag(tag, _tag_group = {})
-    tags << tags.where(name: tag, polytag_tag_group_id: tag_group(_tag_group).try(&:id)).first_or_initialize
+    polytag_tags << polytag_tags.where(name: tag, polytag_tag_group_id: tag_group(_tag_group).try(&:id)).first_or_initialize
   end
 
   def add_tag!(tag, _tag_group = {})
-    tags << tags.where(name: tag, polytag_tag_group_id: tag_group(_tag_group).try(&:id)).first_or_create
+    polytag_tags << polytag_tags.where(name: tag, polytag_tag_group_id: tag_group(_tag_group).try(&:id)).first_or_create
+  end
+
+  def add_tags(*_tags)
+    _tag_group = _tags.pop if _tags.last.is_a?(Hash)
+    _tags.map { |x| add_tag(x, _tag_group || P{}) }
+  end
+
+  def add_tags!(*_tags)
+    _tag_group = _tags.pop if _tags.last.is_a?(Hash)
+    _tags.map { |x| add_tag!(x, _tag_group || {}) }
   end
 
   def remove_tag!(tag, _tag_group = {})
-    tag_id = tags.where(name: tag, polytag_tag_group_id: tag_group(_tag_group).try(&:id)).first.try(:id)
+    tag_id = polytag_tags.where(name: tag, polytag_tag_group_id: tag_group(_tag_group).try(&:id)).first.try(:id)
     tag_relations.where("polytag_tag_relations.polytag_tag_id = ?", tag_id).delete_all
   end
 

data/lib/polytag/tag_group.rb

@@ -33,6 +33,10 @@ class Polytag::TagGroup < ActiveRecord::Base
 
       # Query by tag group name
       conditions.merge!(name: "#{hash[:name]}") if hash[:name]
+
+      # Query by tag group id
+      conditions.merge!(id: hash[:id]) if hash[:id]
+
       where(conditions)
     end
 

data/lib/polytag/version.rb

@@ -1,3 +1,3 @@
 module Polytag
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/specs/polytag_querying_spec.rb

@@ -3,11 +3,12 @@ require 'spec_helper'
 describe "Create a a model with tags and query for them" do
 
   # Create some random models with tags
-  let(:sample_classes) do
+  let!(:sample_classes) do
     (0..5).to_a.map do |t|
       klass = TestTaggableThree.create!(name: "test_#{Time.now}")
       klass.tag_group(name: 'Apple')
-      klass.add_tag!(*('A'..'E').shuffle.sample((2..3).sample))
+      entropy = ('A'..'E').to_a.shuffle.sample((2..3).to_a.sample)
+      klass.add_tags!(*entropy.concat(%w(A)))
       klass
     end
   end
@@ -36,6 +37,8 @@ describe "Create a a model with tags and query for them" do
 
     it "Should not find our `test_taggable` model in the `Apple` tag_group" do
       TestTaggableThree.in_tag_group(name: 'Apple').should_not include(test_taggable)
+      TestTaggableThree.in_tag_group(name: 'Apple').should_not be_empty
+      TestTaggableThree.in_tag_group(name: 'Apple').count.should == 6
     end
 
     it "Should not find our `test_taggable` model in the `Apple` tag_group even if it shares a tag name" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polytag
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kelly Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- circle.yml
 - lib/generators/polytag/install/install_generator.rb
 - lib/generators/polytag/install/templates/create_polytag_tables.rb
 - lib/polytag.rb