trollo 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bd5e2d080cd0c578f65d74cb53a6aaa90aef9434
+  data.tar.gz: 48d020cfed27768c4e382596f5e5846625ef4fbc
+SHA512:
+  metadata.gz: 3d1824a4f6675db5fa8b93806718fba42500d97cb51aa382282128a95196d2332e673a6def19cf06bcce0f75211d09fdce14a38a9b4fec08d9a462d51b91804e
+  data.tar.gz: 9109e88cf09179fa217d80d04719a3caba889aadfa482224d98dca5750f27b249c6c1256d4d2a53e3d601997c79cd0160d76a19c395560cbe0764f386f36186f

data/lib/generators/active_record/templates/migration.rb

@@ -54,9 +54,9 @@ class CreateTrolloTables < ActiveRecord::Migration
       t.string :name
     end
 
-    create_table :trollo_labels_lists do |t|
+    create_table :trollo_boards_labels do |t|
+      t.references :board
       t.references :label
-      t.references :list
     end
 
     create_table :trollo_cards_labels do |t|

data/lib/trollo/board.rb

@@ -3,6 +3,7 @@ module Trollo
   class Board < ActiveRecord::Base
     has_many :lists, order: 'ordinal ASC', dependent: :destroy
     has_many :subscriptions, dependent: :destroy
+    has_and_belongs_to_many :labels, join_table: 'trollo_boards_labels'
     attr_accessible :name
 
     def tasks
@@ -18,6 +19,20 @@ module Trollo
     def overdue_tasks
       incomplete_tasks.overdue
     end
+
+    def add_label(name)
+      return if has_label?(name)
+      label = Label.where(name: name).first || Label.create!(name: name)
+      self.labels << label
+    end
+
+    def remove_label(name)
+      self.labels -= Label.where(name: name)
+    end
+
+    def has_label?(name)
+      labels.pluck(:name).include?(name)
+    end
   end
 
 end

data/lib/trollo/card.rb

@@ -45,6 +45,10 @@ module Trollo
       return if has_label?(name)
       label = Label.where(name: name).first || Label.create!(name: name)
       self.labels << label
+      
+      if self.list && self.list.board
+        self.list.board.add_label(name)
+      end
     end
 
     def remove_label(name)
@@ -52,7 +56,7 @@ module Trollo
     end
 
     def has_label?(name)
-      labels.map(&:name).include?(name)
+      labels.pluck(:name).include?(name)
     end
       
   end

data/lib/trollo/list.rb

@@ -3,26 +3,11 @@ module Trollo
   class List < ActiveRecord::Base
     belongs_to :board
     has_many :cards, order: 'due_at ASC', dependent: :destroy
-    has_and_belongs_to_many :labels, join_table: 'trollo_labels_lists'
     attr_accessible :name
 
     def named(name)
       where(name: name).first
     end
-
-    def add_label(name)
-      return if has_label?(name)
-      label = Label.where(name: name).first || Label.create!(name: name)
-      self.labels << label
-    end
-
-    def remove_label(name)
-      self.labels -= Label.where(name: name)
-    end
-
-    def has_label?(name)
-      labels.map(&:name).include?(name)
-    end
   end
 
 end

data/lib/trollo/version.rb

@@ -1,3 +1,3 @@
 module Trollo
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/internal/db/schema.rb

@@ -53,9 +53,9 @@ ActiveRecord::Schema.define do
     t.string :name
   end
 
-  create_table :trollo_labels_lists do |t|
+  create_table :trollo_boards_labels do |t|
+    t.references :board
     t.references :label
-    t.references :list
   end
 
   create_table :trollo_cards_labels do |t|

data/spec/lib/trollo/board_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Trollo::Board do
+
+  it "can be labelled" do
+    board = Trollo::Board.create!
+    
+    expect{board.add_label('Bug')}.to change{Trollo::Label.count}.by(1)
+    expect{board.add_label('Bug')}.to change{Trollo::Label.count}.by(0)
+    expect{board.add_label('Bug')}.to change{board.labels.count}.by(0)
+
+    board.labels.map(&:name).should == ['Bug']
+  end
+
+  it "can have labels removed" do
+    board = Trollo::Board.create!
+    
+    board.add_label('Bug')
+    board.add_label('Tree')
+    board.add_label('Foo')
+
+    expect{board.remove_label('Bug')}.to change{Trollo::Label.count}.by(0)
+    expect{board.remove_label('Tree')}.to change{board.labels.count}.by(-1)
+
+    board.labels.map(&:name).should == ['Foo']
+  end
+
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: trollo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Douglas Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: workflow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_commentable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -155,34 +140,33 @@ files:
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
+- spec/lib/trollo/board_spec.rb
 - spec/lib/trollo/card_spec.rb
-- spec/lib/trollo/list_spec.rb
 - spec/lib/trollo/task_spec.rb
 - spec/spec_helper.rb
 - trollo.gemspec
 homepage: https://github.com/teachme2/trollo
 licenses: []
+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: trollo
-rubygems_version: 1.8.24
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A trollo gem.
 test_files:
 - spec/README
@@ -191,7 +175,7 @@ test_files:
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
+- spec/lib/trollo/board_spec.rb
 - spec/lib/trollo/card_spec.rb
-- spec/lib/trollo/list_spec.rb
 - spec/lib/trollo/task_spec.rb
 - spec/spec_helper.rb

data/spec/lib/trollo/list_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe Trollo::List do
-
-  it "can be labelled" do
-    list = Trollo::List.create!
-    
-    expect{list.add_label('Bug')}.to change{Trollo::Label.count}.by(1)
-    expect{list.add_label('Bug')}.to change{Trollo::Label.count}.by(0)
-    expect{list.add_label('Bug')}.to change{list.labels.count}.by(0)
-
-    list.labels.map(&:name).should == ['Bug']
-  end
-
-  it "can have labels removed" do
-    list = Trollo::List.create!
-    
-    list.add_label('Bug')
-    list.add_label('Tree')
-    list.add_label('Foo')
-
-    expect{list.remove_label('Bug')}.to change{Trollo::Label.count}.by(0)
-    expect{list.remove_label('Tree')}.to change{list.labels.count}.by(-1)
-
-    list.labels.map(&:name).should == ['Foo']
-  end
-
-end