atig 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5849d378b18e123fd9dcf8bf9a1ee96e6401434
-  data.tar.gz: f0e7fc07a38030e1beb7b2fb9fd2633fb289db1e
+  metadata.gz: 600b07b559862ae694b0c7c99890c9e043a9aa6a
+  data.tar.gz: ae106983e3d0c5846c41c8ff8e93370f981ac7d7
 SHA512:
-  metadata.gz: f8418c16aa59ad77355d7ccb591d1ef21cfe0c3963c0626c3f9e1ecdefdebaf76db89286e62e1528a5f07242f2f76aa06cf172b166ee3d2e08439c56623770af
-  data.tar.gz: c50550489c0888bb2bba2facf47ee41b6524a44b2f7c85c0d3661dcaacc2ae93f5542d2e0c2431d84721bc6881f7cf97795184f05743f18bc0a9c9a0be6bf025
+  metadata.gz: c9b3350f024a475f036f26734c2e5fae1bbd3fb73a93279579b060a44a04a897a88d2e7b66e8cd226d76eeedc16475e6ece90099900ee0cd6cea7c6fff6d1a35
+  data.tar.gz: 00ff15638abddb5064b478a30c3c30e15c3c15b36991418fc90f1adfd7f566a63c493360d7befe27d0c37c0e2368406a8cfde2124bf402406a72e8793020deec

data/README.mkdn

@@ -10,9 +10,8 @@ Atig.rb is forked from cho45's tig.rb. We improve some features of tig.rb.
 PREREQUISITES
 -------------
 
-* Ruby 1.8 or 1.9
+* Ruby 1.9.3 or later
 * sqlite3-ruby
-* json(when use Ruby 1.8)
 * rspec(for unit test)
 * rake(for unit test)
 

data/atig.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sqlite3', ['>= 1.3.2']
   gem.add_dependency 'net-irc', ['>= 0']
   gem.add_dependency 'oauth', ['>= 0']
+  gem.add_dependency 'twitter-text', ['~> 1.7.0']
 
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rspec'

data/lib/atig/command/status.rb

@@ -1,14 +1,12 @@
 # -*- mode:ruby; coding:utf-8 -*-
 require 'atig/command/command'
-begin
-  require 'jcode'
-rescue LoadError
-end
+require 'twitter-text'
 
 module Atig
   module Command
     class Status < Atig::Command::Command
-      def initialize(*args); super end
+      include ::Twitter::Validation
+
       def command_name; %w(status) end
 
       def action(target, mesg, command, args)
@@ -26,9 +24,13 @@ module Atig
         end
         q = gateway.output_message(:status => text)
 
-        if q[:status].each_char.to_a.size > 140 then
+        case tweet_invalid? q[:status]
+        when :too_long
           yield "You can't submit the status over 140 chars"
           return
+        when :invalid_characters
+          yield "You can't submit the status invalid chars"
+          return
         end
 
         api.delay(0, :retry=>3) do|t|

data/lib/atig/http.rb

@@ -49,9 +49,8 @@ module Atig
       http.open_timeout = open_timeout if open_timeout # nil by default
       http.read_timeout = read_timeout if read_timeout # 60 by default
       if uri.is_a? URI::HTTPS
-        http.use_ssl     = true
+        http.use_ssl    = true
         http.cert_store = @cert_store
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       end
       http
     rescue => e

data/lib/atig/oauth.rb

@@ -23,7 +23,7 @@ module Atig
 
     def initialize(context, nick)
       uri = URI(context.opts.api_base)
-      site = "http://#{uri.host}"
+      site = "https://#{uri.host}"
 
       @nick  = nick
       @oauth = ::OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET, {

data/lib/atig/option.rb

@@ -31,7 +31,7 @@ module Atig
 
     default_value :api_base,        'https://api.twitter.com/1.1/'
     default_value :stream_api_base, 'https://userstream.twitter.com/2/'
-    default_value :search_api_base, 'http://search.twitter.com/'
+    default_value :search_api_base, 'https://search.twitter.com/'
 
     def initialize(table)
       @table = {}

data/lib/atig/search.rb

@@ -5,7 +5,7 @@ require 'atig/url_escape'
 module Atig
   class Search
     def search(query, options = {})
-      search = URI("http://search.twitter.com/search.json")
+      search = URI("https://search.twitter.com")
       search.path = "/search.json"
       params = options; options[:q] = query
       search.query = options.to_query_str

data/lib/atig/version.rb

@@ -1,3 +1,3 @@
 module Atig
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/command/status_spec.rb

@@ -24,17 +24,26 @@ describe Atig::Command::Status do
     @gateway.filtered.should == { :status => 'blah blah' }
   end
 
-  if RUBY_VERSION >= '1.9'
-    it "should post with japanese language" do
-      res = status("あ"*140)
-      @statuses.should_receive(:find_by_user).with(@me,:limit=>1).and_return(nil)
-      @api.should_receive(:post).with('statuses/update', {:status=>"あ"*140}).and_return(res)
+  it "should post with japanese language" do
+    res = status("あ"*140)
+    @statuses.should_receive(:find_by_user).with(@me,:limit=>1).and_return(nil)
+    @api.should_receive(:post).with('statuses/update', {:status=>"あ"*140}).and_return(res)
+
+    call '#twitter', "status", ["あ" * 140]
+
+    @gateway.updated.should  == [ res, '#twitter' ]
+    @gateway.filtered.should == { :status => "あ" * 140 }
+  end
+
+  it "should post the status even if has long URL" do
+    res = status("https://www.google.co.jp/search?q=%E3%83%AB%E3%83%93%E3%83%BC%E3%82%92%E7%94%A8%E3%81%84%E3%81%9F%E3%82%A2%E3%83%97%E3%83%AA%E3%82%B1%E3%83%BC%E3%82%B7%E3%83%A7%E3%83%B3%E3%81%AE%E9%96%8B%E7%99%BA&safe=off")
+    @statuses.should_receive(:find_by_user).with(@me,:limit=>1).and_return(nil)
+    @api.should_receive(:post).with('statuses/update', {:status=>'https://www.google.co.jp/search?q=%E3%83%AB%E3%83%93%E3%83%BC%E3%82%92%E7%94%A8%E3%81%84%E3%81%9F%E3%82%A2%E3%83%97%E3%83%AA%E3%82%B1%E3%83%BC%E3%82%B7%E3%83%A7%E3%83%B3%E3%81%AE%E9%96%8B%E7%99%BA&safe=off'}).and_return(res)
 
-      call '#twitter', "status", ["あ" * 140]
+    call '#twitter', "status", ['https://www.google.co.jp/search?q=%E3%83%AB%E3%83%93%E3%83%BC%E3%82%92%E7%94%A8%E3%81%84%E3%81%9F%E3%82%A2%E3%83%97%E3%83%AA%E3%82%B1%E3%83%BC%E3%82%B7%E3%83%A7%E3%83%B3%E3%81%AE%E9%96%8B%E7%99%BA&safe=off']
 
-      @gateway.updated.should  == [ res, '#twitter' ]
-      @gateway.filtered.should == { :status => "あ" * 140 }
-    end
+    @gateway.updated.should  == [ res, '#twitter' ]
+    @gateway.filtered.should == { :status => 'https://www.google.co.jp/search?q=%E3%83%AB%E3%83%93%E3%83%BC%E3%82%92%E7%94%A8%E3%81%84%E3%81%9F%E3%82%A2%E3%83%97%E3%83%AA%E3%82%B1%E3%83%BC%E3%82%B7%E3%83%A7%E3%83%B3%E3%81%AE%E9%96%8B%E7%99%BA&safe=off'}
   end
 
   it "should not post same post" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atig
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - MIZUNO Hiroki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: twitter-text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Atig.rb is forked from cho45's tig.rb. We improve some features of tig.rb.