ramen-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2fd11f0f2fdbc4b14251faddb4ec35e2f89902e
-  data.tar.gz: 6f6110a19e75baa8d0fb3143975bc253a9744bde
+  metadata.gz: a4bdf745220103d28895c16d259b69f1e390fd44
+  data.tar.gz: 4e9e118f904506cd55e13dfedb109ed4a313dd5f
 SHA512:
-  metadata.gz: a3b9575bbbf23fa8b13f90b1624c9b342e0c194f5b5d1486f90bed683935fddf3732f51824906047ff558dd76bfa9aa1733cbfff7ca23b0db38bc5f38f824cef
-  data.tar.gz: f6f8dba80bfa1cd796b55e871e55b9a35f37d67ca8d7985fa648de5515ba937bdb183fcaefe08055c221217320b89398e265ba3f236777cb03bf0fd7e3c5e7cf
+  metadata.gz: ae8cffe0b2ba0ee8b09d92c6aefb7c72c11dc2cd5799743a2a2d45de836256caab170ac8522c380c3a8161b5d044588da90c782d0649de7bf57c6a9b5b3e81e1
+  data.tar.gz: 7b1593f7be00a1e2ce9a6c33440557ab92c37cc0663b8a160c8c7b87e593a6bcd08407884738e22f1f71f83ef54d397f9eb5c8313108e274ba3c30ff893ae815

data/CHANGELOG

@@ -13,3 +13,6 @@ Version 0.4.0
 Add support for window.ramenSettings.onload and window.ramenOnload. Change the way
 ramenSettings is set so that it can be merged with other options previously defined
 in <script> tags.
+
+Version 0.5.0
+Add support for Companies

data/lib/ramen-rails/config.rb

@@ -30,6 +30,18 @@ module RamenRails
         end
       end
 
+      def current_company_labels=(value)
+        raise ArgumentError, "current_company_labels should be a Proc" unless value.kind_of?(Proc)
+        ensure_not_lambda!(value)
+
+        @current_company_labels = value
+      end
+
+      def current_company_labels
+        @current_company_labels
+      end
+
+
       def current_company=(value)
         raise ArgumentError, "current_company should be a Proc" unless value.kind_of?(Proc)
         ensure_not_lambda!(value)

data/lib/ramen-rails/ramen_after_filter.rb

@@ -85,6 +85,38 @@ module RamenRails
       controller.instance_variable_get(SCRIPT_TAG_HELPER_CALLED_INSTANCE_VARIABLE)
     end
 
+    POTENTIAL_RAMEN_COMPANY_OBJECTS = [
+      Proc.new { instance_eval(&RamenRails.config.current_company) if RamenRails.config.current_company.present? },
+      Proc.new { current_company },
+      Proc.new { @company }
+    ]
+
+    def ramen_company_labels
+      return nil unless ramen_company_object
+      controller.instance_eval(&RamenRails.config.current_company_labels) if RamenRails.config.current_company_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_company_object
+      POTENTIAL_RAMEN_COMPANY_OBJECTS.each do |potential_company|
+        begin
+          company = controller.instance_eval &potential_company
+          if (company.present? && company.name.present? && company.id.present?)
+            return company
+          end
+
+        rescue NameError
+          next
+        end
+      end
+
+      nil
+    end
+
     POTENTIAL_RAMEN_USER_OBJECTS = [
       Proc.new { instance_eval(&RamenRails.config.current_user) if RamenRails.config.current_user.present? },
       Proc.new { current_user },
@@ -173,6 +205,16 @@ module RamenRails
       obj[:user][:labels] = ramen_user_labels unless ramen_user_labels.nil?
       obj[:custom_links] = ramen_custom_links if ramen_custom_links.present?
 
+      company = ramen_company_object
+      if company
+        obj[:company] = {}
+
+        [:url, :name, :id].each do |attr|
+          obj[:company][attr] = company.send(attr)
+        end
+      
+        obj[:company][:labels] = ramen_company_labels unless ramen_company_labels.nil?
+      end
 
       obj = obj.deep_merge(ramen_script_tag_options) if ramen_script_tag_options.present?
 

data/lib/ramen-rails/version.rb

@@ -1,3 +1,3 @@
 module RamenRails
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/lib/ramen_after_filter_spec.rb

@@ -171,23 +171,44 @@ describe 'After filter' do
       end
 
       context "and a company" do
-        before :each do
-          RamenRails.config do |c|
-            c.current_company = Proc.new { Hashie::Mash.new(name: 'Scrubber', url: 'https://scrubber.social') }
-            c.current_user_labels = Proc.new { ["ryan", "gold"] }
+        
+        context "that has no id" do
+          before :each do
+            RamenRails.config do |c|
+              c.current_company = Proc.new { Hashie::Mash.new(name: 'Scrubber', url: 'https://scrubber.social') }
+              c.current_company_labels = Proc.new { ["ryan", "gold"] }
+            end
+          end
+
+          it "should not attach user & company" do
+            filter = RamenRails::RamenAfterFilter.filter(@dummy)
+            expect(@dummy.response.body).to include("script")
+            expect(@dummy.response.body).to include("Angilly")
+            expect(@dummy.response.body).not_to include("company")
+            expect(@dummy.response.body).not_to include("Scrubber")
+            expect(@dummy.response.body).not_to include("gold")
           end
         end
+        
+        context "that has an id" do
+          before :each do
+            RamenRails.config do |c|
+              c.current_company = Proc.new { Hashie::Mash.new(id: "1245", name: 'Scrubber', url: 'https://scrubber.social') }
+              c.current_company_labels = Proc.new { ["ryan", "gold"] }
+            end
+          end
 
-        pending "should attach user & company" do
-          filter = RamenRails::RamenAfterFilter.filter(@dummy)
-          expect(@dummy.response.body).to include("script")
-          expect(@dummy.response.body).to include("Angilly")
-          expect(@dummy.response.body).to include("company")
-          expect(@dummy.response.body).to include("Scrubber")
-          expect(@dummy.response.body).to include("gold")
+          it "should attach user & company" do
+            filter = RamenRails::RamenAfterFilter.filter(@dummy)
+            expect(@dummy.response.body).to include("script")
+            expect(@dummy.response.body).to include("Angilly")
+            expect(@dummy.response.body).to include("company")
+            expect(@dummy.response.body).to include("Scrubber")
+            expect(@dummy.response.body).to include("1245")
+            expect(@dummy.response.body).to include("gold")
+          end
         end
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ramen-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Angilly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack