polyblock 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea70ec23a74860c96e50a39ee228a3e830b6fef
-  data.tar.gz: 139793e42037272e9013e2d670c32617a580546f
+  metadata.gz: 94bc45958a0c364700d0eaefba71688b8d8e4bc2
+  data.tar.gz: 44e18333dcd72d3383d012d365fd6b1dd87951aa
 SHA512:
-  metadata.gz: b281ac95c4ed3ca11991db5295831fc6176296ad650871b595e0f07470c28338b830dc312a1a60b33348ffb9d6c6968d0569048079cb60a5e9b8fd027330d5df
-  data.tar.gz: aecc427525e25bc7b528366d4e47a0e634c48c544cfba522d940151f5ed99fecdfef28c326365f2b931125e87acbdb7e58ba7aa4e71951de97fab39aa194c7b0
+  metadata.gz: dd407769d10b23e4ce3ecdf731618b088dd364d65adf5fbd2e2d0a1b0ceb55090f70df774a09c10a1260fcb802e0f39fa80ac3e6755329ccb60ba9c0c47bf67c
+  data.tar.gz: 25da5bb6468e2e457341a9ae1be4e8a92e0145a4b7eb4cd7ce2f922ca47ac628fef0d7a1668f632e48a10e52119978c0a48276bd2fe2878dbcf2fef3d6d521d5

data/app/assets/javascripts/polyblock/init.js

@@ -12,7 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.all
+//= require jquery-ui
 //= require underscore
 //= require underscore.string
 //= require beautify

data/app/controllers/polyblock/polyblocks_controller.rb

@@ -4,7 +4,7 @@ module Polyblock
   class PolyblocksController < ApplicationController
 
     def update
-      if params.has_key? :pbs and params[:pbs].any?
+      if params.key?(:pbs) && params[:pbs].any?
         params[:pbs].each do |i, attrs|
           pb_find = Block.where(:id => attrs[:id])
           attrs.delete(:id)
@@ -14,8 +14,15 @@ module Polyblock
             Block.create! attrs
           end
         end
+        render :text => "OK!"
+      elsif params.key?(:polyblocks)
+        params[:polyblocks].each do |name, pb_attrs|
+          pb = Block.fetch_or_create name
+          pb.update_attributes! pb_attrs
+        end
+        flash[:success] = 'Your polyblocks have been updated!'
+        redirect_to :back
       end
-      render :text => "OK!"
     end
 
     def convert_haml_to_html
@@ -42,5 +49,10 @@ module Polyblock
       render :text => engine.render
     end
 
+    private
+    def polyblocks_params
+      params.require(:polyblocks).permit()
+    end
+
   end
 end

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

@@ -0,0 +1,3 @@
+= fields_for name do |ff|
+  = ff.hidden_field :name, :value => name.to_s
+  = ff.cktext_area :content, options.merge(name.is_a?(String) ? {:value => pb.content} : {})

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/lib/polyblock/view_helpers.rb

@@ -53,26 +53,46 @@ module Polyblock
       end
     end
 
+    def fields_for_polyblock(name, f, options={})
+      options = {}.merge(options)
+      pb = pb_from_name(name, f)
+      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 => false,
+          :label => true,
           :input_html => {}
       }.merge(options)
-
-      pb = if name.is_a?(String)
-             Block.fetch_or_initialize(name)
-           elsif name.is_a?(Symbol)
-             f.object
-           else
-             nil
-           end
-
+      pb = pb_from_name(name, f)
       render :partial => 'polyblock/simple_fields_for', :locals => {:f => f, :pb => pb, :name => name, :options => options}
     end
 
+    def simple_form_for_polyblocks(options={})
+      options = {
+          :url => '/polyblock/update'
+      }.merge(options)
+      simple_form_for(:polyblocks, options) do |f| yield(f) end
+    end
+
     def polyblock_editor_bar
       render :partial => 'polyblock/editor_bar'
     end
 
+    private
+    def pb_from_name(name, f)
+      if 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
+      else
+        raise 'Invalid name passed to Polyblock pb helper!'
+      end
+    end
+
   end
 end

data/test/dummy/app/views/home/index.html.haml

@@ -3,12 +3,36 @@
 %h3 Polyblock with Inline Editing
 = pb 'Test', :editable => true
 
+%h3 Uneditable Polyblock
+= pb 'Test', :editable => false
+
 %h3 New Polyblock
 = pb Polyblock::Block.random_id, :editable => true
 
+%h3 Polyblock Form Helper
+= form_for @event do |f|
+  %p
+    Title:
+    = f.text_field :title
+  %p
+    Description:
+    %br
+    = fields_for_polyblock :description, f
+  %p
+    Some Random String
+    = fields_for_polyblock "Some Random String", f
+  = f.submit
+
+%h3
+
 %h3 Polyblock SimpleForm
 = simple_form_for @event do |f|
   = f.input :title
-  = simple_fields_for_polyblock :description, f, :label => true
-  = simple_fields_for_polyblock "Random String", f, :label => true
-  = f.submit "Save Event"
+  = simple_fields_for_polyblock :description, f
+  = simple_fields_for_polyblock "Some Other Random String", f
+  = f.submit "Save Event"
+
+%h3 System Level Polyblocks in SimpleForm
+= simple_form_for_polyblocks do |f|
+  = simple_fields_for_polyblock 'Another Random String', f
+  = f.submit