merit 1.2.2 → 1.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (1.2.2)
+    merit (1.2.3)
       ambry (~> 0.3.0)
 
 GEM

data/lib/merit.rb

@@ -50,16 +50,17 @@ module Merit
       end
 
       ActiveSupport.on_load(:action_controller) do
-        # Load application defined rules on application boot up
-        # Test if constant exists (doesn't while installing/generating files)
-        if defined? '::Merit::BadgeRules'
+        begin
+          # Load application defined rules on application boot up
           ::Merit::AppBadgeRules = ::Merit::BadgeRules.new.defined_rules
-        end
-        if defined? '::Merit::PointRules'
           ::Merit::AppPointRules = ::Merit::PointRules.new.defined_rules
+          include Merit::ControllerExtensions
+        rescue NameError => e
+          # Trap NameError if installing/generating files
+          if !(e.to_s =~ /uninitialized constant Merit::BadgeRules/)
+            raise e
+          end
         end
-
-        include Merit::ControllerExtensions
       end
     end
   end

data/merit.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.description = "Manage badges, points and rankings (reputation) of resources in a Rails application."
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
-  s.version     = '1.2.2'
+  s.version     = '1.2.3'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors: