fix sb engine

diff --git a/.gitignore b/.gitignore
index f17f516..94ae526 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ db/migrate/*_pettan_protected_v??_licenses_attributes.rb
 db/migrate/*_pettan_public_v??_licenses_attributes.rb
 db/migrate/*_public_domain_v??_licenses_attributes.rb
 db/migrate/*_unknown_v??_licenses_attributes.rb
+db/migrate/*_speech_balloon_speech_balloons.rb
+db/migrate/*_speech_balloon_balloons.rb
+db/migrate/*_speech_balloon_speeches.rb

diff --git a/Gemfile b/Gemfile
index 20a9fc3..cb69f09 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,9 @@ gem 'pettanr_pettan_protected_v01_licenses'
 gem 'pettanr_pettan_public_v01_licenses'
 gem 'pettanr_public_domain_v01_licenses'
 gem 'pettanr_unknown_v01_licenses'
+gem 'circle_speech_balloon'
+gem 'plain_speech_balloon'
+gem 'square_speech_balloon'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index 13acc09..516aca5 100644 (file)
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -60,8 +60,13 @@ class SpeechBalloonsController < ApplicationController
     @speech = @speech_balloon.build_speech 
     @balloon.extend @speech_balloon_template.engine_balloon_module
     @speech.extend @speech_balloon_template.engine_speech_module
-    @balloon.supply_default @speech_balloon_template.parsed_settings
-    @speech.supply_default @speech_balloon_template.parsed_settings
+    @balloon.new_speech_balloon = @speech_balloon
+    @speech.new_speech_balloon = @speech_balloon
+    @balloon.supply_default 
+    @speech.supply_default 
+    @speech_balloon_extend = @speech_balloon.extend_speech_balloon
+    @balloon_extend = @balloon.extend_balloon
+    @speech_extend = @speech.extend_speech
     
     respond_to do |format|
       format.html {
@@ -90,33 +95,68 @@ class SpeechBalloonsController < ApplicationController
   end
 
   def create
-    @panel = Panel.edit(@author.working_panel, @author)
-    if params[:speech_balloon][:settings] and params[:speech_balloon][:settings].is_a?(Hash)
-      params[:speech_balloon][:settings] = params[:speech_balloon][:settings].to_json
+    speech_balloon_settings = params[:speech_balloon][:settings]
+    if speech_balloon_settings.blank?
+      speech_balloon_settings = {}
+    else
+      if speech_balloon_settings.is_a?(Hash)
+        params[:speech_balloon][:settings] = speech_balloon_settings.to_json
+      else
+        speech_balloon_settings = {}
+      end
     end
-    if params[:speech_balloon][:balloon_attributes][:settings] and params[:speech_balloon][:balloon_attributes][:settings].is_a?(Hash)
-      params[:speech_balloon][:balloon_attributes][:settings] = params[:speech_balloon][:balloon_attributes][:settings].to_json
+    balloon_settings = params[:speech_balloon][:balloon_attributes][:settings]
+    if balloon_settings.blank?
+      balloon_settings = {}
+    else
+      if balloon_settings.is_a?(Hash)
+        params[:speech_balloon][:balloon_attributes][:settings] = balloon_settings.to_json
+      else
+        balloon_settings = {}
+      end
     end
-    if params[:speech_balloon][:speech_attributes][:settings] and params[:speech_balloon][:speech_attributes][:settings].is_a?(Hash)
-      params[:speech_balloon][:speech_attributes][:settings] = params[:speech_balloon][:speech_attributes][:settings].to_json
+    speech_settings = params[:speech_balloon][:speech_attributes][:settings]
+    if speech_settings.blank?
+      speech_settings = {}
+    else
+      if speech_settings.is_a?(Hash)
+        params[:speech_balloon][:speech_attributes][:settings] = speech_settings.to_json
+      else
+        speech_settings = {}
+      end
     end
+    @panel = Panel.edit(@author.working_panel, @author)
     @speech_balloon = SpeechBalloon.new 
     @speech_balloon.attributes = params[:speech_balloon]
     
     @speech_balloon_template = @speech_balloon.speech_balloon_template
     @balloon = @speech_balloon.balloon 
     @speech = @speech_balloon.speech 
+    
     @speech_balloon.extend @speech_balloon_template.engine_speech_balloon_module
     @balloon.extend @speech_balloon_template.engine_balloon_module
     @speech.extend @speech_balloon_template.engine_speech_module
+    
+    @balloon.new_speech_balloon = @speech_balloon
+    @speech.new_speech_balloon = @speech_balloon
+    
+    @speech_balloon.extend_speech_balloon = speech_balloon_settings
+    @balloon.extend_balloon = balloon_settings
+    @speech.extend_speech = speech_settings
+    
     @speech_balloon_extend = @speech_balloon.extend_speech_balloon
     @balloon_extend = @balloon.extend_balloon
     @speech_extend = @speech.extend_speech
     
+    params[:speech_balloon][:balloon_attributes][:system_picture_id] = @balloon.select_system_picture 
+    
     @speech_balloon.overwrite @panel.id
     
     respond_to do |format|
-      if @speech_balloon.valid? or @speech_balloon.extend_speech_balloon.valid? or @balloon.extend_balloon.valid? or @speech.extend_speech.valid? or @speech_balloon_extend.valid?
+      sbv = @speech_balloon_extend.valid?
+      bv = @balloon_extend.valid?
+      sv = @speech_extend.valid?
+      if @speech_balloon.valid? and @speech_balloon_extend.valid? and @balloon_extend.valid? and @speech_extend.valid? and sbv and bv and sv
         if @speech_balloon.store @author, params[:speech_balloon]
           flash[:notice] = I18n.t('flash.notice.created', :model => Panel.model_name.human)
           format.html { redirect_to @panel }
@@ -189,7 +229,7 @@ class SpeechBalloonsController < ApplicationController
     @balloon_extend = @balloon.extend_balloon
     @speech_extend = @speech.extend_speech
     
-    @balloon.select_system_picture 
+    params[:speech_balloon][:balloon_attributes][:system_picture_id] = @balloon.select_system_picture 
     
     @panel = Panel.edit(@speech_balloon.panel.id, @author)
     @speech_balloon.overwrite @panel.id

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index 343b61d..76cd5f7 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -44,6 +44,10 @@ class Balloon < ActiveRecord::Base
 self.system_picture_id = 1
   end
   
+  def get_speech_balloon
+    self.speech_balloon
+  end
+  
   def tag_id c = nil
     'panel' + tag_panel_id + tag_element_type + tag_element_id + tag_element_part_type + tag_element_part_id + c.to_s
   end
@@ -53,11 +57,11 @@ self.system_picture_id = 1
   end
   
   def tag_panel_id
-    self.speech_balloon.panel.new_record? ? '0' : self.speech_balloon.panel.id.to_s
+    self.get_speech_balloon.panel.new_record? ? '0' : self.get_speech_balloon.panel.id.to_s
   end
   
   def tag_element_id
-    self.speech_balloon.new_record? ? '0' : self.speech_balloon.id.to_s
+    self.get_speech_balloon.new_record? ? '0' : self.get_speech_balloon.id.to_s
   end
   
   def tag_element_type

diff --git a/app/models/speech.rb b/app/models/speech.rb
index e51ef90..134c038 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -34,6 +34,10 @@ class Speech < ActiveRecord::Base
     self.speech_balloon.panel.visible? roles
   end
   
+  def get_speech_balloon
+    self.speech_balloon
+  end
+  
   def tag_id c = nil
     'panel' + tag_panel_id + tag_element_type + tag_element_id + tag_element_part_type + tag_element_part_id + c.to_s
   end
@@ -43,11 +47,11 @@ class Speech < ActiveRecord::Base
   end
   
   def tag_panel_id
-    self.speech_balloon.panel.new_record? ? '0' : self.speech_balloon.panel.id.to_s
+    self.get_speech_balloon.panel.new_record? ? '0' : self.get_speech_balloon.panel.id.to_s
   end
   
   def tag_element_id
-    self.speech_balloon.new_record? ? '0' : self.speech_balloon.id.to_s
+    self.get_speech_balloon.new_record? ? '0' : self.get_speech_balloon.id.to_s
   end
   
   def tag_element_type

diff --git a/config/speech_balloon.yml b/config/speech_balloon.yml
index 5c37e06..bce7abe 100644 (file)
--- a/config/speech_balloon.yml
+++ b/config/speech_balloon.yml
@@ -1,2 +1,4 @@
-#  Square: pettanr_square_v01_sbt
+  CircleSpeechBalloon: circle_speech_balloon
+  PlainSpeechBalloon: plain_speech_balloon
+  SquareSpeechBalloon: square_speech_balloon
 #  TestSpeechBalloon: test_speech_balloon