acts_as_label 1.1.0 → 1.1.3

data/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+*.gem

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.rdoc

@@ -70,6 +70,19 @@ method +default+.  This yields more expressive code.
   User.create!({ :name => "Anonymous Dude", :role => Role.default })
 	
 
+To help avoid excessive querying, the extension overrides the equality operator. 
+This allows record comparisons in a couple of formats:
+
+  u.role == Role.superuser	# as you would expect
+  u.role == :superuser		# to spare a superfluous query (same as u.role.to_sym == :superuser)
+
+
+Other useful utility methods:
+
++to_s+:: Returns the friendly label value
++to_sym+:: Returns the downcased, symbolized system label value 
+
+
 
 == Helpful Links
 

data/Rakefile

@@ -1,6 +1,6 @@
 require "rake"
 require "rake/testtask"
-require "rake/rdoctask"
+require "rdoc/task"
 require "jeweler"
 
 
@@ -35,8 +35,8 @@ begin
     gemspec.name              = "acts_as_label"
     gemspec.summary           = "Gem version of acts_as_label Rails plugin."
     
-    gemspec.add_dependency("activerecord", ">=2.3.4")
-    gemspec.add_development_dependency("activesupport", ">=2.3.4")
+    gemspec.add_dependency("activerecord", ">=3.0.0")
+    gemspec.add_development_dependency("activesupport", ">=3.0.0")
     gemspec.files.include("lib/**/*.rb")
   end
   Jeweler::GemcutterTasks.new

data/acts_as_label.gemspec

@@ -1,52 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "acts_as_label/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{acts_as_label}
-  s.version = "1.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Coroutine}, %q{John Dugan}, %q{Rick Branson}]
-  s.date = %q{2011-05-12}
+  s.name        = "acts_as_label"
+  s.version     = Coroutine::ActsAsLabel::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Coroutine", "John Dugan"]
+  s.email       = ["gems@coroutine.com"]
+  s.homepage    = "http://github.com/coroutine/acts_as_label"
+  s.summary     = %q{This acts_as extension simplifies the process of assigning mutable user-friendly labels to immutable system labels.}
   s.description = %q{This acts_as extension implements a system label and a friendly label on a class and centralizes the logic for performing validations and accessing items by system label.}
-  s.email = %q{jdugan@coroutine.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".specification",
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "acts_as_label.gemspec",
-    "init.rb",
-    "lib/acts_as_label.rb",
-    "lib/acts_as_label/base.rb",
-    "rails/init.rb",
-    "test/acts_as_label_test.rb",
-    "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/coroutine/acts_as_label}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.2}
-  s.summary = %q{Gem version of acts_as_label Rails plugin.}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_dependency "rails", ">= 3.0.0"
+  
+  s.add_development_dependency "rspec", ">= 2.0.0"
+  
+  s.rubyforge_project = "acts_as_label"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.4"])
-      s.add_development_dependency(%q<activesupport>, [">= 2.3.4"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.3.4"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.3.4"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/init.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + "/rails/init.rb"
+require "acts_as_label"

data/lib/acts_as_label/base.rb

@@ -78,20 +78,19 @@ module Coroutine                      #:nodoc:
           class_eval do
             
             # inheritable accessors
-            write_inheritable_attribute :acts_as_label_system_label_column,   system_label
-            class_inheritable_reader    :acts_as_label_system_label_column
-            write_inheritable_attribute :acts_as_label_label_column,          label
-            class_inheritable_reader    :acts_as_label_label_column
-            write_inheritable_attribute :acts_as_label_scope,                 scope
-            class_inheritable_reader    :acts_as_label_scope
-            write_inheritable_attribute :acts_as_label_default_system_label,  default
-            class_inheritable_reader    :acts_as_label_default_system_label
-          
-            
+            class_attribute :acts_as_label_system_label_column
+            class_attribute :acts_as_label_label_column
+            class_attribute :acts_as_label_scope
+            class_attribute :acts_as_label_default_system_label
+
+            self.acts_as_label_system_label_column  = system_label
+            self.acts_as_label_label_column         = label
+            self.acts_as_label_scope                = scope
+            self.acts_as_label_default_system_label = default
+
             # protect attributes
             attr_readonly               system_label
             
-            
             # validations
             validates_presence_of       system_label
             validates_length_of         system_label,  :maximum   => 255
@@ -99,8 +98,6 @@ module Coroutine                      #:nodoc:
             validates_presence_of       label
             validates_length_of         label,         :maximum => 255
             
-            
-            
             # This method catches all undefined method calls. It first sees if any ancestor
             # understands the request. If not, it tries to match the method call to an
             # existing system label. If that is found, it lazily manufacturers a method on the
@@ -112,8 +109,6 @@ module Coroutine                      #:nodoc:
               rescue NoMethodError => e
                 if has_acts_as_label_method?(method)
                   self.__send__(method)
-                elsif method.to_s == "to_ary"
-                  # do nothing
                 else
                   throw e
                 end
@@ -135,6 +130,8 @@ module Coroutine                      #:nodoc:
                     def #{mn}
                       by_acts_as_label_system_label('#{sl}')
                     end
+                    
+                    alias_method :#{mn.upcase}, :#{mn}
                   end
                 }
               end
@@ -144,17 +141,9 @@ module Coroutine                      #:nodoc:
             
             
             # This method finds an active record object for the given system label.
-            # It automatically determines the correct syntax for the current version
-            # of rails via duck typing.def typing.
             #             
             def self.by_acts_as_label_system_label(system_label)
-              sl = system_label.to_s.upcase
-              
-              if @by_system_label_has_arel ||= ActiveRecord::Base.respond_to?(:where)
-                where("#{acts_as_label_system_label_column} = ?", sl).first
-              else
-                find(:first, :conditions => ["#{acts_as_label_system_label_column} = ?", sl])
-              end
+              where("#{acts_as_label_system_label_column} = ?", system_label.to_s.upcase).first
             end
 
 
@@ -192,6 +181,16 @@ module Coroutine                      #:nodoc:
     
       module InstanceMethods
         
+        # This method overrides to_ary to return nil, which tells anything trying to
+        # flatten this we are already flat. This is necessary because we are overriding
+        # active records method missing, which must do this somewhere in the bowels
+        # of rails.
+        #
+        def to_ary
+          nil
+        end
+        
+        
         # This method overrides the to_s method to return the friendly label value.
         #
         def to_s
@@ -214,11 +213,11 @@ module Coroutine                      #:nodoc:
         #   u.role == :superuser
         #
         def ==(other)
-          self.to_sym == other.to_sym
+          self.to_sym == (other.to_sym rescue false)
         end
         
       end
     
     end
   end
-end
+end

data/lib/acts_as_label/version.rb

@@ -0,0 +1,5 @@
+module Coroutine
+  module ActsAsLabel
+    VERSION = "1.1.3"
+  end
+end

data/test/acts_as_label_test.rb

@@ -293,6 +293,8 @@ class ActsAsLabelTest < ActiveSupport::TestCase
     
     assert (r1 == Role.superuser)
     assert (r1 == :superuser)
+    
+    assert !(r1 == false)
   end
   
   def test_to_s
@@ -306,7 +308,6 @@ class ActsAsLabelTest < ActiveSupport::TestCase
   end
   
   def test_upcase_system_label_value
-    
     # default system label column name
     record = Role.create!({ :system_label => "Customer",  :label => "Client" })
     assert_equal record.system_label, "CUSTOMER"
@@ -314,7 +315,11 @@ class ActsAsLabelTest < ActiveSupport::TestCase
     # custom system label column name
     record = Framework.create!( :system_name => "example", :name => "Example")
     assert_equal record.system_name, "EXAMPLE"
-    
+  end
+
+  def test_support_upcase_accessors
+    assert Role.SUPERUSER == Role.superuser
+    assert Role.SUPERUSER == :superuser
   end
 
 end

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 # require rails stuff
 require "rubygems"
+require "active_record"
 require "active_support"
 require "active_support/test_case"
-require "active_record"
 require "test/unit"
 
 # require plugin

metadata

@@ -1,76 +1,77 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_label
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Coroutine
 - John Dugan
-- Rick Branson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -05:00
+date: 2011-11-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 4
-        version: 2.3.4
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15
         segments: 
         - 2
-        - 3
-        - 4
-        version: 2.3.4
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id002
 description: This acts_as extension implements a system label and a friendly label on a class and centralizes the logic for performing validations and accessing items by system label.
-email: jdugan@coroutine.com
+email: 
+- gems@coroutine.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - .specification
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - acts_as_label.gemspec
 - init.rb
 - lib/acts_as_label.rb
 - lib/acts_as_label/base.rb
-- rails/init.rb
+- lib/acts_as_label/version.rb
 - test/acts_as_label_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -102,10 +103,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: acts_as_label
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Gem version of acts_as_label Rails plugin.
-test_files: []
-
+summary: This acts_as extension simplifies the process of assigning mutable user-friendly labels to immutable system labels.
+test_files: 
+- test/acts_as_label_test.rb
+- test/test_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.1.0

data/rails/init.rb

@@ -1 +0,0 @@
-require "acts_as_label"