symbolize 3.2.0 → 3.3.0pre

data/README.rdoc

@@ -175,7 +175,22 @@ As the name suggest, the symbol you choose as default will be set in new objects
   u.save                          # => validation fails
 
 
-== Examples Helpers
+== Model Helpers
+
+
+You may call `Class.get_attr_values` anywhere to get a nice array.
+Works nice with dropdowns. Examples:
+
+    class Coffee
+      symbolize :genetic, :in => [:arabica, :robusta, :blend]
+    end
+
+Somewhere on a view:
+
+    = select_tag :kind, Coffee.get_genetic_values
+
+
+== View Helpers
 
   <% form_for @user do |f| %>
     <%= f.radio_sym "gender" %>

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/lib/symbolize.rb

@@ -60,7 +60,6 @@ module Symbolize
       default_option = configuration.delete :default
 
       unless enum.nil?
-        # enum = enum.map { |e| e.respond_to?(:to_sym) ? e.to_sym : e}
         # Little monkeypatching, <1.8 Hashes aren't ordered.
         hsh = RUBY_VERSION > '1.9' || !defined?("ActiveSupport") ? Hash : ActiveSupport::OrderedHash
 
@@ -101,13 +100,13 @@ module Symbolize
             values.each do |value|
               if value[0].respond_to?(:to_sym)
                 scope_comm.call value[0].to_sym, :conditions => { attr_name => value[0].to_sym }
-              else
+              elsif ActiveRecord::VERSION::STRING <= "3.0"
                 if value[0] == true || value[0] == false
-                  scope_comm.call "with_#{attr_name}",    :conditions => { attr_name => true }
-                  scope_comm.call "without_#{attr_name}", :conditions => { attr_name => false }
+                  scope_comm.call "with_#{attr_name}".to_sym,    :conditions => { attr_name => '1' }
+                  scope_comm.call "without_#{attr_name}".to_sym, :conditions => { attr_name => '0' }
 
-                  scope_comm.call attr_name.to_sym,   :conditions => { attr_name => true }
-                  scope_comm.call "not_#{attr_name}", :conditions => { attr_name => false }
+                  scope_comm.call attr_name.to_sym,   :conditions => { attr_name => '1' }
+                  scope_comm.call "not_#{attr_name}".to_sym, :conditions => { attr_name => '0' }
                 end
               end
             end
@@ -166,13 +165,7 @@ module Symbolize
     val = { "true" => true, "false" => false }[value]
     val = symbolize_attribute(value) if val.nil?
 
-    current_value = self.send(attr_name)
-    if current_value == val
-      current_value
-    else
-      self[attr_name] = val
-      val
-    end
+    self[attr_name] = val #.to_s # rails 3.1 fix
   end
 end
 
@@ -189,12 +182,12 @@ end
 #       only used on symbols returned by read_and_symbolize_attribute,
 #       but unfortunately this is not possible since Symbol is an immediate
 #       value and therefore does not support singleton methods.
-class Symbol
-  def quoted_id
-    # A symbol can contain almost every character (even a backslash or an
-    # apostrophe), so make sure to properly quote the string value here.
-    "'#{ActiveRecord::Base.connection.quote_string(self.to_s)}'"
-  end
-end
+# class Symbol
+#   def quoted_id
+#     # A symbol can contain almost every character (even a backslash or an
+#     # apostrophe), so make sure to properly quote the string value here.
+#     "'#{ActiveRecord::Base.connection.quote_string(self.to_s)}'"
+#   end
+# end
 
 ActiveRecord::Base.send(:include, Symbolize) if ActiveRecord::VERSION::MAJOR >= 3

data/spec/db/{create_testing_structure.rb → 001_create_testing_structure.rb}

@@ -1,5 +1,5 @@
 class CreateTestingStructure < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :users do |t|
       t.string :name, :so, :gui, :other, :status, :language, :kind
       t.string :limited, :limit => 10
@@ -22,8 +22,4 @@ class CreateTestingStructure < ActiveRecord::Migration
       t.integer :lvl,  :null => false
     end
   end
-
-  def self.down
-    drop_table :users
-  end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ begin
 rescue LoadError
   require 'rspec'
 end
+require 'pry'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -12,13 +13,18 @@ require 'action_controller'
 require 'action_view'
 require 'symbolize'
 require File.join(File.dirname(__FILE__), '..', 'init')
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:") #'postgresql', :database => 'symbolize_test', :username => 'postgres')
+
+if ActiveRecord::VERSION::STRING >= "3.1"
+  ActiveRecord::Migrator.migrate("spec/db")
+else
+  require "db/001_create_testing_structure"
+  CreateTestingStructure.migrate(:up)
+end
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-require File.dirname(__FILE__) + "/db/create_testing_structure"
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), "locales", "*.{rb,yml}")]
 I18n.default_locale = "pt"
-CreateTestingStructure.migrate(:up)
 
-puts "Running AR #{ActiveRecord::VERSION::MAJOR}"
+puts "Running AR #{ActiveRecord::VERSION::STRING}"
 # Spec::Runner.configure do |config|
 # end

data/spec/symbolize_spec.rb

@@ -68,7 +68,7 @@ describe "Symbolize" do
     it "test_symbolize_symbol" do
       @user.status = :active
       @user.status.should eql(:active)
-      @user.status_before_type_cast.should eql('active')
+      @user.status_before_type_cast.should eql(:active)
       # @user.read_attribute(:status).should eql('active')
     end
 
@@ -94,6 +94,7 @@ describe "Symbolize" do
     end
 
     it "test_symbols_quoted_id" do
+      pending
       @user.status = :active
       @user.status.quoted_id.should eql("'active'")
     end
@@ -390,10 +391,12 @@ describe "Symbolize" do
 
           return_value = @anna.language = :pt
           return_value.should == :pt
+          p @anna.changes
           @anna.language_changed?.should be_false
         end
       end
 
+      if  ActiveRecord::VERSION::STRING <= "3.0"
       describe "Named Scopes" do
 
         before do
@@ -426,6 +429,7 @@ describe "Symbolize" do
         end
 
       end
+      end
 
     end
 

data/symbolize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{symbolize}
-  s.version = "3.2.0"
+  s.version = "3.3.0pre"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2011-07-12}
   s.description = %q{ActiveRecord enums with i18n}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     "lib/symbolize/railtie.rb",
     "lib/symbolize/symbolize_helper.rb",
     "rails/init.rb",
-    "spec/db/create_testing_structure.rb",
+    "spec/db/001_create_testing_structure.rb",
     "spec/locales/en.yml",
     "spec/locales/pt.yml",
     "spec/spec_helper.rb",

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: symbolize
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 3
-  - 2
-  - 0
-  version: 3.2.0
+  - 3
+  - 0pre
+  version: 3.3.0pre
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -03:00
+date: 2011-07-12 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ files:
 - lib/symbolize/railtie.rb
 - lib/symbolize/symbolize_helper.rb
 - rails/init.rb
-- spec/db/create_testing_structure.rb
+- spec/db/001_create_testing_structure.rb
 - spec/locales/en.yml
 - spec/locales/pt.yml
 - spec/spec_helper.rb