symbolize 4.0.3 → 4.0.4

data/Rakefile

@@ -1,6 +1,30 @@
+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"
+
+task :gem => :build
+task :build do
+  system "gem build symbolize.gemspec"
+end
+
+task :install => :build do
+  system "sudo gem install symbolize-#{Symbolize::VERSION}.gem"
+end
+
+task :release => :build do
+  system "git tag -a v#{Symbolize::VERSION} -m 'Tagging #{Symbolize::VERSION}'"
+  system "git push --tags"
+  system "gem push symbolize-#{Symbolize::VERSION}.gem"
+end
+
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end

data/lib/symbolize/active_record.rb

@@ -91,7 +91,7 @@ module Symbolize
             values.each do |value|
               key = value[0]
               define_method("#{key}?") do
-                self[attr_name] == key
+                self[attr_name].to_s == key.to_s
               end
             end
           end
@@ -99,16 +99,11 @@ module Symbolize
           if scopes
             scope_comm = lambda { |*args| ActiveRecord::VERSION::MAJOR >= 3 ? scope(*args) : named_scope(*args)}
             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 }
-              elsif ActiveRecord::VERSION::STRING <= "3.0"
-                if value[0] == true || value[0] == 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 => '1' }
-                  scope_comm.call "not_#{attr_name}".to_sym, :conditions => { attr_name => '0' }
-                end
+              name = value[0]
+              if name.respond_to?(:to_sym)
+                scope_comm.call name.to_sym, :conditions => { attr_name => name }
+                # Figure out if this as another option, or default...
+                # scope_comm.call "not_#{attr_name}".to_sym, :conditions => { attr_name != name }
               end
             end
           end
@@ -171,7 +166,7 @@ module Symbolize
     val = { "true" => true, "false" => false }[value]
     val = symbolize_attribute(value) if val.nil?
 
-    self[attr_name] = val #.to_s # rails 3.1 fix
+    self[attr_name] = val #.to_s
   end
 end
 

data/lib/symbolize/version.rb

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

data/spec/db/001_create_testing_structure.rb

@@ -1,7 +1,8 @@
 class CreateTestingStructure < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.string :name, :so, :gui, :other, :status, :language, :kind
+      t.string :name, :so, :gui, :other, :language, :kind
+      t.string :status, :default => :active
       t.string :limited, :limit => 10
       t.string :karma, :limit => 5
       t.boolean :sex

data/spec/locales/pt.yml

@@ -14,6 +14,9 @@ pt:
           kind:
             magic: Mágica
             agility: Agilidade
+    errors:
+      messages: &errors_messages
+        record_invalid: Inválido
   mongoid:
     attributes:
       person:

data/spec/spec_helper_ar.rb

@@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 require 'active_record'
 require 'symbolize/active_record'
-
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:") #'postgresql', :database => 'symbolize_test', :username => 'postgres')
 
 if ActiveRecord::VERSION::STRING >= "3.1"
@@ -12,6 +11,17 @@ else
   CreateTestingStructure.migrate(:up)
 end
 
+require 'support/ar_models'
+
 puts "Running AR #{ActiveRecord::VERSION::STRING}"
 # Spec::Runner.configure do |config|
 # end
+
+RSpec.configure do |config|
+
+  config.after(:each) do
+    [User, Permission].each { |klass| klass.delete_all }
+  end
+
+end
+

data/spec/spec_helper_mongoid.rb

@@ -2,8 +2,16 @@ require File.dirname(__FILE__) + '/spec_helper'
 require 'mongoid'
 
 Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db("symbolize_#{Time.now.to_i}")
+  config.master = Mongo::Connection.new.db("symbolize_test")
 end
 
-require 'symbolize/mongoid'
+Mongoid.database.collections.each do |collection|
+  unless collection.name =~ /^system\./
+    collection.remove
+  end
+end
 
+puts "Running Mongoid 2"
+
+require 'symbolize/mongoid'
+require 'support/mongoid_models'

data/spec/support/ar_models.rb

@@ -0,0 +1,41 @@
+
+#
+# Test model
+class User < ActiveRecord::Base
+  symbolize :other
+  symbolize :language, :in => [:pt, :en]
+  symbolize :sex, :in => [true, false], :scopes => true
+  symbolize :status , :in => [:active, :inactive], :i18n => false, :capitalize => true, :scopes => true, :methods => true
+  symbolize :so, :allow_blank => true, :in => {
+    :linux => 'Linux',
+    :mac   => 'Mac OS X',
+    :win   => 'Videogame'
+  }, :scopes => true
+  symbolize :gui, :allow_blank => true, :in => [:cocoa, :qt, :gtk], :i18n => false
+  symbolize :karma, :in => %w{ good bad ugly}, :methods => true, :i18n => false, :allow_nil => true
+  symbolize :cool, :in => [true, false], :scopes => true
+
+  has_many :extras, :dependent => :destroy, :class_name => "UserExtra"
+  has_many :access, :dependent => :destroy, :class_name => "UserAccess"
+end
+
+class UserSkill < ActiveRecord::Base
+  symbolize :kind, :in => [:agility, :magic]
+end
+
+class UserExtra < ActiveRecord::Base
+  symbolize :key, :in => [:one, :another]
+end
+
+class Permission < ActiveRecord::Base
+  validates_presence_of :name
+  symbolize :kind, :in => [:temp, :perm], :default => :perm
+  symbolize :lvl, :in => (1..9).to_a, :i18n => false#, :default => 1
+end
+
+# Make with_scope public-usable for testing
+#if ActiveRecord::VERSION::MAJOR < 3
+class << ActiveRecord::Base
+  public :with_scope
+end
+#end

data/spec/support/mongoid_models.rb

@@ -0,0 +1,64 @@
+
+#
+# Test model
+class Person
+  include Mongoid::Document
+  include Mongoid::Symbolize
+  include Mongoid::Timestamps
+
+  symbolize :other
+  symbolize :language, :in => [:pt, :en]
+#  symbolize :sex, :in => [true, false], :scopes => true
+  symbolize :status , :in => [:active, :inactive], :i18n => false, :capitalize => true, :scopes => true
+  symbolize :so, :allow_blank => true, :in => {
+    :linux => 'Linux',
+    :mac   => 'Mac OS X',
+    :win   => 'Videogame'
+  }, :scopes => true
+  symbolize :gui, :allow_blank => true, :in => [:cocoa, :qt, :gtk], :i18n => false
+  symbolize :karma, :in => %w{good bad ugly}, :methods => true, :i18n => false, :allow_nil => true
+  symbolize :planet, :in => %w{earth centauri tatooine}, :default => :earth
+ # symbolize :cool, :in => [true, false], :scopes => true
+
+  has_many :rights, :dependent => :destroy
+  has_many :extras, :dependent => :destroy, :class_name => "PersonExtra"
+  embeds_many :skills, :class_name => "PersonSkill"
+end
+
+class PersonSkill
+  include Mongoid::Document
+  include Mongoid::Symbolize
+  embedded_in :person, :inverse_of => :skills
+
+  symbolize :kind, :in => [:agility, :magic]
+end
+
+class PersonExtra
+  include Mongoid::Document
+  include Mongoid::Symbolize
+  belongs_to :person, :inverse_of => :extras
+
+  symbolize :key, :in => [:one, :another]
+end
+
+class Right
+  include Mongoid::Document
+  include Mongoid::Symbolize
+
+  validates_presence_of :name
+  symbolize :kind, :in => [:temp, :perm], :default => :perm
+end
+
+
+class Project
+  include Mongoid::Document
+
+  field :name
+  field :state, :default => 'active'
+
+  # Comment 1 line and it works, both fails:
+  default_scope where(:state => 'active')
+ # scope :inactive, any_in(:state => [:done, :wip])
+  scope :dead, all_of(:state => :wip, :name => "zim")
+
+end

data/spec/symbolize/active_record_spec.rb

@@ -1,61 +1,28 @@
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper_ar'
 
-#
-# Test model
-class User < ActiveRecord::Base
-  symbolize :other
-  symbolize :language, :in => [:pt, :en]
-  symbolize :sex, :in => [true, false], :scopes => true
-  symbolize :status , :in => [:active, :inactive], :i18n => false, :capitalize => true, :scopes => true
-  symbolize :so, :allow_blank => true, :in => {
-    :linux => 'Linux',
-    :mac   => 'Mac OS X',
-    :win   => 'Videogame'
-  }, :scopes => true
-  symbolize :gui, :allow_blank => true, :in => [:cocoa, :qt, :gtk], :i18n => false
-  symbolize :karma, :in => %w{ good bad ugly}, :methods => true, :i18n => false, :allow_nil => true
-  symbolize :cool, :in => [true, false], :scopes => true
-
-  has_many :extras, :dependent => :destroy, :class_name => "UserExtra"
-  has_many :access, :dependent => :destroy, :class_name => "UserAccess"
-end
-
-class UserSkill < ActiveRecord::Base
-  symbolize :kind, :in => [:agility, :magic]
-end
-
-class UserExtra < ActiveRecord::Base
-  symbolize :key, :in => [:one, :another]
-end
-
-class Permission < ActiveRecord::Base
-  validates_presence_of :name
-  symbolize :kind, :in => [:temp, :perm], :default => :perm
-  symbolize :lvl, :in => (1..9).to_a, :i18n => false#, :default => 1
-end
-
-# Make with_scope public-usable for testing
-#if ActiveRecord::VERSION::MAJOR < 3
-class << ActiveRecord::Base
-  public :with_scope
-end
-#end
-
-# Test records
-User.create(:name => 'Anna', :other => :fo, :status => :active  , :so => :linux, :gui => :qt, :language => :pt, :sex => true, :cool => true)
-User.create!(:name => 'Bob' , :other => :bar,:status => :inactive, :so => :mac, :gui => :gtk, :language => :en, :sex => false, :cool => false)
-
-
 describe "Symbolize" do
 
   it "should respond to symbolize" do
     ActiveRecord::Base.should respond_to :symbolize
   end
 
+  it "should have a valid blueprint" do
+    # Test records
+    u = User.create(:name => 'Bob' , :other => :bar,:status => :inactive, :so => :mac, :gui => :gtk, :language => :en, :sex => false, :cool => false)
+    u.errors.messages.should eql({})
+  end
+
+  it "should work nice with default values from active model" do
+    u = User.create(:name => 'Niu' , :other => :bar, :so => :mac, :gui => :gtk, :language => :en, :sex => false, :cool => false)
+    u.errors.messages.should eql({})
+    u.status.should eql(:active)
+    u.should be_active
+  end
+
   describe "User Instantiated" do
     before(:each) do
-      @user = User.first
+      @user = User.create(:name => 'Anna', :other => :fo, :status => :active  , :so => :linux, :gui => :qt, :language => :pt, :sex => true, :cool => true)
     end
 
     it "test_symbolize_string" do
@@ -238,6 +205,28 @@ describe "Symbolize" do
 
     end
 
+    describe "Methods" do
+
+      it "is dirty if you change the attribute value" do
+        @user.language.should == :pt
+        @user.language_changed?.should be_false
+
+        return_value = @user.language = :en
+        return_value.should == :en
+        @user.language_changed?.should be_true
+      end
+
+      it "is not dirty if you set the attribute value to the same value" do
+        @user.language.should == :pt
+        @user.language_changed?.should be_false
+
+        return_value = @user.language = :pt
+          return_value.should == :pt
+        @user.language_changed?.should be_false
+      end
+
+    end
+
   end
 
   describe "more tests on Permission" do
@@ -263,6 +252,7 @@ describe "Symbolize" do
     end
 
     it "should work on edit" do
+      Permission.create!(:name => "p8", :lvl => 9)
       pm = Permission.find_by_name("p8")
       pm.kind = :temp
       pm.save
@@ -278,125 +268,47 @@ describe "Symbolize" do
 
   end
 
-  describe "ActiveRecord stuff" do
-
-    #
-    #  ActiveRecord <= 2
-    #
-    if ActiveRecord::VERSION::MAJOR <= 2
-
-      it "test_symbolized_finder" do
-        User.find(:all, :conditions => { :status => :inactive }).map(&:name).should eql(['Bob'])
-        User.find_all_by_status(:inactive).map(&:name).should eql(['Bob'])
-      end
+  describe "Named Scopes" do
 
-      it "test_symbolized_with_scope" do
-        User.with_scope(:find => { :conditions => { :status => :inactive }}) do
-          User.find(:all).map(&:name).should eql(['Bob'])
-        end
-      end
-
-      describe "dirty tracking / changed flag" do
-        before do
-          @anna = User.find_by_name!('Anna')
-        end
-
-        it "is dirty if you change the attribute value" do
-          @anna.language.should == :pt
-          @anna.language_changed?.should be_false
-
-          return_value = @anna.language = :en
-          return_value.should == :en
-          @anna.language_changed?.should be_true
-        end
-
-        it "is not dirty if you set the attribute value to the same value it was originally" do
-          @anna.language.should == :pt
-          @anna.language_changed?.should be_false
-
-          return_value = @anna.language = :pt
-          return_value.should == :pt
-          @anna.language_changed?.should be_false
-        end
-      end
-
-      #
-      #  ActiveRecord >= 3
-      #
-    else
-
-      it "test_symbolized_finder" do
-        User.where({ :status => :inactive }).all.map(&:name).should eql(['Bob'])
-        User.find_all_by_status(:inactive).map(&:name).should eql(['Bob'])
-      end
-
-      it "test_symbolized_with_scope" do
-        User.with_scope(:find => { :conditions => { :status => :inactive }}) do
-          User.find(:all).map(&:name).should eql(['Bob'])
-        end
-      end
-
-      describe "dirty tracking / changed flag" do
-        before do
-          @anna = User.find_by_name!('Anna')
-        end
-
-        it "is dirty if you change the attribute value" do
-          @anna.language.should == :pt
-          @anna.language_changed?.should be_false
-
-          return_value = @anna.language = :en
-          return_value.should == :en
-          @anna.language_changed?.should be_true
-        end
+    before do
+      @anna = User.create(:name => 'Anna', :other => :fo, :status => :active  , :so => :linux, :gui => :qt, :language => :pt, :sex => true, :cool => true)
+      @mary = User.create(:name => 'Mary', :other => :fo, :status => :inactive, :so => :mac,   :language => :pt, :sex => true, :cool => true)
+    end
 
-        it "is not dirty if you set the attribute value to the same value" do
-          @anna.language.should == :pt
-          @anna.language_changed?.should be_false
+    it "test_symbolized_finder" do
+      User.where({ :status => :inactive }).all.map(&:name).should eql(['Mary'])
+      User.find_all_by_status(:inactive).map(&:name).should eql(['Mary'])
+    end
 
-          return_value = @anna.language = :pt
-          return_value.should == :pt
-          @anna.language_changed?.should be_false
-        end
+    it "test_symbolized_with_scope" do
+      User.with_scope(:find => { :conditions => { :status => :inactive }}) do
+        User.all.map(&:name).should eql(['Mary'])
       end
+    end
 
-      if  ActiveRecord::VERSION::STRING <= "3.0"
-      describe "Named Scopes" do
-
-        before do
-          @anna = User.find_by_name!('Anna')
-          @bob = User.find_by_name!('Bob')
-        end
-
-        it "should have main named scope" do
-          User.inactive.should == [@bob]
-        end
-
-        it "should have other to test better" do
-          User.linux.should == [@anna]
-        end
-
-        it "should have 'with' helper" do
-          User.with_sex.should == [@anna]
-        end
+    it "should have main named scope" do
+      User.inactive.should == [@mary]
+    end
 
-        it "should have 'without' helper" do
-          User.without_sex.should == [@bob]
-        end
+    it "should have other to test better" do
+      User.linux.should == [@anna]
+    end
 
-        it "should have 'attr_name' helper" do
-          User.cool.should == [@anna]
-        end
+    # it "should have 'with' helper" do
+    #   User.with_sex.should == [@anna]
+    # end
 
-        it "should have 'not_attr_name' helper" do
-          User.not_cool.should == [@bob]
-        end
+    # it "should have 'without' helper" do
+    #   User.without_sex.should == [@bob]
+    # end
 
-      end
-      end
+    # it "should have 'attr_name' helper" do
+    #   User.cool.should == [@anna]
+    # end
 
-    end
+    # it "should have 'not_attr_name' helper" do
+    #   User.not_cool.should == [@bob]
+    # end
 
   end
-
 end

data/spec/symbolize/mongoid_spec.rb

@@ -1,55 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper_mongoid'
 
-#
-# Test model
-class Person
-  include Mongoid::Document
-  include Mongoid::Symbolize
-
-  symbolize :other
-  symbolize :language, :in => [:pt, :en]
-#  symbolize :sex, :in => [true, false], :scopes => true
-  symbolize :status , :in => [:active, :inactive], :i18n => false, :capitalize => true, :scopes => true
-  symbolize :so, :allow_blank => true, :in => {
-    :linux => 'Linux',
-    :mac   => 'Mac OS X',
-    :win   => 'Videogame'
-  }, :scopes => true
-  symbolize :gui, :allow_blank => true, :in => [:cocoa, :qt, :gtk], :i18n => false
-  symbolize :karma, :in => %w{good bad ugly}, :methods => true, :i18n => false, :allow_nil => true
-  symbolize :planet, :in => %w{earth centauri tatooine}, :default => :earth
- # symbolize :cool, :in => [true, false], :scopes => true
-
-  has_many :rights, :dependent => :destroy
-  has_many :extras, :dependent => :destroy, :class_name => "PersonExtra"
-  embeds_many :skills, :class_name => "PersonSkill"
-end
-
-class PersonSkill
-  include Mongoid::Document
-  include Mongoid::Symbolize
-  embedded_in :person, :inverse_of => :skills
-
-  symbolize :kind, :in => [:agility, :magic]
-end
-
-class PersonExtra
-  include Mongoid::Document
-  include Mongoid::Symbolize
-  belongs_to :person, :inverse_of => :extras
-
-  symbolize :key, :in => [:one, :another]
-end
-
-class Right
-  include Mongoid::Document
-  include Mongoid::Symbolize
-
-  validates_presence_of :name
-  symbolize :kind, :in => [:temp, :perm], :default => :perm
-end
-
 describe "Symbolize" do
 
   it "should be a module" do
@@ -279,6 +230,21 @@ describe "Symbolize" do
 
   end
 
+  describe "Scopes" do
+    it "should work under scope" do
+      # Person.with_scope({ :status => :inactive }) do
+      #   Person.all.map(&:name).should eql(['Bob'])
+      # end
+    end
+
+    it "should work under scope" do
+      Project.create(:name => "A", :state => :done)
+      Project.create(:name => "B", :state => :active)
+      Project.count.should eql(1)
+    end
+
+  end
+
   describe "Mongoid stuff" do
 
     it "test_symbolized_finder" do
@@ -288,12 +254,6 @@ describe "Symbolize" do
       Person.where(status: :inactive).map(&:name).should eql(['Bob'])
     end
 
-    # it "should work under scope" do
-    #   Person.with_scope({ :status => :inactive }) do
-    #     Person.all.map(&:name).should eql(['Bob'])
-    #   end
-    # end
-
     describe "dirty tracking / changed flag" do
       before do
         @anna = Person.where(name: 'Anna').first

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 4
   - 0
-  - 3
-  version: 4.0.3
+  - 4
+  segments_generated: true
+  version: 4.0.4
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-15 23:00:00 -03:00
+date: 2011-10-28 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,12 +29,13 @@ dependencies:
         - 0
         - 6
         - 0
+        segments_generated: true
         version: 0.6.0
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,14 +43,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 6
+        - 7
         - 0
-        version: 2.6.0
+        segments_generated: true
+        version: 2.7.0
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,13 +60,14 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 1
-        version: 2.3.1
+        - 0
+        segments_generated: true
+        version: 2.3.0
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: active_record
-  prerelease: false
+  name: activerecord
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,8 +77,10 @@ dependencies:
         - 3
         - 1
         - 1
+        segments_generated: true
         version: 3.1.1
   type: :development
+  prerelease: false
   version_requirements: *id004
 description: ActiveRecord/Mongoid enums with i18n
 email: x@nofxx.com
@@ -98,6 +103,8 @@ files:
 - spec/symbolize/active_record_spec.rb
 - spec/symbolize/mongoid_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
@@ -116,8 +123,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3271037607239981482
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -126,6 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []