rails_attr_enum 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 294b0316bab39b37461ec932a8aacf826401f714
-  data.tar.gz: 2d781e84e8ffd18095a210c26fc7a3afecd1083c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTZmNmQyMTg3YzVmN2VmYjgyNGFmZDJkYjZiMzhlYzFkYmRjMDRhMg==
+  data.tar.gz: !binary |-
+    NzUyMTU2NTJhMDIzYzY0NjU4MmJjMGE5MmE5ZGVjYzIwNDJiNTllOQ==
 SHA512:
-  metadata.gz: 59f6044b759d53a721eda593a369c21c7e6507b5869522b0896b2953e84a5f9b9afc328494d28e2bbb32d75af87e733c1fbabbdeff59b5b6159f0b04f15d5eb4
-  data.tar.gz: 8b506c2b581c60cdd6fda0b07e5f148072fd001df4be6f418f26cda960088b4606b0d492a00a28b742f0f13bfcb2ed985941b1412273522cdaadcbd2ce7a74a5
+  metadata.gz: !binary |-
+    MTM2MDQwMGRmYTU0ZWM5Njg1MTMxMzJjNWM1ZDUwZTFjNDI2MTZhMmZmZTI1
+    ODEwZDMyOWNhZDkyNmJlNDM5MjFiMWI0ZjQ0YmYxNTczNGI1MThkYzlhMDU4
+    NzRmNTQwYjZlM2JlNGU2ZmYzOThlMzhlYzJlYWMzNzI5Y2I3MGM=
+  data.tar.gz: !binary |-
+    OWVhOTEwNDM0YWJlYTg3ZTc4NGExNmRlNGRiNzhmNDcyNDQyNTY0MzdlZDdk
+    ZGNiM2M3NGQ1Y2QwMDIwNWE2OTU0Zjc1MjZjOTk1NTI0NDJkYWQ5NjYyNzY5
+    Y2ZhNzIxYzRkYmNhOTM5NWFlMmNmOGZmNGRkMmMzNjdhYWZmZTU=

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+### v0.0.6
+* Added example usage of extending `RailsAttrEnum` and calling
+  `attr_enum` in `User` model in test Rails app.
+* Fixed a bug that crashed the Rails environment when a model without an
+  existing table used `RailsAttrEnum`. An example of this happening
+  would be when someone tried to run `rake db:schema:load`.
+* Fixed a bug in `clear_user` in the spec_helper.rb file with calling
+  the private `remove_instance_variable` method on the test model
+  `User`.
+* Added `default_user_roles` to spec_helper.rb file, so a default usage
+  of extending `RailsAttrEnum` and calling `attr_enum` could be
+  established. This allows other future specs that depend on that
+  default usage to not be messed up by the user_spec.rb file which
+  alters `RailsAttrEnum` usage in `User` for different tests.
+
+### v0.0.5
+* Fix a bug with the 'to_json' and 'as_json' methods for a model that
+  has an enum attribute set up.

data/lib/rails_attr_enum.rb

@@ -32,7 +32,7 @@ module RailsAttrEnum
 
     @_attr_enums ||= {}
 
-    unless column_names.include?(attr.name)
+    if table_exists? && !column_names.include?(attr.name)
       raise "Invalid attribute name #{attr.name}"
     end
 
@@ -42,10 +42,14 @@ module RailsAttrEnum
 
     @_attr_enums[attr.name.to_sym] = Module.new { include Enum }.tap do |mod|
       mod.init_enum(attr.name)
-      entries.each(&mod.method(:add))
       const_set(attr.enum_name, mod)
-      class_eval do
-        validates(attr.name.to_sym, validation_rules.merge(inclusion: { in: mod.values }))
+      validates(attr.name.to_sym, validation_rules.merge(inclusion: { in: mod.values }))
+
+      entries.each do |entry|
+        mod.add(entry)
+        class_eval <<-EOS
+          scope :#{attr.name}_#{entry.key}, -> { where(:#{attr.name} => #{entry.value}) }
+        EOS
       end
     end
 

data/lib/rails_attr_enum/entry.rb

@@ -2,5 +2,17 @@ require 'ostruct'
 
 module RailsAttrEnum
   ## Enum entry class
-  Entry = Struct.new(:key, :value, :label)
+  Entry = Struct.new(:const_name, :key, :value, :label) do
+    # Add a to_h method if it doesn't exist (< ruby 2.0)
+    unless nil.respond_to?(:to_h)
+      def to_h
+        # Hash[*(entry.members.flat_map { |key| [key, entry.send(key)] })]
+        Hash[members.map { |key| [key, send(key)] }]
+      end
+    end
+
+    def to_json(*args)
+      to_h.to_json
+    end
+  end
 end

data/lib/rails_attr_enum/enum.rb

@@ -38,6 +38,50 @@ module RailsAttrEnum
       def values; mapped(:value) end
       def labels; mapped(:label) end
 
+      def to_h(options = {})
+        default_to_include = [:key, :value, :label]
+
+        [:only, :except].each do |key|
+          if options.include?(key)
+            if options[key].is_a?(Symbol)
+              options[key] = [options[key]]
+            elsif options[key].empty?
+              options[key] = nil
+            end
+
+            unless options[key].nil? || (options[key] - default_to_include).empty?
+              raise 'Unknown keys for enum'
+            end
+          end
+        end
+
+        to_include =
+          if !options[:only].nil?
+            default_to_include & options[:only]
+          elsif !options[:except].nil?
+            default_to_include - options[:except]
+          else
+            default_to_include
+          end
+
+        builder =
+          if to_include.size == 1
+            to_include = to_include.first
+            proc { |entry| [entry.const_name, entry.send(to_include)]}
+          else
+            proc do |entry|
+              value = Hash[entry.to_h.select { |(key, _)| to_include.include?(key) }]
+              [entry.const_name, value]
+            end
+          end
+
+        Hash[@entries.map(&builder)]
+      end
+
+      def to_json(options = {})
+        to_h(options).to_json
+      end
+
       private
 
       def get_from_entries(key, value)

data/lib/rails_attr_enum/enum_accumulator.rb

@@ -31,7 +31,9 @@ module RailsAttrEnum
         label = key.to_s.titleize
       end
 
-      add_entry(key, value, label)
+      const_name = key.to_s.upcase
+
+      add_entry(const_name, key, value, label)
     end
 
     def validates(rules = {})
@@ -40,8 +42,8 @@ module RailsAttrEnum
 
     private
 
-    def add_entry(key, value, label)
-      Entry.new(key, value, label).tap do |entry|
+    def add_entry(const_name, key, value, label)
+      Entry.new(const_name, key, value, label).tap do |entry|
         revalue_entries!(value)
         @entries << entry
         @values << value

data/lib/rails_attr_enum/version.rb

@@ -1,3 +1,3 @@
 module RailsAttrEnum
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/dummy/app/models/user.rb

@@ -1,2 +1,5 @@
 class User < ActiveRecord::Base
+  extend RailsAttrEnum
+
+  attr_enum :role, :admin, :editor, :author, :user
 end

data/test/dummy/log/development.log

@@ -32,3 +32,68 @@ Migrating to CreateUsers (20131023212242)
    (0.1ms)  begin transaction
   SQL (0.3ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 3]]
    (1.2ms)  commit transaction
