labelized 0.6.3 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.0

data/labelized.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{labelized}
-  s.version = "0.6.3"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter T. Brown"]
-  s.date = %q{2011-08-16}
+  s.date = %q{2011-11-15}
   s.description = %q{A better tag library}
   s.email = %q{peter@pathable.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "labelized.gemspec",
     "lib/labelized.rb",
     "lib/labelized/label_concern.rb",
+    "lib/labelized/label_concern.rb.orig",
     "lib/labelized/label_list.rb",
     "lib/labelized/label_set_concern.rb",
     "lib/labelized/labeling_concern.rb",

data/lib/labelized/label_concern.rb

@@ -1,3 +1,5 @@
+require 'labelized/label_list'
+
 module Labelized
   module LabelConcern
     extend ActiveSupport::Concern
@@ -10,33 +12,23 @@ module Labelized
     end
       
     module ClassMethods
-      def labelized(params)
+      def labelized(params = {})
         setup_labelized params
         
-        def find_or_build_by_list(labels, labeled, label_set_name = nil)
+	def find_or_build_by_list(labels, labeled, label_set_name = nil)
           label_set_class = (labelized_options[:label_set_class_name] || 'LabelSet').constantize
-          existing_labels = self.label_scope(labeled).where(:name => labels)
 
           unless label_set_name.blank?
             label_set_name.strip! # ooh lah lah
             label_set = label_set_class.label_scope(labeled).find_or_initialize_by_name(label_set_name)
           end
 
-          new_label_names = labels.reject do |name| 
-            existing_labels.any? do |label|
-              name.downcase == label.name.downcase
-            end
-          end
-
-          new_labels = new_label_names.map do |name| 
-            name.strip!
-            self.label_scope(labeled).build(:name => name, :label_set => label_set)
+          LabelList.from(labels).map do |label|
+            self.label_scope(labeled).find_or_initialize_by_name(label.strip, :label_set => label_set)
           end
-
-          existing_labels + new_labels
         end          
         
       end
     end    
   end
-end
+end

data/lib/labelized/label_concern.rb.orig

@@ -0,0 +1,42 @@
+module Labelized
+  module LabelConcern
+    extend ActiveSupport::Concern
+    
+    included do
+      has_many :labelings, :dependent => :destroy
+      belongs_to :label_set
+      
+      extend Support
+    end
+      
+    module ClassMethods
+      def labelized(params = {})
+        setup_labelized params
+        
+        def find_or_build_by_list(labels, labeled, label_set_name = nil)
+          label_set_class = (labelized_options[:label_set_class_name] || 'LabelSet').constantize
+          existing_labels = self.label_scope(labeled).where(:name => labels)
+
+          unless label_set_name.blank?
+            label_set_name.strip! # ooh lah lah
+            label_set = label_set_class.label_scope(labeled).find_or_initialize_by_name(label_set_name)
+          end
+
+          new_label_names = labels.reject do |name| 
+            existing_labels.any? do |label|
+              name.downcase == label.name.downcase
+            end
+          end
+
+          new_labels = new_label_names.map do |name| 
+            name.strip!
+            self.label_scope(labeled).build(:name => name, :label_set => label_set)
+          end
+
+          existing_labels + new_labels
+        end          
+        
+      end
+    end    
+  end
+end

data/lib/labelized/label_list.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute_accessors'
+
 module Labelized
   class LabelList < Array
     cattr_accessor :delimiter
@@ -93,4 +95,4 @@ module Labelized
       args.flatten!
     end
   end
-end
+end

data/lib/labelized/labelized_concern.rb

@@ -44,6 +44,8 @@ module Labelized
             labels = [labels].flatten
             return [] if labels.empty?
             
+            label_class.is_labelized? rescue raise "label_class #{label_class} must be labelized"
+            
             self.labels = cache_label_set(label_set_name, label_class.label_scope(self).find_or_build_by_list(labels, self, label_set_name.to_s))
           end
           
@@ -53,13 +55,17 @@ module Labelized
             cache_label_get(label_set_name) || self.labels.where(:label_set_id => label_set.id)
           end
           
+          # Convenience setter to the label_set name. Accepts a single item or an array.
           labelized_label_set_names.map(&:to_s).each do |label_set_name|
             define_method "#{label_set_name}=" do |labels|
               label labels, label_set_name
             end
-        
+          
+            # Convenience acccessor to the label_set name. If singular will return a single label.
+            # Otherwise returns an array of labels.
             define_method "#{label_set_name}" do
-              label_for label_set_name
+              labels = label_for label_set_name
+              Labelized::Support.singular?(label_set_name) ? labels[0] : labels
             end
           end
         end

data/lib/labelized/support.rb

@@ -23,6 +23,7 @@ module Labelized
     end
     
     def setup_label_scope(scopes)
+      return if scopes.blank?
       self.class_eval do
         scope :label_scope, lambda {|labeled| where(*scopes.collect{|s| {s => labeled.send(s)}}.flatten)}
       end
@@ -38,5 +39,8 @@ module Labelized
       class_inheritable_reader(:labelized_label_set_names)
     end
     
+    def is_labelized?
+      true
+    end
   end
 end

data/spec/labelized/label_concern_spec.rb

@@ -4,7 +4,7 @@ class Label < ActiveRecord::Base
   include Labelized::LabelConcern
   
   belongs_to :root
-  labelized :scope => :root_id
+  labelized
 end
 
 class Root < ActiveRecord::Base

data/spec/labelized/labelized_concern_spec.rb

@@ -29,6 +29,13 @@ class Thing < ActiveRecord::Base
   labelized :tags
 end
 
+class InvalidThing < Thing
+  include Labelized::LabelizedConcern
+  belongs_to :root
+  labelized :tags, :label_class_name => 'Root'
+end
+
+
 # thing.tags # [<label id=1>]
 # label.label_set 
 # thing.labels # [<label id=1>]
@@ -72,6 +79,7 @@ describe Labelized::LabelizedConcern do
     it{should be_instance_of Array}
     it{should include('tag one')}
     its(:size){should == 1}
+
   end
   
   context 'after saved' do
@@ -100,4 +108,9 @@ describe Labelized::LabelizedConcern do
     end
   end
 
+  context 'when invalid' do
+    let(:invalid_thing){InvalidThing.new()}
+    
+    specify{expect{invalid_thing.label'tag', :tags}.to raise_exception}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labelized
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000 -07:00
+date: 2011-11-15 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2159282580 !ruby/object:Gem::Requirement
+  requirement: &2167182500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159282580
+  version_requirements: *2167182500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2159281900 !ruby/object:Gem::Requirement
+  requirement: &2167181900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159281900
+  version_requirements: *2167181900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2159281340 !ruby/object:Gem::Requirement
+  requirement: &2167181300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159281340
+  version_requirements: *2167181300
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2159280860 !ruby/object:Gem::Requirement
+  requirement: &2167180700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159280860
+  version_requirements: *2167180700
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2159280360 !ruby/object:Gem::Requirement
+  requirement: &2167180100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159280360
+  version_requirements: *2167180100
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2159279880 !ruby/object:Gem::Requirement
+  requirement: &2167179500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159279880
+  version_requirements: *2167179500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159279380 !ruby/object:Gem::Requirement
+  requirement: &2167174100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159279380
+  version_requirements: *2167174100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2159278900 !ruby/object:Gem::Requirement
+  requirement: &2167173620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159278900
+  version_requirements: *2167173620
 description: A better tag library
 email: peter@pathable.com
 executables: []
@@ -120,6 +120,7 @@ files:
 - labelized.gemspec
 - lib/labelized.rb
 - lib/labelized/label_concern.rb
+- lib/labelized/label_concern.rb.orig
 - lib/labelized/label_list.rb
 - lib/labelized/label_set_concern.rb
 - lib/labelized/labeling_concern.rb
@@ -146,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 671687505935235281
+      hash: -2535347908215351964
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: