sequel-bit_fields 0.5.1 → 0.5.2

data/lib/sequel/plugins/bit_fields.rb

@@ -2,47 +2,53 @@ require 'sequel'
 
 module Sequel::Plugins
   module BitFields
+    @@bit_fields_for_models = {}
+
+    def self.bit_fields_for_models
+      @@bit_fields_for_models
+    end
+
     def self.configure(model, bit_field_column, bit_fields, options = {})
       model.class_eval do
-        @@bit_fields ||= {}
-        @@bit_fields[bit_field_column] = bit_fields
-      end
+        @@bit_fields_for_models[model.to_s] ||= {}
+        @@bit_fields_for_models[model.to_s][bit_field_column] = bit_fields
 
-      unless model.respond_to?(:bit_fields)
-        model.send(:define_singleton_method, :bit_fields) do |*args|
-          if column_name = [*args].first
-            @@bit_fields[column_name]
-          else
-            @@bit_fields
+        unless respond_to?(:bit_fields)
+          define_singleton_method(:bit_fields) do |*args|
+            if column_name = [*args].first
+              @@bit_fields_for_models[model.to_s][column_name]
+            else
+              @@bit_fields_for_models[model.to_s]
+            end
           end
         end
-      end
 
-      unless model.respond_to?(:bit_field_indexes_for)
-        model.send(:define_singleton_method, :bit_field_indexes_for) do |*args|
-          if column_name = [*args].first
-            hash = {}
+        unless respond_to?(:bit_field_indexes_for)
+          define_singleton_method(:bit_field_indexes_for) do |*args|
+            if column_name = [*args].first
+              hash = {}
 
-            @@bit_fields[column_name].each_with_index do |attribute, i|
-              hash[attribute.to_sym] = 2**i
-            end
+              @@bit_fields_for_models[model.to_s][column_name].each_with_index do |attribute, i|
+                hash[attribute.to_sym] = 2**i
+              end
 
-            hash
-          else
-            raise 'No bit field name was passed!'
+              hash
+            else
+              raise 'No bit field name was passed!'
+            end
           end
         end
       end
 
       model.instance_eval do
-        unless self.respond_to?(:bit_field_values_for)
+        unless respond_to?(:bit_field_values_for)
           # inject the method bit_field_values_for which
           # returns a hash with all the values of the bit_fields
           define_method("bit_field_values_for") do |*args|
             if column_name = [*args].first
               hash = {}
 
-              @@bit_fields[column_name].each do |attribute|
+              @@bit_fields_for_models[model.to_s][column_name].each do |attribute|
                 hash[attribute.to_sym] = self.send("#{attribute}?".to_sym)
               end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-bit_fields
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -49,7 +49,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1844713943839378308
+      hash: 4547982542808219160
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: