tdiary-contrib 3.2.2.20130614 → 4.0.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6160075d3a10a3f127fd3ec59f82b59a5ea4e494
-  data.tar.gz: 4302b52ef1948c223e5e1ce311c13bc601856e45
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTA2NTZkMTYzYjk5MTczYTJmMzQ4NTMzNzY5ZjZlNzdhNzhhM2Y4NQ==
+  data.tar.gz: !binary |-
+    ZjMyYzVhZjljMTgwYjcyODk2MTY3NGUyYTA4YThlMjY1OTJhNjMzMQ==
 SHA512:
-  metadata.gz: 2c3204d15ab266d374ae86082854cd7a82f38118509b6b85e56ef69ba5aedca4fa0e66b8682e4de391b671b6cac9376c3f0e124ab8ab659417eeef78225656cd
-  data.tar.gz: 52c0bd44604864f41e488564e38564c1e20b7126a3faf320aa224dc2f71bea2ebfab0279f426eb6c4e9f09105a467f6cb77b0445d6c9b4b6409eddc724233d70
+  metadata.gz: !binary |-
+    N2Y0ZTVmZDNhYzdmNzEzOWY0OTdkZWM1NmEyNTFjMDExMTI4ZTFiY2Y5ZTJi
+    MjAzNjk4NGIzYmJmYWI5Y2JiMmIxYmNjOTg4NmU0YjE5ZjAzNWM5Zjk0YWNh
+    OGUzZjE0MjNhNzlmODhlMmRjYTk0NDAzYjQ2ZmY0ODQxYzVjYjk=
+  data.tar.gz: !binary |-
+    NWU1MzJlODJmMDI1ZWE2MzJmNmRlZGE2ODMxY2EzM2VhOTg0OGQ2Mjk0NDhj
+    YjYyM2JkMGNiMGNjNDI5ZTU1NmYzNjVkMmFiM2YzNzg0MzIxNjYwODYwNGIw
+    MzRhNDc3MDU1YWUwMzIyYjYyM2RkZWUzMTdlZWQ2MDE3ZDY1YjE=

data/Gemfile.lock

@@ -1,24 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.4)
-    json (1.8.0)
-    multi_json (1.7.3)
-    rake (10.0.4)
+    diff-lcs (1.2.5)
+    docile (1.1.1)
+    json (1.8.1)
+    multi_json (1.8.2)
+    rake (10.1.0)
     rcov (1.0.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    tdiary (3.2.2.20130518)
+    rspec-mocks (2.14.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    tdiary (4.0.1.20131102)
       bundler (~> 1.3)
       thor (~> 0.18)
     thor (0.18.1)

data/js/socialbutton.js

@@ -27,8 +27,13 @@ $(function() {
   // set options for jQuery.socialbutton
   var callbacks = {
     twitter: function(url, title) {
+      var link = url;
+      var pos = 0;
+      if ((pos = url.indexOf('#')) > 0) {
+        link = url.substr(0, pos)
+      }
       return {
-        url: url,
+        url: link,
         text: title,
         button: 'horizontal',
         lang: $('html').attr('lang').substr(0,2)

data/plugin/instagram.rb

@@ -0,0 +1,10 @@
+# instagram.rb - embed your photo/videos in instagram to a diary
+#
+# Author: Tatsuya Sato 
+# License: GPL
+
+def instagram(code, width=612, height=700)
+  <<-BODY
+<iframe src="//instagram.com/p/#{code}/embed/" width="#{width}" height="#{height}" frameborder="0" scrolling="no" allowtransparency="true"></iframe>
+  BODY
+end

data/plugin/playstore.rb

@@ -2,7 +2,7 @@
 # playstore.rb 
 # 
 # 概要:
-#   GooglePlay( play.goog.com)へのリンクを生成します。
+#   GooglePlay(play.google.com)へのリンクを生成します。
 #
 # 使い方:
 #   playstore'app_id' or playstore_txt'app_id'
@@ -44,8 +44,13 @@ class PlayStore < MarketBot::Android::App
       end
       return html
    end
+
+   def self.valid?(app_id)
+      return app_id.downcase =~ /^([a-z_]{1}[a-z0-9_]*(\.[a-z_]{1}[a-z0-9_]*)*)$/
+   end
 end
 
+
 def playstore_load_cache(app)
    path="#{@cache_path}/playstore/#{app.app_id}"
    begin
@@ -66,8 +71,12 @@ def playstore_save_cache(app)
    app.save(path)
 end
 
-def playstore(app_id)
-   app = PlayStore.new(app_id) 
+def playstore_main(app_id)
+   unless PlayStore.valid?(app_id)
+      return :invalid
+   end
+
+   app = PlayStore.new(app_id)
    if playstore_load_cache(app).nil?
       app.update
       save = true
@@ -75,70 +84,78 @@ def playstore(app_id)
       save = false
    end
    if app.nil? || app.error
-      html =
-         <<-HTML
-            <div class="market">#{app_id} was not found.</div>
-         HTML
+      return :notfound
    else
       playstore_save_cache(app) if save
-      html =
+      return app
+   end
+end
+
+def playstore(app_id)
+   app = playstore_main(app_id)
+   case app
+   when :invalid
+      <<-HTML
+         <div class="playstore-frame">package name is invalid(#{app_id}).</div>
+      HTML
+   when :notfound
       <<-HTML
-         <div class="market">
-            <div class="leader"><a href="#{app.market_url}">#{app.title} #{app.current_version}</a>
-                - <span class="dev">#{app.developer}</span></div>
+         <div class="playstore-frame">#{app_id} was not found.</div>
+      HTML
+   else
+      <<-HTML
+         <div class="playstore-frame">
+            <div class="playstore-leader"><a href="#{app.market_url}">#{app.title} #{app.current_version}</a>
+                - <span class="playstore-devlop">#{app.developer}</span></div>
             <a href="#{app.market_url}">
-               <img class="icon" src="#{app.banner_icon_url}" title="#{app.title}">
+               <img class="playstore-icon" src="#{app.banner_icon_url}" title="#{app.title}" >
             </a>
-            <ul class="info">
+            <ul class="playstore-detail">
             <li>Rating:#{app.rating}</li>
             <li>Price:#{app.price}</li>
             </ul>
          </div>
       HTML
    end
-   return html
 end
 
 def playstore_text(app_id)
-   app = PlayStore.new(app_id)
-   if playstore_load_cache(app).nil?
-      app.update
-      save = true
+   app = playstore_main(app_id)
+   case app
+   when :invalid
+      "<em>package name is invalid(#{app_id}).</em>"
+   when :notfound
+      "<em>#{app_id} was not found</em>"
    else
-      save = false
-end
-   if app.nil? || app.error
-      html = "<em>#{app_id} was not found</em>"
-   else
-      app.update
-      playstore_save_cache(app) if save
-      html=%Q[<a href="#{app.market_url}">#{app.title} #{app.current_version}</a>]
+      %Q[<a href="#{app.market_url}">#{app.title}</a>]
    end
-   return html
 end
 
 add_header_proc do
    if @mode !~ /conf$/ and not bot? then
       <<-HTML
         <style type="text/css"><!--
-         div.market ul.info {
+         ul.playstore-detail {
             list-style: none;
             padding: 3px;
          }
-         div.market img.icon {
+         img.playstore-icon {
             float: left;
+            width:100px;
+            height:100px;
+            padding:6px;
          }
-         div.market span.dev {
+         span.playstore-devlop {
             font-size: small;
             color: gray;
          }
-         div.market div.leader {
+         div.playstore-leader {
             background: #a4c639;
             border-top-left-radius: 6px;
             border-top-right-radius: 6px;
             padding: 3px;
          }
-         div.market {
+         div.playstore-frame {
             background: #f5f5f5;
             border-radius: 6px;
             margin: 5px;

data/plugin/search-default.rb

@@ -100,7 +100,7 @@ module DefaultIOSearch
 		c = DIARY_CLASS_CACHE[style]
 		return c if c
 		require "tdiary/style/#{style.downcase}_style.rb"
-		c = eval("TDiary::#{style.capitalize}Diary")
+		c = TDiary.const_defined?('Style') ? eval("TDiary::Style::#{style.capitalize}Diary") : eval("TDiary::#{style.capitalize}Diary")
 		c.__send__(:include, DiaryClassDelta)
 		DIARY_CLASS_CACHE[style] = c
 		c

data/plugin/tweet_quote.rb

@@ -24,7 +24,7 @@ require 'openssl'
 require 'json'
 
 def twitter_quote_option_keys
-	%w( consumer_key consumer_secret token token_secret).map{|k| "twitter_quote.oauth_#{k}" }
+	%w( oauth_consumer_key oauth_consumer_secret oauth_token oauth_token_secret, render_method ).map{|k| "twitter_quote.#{k}" }
 end
 
 def twitter_statuses_show_api( tweet_id )
@@ -61,24 +61,17 @@ def twitter_statuses_show_api( tweet_id )
 	end
 end
 
-def twitter_status_json_to_html( json )
-	tweet_id = json['id_str']
-	screen_name = json['user']['screen_name']
-	name = json['user']['name']
-	background_url = json['user']['profile_background_image_url']
-	profile_background_color = "##{json['user']['profile_background_color']}"
-	avatar = json['user']['profile_image_url']
-	source = json['source']
-	timestamp = Time.parse( json['created_at'] )
-	content = json['text']
-	content.gsub!( URI.regexp( %w|http https| ) ){ %Q|<a href="#{$&}">#{$&}</a>| }
-	content = content.split( /(<[^>]*>)/ ).map {|s|
-		next s if s[/\A</]
-		s.gsub!( /@(?>([a-zA-Z0-9_]{1,15}))(?![a-zA-Z0-9_])/ ){ %Q|<a href="http://twitter.com/#{$1}">#{$&}</a>| }
-		s.gsub( /#([a-zA-Z0-9]{1,16})/ ){ %Q|<a href="http://twitter.com/search?q=%23#{$1}">#{$&}</a>| }
-	}.join
-	
-	<<-HTML
+def render_widget(tweet_id, screen_name, name, background_url, profile_backgound_color, avatar, source, timestamp, content)
+  <<-HTML
+<blockquote class="twitter-tweet"><p>#{content}</p>
+&mdash; #{@name} (#{@screen_name}) <a href="http://twitter.com/#{screen_name}/status/#{tweet_id}">#{timestamp}</a>
+</blockquote>
+<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+  HTML
+end
+
+def render_bbp(tweet_id, screen_name, name, background_url, profile_backgound_color, avatar, source, timestamp, content)
+  <<-HTML
 	<!-- http://twitter.com/#{screen_name}/status/#{tweet_id} -->
 	<div class="bbpBox" style="background:url(#{background_url}) #{profile_background_color};padding:20px;">
 		<p class="bbpTweet" style=
@@ -105,6 +98,30 @@ def twitter_status_json_to_html( json )
 	HTML
 end
 
+def twitter_status_json_to_html( json )
+	tweet_id = json['id_str']
+	screen_name = json['user']['screen_name']
+	name = json['user']['name']
+	background_url = json['user']['profile_background_image_url']
+	profile_background_color = "##{json['user']['profile_background_color']}"
+	avatar = json['user']['profile_image_url']
+	source = json['source']
+	timestamp = Time.parse( json['created_at'] )
+	content = json['text']
+	content.gsub!( URI.regexp( %w|http https| ) ){ %Q|<a href="#{$&}">#{$&}</a>| }
+	content = content.split( /(<[^>]*>)/ ).map {|s|
+		next s if s[/\A</]
+		s.gsub!( /@(?>([a-zA-Z0-9_]{1,15}))(?![a-zA-Z0-9_])/ ){ %Q|<a href="http://twitter.com/#{$1}">#{$&}</a>| }
+		s.gsub( /#([a-zA-Z0-9]{1,16})/ ){ %Q|<a href="http://twitter.com/search?q=%23#{$1}">#{$&}</a>| }
+	}.join
+
+	if @conf['twitter_quote.render_method'] == 'widget'
+		render_widget(tweet_id, screen_name, name, background_url, profile_backgound_color, avatar, source, timestamp, content)
+	else
+		render_bbp(tweet_id, screen_name, name, background_url, profile_backgound_color, avatar, source, timestamp, content)
+	end
+end
+
 def tweet_quote( src )
 	return unless twitter_quote_option_keys.all?{|v| @options.key? v }
 
@@ -152,6 +169,12 @@ add_conf_proc( 'twitter_quote', 'Embedded Tweets' ) do
 	<p><input type="text" name="twitter_quote.oauth_token" value="#{h @conf["twitter_quote.oauth_token"]}" size="80"></p>
 	<h3>Access token secret</h3>
 	<p><input type="text" name="twitter_quote.oauth_token_secret" value="#{h @conf["twitter_quote.oauth_token_secret"]}" size="80"></p>
+        <h3>Render method</h3>
+	<select name="twitter_quote.render_method">
+	<option value="bbp"#{' selected' if @conf['twitter_quote.render_method'] == 'bbp'}>Bbp</option>
+	<option value="widget"#{' selected' if @conf['twitter_quote.render_method'] == 'widget'}>Widget</option>
+	</select>
+        </p>
 	HTML
 end
 

data/plugin/twitter_summary_card.rb

@@ -0,0 +1,56 @@
+# Twitter Summary Card plugin
+#
+#
+# Copyright (c) 2013 Tatsuya Sato <satoryu.1981@gmail.com>
+
+def twitter_summary_card_description
+  section_index = @cgi.params['p'][0]
+  if @mode == 'day' and section_index
+    diary = @diaries[@date.strftime('%Y%m%d')]
+    sections = diary.instance_variable_get(:@sections)
+    section = sections[section_index.to_i - 1].body_to_html
+    @conf.shorten(apply_plugin(section, true), 200)
+  else
+    @conf.description
+  end
+end
+
+add_header_proc do
+  headers = {
+    'twitter:card' => 'summary',
+    'twitter:site' => @conf['twitter_summary_card.site'] || @conf['twitter_summary_card.creator'],
+    'twitter:creator' => @conf['twitter_summary_card.creator'],
+    'twitter:title' => title_tag.match(/>([^<]+)/).to_a[1],
+    'twitter:description' => twitter_summary_card_description,
+    'twitter:image:src' => @conf.banner
+  }
+  headers = headers.select { |_, v| v && not(v.empty?) }
+  headers = headers.map do |k, v|
+    %Q|<meta name="#{k}" content="#{CGI.escapeHTML(v)}">|
+  end
+
+  headers.join("\n")
+end
+
+add_conf_proc('Twitter Summary Card', 'Twitter Summary Card') do
+  if @mode == 'saveconf'
+    @conf['twitter_summary_card.site'] = @cgi.params['twitter_summary_card.site'][0]
+    @conf['twitter_summary_card.creator'] = @cgi.params['twitter_summary_card.creator'][0]
+  end
+
+  <<-HTML
+  <h2>Twitter Summary Card</h2>
+  <p>
+  Please refer to the following documentation at first. 
+  <ul>
+    <li><a href="https://dev.twitter.com/docs/cards/types/summary-card" target="_blank">Summary Card | Twitter Developers</a></li>
+  </ul>
+  </p>
+
+	<h3>Your tDiary's Twitte account</h3>
+	<p><input name="twitter_summary_card.site" value="#{h(@conf['twitter_summary_card.site'])}"></p>
+
+	<h3>Creator's Twitter account </h3>
+	<p><input name="twitter_summary_card.creator" value="#{h(@conf['twitter_summary_card.creator'])}"></p>
+  HTML
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 3.2.2.20130614
+  version: 4.0.2
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.2.20130614
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.2.20130614
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: tDiary contributions package that includes plugins, styles, utilities,
@@ -228,6 +228,7 @@ files:
 - plugin/image_gps.rb
 - plugin/inline_wiki.rb
 - plugin/instagr.rb
+- plugin/instagram.rb
 - plugin/ja/add_bookmark.rb
 - plugin/ja/del_footer.rb
 - plugin/ja/flickr.rb
@@ -305,6 +306,7 @@ files:
 - plugin/twitter_anywhere.rb
 - plugin/twitter_badge.rb
 - plugin/twitter_js.rb
+- plugin/twitter_summary_card.rb
 - plugin/ustream.rb
 - plugin/vimeo.rb
 - plugin/volatile.rb
@@ -441,17 +443,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package
@@ -475,3 +477,4 @@ test_files:
 - spec/title_anchor_spec.rb
 - spec/twitter_js_spec.rb
 - spec/youtube_spec.rb
+has_rdoc: