activerecord-string-enum 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119c5e3985161d99305ceaffd9626b89e3f53e9b
-  data.tar.gz: c1ea2773a67525dd178650aba25b3253886f139a
+  metadata.gz: 265b860ca05e81e1cb56da1852509800557900a4
+  data.tar.gz: 7a67a8ca407f451eb76332e95a02653bdc6e7a90
 SHA512:
-  metadata.gz: cfe8875234b49015f76bd59272f2dc94400ebdeddd9c34f828017463ec842a8a781e5dbb367dba15a179decc10fd10f25d0b60e69c64071a8954ccd00df34dc1
-  data.tar.gz: 1d30978531fb961b3b6fd0fc6ee38dd7cefc1f99d21f57c49af114f7b567d4a0f4e929c2fd2fd840c1a92c34f112a5b185b5d31c9de8178457e74b232e5cbdbe
+  metadata.gz: f405376b1533f4269f80a3f57dd6eefb41a7d7ae63389501f767621bacaf3f106b5f4853d6d1f2962548426fbcfdb884c2a0fffe46f60b2be96b3ed8213f43c1
+  data.tar.gz: 8a4e0be3cb6f0bbbeec390ff840fe9885196d05f16c73fcfb41d4800d053642534d5192a3a5f8bee9e6ad01fe00923c0e56a987ae9e09eccc3f262d0deaff156

data/lib/active_record/string_enum.rb

@@ -75,7 +75,7 @@ module ActiveRecord
         return if value.blank?
 
         if mapping.include?(value.to_s)
-          value
+          value.to_sym
         else
           raise ArgumentError, "'#{value}' is not a valid #{name}"
         end
@@ -83,7 +83,7 @@ module ActiveRecord
 
       def deserialize(value)
         return if value.nil?
-        cast(value)
+        value.to_sym
       end
 
       def serialize(value)
@@ -111,9 +111,13 @@ module ActiveRecord
 
         # TODO: in Rails 4.2.1 this will be legal:
         # attribute name, EnumType.new(name, enum_values)
-        # instead of the next two lines:
+        # instead of the next lines:
         type = EnumType.new(name, enum_values)
-        define_method("#{name}=") { |value| self[name] = type.cast(value) }
+        define_method("#{name}=") do |value|
+          write_attribute(name, type.cast(value))
+        end
+
+        define_method(name) { type.deserialize(self[name]) }
 
         _enum_methods_module.module_eval do
           enum_values.each do |value|

data/lib/active_record/string_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module StringEnum
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/cases/str_enum_test.rb

@@ -18,8 +18,8 @@ class EnumTest < ActiveRecord::TestCase
   end
 
   test "query state with strings" do
-    assert_equal "proposed", @book.status
-    assert_equal "unread", @book.read_status
+    assert_equal :proposed, @book.status
+    assert_equal :unread, @book.read_status
   end
 
   test "find via scope" do
@@ -61,7 +61,7 @@ class EnumTest < ActiveRecord::TestCase
   test "enum changes" do
     old_status = @book.status
     @book.status = :published
-    assert_equal [old_status, 'published'], @book.changes[:status]
+    assert_equal [old_status, :published], @book.changes[:status]
   end
 
   test "enum attribute was" do
@@ -77,7 +77,7 @@ class EnumTest < ActiveRecord::TestCase
 
   test "enum attribute changed to" do
     @book.status = :published
-    assert @book.attribute_changed?(:status, to: 'published')
+    assert @book.attribute_changed?(:status, to: :published)
   end
 
   test "enum attribute changed from" do
@@ -89,7 +89,7 @@ class EnumTest < ActiveRecord::TestCase
   test "enum attribute changed from old status to new status" do
     old_status = @book.status
     @book.status = :published
-    assert @book.attribute_changed?(:status, from: old_status, to: 'published')
+    assert @book.attribute_changed?(:status, from: old_status, to: :published)
   end
 
   test "enum didn't change" do
@@ -246,7 +246,7 @@ class EnumTest < ActiveRecord::TestCase
       extend ActiveRecord::StringEnum
       def self.name; 'Book'; end
       str_enum status: [:proposed, :written]
-      validates_inclusion_of :status, in: ["written"]
+      validates_inclusion_of :status, in: [:written]
     end
     klass.delete_all
     invalid_book = klass.new(status: "proposed")
@@ -270,11 +270,11 @@ class EnumTest < ActiveRecord::TestCase
 
     book1 = klass1.proposed.create!
     book1.status = :written
-    assert_equal ['proposed', 'written'], book1.status_change
+    assert_equal [:proposed, :written], book1.status_change
 
     book2 = klass2.drafted.create!
     book2.status = :uploaded
-    assert_equal ['drafted', 'uploaded'], book2.status_change
+    assert_equal [:drafted, :uploaded], book2.status_change
   end
 
   test "enums are inheritable" do
@@ -286,10 +286,10 @@ class EnumTest < ActiveRecord::TestCase
 
     book1 = subklass1.proposed.create!
     book1.status = :written
-    assert_equal ['proposed', 'written'], book1.status_change
+    assert_equal [:proposed, :written], book1.status_change
 
     book2 = subklass2.drafted.create!
     book2.status = :uploaded
-    assert_equal ['drafted', 'uploaded'], book2.status_change
+    assert_equal [:drafted, :uploaded], book2.status_change
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-string-enum
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tinco Andringa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,4 +190,3 @@ test_files:
 - test/support/connection_helper.rb
 - test/support/ddl_helper.rb
 - test/support/schema_dumping_helper.rb
-has_rdoc: