symbolize 4.3.0 → 4.3.1

data/README.rdoc

@@ -13,7 +13,7 @@ and can be set using :symbols or "strings".
 
 === Gemfile
 
-    gem "symbolize"
+    gem 'symbolize'
 
 
 == About
@@ -27,6 +27,7 @@ On schema DBs, the attribute should be a string (varchar) column.
 
 == Usage
 
+
 ActiveRecord:
 
     class Contact < ActiveRecord::Base
@@ -36,20 +37,11 @@ ActiveRecord:
 
 Mongoid:
 
-    require 'symbolize/mongoid'
-
     class Contact
       include Mongoid::Symbolize
 
       symbolize :kind, :in => [:im, :mobile, :email], :scopes => true
 
-or just
-
-    class Contact
-      include Symbolize::Mongoid
-
-      symbolize :kind, :in => [:im, :mobile, :email], :scopes => true
-
 
 Other examples:
 
@@ -77,18 +69,20 @@ Other examples:
 
 === in/within
 
-The values allowed on the enum field, you can provide a hash like
+You can provide a hash like for values allowed on the field, e.g.:
 {:value => "Human text"} or an array of keys to run i18n on.
 Booleans are also supported. See below.
 
-allow_(blank|nil): What you expect.
-
 
-=== validate
+=== Validate
 
 Set to false to avoid the validation of the input.
 Useful for a dropdown with an "other" option textfield.
 
+    symbolize :color, :in => [:green, :red, :blue], :validate => false
+
+There's is also allow_(blank|nil): As you expect.
+
 
 === method
 
@@ -139,7 +133,7 @@ You can skip i18n lookup with :i18n => false
     symbolize :style, :in => [:rock, :punk, :funk, :jazz], :i18n => false
 
 
-=== scopes
+=== Scopes
 
 If you provide the scopes option, some fancy named scopes will be added:
 In our User example, gender has male/female options, so you can do:
@@ -163,7 +157,7 @@ For boolean colums you can use
     ( or with_[attribute] and without_[attribute] )
 
 
-=== default
+=== Default
 
 As the name suggest, the symbol you choose as default will be set
 in new objects automatically. Mongoid only for now.
@@ -190,19 +184,6 @@ Somewhere on a view:
 
     = select_tag :kind, Coffee.get_genetic_values
 
-
-== View Helpers (DEPRECATED)
-
-
-  <% form_for @user do |f| %>
-    <%= f.radio_sym "gender" %>
-    <!-- Alphabetic order -->
-    <%= f.select_sym "so" %>
-    <!-- Fixed order -->
-    <%= f.select_sym "office" %>
-  <%end>
-
-
 == Specs
 
 Run the adapter independently:
@@ -215,4 +196,3 @@ Run the adapter independently:
 
 This fork:
 http://github.com/nofxx/symbolize
-

data/lib/symbolize.rb

@@ -1,7 +1,7 @@
+# Todo: is this the best way for AR?
 module Symbolize
   autoload :ActiveRecord, 'symbolize/active_record'
-  autoload :Mongoid, 'symbolize/mongoid'
 end
 
-require 'symbolize/railtie' if defined? Rails
-
+require 'symbolize/mongoid' if defined? 'Mongoid'
+require 'symbolize/railtie' if defined? 'Rails'

data/lib/symbolize/mongoid.rb

@@ -108,16 +108,13 @@ module Mongoid
             end
 
             if scopes
-              values.each do |k, v|
-                if k.respond_to?(:to_sym)
-                  scope k.to_sym, where({ attr_name => k.to_sym })
-                end
-              end
+              # scoped scopes
+              scope attr_name, ->(enum) { where(attr_name => enum) }
             end
 
             if validation
-              v = "validates :#{attr_names.join(', :')}"
-              v += ",:inclusion => { :in => #{values.keys.inspect} }"
+              v = "validates :#{attr_names.join(', :')}" +
+                ",:inclusion => { :in => #{values.keys.inspect} }"
               v += ",:allow_nil => true"   if configuration[:allow_nil]
               v += ",:allow_blank => true" if configuration[:allow_blank]
               class_eval v

data/lib/symbolize/version.rb

@@ -1,3 +1,3 @@
 module Symbolize
-  VERSION = '4.3.0'
+  VERSION = '4.3.1'
 end

data/spec/symbolize/active_record_spec.rb

@@ -253,7 +253,7 @@ describe "Symbolize" do
 
     end
 
-    describe "Methods" do
+    describe "Changes" do
 
       it "is dirty if you change the attribute value" do
         subject.language.should == :pt
@@ -269,7 +269,15 @@ describe "Symbolize" do
         subject.language_changed?.should be_false
 
         return_value = subject.language = :pt
-          return_value.should == :pt
+        return_value.should == :pt
+        subject.language_changed?.should be_false
+      end
+
+      it "is not dirty if you set the attribute value to the same value (string)" do
+        subject.language.should == :pt
+        subject.language_changed?.should be_false
+
+        return_value = subject.language = 'pt'
         subject.language_changed?.should be_false
       end
 

data/spec/symbolize/mongoid_spec.rb

@@ -98,6 +98,12 @@ describe "Symbolize" do
       person[:status].should eql(:active)
     end
 
+    it "should make strings symbols from initializer" do
+      other = Person.new(language: 'en', :so => :mac, :gui => :cocoa, :language => :pt, :sex => true, :status => 'active')
+      other[:status].should eq(:active)
+      other.status.should eq(:active)
+    end
+
     # it "should work nice with numbers" do
     #   pending
     #   person.status = 43
@@ -177,17 +183,6 @@ describe "Symbolize" do
       person.other_text.should eql("foo")
     end
 
-    it "should validate status" do
-      person.status = nil
-      person.should_not be_valid
-      person.should have(1).errors
-    end
-
-    it "should not validate so" do
-      person.so = nil
-      person.should be_valid
-    end
-
     it "should work with weird chars" do
       person.status = :"weird'; chars"
       person.status.should eql(:"weird'; chars")
@@ -203,20 +198,42 @@ describe "Symbolize" do
       person.skills.first.kind.should eql(:magic)
     end
 
-    # it "should play fine with null db columns" do
-    #   new_extra = person.extras.build
-    #   new_extra.should_not be_valid
-    # end
-
-    # it "should play fine with null db columns" do
-    #   new_extra = person.extras.build
-    #   new_extra.should_not be_valid
-    # end
-
     it "should default planet to earth" do
       Person.new.planet.should eql(:earth)
     end
 
+    describe "validation" do
+
+      it "should validate from initializer" do
+        other = Person.new(language: 'en', :so => :mac, :gui => :cocoa, :language => :pt, :sex => true, :status => 'active')
+        other.should be_valid
+        other.errors.messages.should eq({})
+      end
+
+      it "should validate nil" do
+        person.status = nil
+        person.should_not be_valid
+        person.errors.messages.should have_key(:status)
+      end
+
+      it "should validate not included" do
+        person.language = 'xx'
+        person.should_not be_valid
+        person.errors.messages.should have_key(:language)
+      end
+
+      it "should not validate so" do
+        person.so = nil
+        person.should be_valid
+      end
+
+      it "should validate ok" do
+        person.language = 'pt'
+        person.should be_valid
+        person.errors.messages.should eq({})
+      end
+
+    end
 
     describe "i18n" do
 
@@ -342,6 +359,12 @@ describe "Symbolize" do
       Project.count.should eql(1)
     end
 
+    it "should set some scopes" do
+      Person.create(:name => 'Bob' , :other => :bar, :status => :active, :so => :mac, :gui => :gtk, :language => :en, :sex => false, :cool => false)
+      Person.status(:active).should be_a(Mongoid::Criteria)
+      Person.status(:active).count.should eq(1)
+    end
+
   end
 
   describe "Mongoid stuff" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symbolize
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -669350637973584292
+      hash: -387453274023359957
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: