favt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22fdcc2d77b7cb92dfaf41890e77176c51b6ec12
-  data.tar.gz: 3c52f7271410151fb3dd8711994c48ade552a22c
+  metadata.gz: 18aa947268570843ba11da2a4639134a7c33f0e1
+  data.tar.gz: 4c5834327b8b39330300e330061735ba2d9dae53
 SHA512:
-  metadata.gz: a6bfb7625e755c048a71ccc79b9495e695b52026eb775699a4beb225e8fa25452b02899ec10c7e27f345e1e1e2b6edba2a9afa0d4e7713931ee12e22e1da5199
-  data.tar.gz: c7e0a7d90ac006acca901e260cc2c3ec816f443012aa0ec06a0c5dcf78089550b7f79347388d2a12c7517f7d60efb09f52d4a313235f7c8bcbef8d374f9d801f
+  metadata.gz: 140e66aab7a0a02aaad86daec01b9eda0950f612bb29bdd940b09a9290b8de3cdf67320709b353d02e995dd7ae33ca24c517cdccfe193f3d70a18e922dcb65a7
+  data.tar.gz: 08dee70ade6447ed1568ea07c3e46c944a71b78092b9fbfe4183c3f9947aeb7017f4bede9b589dd26b828fef52edbfb1660c73ed0bee6bd76d142c6c0c93c902

data/bin/favt

@@ -78,10 +78,18 @@ client:
   access_token_secret: "Your Access Token Secret"
 
 custom_render:
-  users: "■"
-  screen_name: "#\{post.user.screen_name}\n"
-  post_text: "#\{post.text}"
-  post_url: "#\{post.url}"
+  users:
+    template: "■"
+    color: "red"
+  screen_name:
+    template: "#\{post.user.screen_name}\n"
+    color: "green"
+  post_text:
+    template: "#\{post.text}"
+    color: "white"
+  post_url:
+    template: "#\{post.url}"
+    color: "blue"
   
 users:
   - "esehara"

data/lib/favt/render.rb

@@ -15,63 +15,106 @@ module Render
     
     def repack
       post = @favorite["post"]
-
-      @render = {}
-      @render[:users] = @origin_render[:users] * @favorite["users"]
-      @render[:screen_name] = @origin_render[:screen_name]
+      @render = @origin_render
+      
+      @render[:users][:template] =
+        @origin_render[:users][:template] * @favorite["users"]
+      @render[:screen_name][:template] =
+        @origin_render[:screen_name][:template]
         .sub('#{post.user.screen_name}', post.user.screen_name)
-      @render[:post_text] = @origin_render[:post_text]
+      @render[:post_text][:template] =
+        @origin_render[:post_text][:template]
         .sub('#{post.text}', post.text)
-      @render[:post_url] = @origin_render[:post_url]
+      @render[:post_url][:template] =
+        @origin_render[:post_url][:template]
         .sub('#{post.url}', post.url.to_s)
     end
   
     def init_custom_render
-      custom_render = @config["custom_render"]
+      @custom_render = @config["custom_render"]
 
       # First Initialize Values
+      users_dict = {
+        template: '■',
+        color: :red
+      }
+
+      screen_name_dict = {
+        template: '[#{post.user.screen_name}]\n',
+        color: :green
+      } 
       
-      users_str = '■'
-      screen_name_str = '[#{post.user.screen_name}]\n'
-      post_text_str = '#{post.text}\n'
-      post_url_str =  '#{post.url}\n'
+      post_text_dict = {
+        template: '#{post.text}\n',
+        color: :white
+      }
 
-      if custom_render
-        users_str = custom_render["users"] || users_str
-        screen_name_str = custom_render["screen_name"] || screen_name_str
-        post_text_str = custom_render["post_text"] || post_text_str
-        post_url_str = custom_render["post_url"] || post_url_str
+      post_url_dict = {
+        template: '#{post.url}\n',
+        color: :blue
+      }
+      
+
+      def build_render_dict(key, defalut_dict)
+        if !@custom_render[key]
+          defalut_dict
+        else
+          pre_dict = {
+            template: @custom_render[key]["template"] || defalut_dict[:template],
+            color:    @custom_render[key]["color"]    || defalut_dict[:color]
+          }
+          pre_dict[:color] = pre_dict[:color].to_sym
+          return pre_dict
+        end
+      end
+      
+      if @custom_render
+        users_dict       = build_render_dict "users", users_dict
+        screen_name_dict = build_render_dict "screen_name", screen_name_dict
+        post_text_dict   = build_render_dict "post_text", post_text_dict
+        post_url_dict    = build_render_dict "post_url",  post_url_dict
       end
       
       @origin_render = {
-        users: users_str,
-        screen_name: screen_name_str,
-        post_text: post_text_str,
-        post_url: post_url_str
+        users: users_dict,
+        screen_name: screen_name_dict,
+        post_text: post_text_dict,
+        post_url: post_url_dict
       }
       return self
     end
 
     def user_colorize
       if !@options["no_color"]
-        @render[:users] = @render[:users].red
+        @render[:users][:template] =
+          @render[:users][:template]
+          .colorize(@render[:users][:color])
       end
       return self
     end
 
     def post_colorize
       if !@options["no_color"]
-        @render[:screen_name] = @render[:screen_name].green.bold
-        @render[:post_url] = @render[:post_url].blue
+        @render[:screen_name][:template] =
+          @render[:screen_name][:template]
+          .colorize(@render[:screen_name][:color])
+        @render[:post_url][:template] =
+          @render[:post_url][:template]
+          .colorize(@render[:post_url][:color])
       end  
-      return @render
+      return self
     end
 
+    def to_only_template
+      return @render.values.map {|d| d[:template]}
+    end
+    
     def to_s
       self
         .user_colorize
         .post_colorize
-        .values.join
+        .to_only_template
+        .join
         .sub("\\n", "\n")
     end
   end

data/lib/favt/version.rb

@@ -1,3 +1,3 @@
 module Favt
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: favt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - esehara shigeo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter