polyblock 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1cf49aeb0def2dcae5443ec3bc630aa55ce9284
-  data.tar.gz: 28c7f391771bafffdf7c862f572e4518e0f9c23c
+  metadata.gz: 80795451e15edd4c4f2d7eb45fc9f023643d2ecc
+  data.tar.gz: 10c97e9da58822ff329b673c9f944ac43dbdd241
 SHA512:
-  metadata.gz: 52032f72eebdaac1c5b5c89a1986ac19b76aa17ad7814368cd3823048a671613cd94ecd17a638e86da10d843022b6d9862591a46ea63c9faaec509c4f12d6496
-  data.tar.gz: 8b38559e23d84ad39daad1e4dfaaa6265a26098e25b61e4b09239ffce8dd162f0f0024771473566d8fea7db8034a519a9615848359283a48c5d9147ad87fd5de
+  metadata.gz: da8686b6bcc954bdabb98776b1076f48274710124ccf6a8d297e05cbdcc449e3d6715b7bd31dd0e082c523a7935676394ff1756c3124cc0671c952f4058a193e
+  data.tar.gz: 37aeb629009db8eed40f3cab52f2ad0b0c7364f60784cf400502ca15db921d2f363fb895cdd23faaf36e9dc536076c8d4eb68aa07fda7bf2707b265101bab693

data/app/helpers/polyblock/application_helper.rb

@@ -12,56 +12,41 @@ module Polyblock
       }.merge(options)
 
       # Fetch or create Polyblock
-      if name.is_a? Polyblock::Block
-        pb = name
-        pb_id = pb.id
-        name = pb.name
-        pb_exists = true
-      else
-        matches = Polyblock::Block.where :name => name
-        pb_exists = matches.any?
-        pb = pb_exists ? matches.first : Polyblock::Block.new({:name => name})
-        pb_id = if pb_exists
-          pb.id
-        else
-          Polyblock::Block.any? ? Polyblock::Block.order(:id).last.id + 1 : 1
-        end
-      end
-
-      # Generate a random string for id
-      o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
-      random_id = (0...50).map { o[rand(o.length)] }.join
+      pb = Block.fetch_or_create(name)
+      pb_id = pb.new_record? ? Block.next_id : pb.id
+      name = pb.name if name.is_a? Block
+      random_id = Block.random_id
 
       # Build output tag
-      content = pb_exists ? pb.content : "<p>This block is content managed by Polyblock!<br />Click to edit me!</p>"
+      content = pb.content.present? ? pb.content : "[Editable content space for Polyblock <code>#{name}</code>]"
       tag_options = options[:tag_options].deep_merge({:id => "pb-#{pb_id}-#{random_id}", :data => {:pbid => pb_id, :pbname => name}})
       tag_options[:contenteditable] = if options[:condensed]
-                                        "false"
+                                        'false'
                                       elsif options.has_key?(:editable)
-                                        options[:editable] ? "true" : "false"
+                                        options[:editable] ? 'true' : 'false'
                                       elsif respond_to?(:can?) && can?(:manage, pb)
-                                        "true"
+                                        'true'
                                       elsif respond_to?(:user_signed_in?) && user_signed_in?
                                         if current_user.respond_to?(:admin?) && current_user.admin?
-                                          "true"
+                                          'true'
                                         elsif pb.contentable.present? &&
                                             pb.contentable.respond_to?(:user_id) &&
                                             pb.contentable.user_id == current_user.id
-                                          "true"
+                                          'true'
                                         else
-                                          "false"
+                                          'false'
                                         end
                                       else
-                                        "false"
+                                        'false'
                                       end
-      tag_options.delete(:contenteditable) if tag_options[:contenteditable] == "false"
-      tag_options[:class] = (tag_options.has_key?(:class) ? "#{tag_options[:class]} ":"") + "polyblock"
-      tag_options[:data][:pb_exists] = pb_exists
+      tag_options.delete(:contenteditable) if tag_options[:contenteditable] == 'false'
+      tag_options[:class] = (tag_options.key?(:class) ? "#{tag_options[:class]} ": '') + 'polyblock'
+      tag_options[:data][:pb_exists] = pb.new_record?
 
       # Truncation
       if options[:condensed]
         tag_options[:class] += " polyblock-condensed"
-        content = CGI.unescapeHTML(content.gsub("<br><br>", "<br>").gsub('&nbsp;', ' '))
+        content = CGI.unescapeHTML(content.gsub('<br><br>', '<br>').gsub('&nbsp;', ' '))
         truncate(sanitize(strip_tags(content)), :length => options[:length], :omission => options[:omission])
       else
         content_tag(options[:tag], content, tag_options, false)
@@ -73,11 +58,11 @@ module Polyblock
           :label => false,
           :input_html => {}
       }.merge(options)
-      render :partial => "polyblock/simple_fields_for", :locals => {:f => f, :name => name, :options => options}
+      render :partial => 'polyblock/simple_fields_for', :locals => {:f => f, :name => name, :options => options}
     end
 
     def polyblock_editor_bar
-      render :partial => "polyblock/editor_bar"
+      render :partial => 'polyblock/editor_bar'
     end
 
   end

data/app/models/polyblock/block.rb

@@ -7,19 +7,15 @@ module Polyblock
 
     def self.import(pbs)
       outputs = pbs.map do |pb|
-        matches = Block.where :name => pb[:name]
-        if matches.any?
-          m = matches.first
-          m.update_attributes(pb) if m.content != pb[:content]
-        else
-          Block.create(pb)
-        end
+        block = fetch_or_initialize pb[:name]
+        block.content = pb[:content] if pb.key?(:content) && pb[:content].present? && pb[:content] != block.content
+        block.save
       end
       outputs.include?(false)
     end
 
     def self.export
-      output = Block.all.as_json(:except => [:id, :created_at, :updated_at])
+      output = all.as_json(:except => [:id, :created_at, :updated_at])
       puts ""
       puts "Run the following in Rails Console on the remote server:"
       puts ""
@@ -32,11 +28,37 @@ module Polyblock
     end
 
     def present?
-      content.present?
+      !nil? && content.present?
     end
 
     def blank?
-      content.blank?
+      nil? || content.blank?
+    end
+
+    def self.fetch_or_initialize(name)
+      if name.is_a? Block
+        name
+      else
+        matches = where :name => name
+        if matches.any?
+          matches.first
+        else
+          new({:name => name})
+        end
+      end
+    end
+    def self.fetch_or_create(name)
+      pb = fetch_or_initialize(name)
+      pb.save if pb.new_record?
+      pb
+    end
+
+    def self.next_id
+      any? ? maximum(:id).next : 1
+    end
+    def self.random_id
+      o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
+      (0...50).map { o[rand(o.length)] }.join
     end
 
   end

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

@@ -1,4 +1,5 @@
 = f.simple_fields_for name do |ff|
+
   = ff.input_field :name, :as => :hidden, :value => name.to_s
   - if !options[:label]
     = ff.input_field :content, options[:input_html].merge({:as => :ckeditor})

data/lib/polyblock/version.rb

@@ -1,3 +1,3 @@
 module Polyblock
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

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

@@ -1,10 +1,10 @@
 %h1 Polyblock Test Dummy
 
 %h3 Polyblock with Inline Editing
-= pb "Test", :editable => true
+= pb 'Test', :editable => true
 
 %h3 New Polyblock
-= pb "Neww", :editable => true
+= pb Polyblock::Block.random_id, :editable => true
 
 %h3 Polyblock SimpleForm
 = simple_form_for @event do |f|