attribute_mapper 1.2.0 → 1.3.0

data/lib/attribute_mapper.rb

@@ -39,11 +39,13 @@ module AttributeMapper
     # @param [Hash] options the options for this attribute
     # @option options [Hash] :to The enumeration to use for this
     #   attribute. See example above.
+    # @option options :predicate_methods Generate methods for checking
+    #   whether an object has a certain attribute set
     def map_attribute(attribute, options)
       mapping = options[:to]
       verify_existence_of attribute
       add_accessor_for    attribute, mapping
-      add_predicates_for  attribute, mapping.keys
+      add_predicates_for  attribute, mapping.keys if options.fetch(:predicate_methods) { true }
       override            attribute
       add_options_helper_for attribute, mapping
     end
@@ -51,7 +53,7 @@ module AttributeMapper
     private
     
     def add_accessor_for(attribute, mapping)
-      class_eval(<<-EVAL)
+      class_eval(<<-EVAL, __FILE__, __LINE__)
         class << self
           def #{attribute.to_s.pluralize}
             #{mapping.inspect}
@@ -62,7 +64,7 @@ module AttributeMapper
 
     def add_predicates_for(attribute, names)
       names.each do |name|
-        class_eval(<<-RUBY)
+        class_eval(<<-RUBY, __FILE__, __LINE__)
           def #{name}?
             self.#{attribute} == :#{name}
           end
@@ -89,7 +91,7 @@ module AttributeMapper
     end
     
     def override_getters(attribute)
-      class_eval(<<-EVAL)
+      class_eval(<<-EVAL, __FILE__, __LINE__)
         def #{attribute}
           self.class.#{attribute.to_s.pluralize}.invert[read_attribute(:#{attribute})]
         end
@@ -97,7 +99,7 @@ module AttributeMapper
     end
     
     def override_setters(attribute)
-      class_eval(<<-EVAL)
+      class_eval(<<-EVAL, __FILE__, __LINE__)
         def #{attribute}=(raw_value)
           value = resolve_value_of :#{attribute}, raw_value
           write_attribute(:#{attribute}, value)
@@ -114,14 +116,15 @@ module AttributeMapper
   module InstanceMethods
     
     private
-    
+
     def resolve_value_of(attribute, raw_value)
+      return raw_value if raw_value.blank?
       check_value = raw_value.is_a?(String) ? raw_value.to_sym : raw_value
       mapping = self.class.send(attribute.to_s.pluralize)
       raise ArgumentError, "`#{check_value}' not present in attribute mapping `#{mapping.inspect}'" unless mapping.to_a.flatten.include? check_value
-      mapping[check_value] || check_value
+      mapping.include?(check_value) ? mapping[check_value] : check_value
     end
-    
+
   end
   
 end

data/test/attribute_mapper_test.rb

@@ -96,6 +96,58 @@ class AttributeMapperTest < Test::Unit::TestCase
       assert_equal [[["Open", :open], ["Closed", :closed]], {:selected => :open}], ticket.status_options(false)
     end
     
+    context "setting nil as a valid value in the mapping" do
+      setup do
+        Ticket.map_attribute :status, :to => mapping(:unanswered => nil)
+      end
+
+      should "allow setting the status by primitive value" do
+        assert_nothing_raised do
+          ticket.status = mapping[:unanswered]
+        end
+        assert_equal :unanswered, ticket.status
+        assert ticket.unanswered?
+      end
+
+      
+      should "allow setting the status by symbol" do
+        assert_nothing_raised do
+          ticket.status = :unanswered
+        end
+        assert_equal :unanswered, ticket.status
+        assert ticket.unanswered?
+      end
+
+    end
+
+    should "not raise an error when setting to a blank value" do
+      assert_nothing_raised {
+        ticket.update_attributes(:status => "")
+      }
+    end
+
+    should "not raise an error when setting to a nil value" do
+      assert_nothing_raised {
+        ticket.update_attributes(:status => nil)
+      }
+    end
+
+    should "turn off generation of predicate methods" do
+      new_ticket = Class.new(ActiveRecord::Base) do
+        set_table_name "tickets"
+
+        include AttributeMapper
+        map_attribute :status, :to => {:open => 1, :closed => 2}, :predicate_methods => false
+      end
+
+      t = new_ticket.new
+      t.status = :open
+
+      assert_raises(NoMethodError) {
+        t.open?
+      }
+    end
+    
   end
   
   #######

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: attribute_mapper
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Marcel Molina Jr.
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -06:00
+date: 2009-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -21,28 +21,19 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- .kick
-- HISTORY.rdoc
-- LICENSE
 - README.md
-- Rakefile
-- VERSION.yml
-- attribute_mapper.gemspec
-- init.rb
 - lib/attribute_mapper.rb
 - test/attribute_mapper_test.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/therealadam/attribute_mapper
 licenses: []
 
 post_install_message: 
 rdoc_options: 
+- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -65,6 +56,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Map symbolic types to primitive types and stash them in a column.
-test_files: 
-- test/attribute_mapper_test.rb
-- test/test_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,4 +0,0 @@
-coverage
-pkg
-doc
-.yardoc

data/.kick

@@ -1,6 +0,0 @@
-recipe :ruby
-
-startup { log "Here we go." }
-
-Ruby.test_options << "-Itest"
-Ruby.test_options << "-rubygems"

data/HISTORY.rdoc

@@ -1,8 +0,0 @@
-= 1.2.0 (2010-02-23)
-
-* Verified compatibility with +update_attributes+ and +attr_accessible+.
-* Add +_options+ helper to make generating select forms for mappings easier
-
-= 1.1.1 (2010-01-08)
-
-* Changelog epoch.

data/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2007-2010 Marcel Molina, Jr., Bruce Williams, Adam Keys
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

data/Rakefile

@@ -1,37 +0,0 @@
-require 'rake/testtask'
-require 'rcov/rcovtask'
-
-task :default => :test
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/*_test.rb']
-  t.ruby_opts = ['-Itest', '-rubygems']
-end
-
-Rcov::RcovTask.new do |t|
-  t.test_files = FileList['test/*_test.rb']
-end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new(:doc) do |t|
-    t.options = ['--no-private']
-    t.files = FileList['lib/**/*.rb']
-  end
-rescue LoadError => e
-  puts "yard not available. Install it with: gem install yard"
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = 'attribute_mapper'
-    s.summary = 'Map symbolic types to primitive types and stash them in a column.'
-    s.email = 'adamkkeys@gmail.com'
-    s.homepage = 'http://github.com/therealadam/attribute_mapper'
-    s.description = 'Provides a transparent interface for mapping symbolic representations to a column in the database of a more primitive type.'
-    s.authors = ['Marcel Molina Jr.', 'Bruce Williams', 'Adam Keys']
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install technicalpickles-jeweler -s http://gems.github.com"
-end

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:minor: 2
-:patch: 0
-:build: 
-:major: 1

data/attribute_mapper.gemspec

@@ -1,29 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{attribute_mapper}
-  s.version = "0.9.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcel Molina Jr.", "Bruce Williams", "Adam Keys"]
-  s.date = %q{2009-03-10}
-  s.description = %q{Provides a transparent interface for mapping symbolic representations to a column in the database of a more primitive type.}
-  s.email = %q{adamkkeys@gmail.com}
-  s.files = ["README.md", "VERSION.yml", "lib/attribute_mapper.rb", "test/attribute_mapper_test.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/therealadam/attribute_mapper}
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Map symbolic types to primitive types and stash them in a column.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), "/lib/attribute_mapper")

data/test/test_helper.rb

@@ -1,23 +0,0 @@
-require 'test/unit'
-require 'shoulda'
-
-require 'active_record'
-require 'attribute_mapper'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => 'sqlite3',
-  :database => ':memory:'
-)
-
-ActiveRecord::Schema.define do 
-  create_table :tickets do |table|
-    table.column :status, :integer
-    table.column :name, :string
-  end
-end
-
-# Pseudo model for testing purposes
-class Ticket < ActiveRecord::Base
-  include AttributeMapper
-end
-