notifly 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6111c9569a44311f1348d13fe80f7a8463feae4a
-  data.tar.gz: 65b36c5d13eb9d42d2cb8a628f39d25361d7c306
+  metadata.gz: 0eed5d09169b00e015b843f966332e3e558618df
+  data.tar.gz: 82e251a76068372513597dc289e1c3388f2599dc
 SHA512:
-  metadata.gz: 09d4e63529826842d329b5663951e99b21748a8ab15785e0544610baea5d435889e9752db0d5bfedb03f4894e9b85ea5d5979a401bc410de3924ceb4d7e40b24
-  data.tar.gz: 78e93dcbb853a7afbaf79b6d6973f157b875e77945f9b7d4e40f13b1522e52e78a15d083dbbc51134bf50b805c82287d912aff2827937666353fb0c7f9de8ccb
+  metadata.gz: 0a6436ea150dfa3e28b65a3bd9d4150c722abd4499ff22d47bd86e2c850d2cefdbb7ef4f63afe61768d978fe28499f1c6203c8c565d9a5a4b608b7215cc52d29
+  data.tar.gz: 87d238c6a8c05ab02d6c57bcd03df527e297197a33c9c85312fe753369a281e356f0fbe01d16b45225e57b73052d4965f5377e06f1ecfec8b56f4d687e071200

data/app/controllers/notifly/notifications_controller.rb

@@ -32,7 +32,7 @@ module Notifly
 
     private
       def scoped_notifications
-        current_user_notifications.send(scope_param, than: params[:reference_notification_id])
+        current_user_notifications.send(scope_param, than: params[:reference_notification_id]).limited
       end
 
       def scope_param

data/app/models/notifly/notification.rb

@@ -4,7 +4,7 @@ module Notifly
     belongs_to :sender, polymorphic: true
     belongs_to :receiver, polymorphic: true
 
-    before_validation :convert_data, :set_defaults
+    before_validation :set_defaults
 
     scope :all_from,      -> (receiver) { where(receiver: receiver) }
     scope :unseen,        -> { where(seen: false) }
@@ -12,7 +12,7 @@ module Notifly
     scope :limited,       -> { limit(Notifly.per_page) }
     scope :ordered,       -> { order('created_at DESC') }
     scope :newer,         ->(than: nil) do
-      return ordered.limited if than.blank?
+      return ordered if than.blank?
 
       reference = find(than)
       ordered.where('created_at > ?', reference.created_at).where.not(id: reference)
@@ -22,8 +22,7 @@ module Notifly
 
       ordered.
       where('created_at < ?', reference.created_at).
-      where.not(id: reference).
-      limited
+      where.not(id: reference)
     end
     scope :between,       ->(first, last) do
       notifications = where(id: [first, last])
@@ -32,15 +31,9 @@ module Notifly
 
     validates :receiver, :template, :mail, :kind, presence: true
 
-    def data
-      YAML.load(read_attribute(:data))
-    end
+    serialize :data, JSON
 
     private
-      def convert_data
-        self.data = read_attribute(:data).to_json
-      end
-
       def set_defaults
         self.mail     ||= :never
         self.kind     ||= :notification

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifly
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Pedro Passalini
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails