enumerize 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964f689869d7570459451bae1068a737f69a7db2
-  data.tar.gz: b1c59894d98bd2656d01c5bca52f4dc15a7fa42a
+  metadata.gz: 7430100f0e35ac39085f08ca0dca223b4f101a86
+  data.tar.gz: 5726bf780a70d9cfd67e6c51622c734abd7a9644
 SHA512:
-  metadata.gz: 61ca5ff5fcaac6dd6a38622fbf2af35f74896bf57f9f317cbc2b7b918814ab9b4aa5e9a6437de14b709a72b61d2d09c04c7d86a6504335faed7fd008c21b2051
-  data.tar.gz: 8a5e9bb95f72b0abbdd5619ace2299ed8d3001d520d747751d00a84d474ecdfb82a3fce065c6af3d9e422fe1d38cdf288e286d578a95fda836b0f02606ee4c21
+  metadata.gz: 1221db4e0a2377d4123c0d64f3b0fbcf63d549e15963d44562a96d4a68eac0017015fbba7ce4e56bdaf4f6904ca5ab99592fdad70813333cdd52032ae440902c
+  data.tar.gz: dfd016c59f61900a641483df577bf793ce9f6b36f695958d6f9676ef49ed4f54d7cce57e1a2c9936ab8f7f63ee76f9932244d998474cf32677a55671339cc6d8

data/.travis.yml

@@ -9,8 +9,13 @@ gemfile:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
   - jruby-19mode
+matrix:
+  exclude:
+    - rvm: 2.2
+      gemfile: Gemfile
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### bug fix
 
+## 0.10.1 (March 4, 2015) ##
+
+### bug fix
+
+ * Use method_missing instead of defining singleton class methods to allow Marshal serialization (by [@lest](https://github.com/lest))
+
 ## 0.10.0 (February 17, 2015) ##
 
 ### enhancements

data/lib/enumerize/attribute.rb

@@ -26,12 +26,6 @@ module Enumerize
         @default_value = find_default_value(options[:default])
         raise ArgumentError, 'invalid default value' unless @default_value
       end
-
-      # Define methods to get each value
-      @values.each do |v|
-        metaclass = class << self; self; end
-        metaclass.send(:define_method, v.to_s) { v }
-      end
     end
 
     def find_default_value(value)
@@ -81,6 +75,10 @@ module Enumerize
       values.map { |v| [v.text, v.to_s] }
     end
 
+    def respond_to_missing?(method, include_private=false)
+      @value_hash.include?(method.to_s) || super
+    end
+
     def define_methods!(mod)
       mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{name}
@@ -123,6 +121,16 @@ module Enumerize
         end
       RUBY
     end
+
+    private
+
+    def method_missing(method)
+      if @value_hash.include?(method.to_s)
+        find_value(method)
+      else
+        super
+      end
+    end
   end
 
   module Multiple

data/lib/enumerize/predicatable.rb

@@ -1,29 +1,20 @@
 module Enumerize
   module Predicatable
-    def method_missing(method, *args, &block)
-      if boolean_method?(method)
-        define_query_methods
-        send(method, *args, &block)
-      else
-        super
-      end
-    end
-
     def respond_to_missing?(method, include_private=false)
-      boolean_method?(method)
+      predicate_method?(method) || super
     end
 
     private
 
-    def define_query_methods
-      @attr.values.each do |value|
-        unless singleton_methods.include?(:"#{value}?")
-          define_query_method(value)
-        end
+    def method_missing(method, *args, &block)
+      if predicate_method?(method)
+        predicate_call(method[0..-2], *args, &block)
+      else
+        super
       end
     end
 
-    def boolean_method?(method)
+    def predicate_method?(method)
       method[-1] == '?' && @attr.values.include?(method[0..-2])
     end
   end

data/lib/enumerize/set.rb

@@ -59,12 +59,8 @@ module Enumerize
 
     private
 
-    def define_query_method(value)
-      singleton_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{value}?
-          include?("#{value}")
-        end
-      RUBY
+    def predicate_call(value)
+      include?(value)
     end
 
     def mutate!

data/lib/enumerize/value.rb

@@ -27,12 +27,8 @@ module Enumerize
 
     private
 
-    def define_query_method(value)
-      singleton_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{value}?
-          #{value == self}
-        end
-      RUBY
+    def predicate_call(value)
+      value == self
     end
 
     def i18n_keys

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/test/attribute_test.rb

@@ -87,6 +87,10 @@ describe Enumerize::Attribute do
 
   it 'sets up shortcut methods for each value' do
     build_attr nil, :foo, :in => {:a => 1, :b => 2}
+
+    attr.must_respond_to :a
+    attr.must_respond_to :b
+
     attr.a.value.must_equal 1
     attr.b.value.must_equal 2
     attr.a.text.must_equal 'A'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support