square_speech_balloon 0.0.2 → 0.0.3

data/db/square_speech_balloon_templates.json

@@ -1,7 +1,7 @@
 {
-  "plain@pettan.com": {
-    "classname": "PlainSpeechBalloon",
-    "caption": "plain",
+  "square@pettan.com": {
+    "classname": "SquareSpeechBalloon",
+    "caption": "Square",
     "settings": {
       "speech_balloon": {
         "default_width": 150,
@@ -9,7 +9,7 @@
       },
       "all": {
         "balloon": {
-          "system_picture_file": "plain.png"
+          "system_picture_file": "square.png"
         },
         "speech": {
           "x_rate": 0,

data/db/work/square_speech_balloon_templates.json

@@ -1,4 +1 @@
-{"square@pettan.com":{"classname":"SquareSpeechBalloon","caption":"plain","settings":{"speech_balloon":{"default_width":150,"default_height":150},"all":{"balloon":{"system_picture_id":
-{
-            "text":"iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAIAAACzY+a1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAISSURBVHhe7dOxFQAgDIRQ9186NlmCvG9jK+C95xwwME7WwH6/7Ps9fCTMfwIJJcwbyANYoYR5A3kAK5QwbyAPYIUS5g3kAaxQwryBPIAVSpg3kAewQgnzBvIAVihh3kAewAolzBvIA1ihhHkDeQArlDBvIA9ghRLmDeQBrFDCvIE8gBVKmDeQB7BCCfMG8gBWKGHeQB7ACiXMG8gDWKGEeQN5ACuUMG8gD2CFEuYN5AGsUMK8gTyAFUqYN5AHsEIJ8wbyAFYoYd5AHsAKJcwbyANYoYR5A3kAK5QwbyAPYIUS5g3kAaxQwryBPIAVSpg3kAewQgnzBvIAVihh3kAewAolzBvIA1ihhHkDeQArlDBvIA9ghRLmDeQBrFDCvIE8gBVKmDeQB7BCCfMG8gBWKGHeQB7ACiXMG8gDWKGEeQN5ACuUMG8gD2CFEuYN5AGsUMK8gTyAFUqYN5AHsEIJ8wbyAFYoYd5AHsAKJcwbyANYoYR5A3kAK5QwbyAPYIUS5g3kAaxQwryBPIAVSpg3kAewQgnzBvIAVihh3kAewAolzBvIA1ihhHkDeQArlDBvIA9ghRLmDeQBrFDCvIE8gBVKmDeQB7BCCfMG8gBWKGHeQB7ACiXMG8gDWKGEeQN5ACuUMG8gD2CFEuYN5AGsUMK8gTyAFUqYN5AHsEIJ8wbyAFYoYd5AHsAKryTckq6mgQ/T675COdQRngAAAABJRU5ErkJggg=="
-},"speech":{"x_rate":0,"y_rate":0,"width_rate":100,"height_rate":100}}}}}
+{"square@pettan.com":{"classname":"SquareSpeechBalloon","caption":"Square","settings":{"speech_balloon":{"default_width":150,"default_height":150},"all":{"balloon":{"system_picture_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAYAAAA8AXHiAAAACXBIWXMAABcSAAAXEgFnn9JSAAABqUlEQVR4nO3UMQrDUAwFQSn4/lf+rnKCZDGYmUqliuXtzJyBP/s8/QDvdH2PcwwXv9vdmbFYRIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJHZmztNP8D4Wi8QNaTAGK2LVzWEAAAAASUVORK5CYII="}},"speech":{"x_rate":0,"y_rate":0,"width_rate":100,"height_rate":100}}}}}

data/lib/square_speech_balloon.rb

@@ -24,7 +24,20 @@ module SquareSpeechBalloon
   end
   
   module BalloonModule
-    def supply_default parsed_settings
+    def new_speech_balloon
+      @new_speech_balloon
+    end
+    
+    def new_speech_balloon= v
+      @new_speech_balloon = v
+    end
+    
+    def get_speech_balloon
+      self.speech_balloon || @new_speech_balloon
+    end
+    
+    def supply_default 
+      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
       s = parsed_settings['all']['balloon']
       self.x = 0
       self.y = 0
@@ -41,15 +54,30 @@ module SquareSpeechBalloon
       @extend_balloon = SquareSpeechBalloon::Balloon.new params
     end
     
-    def select_system_picture parsed_settings
+    def select_system_picture 
+      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
       s = parsed_settings['all']['balloon']
       self.system_picture_id = s['system_picture_id']
+      self.system_picture_id
     end
     
   end
   
   module SpeechModule
-    def supply_default parsed_settings
+    def new_speech_balloon
+      @new_speech_balloon
+    end
+    
+    def new_speech_balloon= v
+      @new_speech_balloon = v
+    end
+    
+    def get_speech_balloon
+      self.speech_balloon || @new_speech_balloon
+    end
+    
+    def supply_default 
+      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
       s = parsed_settings['all']['speech']
       self.x = s['x_rate']
       self.y = s['y_rate']

data/lib/square_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module SquareSpeechBalloon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: square_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -83,6 +83,7 @@ files:
 - db/migrate/20130629042756_create_square_speech_balloon_speeches.rb
 - db/square.png
 - db/square_speech_balloon_templates.json
+- db/work/square.png
 - db/work/square_speech_balloon_templates.json
 - lib/square_speech_balloon/engine.rb
 - lib/square_speech_balloon/version.rb