polyblock 0.8.8 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbefa64847a7363aaca2d2b19172cadf459a9e08
-  data.tar.gz: 6e540f64345f94bf2e423ee70c0de8ae06b6af18
+  metadata.gz: b4306edc72fcb000b6f3c3f9a5f532f785da47a7
+  data.tar.gz: c9f530612d2cc20d0955241318563a82439398e4
 SHA512:
-  metadata.gz: d2777dcb2e6a3bc97275b0c1d6a44124d402cd37c7b3c0745508718b36a580e23ee1cb1f5c8b75c5f0de3eead51a27556789a4c38070b9edfd3db0e287237c08
-  data.tar.gz: 44aa66f75e3f2e693d88ab4723f997103a6a8faec432466986cd156a8f1adfcb6d51d79805e2013a7bf419a0c8335b09116bbea6b1a3aac1aa9747a287130536
+  metadata.gz: 61d36b682dec3c1e0ea9dfbe0b8ce891f11058da0d8b33bae36a762b735500c74f3d494ae8de0aa54b33d804053801896d2ecaf582e68eb3df4f32faef66b97c
+  data.tar.gz: 2f13c165a11cd6bbeb90f3023351805a14aa46f853800fe608cdbdf7089ee7b517370a85c3e54642c65a5a6943c5935c1dac1f554acf2cfcc735c801fe4b5ba1

data/app/views/polyblock/_simple_fields_for.html.haml

@@ -1,6 +1,11 @@
 = f.simple_fields_for name do |ff|
+  - if f.object.errors[name.to_sym].any?
+    - f.object.errors.full_messages_for(name.to_sym).each do |e|
+      .alert.alert-danger= e
   = ff.input_field :name, :as => :hidden, :value => name.to_s
-  - if !options[:label]
-    = ff.input_field :content, options[:input_html].merge({:as => :ckeditor})
+  - if options[:use_input_field] == false
+    = ff.input :content, options[:field]
   - else
-    = ff.input :content, :as => :ckeditor, :label => options[:label].is_a?(String) ? options[:label] : name.to_s.titleize, :input_html => pb.content.present? ? options[:input_html].merge({:value => pb.content}) : options[:input_html]
+    = ff.input_field :content, options[:field][:input_html]
+    -# = ff.input :content, :as => :ckeditor, :label => options[:label].is_a?(String) ? options[:label] : name.to_s.titleize,
+    -#            :input_html => pb.content.present? ? options[:input_html].merge({:value => pb.content}) : options[:input_html]

data/lib/polyblock/capybara_helpers.rb

@@ -0,0 +1,15 @@
+module Polyblock
+  module CapybaraHelpers
+    def fill_in_polyblock(locator, params = {})
+      # Find out ckeditor id at runtime using its label
+      locator = find('label', text: locator)[:for] if page.has_css?('label', text: locator)
+      # Fill the editor content
+      page.execute_script <<-SCRIPT
+          var ckeditor = CKEDITOR.instances.#{locator}
+          ckeditor.setData('#{params[:with]}')
+          ckeditor.focus()
+          ckeditor.updateElement()
+      SCRIPT
+    end
+  end
+end

data/lib/polyblock/railtie.rb

@@ -1,3 +1,4 @@
+require 'polyblock/capybara_helpers'
 require 'polyblock/view_helpers'
 require 'polyblock/glue'
 
@@ -10,9 +11,13 @@ module Polyblock
         Polyblock::Railtie.insert
       end
     end
+
     initializer "polyblock.view_helpers" do
       ActionView::Base.send :include, ViewHelpers
     end
+    # initializer "polyblock.capybara_helpers" do
+    #   RSpec.send :include, CapybaraHelpers
+    # end
   end
 
   class Railtie
@@ -22,4 +27,4 @@ module Polyblock
       end
     end
   end
-end
+end

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.8.8"
-end
+  VERSION = "0.9.2"
+end

data/lib/polyblock/view_helpers.rb

@@ -45,7 +45,7 @@ module Polyblock
 
       # Truncation
       if options[:condensed]
-        tag_options[:class] += " polyblock-condensed"
+        tag_options[:class] += ' polyblock-condensed'
         truncate(Block.strip_html(content), :length => options[:length], :omission => options[:omission])
       else
         content_tag(options[:tag], content, tag_options, false)
@@ -58,13 +58,22 @@ module Polyblock
       render :partial => 'polyblock/fields_for', :locals => {:f => f, :pb => pb, :name => name, :options => options}
     end
 
-    def simple_fields_for_polyblock(name, f, options={})
-      options = {
-          :label => true,
-          :input_html => {}
-      }.merge(options)
+    def simple_fields_for_polyblock(name, f, settings={})
       pb = pb_from_name(name, f)
-      render :partial => 'polyblock/simple_fields_for', :locals => {:f => f, :pb => pb, :name => name, :options => options}
+      options = {
+        :field => {
+          :as => :ckeditor,
+          :label => name.to_s.titleize,
+          :input_html => {
+            :value => pb.present? ? pb.content : nil
+          }
+        },
+        :use_input_field => false
+      }.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',
+             :locals => {:f => f, :pb => pb, :name => name, :options => options}
     end
 
     def simple_form_for_polyblocks(options={})
@@ -80,7 +89,8 @@ module Polyblock
 
     private
     def pb_from_name(name, f)
-      if name.is_a?(String)
+      if name.is_a?(Polyblock::Block) then name
+      elsif name.is_a?(String)
         Block.fetch_or_initialize(name)
       elsif name.is_a?(Symbol)
         if f.object.is_a? Block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyblock
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.2
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -186,6 +186,7 @@ files:
 - lib/generators/polyblock/install/templates/ckeditor_migration.rb
 - lib/generators/polyblock/install/templates/polyblock_migration.rb
 - lib/polyblock.rb
+- lib/polyblock/capybara_helpers.rb
 - lib/polyblock/engine.rb
 - lib/polyblock/glue.rb
 - lib/polyblock/has_polyblock.rb