polyblock 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06919525f4b221723117aefa89b3197c9a76d502
-  data.tar.gz: 0c597e36d939f518fc755188d36f29746dffb570
+  metadata.gz: ff857a4f0e3e9ab5a5d010b4d8e609752b933509
+  data.tar.gz: b3c3c81c34bc63ce8721ebabca286b840463205a
 SHA512:
-  metadata.gz: 57bc2dcaf71ca828830c2bf35f759a2454ce455c2f366b7392ba9b1117c63d4c94e2c00164196c9f7b8f92d99c38f9c89a3cf63bf8a7ae561be38e141cc895cb
-  data.tar.gz: b68949a6c40b78f33772e1fa9422e7c9845e4d05d2635cfbcd12f0b7ab4e65aabdd899e3c1fb89bacb95385a06ca39ca20d999461e9a1ec935bdddef97880de9
+  metadata.gz: 64b76b6a9049a17eb21a71ade8d6cc0903883275271486e5689e50c2c3445198f5f0917da744c2a08ca48adf98c3481f5ec281e6ee6b3f7ec098ad81d63b9109
+  data.tar.gz: 997011ec6537b48d2c6ff635f97a1e3ed7b138d20be28b9016338b04b1078005b0c95a9ad05e2cf42558a95d4dd97da6ede988681866bbf71a8a317bd4ae11a3

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/lib/polyblock/view_helpers.rb

@@ -9,7 +9,7 @@ module Polyblock
           :condensed => false,
           :length => 250,
           :omission => '... (continued)'
-      }.merge(options)
+      }.deep_merge(options)
 
       # Fetch or create Polyblock
       pb = Block.fetch_or_create(name)
@@ -19,7 +19,7 @@ module Polyblock
 
       # Build output tag
       content = pb.content.present? ? pb.content : pb.settings[:default_text]
-      tag_options = options[:tag_options].deep_merge({:id => "pb-#{pb_id}-#{random_id}", :data => {:pbid => pb_id, :pbname => name}})
+      tag_options = options[:tag_options].deep_deep_merge({:id => "pb-#{pb_id}-#{random_id}", :data => {:pbid => pb_id, :pbname => name}})
       tag_options[:contenteditable] = if options[:condensed]
                                         'false'
                                       elsif options.has_key?(:editable)
@@ -53,7 +53,7 @@ module Polyblock
     end
 
     def fields_for_polyblock(name, f, options={})
-      options = {}.merge(options)
+      options = {}.deep_merge(options)
       pb = pb_from_name(name, f)
       render :partial => 'polyblock/fields_for', :locals => {:f => f, :pb => pb, :name => name, :options => options}
     end
@@ -69,7 +69,7 @@ module Polyblock
           }
         },
         :use_input_field => false
-      }.merge(settings)
+      }.deep_merge(settings)
       # Merge in legacy fields
       [:label, :input_html].each{|o| options[:field][o] = options[o] if options[o].present? }
       render :partial => 'polyblock/simple_fields_for',
@@ -79,7 +79,7 @@ module Polyblock
     def simple_form_for_polyblocks(options={})
       options = {
           :url => '/polyblock/update'
-      }.merge(options)
+      }.deep_merge(options)
       simple_form_for(:polyblocks, options) do |f| yield(f) end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyblock
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails