happyfunjuice 0.0.1.beta.1 → 0.0.1.beta.2

data/app/controllers/happyfunjuice/happyfunjuice_controller.rb

@@ -2,6 +2,8 @@ class Happyfunjuice::HappyfunjuiceController < ApplicationController
   
   before_filter :verify_key
 
+  before_filter :select_handled_exceptions
+
   def activities
 
     begin
@@ -16,7 +18,7 @@ class Happyfunjuice::HappyfunjuiceController < ApplicationController
         )
       }.merge({:status=>'200'})
 
-    rescue StandardError => e
+    rescue *@handled_exceptions => e
       render :json=>{:status=>'500', :error=>e.message}
     end
 
@@ -32,7 +34,7 @@ class Happyfunjuice::HappyfunjuiceController < ApplicationController
         )
       }.merge({:status=>'200'})
 
-    rescue StandardError => e
+    rescue *@handled_exceptions => e
       render :json=>{:status=>'500', :error=>e.message}
     end
 
@@ -40,6 +42,14 @@ class Happyfunjuice::HappyfunjuiceController < ApplicationController
 
 
   private
+
+    def select_handled_exceptions
+      if Happyfunjuice.exceptions_are_fatal
+        @handled_exceptions = []
+      else
+        @handled_exceptions = [StandardError]
+      end
+    end
     
     def verify_key
       unless (Happyfunjuice.api_key == params[:api_key] )

data/lib/generators/happyfunjuice/templates/config/initializers/happyfunjuice.rb.erb

@@ -3,6 +3,11 @@ Happyfunjuice.setup do |config|
   # Insert the API key from the HappyFunJuice settings page here:
   config.api_key = "<%=@api_key%>"
 
+  # By default, exceptions encountered while querying activities are passed
+  # back as an error message. Debugging is much easier though if exceptions
+  # cause an application error.
+  # config.exceptions_are_fatal = false
+
   # Sample usage:
   #
   # config.activity :new_user, User do |u|

data/lib/happyfunjuice/config.rb

@@ -29,8 +29,8 @@ module Happyfunjuice
           Happyfunjuice.environment = env.to_s
         end
 
-        def debug_mode= bool
-          Happyfunjuice.debug_mode = !!(bool)
+        def exceptions_are_fatal= bool
+          Happyfunjuice.exceptions_are_fatal = !!(bool)
         end
 
         def activity( key, scope, opts={}, &block )

data/lib/happyfunjuice/version.rb

@@ -1,5 +1,5 @@
 module Happyfunjuice
-  VERSION = "0.0.1.beta.1"
+  VERSION = "0.0.1.beta.2"
 
   class << self
     def version

data/lib/happyfunjuice.rb

@@ -10,7 +10,7 @@ module Happyfunjuice
 
   # Variables for Juice
   @@apikey = nil
-  @@debug_mode = false
+  @@exceptions_are_fatal = false
   @@environment = 'production'
 
   # Variables for landing page:
@@ -19,7 +19,7 @@ module Happyfunjuice
   @@mailer_api_key = 'api-key'
   @@newsletter_list = 'newsletters'
 
-  mattr_accessor :api_key, :debug_mode
+  mattr_accessor :api_key, :exceptions_are_fatal
   mattr_accessor :mailer, :mailer_api_user, :mailer_api_key, :newsletter_list
   mattr_accessor :environment
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happyfunjuice
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.1
+  version: 0.0.1.beta.2
   prerelease: 6
 platform: ruby
 authors: