symbolize 1.0.1 → 3.0.0

data/README.rdoc

@@ -26,13 +26,26 @@ Github: http://github.com/zargony/activerecord_symbolize
 
 Gem:
 
-  gem install nofxx-symbolize
-  config.gem "nofxx-symbolize", :lib => "symbolize"
+  gem install symbolize
+  config.gem "symbolize", :source => 'http://gemcutter.org'
+
+
+Rails 3+ Gemfile
+
+  gem "symbolize"
 
 
 Plugin:
 
-  ./script/plugin install git://github.com/nofxx/activerecord_symbolize.git
+  ./script/plugin install git://github.com/nofxx/symbolize.git
+
+or
+
+  rails plugin install in Rails3+
+
+== Rails 3 (beta)
+
+Specs pass with rails 3, but a scope :public == fail.
 
 
 == Usage
@@ -41,15 +54,17 @@ Add "symbolize :attr_name" to your model class. You may also want to add
 validates_inclusion_of to restrict the possible values (just like an enum).
 
     class User < ActiveRecord::Base
-      symbolize :gender, :in => [:female, :male]
+      symbolize :gender, :in => [:female, :male], :scopes => true
       symbolize :so, :in => {
         :linux   => "Linux",
         :mac     => "Mac OS X"
-      }
+      }, :scopes => 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
   end
 
+
 === in/within
 
 The values allowed on the enum field, you can provide a hash with
@@ -100,6 +115,25 @@ Its possible to use boolean fields also.
       "nil": Unknown
 
 
+=== scopes (BETA)
+
+If you provide the scopes option, some fancy named scopes will be added:
+In our User example, gender has this option, so you can do:
+
+    User.female => User.find(:all, :conditions => { :gender => :female })
+
+You can chain named scopes as well:
+
+    User.female.mac => User.find(:all, :conditions => { :gender => :female, :so => :mac })
+
+For boolean colums you can use
+
+    User.angry     => User.find(:all, :conditions => { :angry => true })
+    User.not_angry => User.find(:all, :conditions => { :angry => false })
+
+    ( or with_[attribute] and without_[attribute] )
+
+
 == Examples
 
   u = User.find_by_name('Anna')   # => #<User Anna>
@@ -109,6 +143,7 @@ Its possible to use boolean fields also.
   u.gender                        # => :male
 
   u = User.find(:all, :conditions => { :gender => :female })
+  u = User.female
 
   u = User.new(:name => 'ET', :gender => :unknown)
   u.save                          # => validation fails

data/Rakefile

@@ -12,6 +12,7 @@ begin
     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

data/VERSION

@@ -1 +1 @@
-1.0.1
+3.0.0

data/lib/symbolize.rb

@@ -46,6 +46,7 @@ module Symbolize
   module ClassMethods
     # Specifies that values of the given attributes should be returned
     # as symbols. The table column should be created of type string.
+
     def symbolize *attr_names
       configuration = {}
       configuration.update(attr_names.extract_options!)
@@ -53,12 +54,14 @@ module Symbolize
       enum = configuration[:in] || configuration[:within]
       i18n = configuration[:i18n].nil? && !enum.instance_of?(Hash) && enum ? true : configuration[:i18n]
       methods = configuration[:methods]
+      scopes = configuration[:scopes]
+      validation = configuration[:validation] != false
 
       unless enum.nil?
         # Little monkeypatching, <1.8 Hashes aren't ordered.
-        hsh = if RUBY_VERSION > '1.9' || !defined?('ActiveSupport')
+        hsh = if RUBY_VERSION > '1.9'
           Hash
-        else
+        elsif defined?('ActiveSupport')
           ActiveSupport::OrderedHash
         end
 
@@ -87,9 +90,29 @@ module Symbolize
               end
             end
           end
+
+
+          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 })
+                else
+                  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( attr_name.to_sym, :conditions => { attr_name => true })
+                    scope_comm.call( "not_#{attr_name}", :conditions => { attr_name => false })
+                  end
+                end
+            end
+          end
         end
 
-        class_eval "validates_inclusion_of :#{attr_names.join(', :')}, configuration"
+        if validation
+          class_eval "validates_inclusion_of :#{attr_names.join(', :')}, configuration"
+        end
       end
 
       attr_names.each do |attr_name|
@@ -154,3 +177,5 @@ class Symbol
     "'#{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

@@ -5,6 +5,8 @@ class CreateTestingStructure < ActiveRecord::Migration
       t.string :limited, :limit => 10
       t.string :karma, :limit => 5
       t.boolean :sex
+      t.boolean :public
+      t.boolean :cool
     end
     create_table :user_skills do |t|
       t.string :kind

data/spec/symbolize_spec.rb

@@ -6,16 +6,16 @@ require File.dirname(__FILE__) + '/spec_helper'
 class User < ActiveRecord::Base
   symbolize :other
   symbolize :language, :in => [:pt, :en]
-  symbolize :sex, :in => [true, false]
-  symbolize :status , :in => [:active, :inactive], :i18n => false, :capitalize => true
+  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 => [:good, :bad, :ugly], :methods => true, :i18n => false, :allow_nil => true
-
+  symbolize :cool, :in => [true, false], :scopes => true
 end
 
 class UserSkill < ActiveRecord::Base
@@ -23,19 +23,22 @@ class UserSkill < ActiveRecord::Base
 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)
-User.create(:name => 'Bob' , :other => :bar,:status => :inactive, :so => :mac, :gui => :gtk, :language => :en, :sex => false)
+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
+    p ActiveRecord::VERSION::MAJOR
     ActiveRecord::Base.should respond_to :symbolize
   end
 
@@ -147,15 +150,69 @@ describe "Symbolize" do
       #   assert_equal "'weird''; chars'", @user.status.quoted_id
     end
 
-    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 "ActiveRecord stuff" do
+
+      if ActiveRecord::VERSION::MAJOR < 3
+
+        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
+
+        it "test_symbolized_with_scope" do
+          User.with_scope(:find => { :conditions => { :status => :inactive }}) do
+            User.find(:all).map(&:name).should eql(['Bob'])
+          end
+        end
+
+      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 "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 'without' helper" do
+            User.without_sex.should == [@bob]
+          end
+
+          it "should have 'attr_name' helper" do
+            User.cool.should == [@anna]
+          end
+
+          it "should have 'not_attr_name' helper" do
+            User.not_cool.should == [@bob]
+          end
+
+        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 "View helpers" do

data/symbolize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{symbolize}
-  s.version = "1.0.1"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-01-22}
+  s.date = %q{2010-04-12}
   s.description = %q{ActiveRecord enums with i18n}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,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.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ActiveRecord enums with i18n}
   s.test_files = [
     "spec/db/create_testing_structure.rb",
@@ -49,11 +49,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: symbolize
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  prerelease: false
+  segments: 
+  - 3
+  - 0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,19 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 -02:00
+date: 2010-04-12 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: ActiveRecord enums with i18n
 email: x@nofxx.com
 executables: []
@@ -59,18 +78,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActiveRecord enums with i18n