polyblock 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a92299658f7303efd6feefcedd9ae1f402366c2a
-  data.tar.gz: 2832a3dd1838a1cdad87f1f0b1d88515e1441162
+  metadata.gz: a5431ce08071cf86b397e36aeea37599757119d5
+  data.tar.gz: d49a53f8a8153a86fc19adef8bed5dfba1558410
 SHA512:
-  metadata.gz: 17fe32d78b3c2ca2d1520b8a2292b8246b07115422159824a2b2c86278a6f0f10bd7f858873129e4080b04e3a2a0fee3d54c2c5b075ce8d6dae7611c4b2bbefe
-  data.tar.gz: 7128999258a93f7f3d435cf0634e11de5af1428d8a6790b891ca7ea76ffb14fcd5fc74c42beccc56b4a4924dda761657849340e9ac57efba939c063e6dfaa850
+  metadata.gz: 1f4855ebd857aba89ea075267b85a51282f9ad4a7ffa5c2cc75afad24886546bafa4189dc0805ef5c743c5160054aaf1a50080471c13d32e1b4cc1dbd121ee2e
+  data.tar.gz: b2927232df13beed70eab6c63b290d2100ce7ee456c2ed79907e578acb2f18b5c5fbf8188cbc8facab24e491b516f6b31a72896abb70d36083065611516e4cb9

data/app/models/polyblock/block.rb

@@ -58,15 +58,15 @@ module Polyblock
     end
 
     def self.fetch_or_initialize(name)
-      if name.is_a? Block
-        name
-      elsif name.is_a? String
-        matches = where :name => name
-        if matches.any?
-          matches.first
-        else
-          new({:name => name})
+      if name.is_a?(Block) then name
+      else
+        name = name.to_s if name.is_a? Symbol
+        unless name.is_a? String
+          raise 'Invalid name passed to Polyblock::Block#fetch_or_initialize'
         end
+        matches = find_by(name: name)
+        return matches if matches.present?
+        new({name: name})
       end
     end
     def self.fetch_or_create(name)

data/lib/polyblock/capybara_helpers.rb

@@ -14,7 +14,7 @@ module Polyblock
       # Fill the editor content
       page.execute_script <<-SCRIPT
           var ckeditor = CKEDITOR.instances['#{locator}'];
-          ckeditor.setData('#{params[:with].gsub("'", "\\\'")}');
+          ckeditor.setData('#{params[:with].gsub("'", "\\\\'")}');
           ckeditor.focus();
           setTimeout(function(){
             ckeditor.updateElement();

data/lib/polyblock/controller_helpers.rb

@@ -0,0 +1,11 @@
+require 'polyblock'
+require 'polyblock/strong_params_helper'
+
+module Polyblock
+  module ControllerHelpers
+    extend ActiveSupport::Concern
+    included do
+      include StrongParamsHelper
+    end
+  end
+end

data/lib/polyblock/engine.rb

@@ -1,12 +1,32 @@
-require "ckeditor"
-require 'polyblock/strong_params_helper'
+require 'polyblock'
+require 'ckeditor'
 
 module Polyblock
-  class Engine < Rails::Engine
+  require 'rails'
+  class Engine < ::Rails::Engine
     isolate_namespace Polyblock
+
+    require 'polyblock/controller_helpers'
+    require 'polyblock/view_helpers'
+    require 'polyblock/strong_params_helper'
+    require 'polyblock/simple_form_helper'
+
     initializer 'polyblock_engine.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
-        helper Polyblock::StrongParamsHelper
+        ActionController::Base.send :include, ControllerHelpers
+      end
+    end
+
+    initializer 'polyblock.view_helpers' do
+      ActiveSupport.on_load :action_view do
+        ActionView::Base.send :include, ViewHelpers
+        if defined? SimpleForm
+          ActionView::Base.send :include, SimpleFormHelper
+          SimpleForm::FormBuilder.send :define_method, 'simple_fields_for_polyblock' do |*args, &block|
+            name, *remaining_args = args
+            template.simple_fields_for_polyblock name, self, *remaining_args, &block
+          end
+        end
       end
     end
   end

data/lib/polyblock/railtie.rb

@@ -1,22 +1,14 @@
-require 'polyblock/view_helpers'
 require 'polyblock/glue'
 
 module Polyblock
   require 'rails'
 
   class Railtie < Rails::Railtie
-    initializer "polyblock.insert_into_active_record" do |app|
+    initializer 'polyblock.insert_into_active_record' do |app|
       ActiveSupport.on_load :active_record do
         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

data/lib/polyblock/simple_form_helper.rb

@@ -0,0 +1,59 @@
+require 'polyblock'
+
+module Polyblock
+  module SimpleFormHelper
+    
+    # def self.simple_fields_for_polyblock(fb, title, *args, &block)
+    #   ( '<div class="polyblock-fields">' <<
+    #       fb.simple_fields_for(title, *args, &block) << '</div>' ).html_safe
+    # end
+    # def simple_fields_for_polyblock(fb, title, *args, &block)
+    #   if title.is_a? FormBuilder
+    #     return retrofit_simple_fields_for_polyblock(fb, title, *args, &block)
+    #   end
+    #   pb = pb_from_name(name, fb)
+    #   new_block = block_given? ? block : ->(fb2) {
+    #     render partial: 'polyblock/simple_fields_for',
+    #            locals: { f: fb2 } }
+    #   Polyblock::SimpleFormHelper.simple_fields_for_polyblock(
+    #     fb, title, *args, &new_block)
+    # end
+
+    # Retrofit method
+    # def retrofit_simple_fields_for_polyblock(name, f, options={}, &block)
+    def simple_fields_for_polyblock(name, f, options={}, &block)
+      pb = pb_from_name(name, f)
+      settings = {
+        :field => {
+          :as => :ckeditor,
+          :label => name.to_s.titleize,
+          :input_html => {
+            :value => pb.present? ? pb.content : nil
+          }
+        },
+        :use_input_field => false
+      }.deep_merge(options)
+
+      # Merge in legacy fields
+      [:label, :input_html].each{|o|
+        settings[:field][o] = settings[o] if settings[o].present? }
+
+      new_block = block_given? ? block : ->(fb2) {
+        render partial: 'polyblock/simple_fields_for',
+               locals: { f: fb2, pb: pb, name: name, options: settings } }
+      new_block.call(f)
+    end
+
+    protected
+    def pb_from_name(name, fb)
+      if name.is_a?(Symbol)
+        if fb.object.is_a?(Polyblock::Block) then fb.object
+        else fb.object.send(name) end
+      else
+        foi_block = Block.fetch_or_initialize name
+        return foi_block if foi_block.present?
+        raise 'Invalid name passed to pb_from_name helper!'
+      end
+    end
+  end
+end

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "1.1.1"
+  VERSION = '1.2.0'
 end

data/lib/polyblock/view_helpers.rb

@@ -1,3 +1,5 @@
+require 'polyblock'
+
 module Polyblock
   module ViewHelpers
 
@@ -58,26 +60,26 @@ 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={})
-      pb = pb_from_name(name, f)
-      settings = {
-        :field => {
-          :as => :ckeditor,
-          :label => name.to_s.titleize,
-          :input_html => {
-            :value => pb.present? ? pb.content : nil
-          }
-        },
-        :use_input_field => false
-      }.deep_merge(options)
-
-      # Merge in legacy fields
-      [:label, :input_html].each{|o|
-        settings[:field][o] = settings[o] if settings[o].present? }
-
-      render partial: 'polyblock/simple_fields_for',
-             locals: { f: f, pb: pb, name: name, options: settings }
-    end
+    # def simple_fields_for_polyblock(name, f, options={})
+    #   pb = pb_from_name(name, f)
+    #   settings = {
+    #     :field => {
+    #       :as => :ckeditor,
+    #       :label => name.to_s.titleize,
+    #       :input_html => {
+    #         :value => pb.present? ? pb.content : nil
+    #       }
+    #     },
+    #     :use_input_field => false
+    #   }.deep_merge(options)
+    #
+    #   # Merge in legacy fields
+    #   [:label, :input_html].each{|o|
+    #     settings[:field][o] = settings[o] if settings[o].present? }
+    #
+    #   render partial: 'polyblock/simple_fields_for',
+    #          locals: { f: f, pb: pb, name: name, options: settings }
+    # end
 
     def simple_form_for_polyblocks(options={})
       options = {
@@ -90,19 +92,15 @@ module Polyblock
       render :partial => 'polyblock/editor_bar'
     end
 
-    private
-    def pb_from_name(name, f)
-      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
-          f.object
-        else
-          f.object.send(name)
-        end
+    protected
+    def pb_from_name(name, fb)
+      if name.is_a?(Symbol)
+        if fb.object.is_a?(Polyblock::Block) then fb.object
+        else fb.object.send(name) end
       else
-        raise 'Invalid name passed to Polyblock pb helper!'
+        foi_block = Block.fetch_or_initialize name
+        return foi_block if foi_block.present?
+        raise 'Invalid name passed to pb_from_name helper!'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyblock
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -285,10 +285,12 @@ files:
 - lib/generators/polyblock/install/templates/polyblock_migration.rb
 - lib/polyblock.rb
 - lib/polyblock/capybara_helpers.rb
+- lib/polyblock/controller_helpers.rb
 - lib/polyblock/engine.rb
 - lib/polyblock/glue.rb
 - lib/polyblock/has_polyblock.rb
 - lib/polyblock/railtie.rb
+- lib/polyblock/simple_form_helper.rb
 - lib/polyblock/strong_params_helper.rb
 - lib/polyblock/validators.rb
 - lib/polyblock/validators/polyblock_presence_validator.rb