specstar-models 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3ee37cc5b4917b1bd35ea28b6f21377b7eb836
-  data.tar.gz: bc210547f94e2e43243a7341a3f7e719f5280575
+  metadata.gz: 4b065846863af4226a3ab27f23beeb016cac032f
+  data.tar.gz: ea4bd2771757700817bd2b3396c83b850fd2164f
 SHA512:
-  metadata.gz: c38baed49d61b30eb938b771253b4fa45cc780b5c757f1b64ecba6c68687c4b39b6eb789328a7062db2df7b6336487242d7bb116577820d0526ac1505295e071
-  data.tar.gz: 34eeaeb8f58a0008188ccbc1fd888aa53e1dfb5b3c42baa21f9521b99d150de3183a56aad2d4c2b7ceb3ac783dbbdb76aec21f33a9e3eb83ba56730d24f03ae6
+  metadata.gz: 12403958e0e596f8a1661bd636a2376f45e11aa348e5f6ba25170d7f618f3543646ee61f2a130ba521a91318f25aacb13c8dc342c02e420239400c2447bf9d25
+  data.tar.gz: 6c7da052912ab9798776ff0b49ee9f49d49313257ea88cd5081501a047cb1dd70151f7d9a44aaaeb3a51f25a6a06efd2b7ebb62fb84aa620b134b65a383c9774

data/lib/specstar/models.rb

@@ -4,10 +4,6 @@ require 'rspec/expectations'
 module Specstar
   module Models
     module Matchers
-      def properties_to_sentence(hash)
-        " of " + hash.map { |key, value| "#{key} #{value}" }.to_sentence if hash.present?
-      end
-
       def validate_presence_of_methods_in_options(model, options)
         if options[:if] && options[:if].is_a?(Symbol)
           return false unless model.respond_to? options[:if]
@@ -53,13 +49,17 @@ module Specstar
           result
         end
 
-        failure_message_for_should do |target|
+        failure_message do |target|
           "Expected #{target.class} to have an attribute '#{attr}'#{properties_to_sentence @extras}."
         end
 
         description do
           "have an attribute '#{attr}'#{properties_to_sentence @extras}."
         end
+
+        def properties_to_sentence(hash)
+          " of " + hash.map { |key, value| "#{key} #{value}" }.to_sentence if hash.present?
+        end
       end
 
       def has_attribute?(model, attr, extras={})
@@ -89,7 +89,7 @@ module Specstar
               end.size > 0
         end
 
-        failure_message_for_should do |model|
+        failure_message do |model|
           if has_attribute?(model, attr) || has_association?(model, attr)
             if options.nil? || validate_presence_of_methods_in_options(model, options)
               "expected #{model.class} to validate presence of #{attr}."
@@ -109,7 +109,7 @@ module Specstar
           end.size > 0
         end
 
-        failure_message_for_should do |model|
+        failure_message do |model|
           if has_attribute?(model, attr) || has_association?(model, attr)
             if options.nil? || validate_presence_of_methods_in_options(model, options)
               "expected #{model.class} to validate uniqueness of #{attr}."
@@ -130,7 +130,7 @@ module Specstar
               end.size > 0
         end
 
-        failure_message_for_should do |model|
+        failure_message do |model|
           if has_attribute?(model, attr) || has_association?(model, attr)
             "expected #{model.class} to validate inclusion of #{attr} in [#{options.delete(:in).map(&:to_s).join(', ')}]."
           else
@@ -149,7 +149,7 @@ module Specstar
               end.size > 0
         end
 
-        failure_message_for_should do |model|
+        failure_message do |model|
           if has_attribute?(model, attr) || has_association?(model, attr)
             "expected #{model.class} to validate numericality of #{attr} in [#{options.delete(:in).map(&:to_s).join(', ')}]."
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specstar-models
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sujoy Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core