jsonapi-resources-matchers 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce61d44c20a946880e5ec4f83cac4b048d9dcf01
-  data.tar.gz: 81e5d38ac48355c2e61a07e46fd477cd614acb5d
+  metadata.gz: 9cf29e748e8ceb2c88f705e41606add289595519
+  data.tar.gz: 8786354af24bb3c3e6b013f11f16014a39930b66
 SHA512:
-  metadata.gz: fdb63eae9a2ff22abbc0289030dfb3547a82fd4fbe5ec1349a99c0f638bbe43742009535010979ecdbd10da2b960dd1947cf87eacc47de7d4de0107e58db00ee
-  data.tar.gz: 665792e728af159ebb6746dfae7f6ae71009239056e5cd454654545bda238aad64403b5ef96d64f5d727b8a8059b99ba8fe2e86d889f082d96c66455df52de20
+  metadata.gz: e941507f83a4c9537bd3c7a69716efa3b1faafd242c926c61ba93a0236109c022a4334701fd4e7e01995838ae1f127d256c57a250acc41a6f19dda9df0e91e43
+  data.tar.gz: 1c5d9824e4024b1dd101aab935a19c4a918db045a76e40582e0c5e7fb4a6a33654a4ce2cf69636336aefc7a906605ca4b332177f6f125acf854455423683c162

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.3.0
+
+- Add `with_relation_name` to `have_many` matcher
+- Condense `HaveOne` and `HaveMany` into `Relationship`. No public API change.
+
 # v0.2.0
 
 - Add `have_one` matcher

data/lib/jsonapi/resources/matchers.rb

@@ -1,8 +1,7 @@
 require "jsonapi/resources/matchers/version"
 require "jsonapi/resources/matchers/have_attribute"
 require "jsonapi/resources/matchers/filter"
-require "jsonapi/resources/matchers/have_many"
-require "jsonapi/resources/matchers/have_one"
+require "jsonapi/resources/matchers/relationship"
 require "jsonapi/resources/matchers/have_model_name"
 require "jsonapi/resources/matchers/have_primary_key"
 
@@ -19,11 +18,11 @@ module JSONAPI
       end
 
       def have_many(name)
-        HaveMany.new(name)
+        Relationship.new(:have_many, name)
       end
 
       def have_one(name)
-        HaveOne.new(name)
+        Relationship.new(:have_one, name)
       end
 
       def have_model_name(name)

data/lib/jsonapi/resources/matchers/{have_many.rb → relationship.rb}

@@ -1,22 +1,33 @@
 module JSONAPI
   module Resources
     module Matchers
-      class HaveMany
+      class Relationship
 
-        attr_accessor :name, :resource, :expected_class_name
+        attr_accessor(:name,
+                      :relationship_type,
+                      :resource,
+                      :expected_class_name,
+                      :expected_relation_name)
 
-        def initialize(name)
+        def initialize(relationship_type, name)
+          self.relationship_type = relationship_type
           self.name = name
         end
 
         def description
-          "have many `#{name}`"
+          "#{humanized_relationship_type} `#{name}`"
+        end
+
+        def humanized_relationship_type
+          relationship_type.to_s.gsub('_',' ')
         end
 
         def matches?(resource)
           self.resource = resource
 
-          has_key_in_relationships? && matches_class_name?
+          has_key_in_relationships? &&
+            matches_class_name? &&
+            matches_relation_name?
         end
 
         def has_key_in_relationships?
@@ -33,12 +44,20 @@ module JSONAPI
           self
         end
 
+        def with_relation_name(name)
+          self.expected_relation_name = name
+          self
+        end
+
         def failure_message
           resource_name = resource.class.name.demodulize
-          message = ["expected `#{resource_name}` to have many `#{name}`"]
+          message = ["expected `#{resource_name}` to #{humanized_relationship_type} `#{name}`"]
           if self.expected_class_name
             message << "with class name `#{self.expected_class_name}`"
           end
+          if self.expected_relation_name
+            message << "with relation name `#{self.expected_relation_name}`"
+          end
           message.join(" ")
         end
 
@@ -49,6 +68,13 @@ module JSONAPI
           self.expected_class_name == actual_class_name
         end
 
+        def matches_relation_name?
+          return true if self.expected_relation_name.nil?
+          association = resource.class._relationships[name]
+          actual_relation_name = association.relation_name
+          self.expected_relation_name == actual_relation_name
+        end
+
       end
     end
   end

data/lib/jsonapi/resources/matchers/version.rb

@@ -1,7 +1,7 @@
 module JSONAPI
   module Resources
     module Matchers
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources-matchers
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - G5
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-resources
@@ -106,11 +106,10 @@ files:
 - lib/jsonapi/resources/matchers.rb
 - lib/jsonapi/resources/matchers/filter.rb
 - lib/jsonapi/resources/matchers/have_attribute.rb
-- lib/jsonapi/resources/matchers/have_many.rb
 - lib/jsonapi/resources/matchers/have_model_name.rb
-- lib/jsonapi/resources/matchers/have_one.rb
 - lib/jsonapi/resources/matchers/have_primary_key.rb
 - lib/jsonapi/resources/matchers/integrations/rspec.rb
+- lib/jsonapi/resources/matchers/relationship.rb
 - lib/jsonapi/resources/matchers/version.rb
 homepage: https://github.com/G5/jsonapi-resources-matchers
 licenses:

data/lib/jsonapi/resources/matchers/have_one.rb

@@ -1,55 +0,0 @@
-module JSONAPI
-  module Resources
-    module Matchers
-      class HaveOne
-
-        attr_accessor :name, :resource, :expected_class_name
-
-        def initialize(name)
-          self.name = name
-        end
-
-        def description
-          "have one `#{name}`"
-        end
-
-        def matches?(resource)
-          self.resource = resource
-
-          has_key_in_relationships? && matches_class_name?
-        end
-
-        def has_key_in_relationships?
-          serialized_hash = JSONAPI::ResourceSerializer.new(resource.class).
-            serialize_to_hash(resource).with_indifferent_access
-          expected_key = name.to_s.dasherize
-          relationships = serialized_hash["data"]["relationships"]
-          return false if relationships.nil?
-          relationships.has_key?(expected_key)
-        end
-
-        def with_class_name(name)
-          self.expected_class_name = name
-          self
-        end
-
-        def failure_message
-          resource_name = resource.class.name.demodulize
-          message = ["expected `#{resource_name}` to have one `#{name}`"]
-          if self.expected_class_name
-            message << "with class name `#{self.expected_class_name}`"
-          end
-          message.join(" ")
-        end
-
-        def matches_class_name?
-          return true if self.expected_class_name.nil?
-          association = resource.class._relationships[name]
-          actual_class_name = association.class_name
-          self.expected_class_name == actual_class_name
-        end
-
-      end
-    end
-  end
-end