polytag 0.0.4 → 0.1.0

data/spec/spec_helper.rb

@@ -3,8 +3,10 @@ GEM_DIR  = File.dirname(SPEC_DIR)
 
 # Load dependencies
 require 'rspec/rails/extensions/active_record/base'
+require 'active_support'
 require 'active_record'
 require 'awesome_print'
+require 'database_cleaner'
 
 # Load in the support for AR
 require 'support/active_record'
@@ -14,10 +16,7 @@ require 'polytag'
 
 # The test models
 require 'support/owner'
-require 'support/test_taggable_one'
-require 'support/test_taggable_two'
-require 'support/test_taggable_three'
-require 'support/test_taggable_four'
+require 'support/taggable'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -31,12 +30,18 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
-  # Handle ActiveRecord transactions
-  config.around do |example|
-    ActiveRecord::Base.transaction do
-      example.run
-      raise ActiveRecord::Rollback
-    end
+  # Use DatabaseCleaner for testing
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
   end
 
   # Run specs in random order to surface order dependencies. If you find an

data/spec/specs/owner_spec.rb

@@ -0,0 +1,104 @@
+require 'spec_helper'
+
+describe "Owner ::" do
+  let!(:time) { Time.now.to_i }
+  let(:owner) { Owner.create(name: "test_#{time}") }
+
+  before(:each) do
+    owner.tag_group.add_tag(:pizza)
+    owner.tag_group.add_tag(:apple, "Fruit")
+  end
+
+  it "Should create a model of Owner" do
+    owner.name.should eq("test_#{time}")
+    owner.should be_a(Owner)
+  end
+
+  context "Tag Groups ::" do
+    it "Should find the \"default\" group" do
+      tag_group = owner.tag_groups.default
+      tag_group.should be_a(::Polytag::TagGroup)
+      tag_group.owner.should eq(owner)
+      tag_group.name.should eq("default")
+    end
+
+    it "Should find the \"Fruit\" tag group" do
+      tag_group = owner.tag_groups.get("Fruit")
+      tag_group.should be_a(::Polytag::TagGroup)
+      tag_group.owner.should eq(owner)
+      tag_group.name.should eq("Fruit")
+    end
+
+    it "Should allow a tag group with the same name on other owners" do
+      other_owner = Owner.create
+
+      # Create a tag (which also creates a tag group)
+      other_owner.tag_group.add_tag(:sub)
+
+      tag_group = owner.tag_groups.default
+      tag_group.should be_a(::Polytag::TagGroup)
+
+      other_tag_group = other_owner.tag_groups.default
+      other_tag_group.should be_a(::Polytag::TagGroup)
+
+      tag_group.should_not eq(other_tag_group)
+
+      tag_group.owner.should eq(owner)
+      tag_group.name.should eq("default")
+      tag_group.tags.map(&:name).should eq(['pizza'])
+
+      other_tag_group.owner.should eq(other_owner)
+      other_tag_group.name.should eq("default")
+      other_tag_group.tags.map(&:name).should eq(['sub'])
+    end
+  end
+
+  context "Owned Tags ::" do
+    it "Should find the tag in the \"default\" group" do
+      tag_group = owner.tag_groups.default
+      tag_group.should be_a(::Polytag::TagGroup)
+      tag_group.owner.should eq(owner)
+      tag_group.tags.map(&:name).should eq(['pizza'])
+    end
+
+    it "Should find the tag in the \"Fruit\" group" do
+      tag_group = owner.tag_groups.get("Fruit")
+      tag_group.should be_a(::Polytag::TagGroup)
+      tag_group.owner.should eq(owner)
+      tag_group.tags.map(&:name).should eq(['apple'])
+    end
+
+    # Adding this spec because it was a problem in testing
+    it "Should allow tags with the same name in other groups" do
+      owner.tag_group.add_tag(:apple)
+
+      tag_group = owner.tag_groups.get("Fruit")
+      tag_group.should be_a(::Polytag::TagGroup)
+      tag_group.owner.should eq(owner)
+      tag_group.tags.map(&:name).should eq(['apple'])
+    end
+  end
+
+  context "Finder Methods ::" do
+    it "Should find the owner by Tag Group" do
+      @owners = Owner.has_tag_group('default')
+    end
+
+    it "Should find the owner by Tag without Tag Group (even if the tag is in a group)" do
+      @owners = Owner.has_tag('apple')
+    end
+
+    it "Should find the owner by Tag with Tag Group" do
+      @owners = Owner.has_tag('apple', 'Fruit')
+    end
+
+    after(:each) do
+      @owners.should include(owner)
+      @owners.first.tag_group.exist?('Fruit').should be_true
+      @owners.first.tag_group.exist?('default').should be_true
+      @owners.first.tag_group.owns_tag?('pizza').should be_true
+      @owners.first.tag_group.owns_tag?('apple').should be_false
+      @owners.first.tag_group.owns_tag?('apple', 'Fruit').should be_true
+    end
+  end
+end

data/spec/specs/taggable_with_owner_spec.rb

@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+describe "Taggable With Owner ::" do
+  let!(:time) { Time.now.to_i }
+  let(:owner) { Owner.create }
+  let(:taggable) { Taggable.create(name: "test_#{time}") }
+
+  before(:each) do
+    taggable.tag.add(:apple, tag_group_owner: owner)
+  end
+
+  it "Should create a model of Taggable" do
+    taggable.name.should eq("test_#{time}")
+    taggable.should be_a(Taggable)
+  end
+
+  context "Add a tag ::" do
+    it "Should find the tag with the right owner and group" do
+      tags = taggable.tags(true)
+
+      tags.size.should eq(1)
+      tags.first.name.should eq('apple')
+      tags.first.tag_group.name.should eq('default')
+      tags.first.tag_group.owner.should eq(owner)
+    end
+
+    it "Should find the tag via has_tag?" do
+      taggable.tag.has_tag?(:apple, tag_group_owner: owner).should be_true
+    end
+
+    context "Add another tag ::" do
+      before(:each) do
+        taggable.tag.add(:peach)
+      end
+
+      it "Should not conflict with model only tags" do
+        taggable.tag.add(:apple)
+        tags = taggable.tags(true)
+
+        # Peach, Apple, Apple (where one of the apples is in a tag group)
+        tags.size.should be(3)
+        tags.map(&:name).should eq(['apple', 'peach', 'apple'])
+      end
+
+      it "Should find only one due to a owner constraint" do
+        tags = taggable.tags(true)
+        tags.size.should eq(2) # Should see both
+
+        # Get only the tags attached to the owner
+        tags = tags.tag_group(tag_group_owner: owner)
+        tags.size.should eq(1) # Now the constainst is applied we should see less.
+        tags.map(&:name).should eq(['apple'])
+        tags.first.tag_group.owner.should eq(owner)
+        tags.first.tag_group.should eq(owner.tag_groups.default)
+      end
+
+      it "and find both tags" do
+        tags = taggable.tags(true)
+        tags.size.should eq(2)
+        tags.map(&:name).should eq(['apple', 'peach'])
+      end
+
+      it "and it Should not delete the original without an owner constraint" do
+        taggable.tag.del(:apple)
+
+        tags = taggable.tags(true)
+        tags.size.should eq(2)
+        tags.map(&:name).should eq(['apple', 'peach'])
+      end
+
+      it "and it Should delete the original with an owner constraint" do
+        taggable.tag.del(:apple, tag_group_owner: owner)
+
+        tags = taggable.tags(true)
+        tags.size.should eq(1)
+        tags.map(&:name).should eq(['peach'])
+      end
+    end
+  end
+
+  it "Should find model by tag" do
+    taggables = Taggable.has_tag(:apple, tag_group_owner: owner)
+    taggables.size.should eq(1)
+    taggables.should include(taggable)
+    tags = taggables.first.tags
+    tags.size.should eq(1)
+    tags.first.name.should eq('apple')
+  end
+
+  context "Many2Many2Many Connection Hopping ::" do
+    it "Should find Owner by Tag" do
+      tag = taggable.tag.get(:apple, tag_group: :default)
+      tag.should be_a(Polytag::Connection)
+      tag.name.should eq('apple')
+      tag.tag_group.name.should eq('default')
+      tag.owner.should eq(owner)
+    end
+
+    it "Should find Tag by Owner" do
+      tag = owner.owned_tags.get(:apple).first
+      tag.should be_a(Polytag::Connection)
+      tag.name.should eq('apple')
+      tag.tag_group.name.should eq('default')
+      tag.owner.should eq(owner)
+    end
+
+    it "Should find Tag by Owner wiht a Group" do
+      taggable.tag.add(:orange, tag_group: "Fruit", tag_group_owner: owner)
+
+      tags = owner.owned_tags.get(:orange, tag_group: "Fruit")
+      tags.size.should eq(1)
+
+      tag = tags.first
+      tag.should be_a(Polytag::Connection)
+      tag.name.should eq('orange')
+      tag.tag_group.name.should eq('Fruit')
+      tag.owner.should eq(owner)
+    end
+  end
+end

data/spec/specs/taggable_without_owner_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe "Taggable Without Owner ::" do
+  let!(:time) { Time.now.to_i }
+  let(:taggable) { Taggable.create(name: "test_#{time}") }
+
+  before(:each) do
+    taggable.tag.new(:apple)
+  end
+
+  it "Should create a model of Taggable" do
+    taggable.name.should eq("test_#{time}")
+    taggable.should be_a(Taggable)
+  end
+
+  context "Add a tag ::" do
+    it "Should have a tag" do
+      tags = taggable.tags(true)
+
+      tags.size.should eq(1)
+      tags.first.name.should eq('apple')
+    end
+
+    it "Should be able to find tag via has_tag?" do
+      taggable.tag.has_tag?(:apple).should be_true
+    end
+
+    it "Should delete the tag" do
+      taggable.tag.del(:apple)
+      taggable.tags(true).should be_empty
+    end
+
+    it "Should add an another tag" do
+      taggable.tag.new(:peach)
+      tags = taggable.tags(true)
+
+      tags.size.should eq(2)
+      tags.map(&:name).should eq(['apple', 'peach'])
+    end
+
+    it "Should add an another tag and delete the original" do
+      taggable.tag.new(:peach)
+      taggable.tag.del(:apple)
+      tags = taggable.tags(true)
+
+      tags.size.should eq(1)
+      tags.first.name.should eq('peach')
+    end
+  end
+
+  it "Should find model by tag" do
+    taggables = Taggable.has_tag(:apple)
+    taggables.size.should eq(1)
+    taggables.should include(taggable)
+    tags = taggables.first.tags
+    tags.size.should eq(1)
+    tags.first.name.should eq('apple')
+  end
+end

data/spec/support/active_record.rb

@@ -1,6 +1,8 @@
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
-# ActiveRecord::Base.connection.disable_query_cache!
+
+# require 'logger'
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
+# ActiveRecord::Base.connection.disable_query_cache!
 
 # Where is the migration file
 migration_path = 'lib/generators/polytag/install/templates'
@@ -10,11 +12,9 @@ require(migration_file)
 # Run the migration file
 CreatePolytagTables.up
 
-[:ones, :twos, :threes, :fours].each do |table|
-  ActiveRecord::Migration.create_table "test_taggable_#{table}" do |t|
-    t.string :name
-    t.timestamps
-  end
+ActiveRecord::Migration.create_table :taggables do |t|
+  t.string :name
+  t.timestamps
 end
 
 ActiveRecord::Migration.create_table :owners do |t|

data/spec/support/owner.rb

@@ -1,3 +1,3 @@
 class Owner < ActiveRecord::Base
-  include Polytag::TagGroup::Owner
+  include Polytag::Concerns::TagOwner
 end

data/spec/support/taggable.rb

@@ -0,0 +1,3 @@
+class Taggable < ActiveRecord::Base
+  include Polytag::Concerns::Taggable
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: polytag
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Kelly Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,106 +22,169 @@ dependencies:
   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: rake
+  name: awesome_print
   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: database_cleaner
+  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: rspec
   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: rspec-rails
   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: fuubar
+  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: sqlite3
   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: awesome_print
+  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: activerecord
+  name: pry
+  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: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 description: Provides really easy tagging for rails and ActiveRecord models
@@ -129,69 +194,73 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
+- .pryrc
 - .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- circle.yml
+- lib/.DS_Store
+- lib/generators/polytag/.DS_Store
+- lib/generators/polytag/install/.DS_Store
 - lib/generators/polytag/install/install_generator.rb
 - lib/generators/polytag/install/templates/create_polytag_tables.rb
 - lib/polytag.rb
+- lib/polytag/concerns/tag_owner.rb
+- lib/polytag/concerns/tag_owner/association_extensions.rb
+- lib/polytag/concerns/tag_owner/association_extensions/owned_tags.rb
+- lib/polytag/concerns/tag_owner/class_helpers.rb
+- lib/polytag/concerns/tag_owner/model_helpers.rb
+- lib/polytag/concerns/taggable.rb
+- lib/polytag/concerns/taggable/association_extensions.rb
+- lib/polytag/concerns/taggable/class_helpers.rb
+- lib/polytag/concerns/taggable/model_helpers.rb
+- lib/polytag/connection.rb
+- lib/polytag/exceptions.rb
 - lib/polytag/tag.rb
 - lib/polytag/tag_group.rb
-- lib/polytag/tag_group/owner.rb
-- lib/polytag/tag_relation.rb
 - lib/polytag/version.rb
 - polytag.gemspec
 - spec/spec_helper.rb
-- spec/specs/polytag_querying_spec.rb
-- spec/specs/polytag_test_taggable_four_spec.rb
-- spec/specs/polytag_test_taggable_one_spec.rb
-- spec/specs/polytag_test_taggable_three_spec.rb
-- spec/specs/polytag_test_taggable_two_spec.rb
+- spec/specs/owner_spec.rb
+- spec/specs/taggable_with_owner_spec.rb
+- spec/specs/taggable_without_owner_spec.rb
 - spec/support/active_record.rb
 - spec/support/owner.rb
-- spec/support/test_taggable_four.rb
-- spec/support/test_taggable_one.rb
-- spec/support/test_taggable_three.rb
-- spec/support/test_taggable_two.rb
+- spec/support/taggable.rb
 homepage: http://github.com/JIFFinc/polytag
 licenses:
 - MIT
-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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Provides really easy tagging for rails and ActiveRecord models
 test_files:
 - spec/spec_helper.rb
-- spec/specs/polytag_querying_spec.rb
-- spec/specs/polytag_test_taggable_four_spec.rb
-- spec/specs/polytag_test_taggable_one_spec.rb
-- spec/specs/polytag_test_taggable_three_spec.rb
-- spec/specs/polytag_test_taggable_two_spec.rb
+- spec/specs/owner_spec.rb
+- spec/specs/taggable_with_owner_spec.rb
+- spec/specs/taggable_without_owner_spec.rb
 - spec/support/active_record.rb
 - spec/support/owner.rb
-- spec/support/test_taggable_four.rb
-- spec/support/test_taggable_one.rb
-- spec/support/test_taggable_three.rb
-- spec/support/test_taggable_two.rb
+- spec/support/taggable.rb
 has_rdoc: