symbolize 3.0.0 → 3.0.1

data/README.rdoc

@@ -24,7 +24,7 @@ Github: http://github.com/zargony/activerecord_symbolize
 
 == Install
 
-Gem:
+=== Gem
 
   gem install symbolize
   config.gem "symbolize", :source => 'http://gemcutter.org'
@@ -35,13 +35,14 @@ Rails 3+ Gemfile
   gem "symbolize"
 
 
-Plugin:
+=== Plugin:
 
   ./script/plugin install git://github.com/nofxx/symbolize.git
 
-or
+or in Rails3+
+
+  rails plugin install ..
 
-  rails plugin install in Rails3+
 
 == Rails 3 (beta)
 
@@ -59,9 +60,10 @@ validates_inclusion_of to restrict the possible values (just like an enum).
         :linux   => "Linux",
         :mac     => "Mac OS X"
       }, :scopes => true
-      symbolize :gui, , :in => [:gnome, :kde, :xfce], :allow_blank => true
+      symbolize :gui,  :in => [:gnome, :kde, :xfce], :allow_blank => true
       symbolize :browser, :in => [:firefox, :opera], :i18n => false, :methods => true
       symbolize :angry, :in => [true, false], :scopes => true
+      symbolize :lang, :in => [:ruby, :c, :erlang], :validate => false
   end
 
 
@@ -74,24 +76,10 @@ Booleans are also supported. See below.
 allow_(blank|nil): What you expect.
 
 
-=== i18n
+=== validate
 
-If you don`t provide a hash with values, it will try i18n:
-
-    activerecord:
-      attributes:
-        user:
-          enums:
-            gui:
-              gnome: Gnome Desktop Enviroment
-              kde: K Desktop Enviroment
-              xfce: XFCE4
-            gender:
-              female: Girl
-              male: Boy
-
-You can skip i18n lookup with :i18n => false
-  symbolize :gender, :in => [:female, :male], :i18n => false
+Set to false to avoid the validation of the input. 
+Useful for a dropdown with an "other" option textfield.
 
 
 === method
@@ -115,6 +103,26 @@ Its possible to use boolean fields also.
       "nil": Unknown
 
 
+=== i18n
+
+If you don`t provide a hash with values, it will try i18n:
+
+    activerecord:
+      attributes:
+        user:
+          enums:
+            gui:
+              gnome: Gnome Desktop Enviroment
+              kde: K Desktop Enviroment
+              xfce: XFCE4
+            gender:
+              female: Girl
+              male: Boy
+
+You can skip i18n lookup with :i18n => false
+  symbolize :gender, :in => [:female, :male], :i18n => false
+
+
 === scopes (BETA)
 
 If you provide the scopes option, some fancy named scopes will be added:

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
+#require 'spec/rake/spectask'
 
 begin
   require 'jeweler'
@@ -19,17 +19,17 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+# Spec::Rake::SpecTask.new(:spec) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.spec_files = FileList['spec/**/*_spec.rb']
+# end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-task :default => :spec
+# Spec::Rake::SpecTask.new(:rcov) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.pattern = 'spec/**/*_spec.rb'
+#   spec.rcov = true
+# end
+# task :default => :spec
 
 # desc 'Generate documentation for the activerecord_symbolize plugin.'
 # Rake::RDocTask.new(:rdoc) do |rdoc|

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/symbolize.rb

@@ -67,21 +67,23 @@ module Symbolize
 
         attr_names.each do |attr_name|
           attr_name = attr_name.to_s
+          const =  "#{attr_name}_values"
           if enum.instance_of?(Hash)
             values = enum
           else
-            if i18n
-              values = hsh[*enum.map { |v| [v, I18n.translate("activerecord.attributes.#{ActiveSupport::Inflector.underscore(self)}.enums.#{attr_name}.#{v}")] }.flatten]
-            else
-              values = hsh[*enum.map { |v| [v, (configuration[:capitalize] ? v.to_s.capitalize : v.to_s)] }.flatten]
-            end
+            values = hsh[*enum.map { |v| [v, (configuration[:capitalize] ? v.to_s.capitalize : v.to_s)] }.flatten]
           end
 
           # Get the values of :in
-          const =  "#{attr_name}_values"
           const_set const.upcase, values unless const_defined? const.upcase
-          # This one is a dropdown helper
-          class_eval "def self.get_#{const}; #{const.upcase}.map(&:reverse); end"
+          ev = if i18n
+            # This one is a dropdown helper
+            code =  "#{const.upcase}.map { |k,v| [I18n.translate(\"activerecord.attributes.\#{ActiveSupport::Inflector.underscore(self)}.enums.#{attr_name}.\#{k}\"), k] }" #.to_sym rescue nila
+            "def self.get_#{const}; #{code}; end;"
+          else
+            "def self.get_#{const}; #{const.upcase}.map(&:reverse); end"
+          end
+          class_eval(ev)
 
           if methods
             values.each do |value|

data/spec/locales/en.yml

@@ -0,0 +1,16 @@
+en:
+  activerecord:
+    attributes:
+      user:
+        enums:
+          language:
+            pt: Portuguese
+            en: English
+          sex:
+            "true": Female
+            "false": Male
+      user_skill:
+        enums:
+          kind:
+            magic: Magic
+            agility: Agility

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 require 'rubygems'
-require 'spec'
+begin
+  require 'spec'
+rescue LoadError
+  require 'rspec'
+end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -15,8 +19,6 @@ I18n.load_path += Dir[File.join(File.dirname(__FILE__), "locales", "*.{rb,yml}")
 I18n.default_locale = "pt"
 CreateTestingStructure.migrate(:up)
 
-
-Spec::Runner.configure do |config|
-
-
-end
+puts "Running AR #{ActiveRecord::VERSION::MAJOR}"
+# Spec::Runner.configure do |config|
+# end

data/spec/symbolize_spec.rb

@@ -36,9 +36,7 @@ User.create(:name => 'Bob' , :other => :bar,:status => :inactive, :so => :mac, :
 
 describe "Symbolize" do
 
-
   it "should respond to symbolize" do
-    p ActiveRecord::VERSION::MAJOR
     ActiveRecord::Base.should respond_to :symbolize
   end
 
@@ -152,6 +150,9 @@ describe "Symbolize" do
 
     describe "ActiveRecord stuff" do
 
+      #
+      #  ActiveRecord < 3
+      #
       if ActiveRecord::VERSION::MAJOR < 3
 
         it "test_symbolized_finder" do
@@ -165,6 +166,9 @@ describe "Symbolize" do
           end
         end
 
+      #
+      #  ActiveRecord >= 3
+      #
       else
 
         it "test_symbolized_finder" do
@@ -261,7 +265,7 @@ describe "Symbolize" do
       end
 
       it "should get the correct values" do
-        User::LANGUAGE_VALUES.should eql({:pt => "Português", :en => "Inglês"})
+        User::LANGUAGE_VALUES.should eql({:pt=>"pt", :en=>"en"})
       end
 
       it "should test boolean" do
@@ -273,7 +277,7 @@ describe "Symbolize" do
       end
 
       it "should get the correct values" do
-        User::SEX_VALUES.should eql({false=>"Masculino", true=>"Feminino"})
+        User::SEX_VALUES.should eql({true=>"true", false=>"false"})
       end
 
       it "should translate a multiword class" do

data/symbolize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{symbolize}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-04-12}
+  s.date = %q{2010-07-09}
   s.description = %q{ActiveRecord enums with i18n}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/symbolize_helper.rb",
      "rails/init.rb",
      "spec/db/create_testing_structure.rb",
+     "spec/locales/en.yml",
      "spec/locales/pt.yml",
      "spec/spec_helper.rb",
      "spec/symbolize_spec.rb",
@@ -35,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nofxx/symbolize}
   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{ActiveRecord enums with i18n}
   s.test_files = [
     "spec/db/create_testing_structure.rb",
@@ -47,7 +48,7 @@ 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
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -03:00
+date: 2010-07-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -33,6 +34,7 @@ dependencies:
   name: sqlite3
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -61,6 +63,7 @@ files:
 - lib/symbolize_helper.rb
 - rails/init.rb
 - spec/db/create_testing_structure.rb
+- spec/locales/en.yml
 - spec/locales/pt.yml
 - spec/spec_helper.rb
 - spec/symbolize_spec.rb
@@ -75,6 +78,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -82,6 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -91,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActiveRecord enums with i18n