simple_messages 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d41874ead77c11ec3bbef3c22a0fa3f86cabb8
-  data.tar.gz: 468cb9500317cd2763c90d4d4cfe32bc8d94a997
+  metadata.gz: 992e209ceb2ca1754e23c03b3e7269f9db3530a4
+  data.tar.gz: 7e0707e15dda322f7c1f54ee38aed17313337ebf
 SHA512:
-  metadata.gz: 5ba07a6d9deba03c3b90981bcbef2bdac17844d959a0adb05d338ac2d752de0f3452c0ce3f1d49c2faa47e620f3e955f4e6931efa05275cd580d02e1668e50a5
-  data.tar.gz: 5d93ec3b49b3bc631c09845c0798386604100fbeca9ae5be54c0bbd9b540f30c9a6a7508cfc9477d1a4280ebb61f4cba2e39629f15fd79982b4720d9f1f35efa
+  metadata.gz: 22af4e290c59a247123b2f7309fc1cc1ace62d952ccde78fc12901306b5919f42483c0bf129a0ff10f20340753b6c0919b590e9deac44db6072200969fb3abbc
+  data.tar.gz: 9541c78a7e8cd5d4864dfcf316f7f1783ffa56f1eeac9a728ec630204afe53cf30ad79e85918db3186831f0c49614a78d4c2744f574e6c207131c297f1a0da69

data/lib/simple_messages/action_controller.rb

@@ -17,6 +17,8 @@ module SimpleMessages
     end
 
     def simple_messages_models
+      return [] if @simple_messages_models.nil? or @dont_simple_messages_models.nil?
+
       (@simple_messages_models.collect(&:to_sym) - @dont_simple_messages_models.collect(&:to_sym)).compact.uniq
     end
 

data/lib/simple_messages/action_view.rb

@@ -16,7 +16,7 @@ module SimpleMessages
 
     def simple_messages_flash(options = {})
       html = flash.collect do |kind, content|
-        builder = Builder.new({ kind: kind, body: content }.reverse_merge(options))
+        builder = Builder.new options.reverse_merge(kind: kind, body: content)
 
         builder.to_html
       end
@@ -30,15 +30,15 @@ module SimpleMessages
       simple_messages_models.collect do |model_name|
         object = instance_variable_get("@#{model_name}")
 
-        object if object.present? and object.errors.any?
+        object if simple_messages_object_has_errors? object
       end.compact
     end
 
     def simple_messages_validation(options = {})
       simple_messages_objects.collect do |object|
-        title = I18n.t('errors.template.header', count: object.errors.count, model: object.class.model_name.human)
+        title = I18n.t('errors.template.header', count: object.errors.full_messages.count, model: object.class.model_name.human)
 
-        builder = Builder.new({ kind: :error, body: object.errors.full_messages, header: title }.reverse_merge(options))
+        builder = Builder.new options.reverse_merge(kind: :error, body: object.errors.full_messages, header: title)
 
         builder.to_html
       end.join.html_safe
@@ -52,6 +52,13 @@ module SimpleMessages
       "SimpleMessages.alert(#{messages.to_json});".html_safe
     end
 
+    private
+    def simple_messages_object_has_errors?(object)
+      object.present? and (
+        (object.errors.respond_to? :any? and object.errors.any?) or
+        (object.errors.respond_to? :empty? and !object.errors.empty?)
+      )
+    end
+
   end
 end
-

data/lib/simple_messages/version.rb

@@ -1,3 +1,3 @@
 module SimpleMessages
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/simple_messages.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", "~> 4.0.8"
+  spec.add_dependency "rails", ">= 4.0.8", "< 5"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "fuubar", '2.0.0.rc1'
+  spec.add_development_dependency "fuubar", '~> 2.0'
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "rake"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: simple_messages
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - 29sul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +62,16 @@ dependencies:
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement