acts_as_label 0.1.6 → 0.2.0

data/.specification

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_label
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Coroutine
@@ -10,19 +15,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -05:00
+date: 2010-07-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: activerecord
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  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
 executables: []
@@ -42,6 +61,7 @@ files:
 - 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
 has_rdoc: true
@@ -57,18 +77,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Gem version of acts_as_label Rails plugin.

data/Rakefile

@@ -35,8 +35,8 @@ begin
     gemspec.name              = "acts_as_label"
     gemspec.summary           = "Gem version of acts_as_label Rails plugin."
     
-    gemspec.add_dependency("activerecord")
-    gemspec.add_dependency("activesupport")
+    gemspec.add_dependency("activerecord", ">=2.3.4")
+    gemspec.add_development_dependency("activesupport", ">=2.3.4")
     gemspec.files.include("lib/**/*.rb")
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/acts_as_label.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_label}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Coroutine", "John Dugan"]
-  s.date = %q{2010-07-04}
+  s.date = %q{2010-07-12}
   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 = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/coroutine/acts_as_label}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Gem version of acts_as_label Rails plugin.}
   s.test_files = [
     "test/acts_as_label_test.rb",
@@ -44,16 +44,16 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+    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>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.4"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.4"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
   end
 end
 

data/lib/acts_as_label/base.rb

@@ -109,8 +109,14 @@ module Coroutine                      #:nodoc:
             
             # Add custom method missing functionality to perform find by system label lookup. If 
             # nothing is found, it delegates the call to the original method_missing.
+            #
+            # The method attempts rails 3 syntax. If that fails, it reverts to rails 2 syntax.
             def self.method_missing_with_label(method, *args, &block)
-              record =  self.find(:first, :conditions => ["#{acts_as_label_system_label_column} = ?", method.to_s.upcase])
+              begin
+                record = self.where("#{acts_as_label_system_label_column} = ?", method.to_s.upcase).first
+              rescue
+                record =  self.find(:first, :conditions => ["#{acts_as_label_system_label_column} = ?", method.to_s.upcase])
+              end
               if record
                 return record
               else

data/test/acts_as_label_test.rb

@@ -212,17 +212,28 @@ class ActsAsLabelTest < ActiveSupport::TestCase
   
   def test_method_missing_accessors
     
+    # lookup database objects using syntax appropriate for version of rails
+    begin
+      role_superuser  = Role.where("system_label = ?", "SUPERUSER").first
+      role_guest      = Role.where("system_label = ?", "GUEST").first
+      framework_rails = Framework.where("system_name = ?", "RUBY_ON_RAILS").first
+    rescue
+      role_superuser  = Role.find(:first, :conditions => ["system_label = ?", "SUPERUSER"])
+      role_guest      = Role.find(:first, :conditions => ["system_label = ?", "GUEST"])
+      framework_rails = Framework.find(:first, :conditions => ["system_name = ?", "RUBY_ON_RAILS"])
+    end
+    
     # test lookup by system label
-    assert_equal Role.find(:first, :conditions => ["system_label = ?", "SUPERUSER"]), Role.superuser
+    assert_equal role_superuser, Role.superuser
     
     # test default with implemented method
-    assert_equal Role.find(:first, :conditions => ["system_label = ?", "GUEST"]), Role.default
+    assert_equal role_guest, Role.default
     
     # test default with unspecified behavior
     assert_equal BillingFrequency.first, BillingFrequency.default
     
     # test default with specified system label
-    assert_equal Framework.find(:first, :conditions => ["system_name = ?", "RUBY_ON_RAILS"]), Framework.default
+    assert_equal framework_rails, Framework.default
     
   end
   

data/test/test_helper.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_label
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Coroutine
@@ -15,32 +16,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 -05:00
+date: 2010-07-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
-        - 0
-        version: "0"
-  type: :runtime
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  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
@@ -74,23 +83,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gem version of acts_as_label Rails plugin.