tw 0.3.2 → 0.3.3

data/Gemfile

@@ -4,6 +4,7 @@ gem 'hoe'
 gem 'newgem'
 gem 'oauth'
 gem 'twitter'
+gem 'twitter-text'
 gem 'userstream'
 gem 'json'
 gem 'rainbow'

data/Gemfile.lock

@@ -32,6 +32,8 @@ GEM
       faraday (~> 0.8)
       multi_json (~> 1.3)
       simple_oauth (~> 0.1.6)
+    twitter-text (1.5.0)
+      activesupport
     userstream (1.2.2)
       hashie (~> 1.2.0)
       oauth (~> 0.4.6)
@@ -49,4 +51,5 @@ DEPENDENCIES
   parallel
   rainbow
   twitter
+  twitter-text
   userstream

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.3 2012-10-18
+
+* count 140 chars with t.co
+
 === 0.3.2 2012-10-11
 
 * set config file permission 600

data/Manifest.txt

@@ -13,6 +13,7 @@ lib/tw/app/opt_parser.rb
 lib/tw/app/render.rb
 lib/tw/client/auth.rb
 lib/tw/client/error.rb
+lib/tw/client/helper.rb
 lib/tw/client/request.rb
 lib/tw/client/stream.rb
 lib/tw/client/tweet.rb
@@ -24,4 +25,5 @@ script/console
 script/destroy
 script/generate
 test/test_helper.rb
+test/test_t_co.rb
 test/test_tw.rb

data/Rakefile

@@ -16,6 +16,7 @@ $hoe = Hoe.spec 'tw' do
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [['oauth','>= 0.4.7', '< 1.0.0'],
                              ['twitter', '>= 4.0.0', '< 5.0.0'],
+                             ['twitter', '>= 1.5.0', '< 2.0.0'],
                              ['userstream', '>= 1.2.0', '< 1.3.0'],
                              ['json', '>= 1.7.5', '< 1.8.0'],
                              ['args_parser', '>= 0.1.2'],

data/lib/tw.rb

@@ -1,8 +1,10 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+$KCODE = 'u' if RUBY_VERSION < '1.9'
 require 'oauth'
 require 'twitter'
+require 'twitter-text'
 require 'time'
 require 'user_stream'
 require 'yaml'
@@ -18,9 +20,10 @@ require 'tw/client/request'
 require 'tw/client/tweet'
 require 'tw/client/stream'
 require 'tw/client/error'
+require 'tw/client/helper'
 
 module Tw
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   class Conf
     REQUIRE_VERSION = '0.1.0'
   end

data/lib/tw/app/cmds.rb

@@ -53,7 +53,7 @@ module Tw::App
       cmd 'dm:to' do |to, opts|
         unless opts[:pipe]
           message = @parser.argv.join(' ')
-          len = message.split(//u).size
+          len = message.char_length_with_t_co
           if len > 140
             STDERR.puts "message too long (#{len} chars)"
             on_error

data/lib/tw/app/main.rb

@@ -113,7 +113,7 @@ module Tw::App
         }, @parser[:format]
       else
         message = @parser.argv.join(' ')
-        if (len = message.split(//u).size) > 140
+        if (len = message.char_length_with_t_co) > 140
           STDERR.puts "tweet too long (#{len} chars)"
           on_error
         else

data/lib/tw/client/helper.rb

@@ -0,0 +1,11 @@
+
+class String
+  def char_length_with_t_co
+    Tw::Conf.update_twitter_config
+    len = self.char_length
+    Twitter::Extractor.extract_urls(self).each do |url|
+      len += (url =~ /^https/ ? Tw::Conf['twitter_config']['short_url_length_https'] : Tw::Conf['twitter_config']['short_url_length']) - url.char_length
+    end
+    len
+  end
+end

data/lib/tw/conf.rb

@@ -60,6 +60,19 @@ module Tw
       end
     end
 
+    def self.update_twitter_config(force_update=false)
+      if self['twitter_config'].kind_of? Hash and
+          self['twitter_config']['last_updated_at']+60*60*24 > Time.now.to_i and
+          !force_update
+        return
+      end
+      self['twitter_config'] = {}
+      self['twitter_config']['short_url_length'] = Twitter::configuration.short_url_length
+      self['twitter_config']['short_url_length_https'] = Twitter::configuration.short_url_length_https
+      self['twitter_config']['last_updated_at'] = Time.now.to_i
+      self.save
+    end
+
     private
     def self.open_conf_file(opt=nil, &block)
       if block_given?

data/test/test_t_co.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestTCo < Test::Unit::TestCase
+
+  def setup
+    @client = Tw::Client.new
+    @client.auth
+  end
+
+  def test_t_co_char_length
+    msg = "blog書いた → http://shokai.org/blog/archives/6513"
+    assert msg.char_length > msg.char_length_with_t_co
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tw
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -233,6 +233,7 @@ files:
 - lib/tw/app/render.rb
 - lib/tw/client/auth.rb
 - lib/tw/client/error.rb
+- lib/tw/client/helper.rb
 - lib/tw/client/request.rb
 - lib/tw/client/stream.rb
 - lib/tw/client/tweet.rb
@@ -244,6 +245,7 @@ files:
 - script/destroy
 - script/generate
 - test/test_helper.rb
+- test/test_t_co.rb
 - test/test_tw.rb
 - .gemtest
 homepage: http://shokai.github.com/tw
@@ -262,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2371504449230392816
+      hash: 1015519835812409521
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -277,4 +279,5 @@ specification_version: 3
 summary: ! '* twitter client.'
 test_files:
 - test/test_helper.rb
+- test/test_t_co.rb
 - test/test_tw.rb