garland 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94143b495a7b352952ac1ba4dceef535a628a730
-  data.tar.gz: ca1755f63483693ecb8945532c05b5d148b6108b
+  metadata.gz: a2b288498ddb5433e1531d660e8a016131d85965
+  data.tar.gz: 5f90325f1edf6ebb8c90e7c7c227fb60dc222f23
 SHA512:
-  metadata.gz: 0aa5890da156ed025662a8df87464d1f6aca63cd01399f401560d977ec97b1b2919547132a255e204ced0e340bbfd83240bbd6e0997c54663da1f64655a5221a
-  data.tar.gz: d5b549ed770a7e9283289590c0ab171b114a9ccd7735d93735a0b8dbaa4ad3adbd024eeee925532f399f213bbcb7705b1f09ac7b0d76d8bb3aca5748a10197b3
+  metadata.gz: 8771347f6b30260954a864529e7b9943e74c4d7ba23c5d116bb953b043290d075c69f6c669337f4dcc9744b223d22b1c71e0558a5c7d52df4ec44071acffaab7
+  data.tar.gz: 8e849c82f4e935bbfb1e751f2f9e7401134b41d18c729b3907c7d46a2baf05b37fa7158472851a4e80951a5cf837fad10ceabca76073f6dca71b7588ccea6e20

data/lib/garland_rails.rb

@@ -107,6 +107,20 @@ module GarlandRails
       self.find_by(id: head.previous_id)
     end
 
+    def next
+      Garland.find(self.next_id)
+    end
+
+    def previous
+      Garland.find(self.previous_id)
+    end
+
+    def safe_eval_entity
+      return nil unless self.entity =~ /\[.*\]/ || self.entity =~ /{.*}/
+
+      eval(self.entity)
+    end
+
     def self.table_type(record)
       record.class.name
     end
@@ -165,7 +179,7 @@ module GarlandRails
       last_diff = self.find_by(id: head.previous_id)
       common_props = self._split_belongs_to(belongs_to)
 
-      diff = HashDiffSym.diff(eval(head.entity), hash)
+      diff = HashDiffSym.diff(head.safe_eval_entity, hash)
       return unless diff.any?
 
       new_diff_props = common_props.merge(
@@ -221,19 +235,19 @@ module GarlandRails
       return false unless tail && head
 
       current_bulb = tail
-      current_hash = eval(tail.entity)
+      current_hash = tail.safe_eval_entity
       items_counted = 1
       while current_bulb.next_id do
         items_counted += 1
-        current_bulb = self.find_by(id: current_bulb.next_id)
+        current_bulb = current_bulb.next
         if current_bulb.entity_type == DIFF
-          current_hash = HashDiffSym.patch!(current_hash, eval(current_bulb.entity))
+          current_hash = HashDiffSym.patch!(current_hash, current_bulb.safe_eval_entity)
         else
           break
         end
       end
 
-      items_counted == self.thread(belongs_to).size && current_hash == eval(head.entity)
+      items_counted == self.thread(belongs_to).size && current_hash == head.safe_eval_entity
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garland
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexander Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashdiff_sym