RubyGems - ramen-rails - Versions diffs - 0.6.0 → 0.6.1 - Mend

ramen-rails 0.6.0 → 0.6.1

Files changed (8) hide show

checksums.yaml +4 -4
data/CHANGELOG +4 -0
data/lib/ramen-rails/ramen_after_filter.rb +15 -3
data/lib/ramen-rails/version.rb +1 -1
data/ramen-rails.gemspec +1 -0
data/spec/lib/ramen_after_filter_spec.rb +68 -16
data/spec/spec_helper.rb +1 -0
metadata +16 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739a8cfacae68879c56af820125300e74c57b518
-  data.tar.gz: 76475fc30d26b8dcd1470fbc54f1d37b1a1505b4
+  metadata.gz: 821f8dd4918426182f359794387fbd8a2f4bab85
+  data.tar.gz: 880aa7f4bc2641f5b46fdfa7da1a836b3a2f03cc
 SHA512:
-  metadata.gz: 96fbb2673a786c57e93bdcb03f9e027b3c39dcd858a7e70dbe1bf5c9befd23bd488bed345bb024d223acc6adb4e5e07bafc8152a21f1aaf3fa41dc765d7c111d
-  data.tar.gz: 17533a7f642eb7e3b8a39666035a250b0c16de1e35bd7070c4f680a884fdbe075ac0acbbbdaa76ff749e4c0afefb8b13c7e577d0968f76d553c0325bcea00acc
+  metadata.gz: 4da047101f00a72ac635f44cd00f20c64cd9241e59c5e651a97f845c2b916a8b303c36ba229227c6fc18af80c0c4c32b1220dd2540e2ed0d090b08799d16599e
+  data.tar.gz: 3fe409e377cba1f2e669d7fc0ebf92ec1cae4c89f354c612ad297260deb3813a42a389a68fe2b178c1e9fa8abf653c00e845bca21f8ea9a7908525f171fc5741

data/CHANGELOG CHANGED Viewed

@@ -22,3 +22,7 @@ Make importer support Companies. Add tests for importer.
 Version 0.6.0
 Support sending custom `trait` data into Ramen for Users & Companies.
+Version 0.6.1
+Check to see if `current_user` responds to `#persisted?` and, if so, and if it returns `false`,
+don't render `ramenSettings`

data/lib/ramen-rails/ramen_after_filter.rb CHANGED Viewed

@@ -134,17 +134,29 @@ module RamenRails
     end
     def ramen_user_object
+      user_to_return = nil
       POTENTIAL_RAMEN_USER_OBJECTS.each do |potential_user|
         begin
           user = controller.instance_eval &potential_user
-          return user if user.present? &&
-            (user.email.present? || user.id.present?)
+          if user.present? && (user.email.present? || user.id.present?)
+            user_to_return = user
+            break
+          end
         rescue NameError
           next
         end
       end
-      nil
+      if user_to_return &&
+        user_to_return.respond_to?(:persisted?) &&
+        (user_to_return.persisted? == false)
+        nil
+      else
+        user_to_return
+      end
     end
     def ramen_user_value

data/lib/ramen-rails/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module RamenRails
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/ramen-rails.gemspec CHANGED Viewed

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~>3.2"
   s.add_development_dependency "hashie", "~>3.4"
   s.add_development_dependency "timecop", "~>0.7"
+  s.add_development_dependency "byebug"
   s.add_dependency "activesupport", ">= 3.0"

data/spec/lib/ramen_after_filter_spec.rb CHANGED Viewed

@@ -1,18 +1,49 @@
 require 'spec_helper'
+module Dummy
+  Controller = Struct.new(:request, :response, :current_user, :ramen_script_tag_options)
+  Request = Struct.new(:original_url)
+  Response = Struct.new(:content_type, :body)
+  class User
+    def self.with(attrs)
+      user_class = Struct.new(*attrs.keys) do
+        def set(attrs)
+          @extras ||= Hashie::Mash.new
+          attrs.each {|k,v| @extras[k.to_s] = v }
+        end
+        def method_missing(name, *args, &block)
+          @extras ||= Hashie::Mash.new
+          if @extras.key?(name.to_s)
+            @extras[name.to_s]
+          else
+            super
+          end
+        end
+        def respond_to?(name)
+          @extras ||= Hashie::Mash.new
+          @extras.key?(name.to_s) or super
+        end
+      end
+      user = user_class.new
+      attrs.each {|k, v| user.send("#{k}=", v) }
+      user
+    end
+  end
+end
 describe 'After filter' do
   before :each do
-    @dummy = Hashie::Mash.new({
-      request: {
-      original_url: "http://hiryan.com",
-    },
-    response: {
-      content_type: 'text/html',
-      body: "<html><body>hi</body>"
-    }
-    })
+    req = Dummy::Request.new("http://hiryan.com")
+    resp = Dummy::Response.new("text/html", "<html><body>hi</body></html>")
+    @dummy = Dummy::Controller.new(req, resp)
     module Rails
       class LogProxy
@@ -55,15 +86,15 @@ describe 'After filter' do
     describe "and a user" do
       before :each do
-        @dummy.current_user = {email: 'ryan@ramen.is', name: 'Ryan Angilly', id: 'person-1234'}
+        @dummy.current_user = Dummy::User.with(email: 'ryan@ramen.is', name: 'Ryan Angilly', id: 'person-1234')
       end
       context "that does not respond to name" do
         before :each do
-          @dummy.current_user = {email: 'ryan@ramen.is', id: 'person-1234'}
+          @dummy.current_user = Dummy::User.with(email: 'ryan@ramen.is', id: 'person-1234')
         end
-        it "should render a comment erro" do
+        it "should render a comment error" do
           RamenRails::RamenAfterFilter.filter(@dummy)
           expect(@dummy.response.body).to include("See logs")
         end
@@ -71,7 +102,7 @@ describe 'After filter' do
       context "with a value proc set" do
         before :each do |c|
-          @dummy.current_user.value = 1000
+          @dummy.current_user.set value: 1000
           RamenRails.config do |c|
             c.current_user_value = Proc.new { current_user.value }
           end
@@ -101,7 +132,7 @@ describe 'After filter' do
       context "that responds to traits" do
         before :each do
-          @dummy.current_user.traits = {bucket: 6, is_friend: true, original_name: "Netflix"}
+          @dummy.current_user.set(traits: {bucket: 6, is_friend: true, original_name: "Netflix"})
         end
         it "should attach traits to company" do
@@ -110,11 +141,32 @@ describe 'After filter' do
         end
       end
+      context "that responds to #persisted? with false" do
+        before :each do
+          @dummy.current_user.set persisted?: false
+        end
+        it "should not render anything" do
+          filter = RamenRails::RamenAfterFilter.filter(@dummy)
+          expect(@dummy.response.body).to_not include("ramenSettings")
+        end
+      end
+      context "that responds to #persisted? with true" do
+        before :each do
+          @dummy.current_user.set persisted?: true
+        end
+        it "should render the tag" do
+          filter = RamenRails::RamenAfterFilter.filter(@dummy)
+          expect(@dummy.response.body).to include("ramenSettings")
+        end
+      end
       context "that responds to created_at" do
         before :each do
           @time = Time.new(2014, 11, 10)
-          @dummy.current_user.created_at = @time
+          @dummy.current_user.set created_at: @time
         end
         it "should include created_at in output" do

data/spec/spec_helper.rb CHANGED Viewed

@@ -2,6 +2,7 @@ require 'rspec'
 require 'ramen-rails'
 require 'hashie/mash'
 require 'timecop'
+require 'byebug'
 RSpec.configure do |config|

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ramen-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ryan Angilly
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement