symbolize 4.0.4 → 4.1.0

data/README.rdoc

@@ -33,33 +33,46 @@ On schema DBs, the attribute should be a string (varchar) column.
 
 == Usage
 
+ActiveRecord:
 
     class User < ActiveRecord::Base
-      or Mongoid::Document
 
       symbolize :gender, :in => [:female, :male], :scopes => true
 
-      symbolize :so, :in => {
+    end
+
+Mongoid:
+
+    class User
+
+      include Mongoid::Document
+      include Mongoid::Symbolize
+
+      symbolize :gender, :in => [:female, :male], :scopes => true
+
+    end
+
+Other examples:
+
+    symbolize :so, :in => {
         :linux   => "Linux",
         :mac     => "Mac OS X"
-      }, :scopes => true
-
-      # Allow blank
-      symbolize :gui,  :in => [:gnome, :kde, :xfce], :allow_blank => true
+    }, :scopes => true
 
-      # Don`t i18n
-      symbolize :browser, :in => [:firefox, :opera], :i18n => false, :methods => true
+    # Allow blank
+    symbolize :gui,  :in => [:gnome, :kde, :xfce], :allow_blank => true
 
-      # Scopes
-      symbolize :angry, :in => [true, false], :scopes => true
+    # Don`t i18n
+    symbolize :browser, :in => [:firefox, :opera], :i18n => false, :methods => true
 
-      # Don`t validate
-      symbolize :lang, :in => [:ruby, :js, :c, :erlang], :validate => false
+    # Scopes
+    symbolize :angry, :in => [true, false], :scopes => true
 
-      # Default
-      symbolize :kind, :in => [:admin, :manager, :user], :default => :user
+    # Don`t validate
+    symbolize :lang, :in => [:ruby, :js, :c, :erlang], :validate => false
 
-    end
+    # Default
+    symbolize :kind, :in => [:admin, :manager, :user], :default => :user
 
 
 === in/within

data/Rakefile

@@ -1,14 +1,13 @@
 require 'bundler'
 Bundler.setup
 
-#require "rake"
-# require "rdoc/task"
 require "rspec"
 require "rspec/core/rake_task"
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "symbolize/version"
 
+desc "Builds the gem"
 task :gem => :build
 task :build do
   system "gem build symbolize.gemspec"
@@ -30,59 +29,3 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 task :default => [:spec]
-
-# require 'rubygems'
-# require 'rake'
-# #require 'spec/rake/spectask'
-
-# begin
-#   require 'jeweler'
-#   Jeweler::Tasks.new do |gem|
-#     gem.name = "symbolize"
-#     gem.summary = "Object enums with i18n in AR or Mongoid"
-#     gem.description = "ActiveRecord/Mongoid enums with i18n"
-#     gem.email = "x@nofxx.com"
-#     gem.homepage = "http://github.com/nofxx/symbolize"
-#     gem.authors = ["Marcos Piccinini"]
-#     gem.add_development_dependency "rspec"
-#     gem.add_development_dependency "sqlite3"
-#     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-#   end
-# 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(: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|
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title    = 'ActiverecordSymbolize'
-#   rdoc.options << '--line-numbers' << '--inline-source'
-#   rdoc.rdoc_files.include('README')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
-# require 'rdoc/task'
-# Rake::RDocTask.new do |rdoc|
-#   if File.exist?('VERSION.yml')
-#     config = YAML.load(File.read('VERSION.yml'))
-#     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-#   else
-#     version = ""
-#   end
-
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title = "symbolize #{version}"
-#   rdoc.rdoc_files.include('README*')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end

data/lib/symbolize/active_record.rb

@@ -80,7 +80,7 @@ module Symbolize
           const_set const.upcase, values unless const_defined? const.upcase
           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
+            code =  "#{const.upcase}.map { |k,v| [I18n.translate(\"activerecord.attributes.\#{ActiveSupport::Inflector.underscore(self.model_name)}.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"
@@ -101,7 +101,7 @@ module Symbolize
             values.each do |value|
               name = value[0]
               if name.respond_to?(:to_sym)
-                scope_comm.call name.to_sym, :conditions => { attr_name => name }
+                scope_comm.call name.to_sym, :conditions => { attr_name => name.to_s }
                 # Figure out if this as another option, or default...
                 # scope_comm.call "not_#{attr_name}".to_sym, :conditions => { attr_name != name }
               end
@@ -158,7 +158,7 @@ module Symbolize
   def read_i18n_attribute attr_name
     attr = read_attribute(attr_name)
     return nil if attr.nil?
-    I18n.translate("activerecord.attributes.#{ActiveSupport::Inflector.underscore(self.class)}.enums.#{attr_name}.#{attr}") #.to_sym rescue nila
+    I18n.translate("activerecord.attributes.#{ActiveSupport::Inflector.underscore(self.class.model_name)}.enums.#{attr_name}.#{attr}") #.to_sym rescue nila
   end
 
   # Write a symbolized value. Watch out for booleans.

data/lib/symbolize/mongoid.rb

@@ -89,7 +89,7 @@ module Mongoid
             const_set const.upcase, values unless const_defined? const.upcase
             ev = if i18n
                    # This one is a dropdown helper
-                   code =  "#{const.upcase}.map { |k,v| [I18n.t(\"mongoid.attributes.\#{ActiveSupport::Inflector.underscore(self)}.enums.#{attr_name}.\#{k}\"), k] }" #.to_sym rescue nila
+                   code =  "#{const.upcase}.map { |k,v| [I18n.t(\"mongoid.attributes.\#{ActiveSupport::Inflector.underscore(self.model_name)}.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"
@@ -130,7 +130,7 @@ module Mongoid
           if i18n # memoize call to translate... good idea?
             define_method "#{attr_name}_text" do
               return nil unless attr = read_attribute(attr_name)
-              I18n.t("mongoid.attributes.#{ActiveSupport::Inflector.underscore(self.class)}.enums.#{attr_name}.#{attr}")
+              I18n.t("mongoid.attributes.#{ActiveSupport::Inflector.underscore(self.class.model_name)}.enums.#{attr_name}.#{attr}")
             end
           elsif enum
             class_eval("def #{attr_name}_text; #{attr_name.to_s.upcase}_VALUES[#{attr_name}]; end")

data/lib/symbolize/version.rb

@@ -1,3 +1,3 @@
 module Symbolize
-  VERSION = '4.0.4'
+  VERSION = '4.1.0'
 end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
+# require 'pry'
 begin
   require 'spec'
 rescue LoadError
   require 'rspec'
 end
-require 'pry'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,148 +1,142 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: symbolize
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 4
-  - 0
-  - 4
-  segments_generated: true
-  version: 4.0.4
+version: !ruby/object:Gem::Version
+  version: 4.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-28 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &15795620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        segments_generated: true
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15795620
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &15794700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 7
-        - 0
-        segments_generated: true
-        version: 2.7.0
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15794700
+- !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &15788120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
-        segments_generated: true
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15788120
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &15787540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: *15787540
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &15786880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *15786880
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: &15786040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: *15786040
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &15784660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 1
-        segments_generated: true
-        version: 3.1.1
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *15784660
 description: ActiveRecord/Mongoid enums with i18n
 email: x@nofxx.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/symbolize.rb
-- lib/symbolize/active_record.rb
 - lib/symbolize/mongoid.rb
 - lib/symbolize/version.rb
+- lib/symbolize/active_record.rb
 - lib/symbolize/railtie.rb
+- spec/support/ar_models.rb
+- spec/support/mongoid_models.rb
+- spec/spec_helper_ar.rb
+- spec/locales/en.yml
+- spec/locales/pt.yml
+- spec/symbolize_spec.rb
 - spec/spec_helper_mongoid.rb
 - spec/spec_helper.rb
-- spec/symbolize_spec.rb
-- spec/spec_helper_ar.rb
-- spec/symbolize/active_record_spec.rb
 - spec/symbolize/mongoid_spec.rb
+- spec/symbolize/active_record_spec.rb
 - spec/db/001_create_testing_structure.rb
-- spec/support/mongoid_models.rb
-- spec/support/ar_models.rb
-- spec/locales/pt.yml
-- spec/locales/en.yml
 - README.rdoc
 - Rakefile
-has_rdoc: true
 homepage: http://github.com/nofxx/symbolize
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3271037607239981482
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1782796710470930293
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Object enums with i18n in AR or Mongoid
 test_files: []
-