ramen-rails 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 111502efcd48f7a5aed23061c7660baf7d0db589
-  data.tar.gz: b52797f58a2979fd1c1aed4b9d1961f3c05f0895
+  metadata.gz: a15c33ea6b27c1c50f0fd07447be2ef4292e77f6
+  data.tar.gz: e285639be89f2f6c5571a9671f662f64aeeae013
 SHA512:
-  metadata.gz: 7ae146cee640ef1adc7923f7baf4dae76081fec24fa9e47348154a4270961f20a3f1257faf54f82e26e5dbd7441aba62b35e9cfafc1efbe85ded45211247b091
-  data.tar.gz: 40a10679f67dc5916e7f3fd9a27c593e215897d2bdc4fc3a41ba88afaf45c6e90d54f8cfb0eb5b27779600025fe4e79677a6e64b62f5839aa531af43886e3ab4
+  metadata.gz: 284b8b82a0cabbeacc989c8accfd407cb42e4b01cbe45923bda932cf757f72463f56635b103edf3873a5cf0c5ba4a5aa9b8db1f7a2cfd77f1215b5f0f36196a3
+  data.tar.gz: 1e2e1d87850827365dcf385fbcf0d281cbc85f2c30b438efe4eab258e6734be743d61de152f28ba0dd4e3d012e48ea716582dc01e72ac1aa8824ca33df5ad9e1

data/lib/rails/generators/ramen/config/ramen.rb.erb

@@ -45,13 +45,4 @@ RamenRails.config do |config|
   #
   # config.current_company = Proc.new { current_company }
 
-
-  ## How we access the current company "value". This is
-  ## a Float. It can represent whatever you want.
-  ##
-  ## If config.current_user is empty, this will be ignored
-  #
-  # config.current_company_value = Proc.new { current_company_value }
-
-
 end

data/lib/ramen-rails/ramen_after_filter.rb

@@ -55,6 +55,11 @@ module RamenRails
     def ramen_user_labels
       return nil unless ramen_user_object
       instance_eval(&RamenRails.config.current_user_labels) if RamenRails.config.current_user_labels.present?
+    rescue NameError => e
+      Rails.logger.debug "Swallowing NameError. We're probably in an Engine or some other context like Devise."
+      Rails.logger.debug e
+    
+      nil
     end
 
     def ramen_user_object
@@ -74,6 +79,11 @@ module RamenRails
     def ramen_user_value
       return nil unless ramen_user_object
       instance_eval(&RamenRails.config.current_user_value) if RamenRails.config.current_user_value.present?
+    rescue NameError => e
+      Rails.logger.debug "Swallowing NameError. We're probably in an Engine or some other context like Devise."
+      Rails.logger.debug e
+    
+      nil
     end
 
     def ramen_org_id
@@ -94,7 +104,24 @@ module RamenRails
 
     def ramen_company
       return nil unless ramen_user_object
-      instance_eval(&RamenRails.config.current_company) if RamenRails.config.current_company.present?
+      
+      begin
+        company = instance_eval(&RamenRails.config.current_company) if RamenRails.config.current_company.present?
+      rescue NameError => e
+        Rails.logger.debug "Swallowing NameError. We're probably in an Engine or some other context like Devise."
+        Rails.logger.debug e
+
+        company = nil
+      end
+      
+      return nil unless company
+
+      obj = {}
+      [:url, :id, :value, :name].each do |attr|
+        obj[attr] = user.send(attr) if user.respond_to?(attr) && user.send(attr).present?
+      end
+    
+      obj
     end
 
 
@@ -113,7 +140,7 @@ module RamenRails
       
       obj[:user][:value] = ramen_user_value if ramen_user_value.present?
       obj[:user][:labels] = ramen_user_labels unless ramen_user_labels.nil?
-
+      
       obj[:company] = ramen_company if ramen_company.present?
 
       super(obj, organization_secret: ramen_org_secret)

data/lib/ramen-rails/version.rb

@@ -1,3 +1,3 @@
 module RamenRails
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ramen-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryan Angilly