+  User Load (0.5ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" ASC LIMIT 1
+   (0.1ms)  begin transaction
+  SQL (85.7ms)  INSERT INTO "users" ("created_at", "name", "role", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Thu, 31 Oct 2013 16:03:34 UTC +00:00], ["name", "jeremy fairbank"], ["role", 1], ["updated_at", Thu, 31 Oct 2013 16:03:34 UTC +00:00]]
+   (1.7ms)  commit transaction
+  User Load (0.3ms)  SELECT "users".* FROM "users" ORDER BY "users"."id" ASC LIMIT 1
+  User Load (23.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 0
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+   (0.3ms)  SELECT COUNT(*) FROM "users"
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1 AND (name like '%j%')
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+DEPRECATION WARNING: Model.scoped is deprecated. Please use Model.all instead. (called from method_missing at /Users/jeremy/Dropbox/projects/rails_attr_enum/lib/rails_attr_enum.rb:83)
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 0
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1 AND (name like '%j%')
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1 AND (name like '%j%')
+DEPRECATION WARNING: Model.scoped is deprecated. Please use Model.all instead. (called from irb_binding at (irb):3)
+  User Load (0.3ms)  SELECT "users".* FROM "users"
+  User Load (0.4ms)  SELECT "users".* FROM "users"
+  User Load (0.4ms)  SELECT "users".* FROM "users"
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.3ms)  SELECT "users".* FROM "users" LIMIT 2
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE (("users"."role" = 2 OR "users"."role" = 1))
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE "users"."role" IN (2, 1)
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE (role = 2 or role = 1)
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE (("users"."role" = 1 OR "users"."role" = 2))
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2 AND "users"."role" = 1
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 2
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."role" = 1
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE (("users"."role" = 1 OR "users"."role" = 2))
+   (3.1ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "role" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131023212242')
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (2.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "role" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131023212242')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (3.7ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "role" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131023212242')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (2.8ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "role" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131023212242')
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"

data/test/dummy/log/test.log

@@ -330,3 +330,403 @@ Migrating to CreateUsers (20131023212242)
    (0.1ms)  rollback transaction
    (0.1ms)  begin transaction
    (0.1ms)  rollback transaction
+   (1.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "role" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20131023212242')
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction

data/test/dummy/spec/spec_helper.rb

@@ -47,6 +47,15 @@ def clear_user
   end
 
   if User.instance_variable_defined?(:@_attr_enums)
-    User.remove_instance_variable(:@_attr_enums)
+    User.send(:remove_instance_variable, :@_attr_enums)
+  end
+end
+
+def default_user_roles
+  clear_user
+
+  User.class_eval do
+    extend RailsAttrEnum
+    attr_enum :role, :admin, :editor, :author, :user
   end
 end

data/test/dummy/spec/to_h_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe 'User::Role.to_h' do
+  let(:enum) { User::Role }
+
+  before { default_user_roles }
+
+  let :only_value do
+    {
+      'ADMIN'  => 0,
+      'EDITOR' => 1,
+      'AUTHOR' => 2,
+      'USER'   => 3
+    }
+  end
+
+  let :value_and_label do
+    {
+      'ADMIN'  => { value: 0, label: 'Admin' },
+      'EDITOR' => { value: 1, label: 'Editor' },
+      'AUTHOR' => { value: 2, label: 'Author' },
+      'USER'   => { value: 3, label: 'User' }
+    }
+  end
+
+  let :all_keys do
+    {
+      'ADMIN'  => { key: :admin,  label: 'Admin',  value: 0 },
+      'EDITOR' => { key: :editor, label: 'Editor', value: 1 },
+      'AUTHOR' => { key: :author, label: 'Author', value: 2 },
+      'USER'   => { key: :user,   label: 'User',   value: 3}
+    }
+  end
+
+  context 'without options' do
+    subject { enum.to_h }
+    it { should eq all_keys }
+  end
+
+  context 'with option `only` as a symbol' do
+    subject { enum.to_h(only: :value) }
+    it { should eq only_value }
+  end
+
+  context 'with option `only` as an array' do
+    context 'with no elements' do
+      subject { enum.to_h(only: []) }
+      it { should eq all_keys }
+    end
+
+    context 'with one element' do
+      subject { enum.to_h(only: [:value]) }
+      it { should eq only_value }
+    end
+
+    context 'with more than one element' do
+      subject { enum.to_h(only: [:label, :value]) }
+      it { should eq value_and_label }
+    end
+
+    context 'with an unknown key' do
+      it 'should raise an error' do
+        expect { enum.to_h(only: :foo) }.to raise_error('Unknown keys for enum')
+      end
+    end
+  end
+
+  context 'with option `except` as a symbol' do
+    subject { enum.to_h(except: :key) }
+    it { should eq value_and_label }
+  end
+
+  context 'with option `except` as an array' do
+    context 'with no elements' do
+      subject { enum.to_h(except: []) }
+      it { should eq all_keys }
+    end
+
+    context 'with one element' do
+      subject { enum.to_h(except: [:key]) }
+      it { should eq value_and_label }
+    end
+
+    context 'with more than one element' do
+      subject { enum.to_h(except: [:label, :key]) }
+      it { should eq only_value }
+    end
+
+    context 'with an unknown key' do
+      it 'should raise an error' do
+        expect { enum.to_h(except: :foo) }.to raise_error('Unknown keys for enum')
+      end
+    end
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rails_attr_enum
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jeremy Fairbank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Create enums for Rails model attributes like enums in C languages
@@ -53,6 +53,7 @@ files:
 - lib/rails_attr_enum/version.rb
 - lib/rails_attr_enum.rb
 - lib/tasks/rails_attr_enum_tasks.rake
+- CHANGELOG.md
 - LICENSE
 - Rakefile
 - README.md
@@ -97,6 +98,7 @@ files:
 - test/dummy/spec/json_spec.rb
 - test/dummy/spec/models/user_spec.rb
 - test/dummy/spec/spec_helper.rb
+- test/dummy/spec/to_h_spec.rb
 homepage: https://github.com/jfairbank/rails_attr_enum
 licenses:
 - MIT
@@ -107,12 +109,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -163,3 +165,4 @@ test_files:
 - test/dummy/spec/json_spec.rb
 - test/dummy/spec/models/user_spec.rb
 - test/dummy/spec/spec_helper.rb
+- test/dummy/spec/to_h_spec.rb