rspec-rabl 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 031ec2eaee71bfd8fb8143fe99668fe40dac2ea2
-  data.tar.gz: 74c53ebd89efbcb43ae92b1c2df888f4781641d9
+  metadata.gz: 53940a4a41092ab090cda50e3b4aa9c7c5e34b60
+  data.tar.gz: 4e50171150a0e9819439e807f8ef3361131b5512
 SHA512:
-  metadata.gz: 8cfccc0d17522afe45fdfbefa4eaa3e6961a47283a8cc70f52ee42386b2c683ed92e579ab9ec6c7bf4131e03d4ba95c12526d5488a4da7f3e4f2cecf3397cf28
-  data.tar.gz: e08a943077e9ac9e718e5ceec0bbfc5ad2f87cb0fbea0c32996beca31433e6c1e901f7adede70bc0d4d2083cd57188f5b91f939dab7f8f11faec39e8a381c7bc
+  metadata.gz: 51e74dad39d51f02879c2f4a6cecc438b630971596009f4cee8fc901ff445c01f457595b1b2f7309a842c29318a9f4788c6306be4392f69f650fab355fd009e3
+  data.tar.gz: f5322992ad11e2bd1d567698f9e8d50bea8c5af592698a07b1319a4087502f0586db780600bf24f9829402f80b9b1151bcd7253aec05f784b74477cae761aea3

data/.travis.yml

@@ -4,12 +4,10 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - jruby
   - jruby-1.7
-  - jruby-9.0.3.0
-  - jruby-head
+  - jruby-9.0.4.0
 before_install:
   - gem update --system
-  - gem install bundler
+  - gem install bundler -v 1.10.6
 sudo: false
 cache: bundler

data/lib/rspec/rabl/attribute_matcher.rb

@@ -16,7 +16,7 @@ module RSpec
 
       def matches?(subject)
         @subject = subject
-        attribute_rendered? && rendered_value == expected_value
+        attribute_rendered? && (!expected_value_set || rendered_value == expected_value)
       end
 
       def with(model_attribute)
@@ -25,12 +25,13 @@ module RSpec
       end
 
       def with_value(expected_value)
+        @expected_value_set = true
         @expected_value = expected_value
         self
       end
 
       private
-      attr_reader :rendered_attribute, :subject, :opts
+      attr_reader :rendered_attribute, :subject, :opts, :expected_value_set
 
       def attribute_path
         @attribute_path ||= begin
@@ -45,8 +46,10 @@ module RSpec
         @model_attribute ||= rendered_attribute
       end
 
+      # The expected value may be set to nil or false. Retrieving the value from the rendered object
+      # will then fail if the attribute is calculated from a node
       def expected_value
-        @expected_value ||= get_attribute_from_rendered_object
+        @expected_value ||= @expected_value_set ? @expected_value : get_attribute_from_rendered_object
       end
 
       def rendered_value

data/lib/rspec/rabl/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Rabl
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/fixtures/user_aliases.rabl

@@ -1,3 +1,5 @@
 object @user => :user
 attributes  :guid => :id
 node(:team){ 'Gorby Puff' }
+node(:feed_is_deleted) { |user| user.is_deleted }
+node(:i_am_nil) { |user| user.nil_value }

data/spec/functional/custom_matchers_spec.rb

@@ -14,6 +14,8 @@ describe "Customer Matchers" do
     rabl_data(:root => 'user'){ user }
     it{ expect(subject).to render_attribute(:id).with(:guid) }
     it{ expect(subject).to render_attribute(:team).with_value('Gorby Puff') }
+    it{ expect(subject).to render_attribute(:feed_is_deleted).with_value(false) }
+    it{ expect(subject).to render_attribute(:i_am_nil).with_value(nil) }
   end
 
   describe "index.rabl" do

data/spec/functional/matcher_errors_spec.rb

@@ -6,11 +6,12 @@ describe "Error Messages" do
       example = it{ expect(subject).to render_attribute(:guid).with_value("Imma derp derp") }
     end
     group.run
-    lines = RSpec::Core::Notifications::FailedExampleNotification.new(example).message_lines
+    lines = RSpec::Core::Notifications::FailedExampleNotification.new(example).message_lines.join("\n")
 
-    expect(lines[0]).to include("with_value(\"Imma derp derp\")")
-    expect(lines[1]).to include("  expected \"Imma derp derp\" in [\"guid\"]")
-    expect(lines[2]).to include("    got nil")
+    expect(lines).to include("with_value(")
+    expect(lines).to include("Imma derp derp")
+    expect(lines).to include("  expected \"Imma derp derp\" in [\"guid\"]")
+    expect(lines).to include("    got nil")
   end
 
   it "renders a helpful error message for root and object_root" do
@@ -21,11 +22,12 @@ describe "Error Messages" do
       example = it{ expect(subject).to render_attribute(:guid).with_value("Imma derp derp") }
     end
     group.run
-    lines = RSpec::Core::Notifications::FailedExampleNotification.new(example).message_lines
+    lines = RSpec::Core::Notifications::FailedExampleNotification.new(example).message_lines.join("\n")
 
-    expect(lines[0]).to include("with_value(\"Imma derp derp\")")
-    expect(lines[1]).to include("  expected \"Imma derp derp\" in [\"user\"][\"guid\"]")
-    expect(lines[2]).to include("    got \"abc\"")
+    expect(lines).to include("with_value(")
+    expect(lines).to include("Imma derp derp")
+    expect(lines).to include("  expected \"Imma derp derp\" in [\"user\"][\"guid\"]")
+    expect(lines).to include("    got \"abc\"")
   end
 
   it "renders a helpful error message for root and object_root" do
@@ -36,10 +38,11 @@ describe "Error Messages" do
       example = it{ expect(subject).to render_attribute(:guid).with_value("Imma derp derp") }
     end
     group.run
-    lines = RSpec::Core::Notifications::FailedExampleNotification.new(example).message_lines
+    lines = RSpec::Core::Notifications::FailedExampleNotification.new(example).message_lines.join("\n")
 
-    expect(lines[0]).to include("with_value(\"Imma derp derp\")")
-    expect(lines[1]).to include("  expected \"Imma derp derp\" in [\"users\"][\"user\"][\"guid\"]")
-    expect(lines[2]).to include("    got \"abc\"")
+    expect(lines).to include("with_value(")
+    expect(lines).to include("Imma derp derp")
+    expect(lines).to include("  expected \"Imma derp derp\" in [\"users\"][\"user\"][\"guid\"]")
+    expect(lines).to include("    got \"abc\"")
   end
 end

data/spec/support/user_context.rb

@@ -5,5 +5,7 @@ shared_context "user_context" do
     last_name: 'bluth',
     email: 'gob@bluth.com',
     password: 'very secret',
+    is_deleted: false,
+    nil_value: nil,
   )}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rabl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Michael Ries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides a more declarative form of view testing for users of rabl