circle_speech_balloon 0.0.51 → 0.0.52

data/app/models/circle_speech_balloon/balloon.rb

@@ -1,5 +1,9 @@
 module CircleSpeechBalloon
   class Balloon < ActiveRecord::Base
     # attr_accessible :title, :body
+    
+    def supply_default 
+    end
+    
   end
 end

data/app/models/circle_speech_balloon/speech.rb

@@ -1,5 +1,9 @@
 module CircleSpeechBalloon
   class Speech < ActiveRecord::Base
     # attr_accessible :title, :body
+    
+    def supply_default 
+    end
+    
   end
 end

data/app/models/circle_speech_balloon/speech_balloon.rb

@@ -1,5 +1,9 @@
 module CircleSpeechBalloon
   class SpeechBalloon < ActiveRecord::Base
     # attr_accessible :title, :body
+    
+    def supply_default 
+    end
+    
   end
 end

data/lib/circle_speech_balloon.rb

@@ -3,33 +3,35 @@ require "circle_speech_balloon/engine"
 module CircleSpeechBalloon
   module SpeechBalloonModule
     def supply_default 
-      if self.speech_balloon_template
-        self.classname = self.speech_balloon_template.classname 
-        self.settings = self.speech_balloon_template.parsed_settings['speech_balloon']
-      end
-      if self.panel
-        self.t = self.panel.new_t 
-        self.z = self.panel.new_z 
-      end
+      super
+      self.speech_balloon_template_classname = self.speech_balloon_template.classname 
     end
     
-    def extend_speech_balloon
-      @extend_speech_balloon ||= CircleSpeechBalloon::SpeechBalloon.new
+    def speech_balloon_extend
+      self.new_speech_balloon unless @speech_balloon_extend
+      @speech_balloon_extend
     end
     
-    def extend_speech_balloon= params
-      @extend_speech_balloon = CircleSpeechBalloon::SpeechBalloon.new params
+    def speech_balloon_extend= params
+      # load attributes
+      @speech_balloon_extend = CircleSpeechBalloon::SpeechBalloon.new params
+      # no supply default params
     end
     
-  end
-  
-  module BalloonModule
+    def new_speech_balloon params = {} 
+      @speech_balloon_extend = CircleSpeechBalloon::SpeechBalloon.new params
+      @speech_balloon_extend.supply_default
+    end
     
     def parsed_settings 
-      @parsed_settings ||= get_parent.speech_balloon_template.parsed_settings
+      @parsed_settings ||= self.speech_balloon_template.parsed_settings
     end
     
-    def supply_default 
+  end
+  
+  module BalloonModule
+    def supply_default parsed_settings
+      s = self.parsed_settings['all']['balloon']
       self.x = 0
       self.y = 0
       self.width = self.parsed_settings['speech_balloon']['default_width']
@@ -37,12 +39,22 @@ module CircleSpeechBalloon
       self.r = self.parsed_settings['speech_balloon']['default_r']
     end
     
-    def extend_balloon
-      @extend_balloon ||= CircleSpeechBalloon::Balloon.new
+    def balloon_extend
+      self.new_balloon unless @balloon_extend
+      @balloon_extend ||= CircleSpeechBalloon::Balloon.new
+    end
+    
+    def balloon_extend= params
+      @balloon_extend = CircleSpeechBalloon::Balloon.new params
     end
     
-    def extend_balloon= params
-      @extend_balloon = CircleSpeechBalloon::Balloon.new params
+    def new_sballoon params = {} 
+      @balloon_extend = CircleSpeechBalloon::Balloon.new params
+      @balloon_extend.supply_default
+    end
+    
+    def parsed_settings 
+      @parsed_settings ||= self.speech_balloon_template.parsed_settings
     end
     
     def select_system_picture 
@@ -58,19 +70,10 @@ module CircleSpeechBalloon
       @r_step ||= self.parsed_settings['speech_balloon']['r_step']
     end
     
-    def classname
-      get_parent.speech_balloon_template.classname
-    end
-    
   end
   
   module SpeechModule
-    
-    def parsed_settings 
-      @parsed_settings ||= get_parent.speech_balloon_template.parsed_settings
-    end
-    
-    def supply_default 
+    def supply_default parsed_settings
       s = self.parsed_settings['0']['speech']
       self.x = s['x_rate']
       self.y = s['y_rate']
@@ -82,12 +85,22 @@ module CircleSpeechBalloon
       self.fore_color = self.parsed_settings['speech_balloon']['default_fore_color']
     end
     
-    def extend_speech
-      @extend_speech ||= CircleSpeechBalloon::Speech.new
+    def speech_extend
+      self.new_speech unless @speech_extend
+      @speech_extend ||= CircleSpeechBalloon::Speech.new
+    end
+    
+    def speech_extend= params
+      @speech_extend = CircleSpeechBalloon::Speech.new params
     end
     
-    def extend_speech= params
-      @extend_speech = CircleSpeechBalloon::Speech.new params
+    def new_speech params = {} 
+      @speech_extend = CircleSpeechBalloon::Speech.new params
+      @speech_extend.supply_default
+    end
+    
+    def parsed_settings 
+      @parsed_settings ||= self.speech_balloon_template.parsed_settings
     end
     
     def arrayed_quotes 

data/lib/circle_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module CircleSpeechBalloon
-  VERSION = "0.0.51"
+  VERSION = "0.0.52"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circle_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.52
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3