mongoid_feature_flags 0.1.22 → 0.1.25

data/lib/mongoid_feature_flags.rb

@@ -41,7 +41,7 @@ module Mongoid
     end
     
     def features
-      inherited_feature_flags.merge(self.feature_flags)
+      (inherited_feature_flags || {}).merge(self.feature_flags || {})
     end
     
     def feature?(*required_features, &block)
@@ -65,8 +65,8 @@ module Mongoid
     def inherited_feature_flags
       if self.class.instance_variable_defined?("@feature_flag_parents")
         self.class.instance_variable_get("@feature_flag_parents").inject({}) do |flag_hash, relative|
-          if self.respond_to?(relative) && self.send(relative).present? && self.send(relative).respond_to?(:feature_flags)
-            flag_hash.merge(self.send(relative).send(:feature_flags))
+          if self.respond_to?(relative) && self.send(relative).present? && self.send(relative).respond_to?(:features)
+            flag_hash.merge(self.send(relative).send(:features) || {})
           else
             flag_hash
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_feature_flags
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.25
   prerelease: 
 platform: ruby
 authors: