tweet_validator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793588e80427f715a7817bc49999ce10d962504a
-  data.tar.gz: d11e59328d7a39ec793ed99b08e41b3581c22996
+  metadata.gz: 4d165a51c510280185de444ac49a5b0e0dfefc08
+  data.tar.gz: f33444cf3603577c84abf248d2b46b5d6bf49d4a
 SHA512:
-  metadata.gz: 464178eba9468210e647d43e6d7ec0a550143b23ec95ace0f7f3774367b59625ebf1b67190ab22c2a5c6bfa8e8eb21573a6369e22996c022b11709958f456075
-  data.tar.gz: dae0fb0131cad2153c11b781228ee51fdbb39357bab3790bdae1956942b78fe192d897170bd4695a6ac251c2b6fe185eda5e6472293e7d22b6ba11e920041133
+  metadata.gz: 95037ca7d4df7856813923bb3bbdfb41d63e5bb43416ec75c244e0b17c72f7c9c7c419ccab3c28fa5af5860325360f66d7bef8abc42741693f6bbb7b1785b0da
+  data.tar.gz: 88a9ee0ada16a4a2798404bb9aa4d1ea753cb1fd4212b5265740b937c0d8f56c15e1fb68e23d0ed16469221facdceef188d0971e2b5e156447061ec368481f02

data/.travis.yml

@@ -19,5 +19,4 @@ notifications:
     secure: ZVIAWIIVaTjj1m4CVUtCj8WZH6HlGvkceKIGbyMOYaSDBAF+2veKrfUMfTeiTiQqveV3dXFjfnHSuP6zV3X1qIT2MrFb+MsDF7uKOMY4xUL+4mtk72sZ1jCdgg5LoBtNz/ueDGI6wIR14q1Z+L9JIlgXSiXKZfoSJj6b71JCAKM=
 matrix:
   allow_failures:
-  - rvm: 2.2
   - rvm: ruby-head

data/README.md

@@ -8,6 +8,9 @@ tweet length check validator
 [![Code Climate](https://codeclimate.com/github/sue445/tweet_validator/badges/gpa.svg)](https://codeclimate.com/github/sue445/tweet_validator)
 [![Coverage Status](https://img.shields.io/coveralls/sue445/tweet_validator.svg)](https://coveralls.io/r/sue445/tweet_validator)
 
+## Requirements
+ruby 2.0+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -60,10 +63,34 @@ tweet.valid?
 tweet.message = "a" * 140 + "%{screen_name}"
 tweet.valid?
 # => true
+
+# url length is calculated as t.co
+"https://github.com/sue445/tweet_validator".length
+# => 41
+
+tweet.message = "a" * 110 + "http://github.com/sue445/tweet_validator"
+tweet.valid?
+# => true
+```
+
+## Configuration
+```ruby
+TweetValidator.config.short_url_length = 22
+TweetValidator.config.short_url_length_https = 23
 ```
 
+If `short_url_length` and `short_url_length_https` is changed, please set new value.
+
+see. https://dev.twitter.com/rest/reference/get/help/configuration
+
 ## Changelog
-[full changelog](https://github.com/sue445/tweet_validatorcompare/0.0.1...master)
+[full changelog](https://github.com/sue445/tweet_validator/compare/0.0.2...master)
+
+### 0.0.2
+[full changelog](https://github.com/sue445/tweet_validator/compare/0.0.1...0.0.2)
+
+* check `t.co` url length
+  * https://github.com/sue445/tweet_validator/pull/5
 
 ### 0.0.1
 * first release

data/lib/tweet_validator.rb

@@ -1,7 +1,10 @@
 require "tweet_validator/version"
+require "tweet_validator/config"
 require "tweet_validator/tweet_length_validator"
 require 'tweet_validator/railtie' if defined?(Rails)
 
 module TweetValidator
-  # Your code goes here...
+  def self.config
+    TweetValidator::Config.config
+  end
 end

data/lib/tweet_validator/config.rb

@@ -0,0 +1,16 @@
+module TweetValidator
+  require "active_support/configurable"
+
+  class Config
+    include ActiveSupport::Configurable
+
+    config_accessor :short_url_length
+    config_accessor :short_url_length_https
+
+    configure do |config|
+      # via. https://dev.twitter.com/rest/reference/get/help/configuration
+      config.short_url_length       = 22
+      config.short_url_length_https = 23
+    end
+  end
+end

data/lib/tweet_validator/tweet_length_validator.rb

@@ -1,5 +1,6 @@
 module TweetValidator
   require "active_model"
+  require "uri"
 
   class TweetLengthValidator < ActiveModel::EachValidator
     TWEET_MAX_LENGTH = 140
@@ -11,7 +12,7 @@ module TweetValidator
     def self.valid_tweet?(tweet)
       return false unless tweet
       return false if tweet.empty?
-      return false unless sanitize(tweet).length <= TWEET_MAX_LENGTH
+      return false unless shorten_url_length(sanitize(tweet)) <= TWEET_MAX_LENGTH
 
       true
     end
@@ -19,5 +20,24 @@ module TweetValidator
     def self.sanitize(tweet)
       tweet.gsub(/%<.+?>/, "").gsub(/%{.+?}/, "")
     end
+
+    def self.shorten_url_length(tweet)
+      shorten_tweet = tweet.gsub(URI.regexp("http"), dummy_http_url).gsub(URI.regexp("https"), dummy_https_url)
+      shorten_tweet.length
+    end
+
+    private_class_method
+
+    def self.dummy_http_url
+      dummy_url("http://", TweetValidator.config.short_url_length)
+    end
+
+    def self.dummy_https_url
+      dummy_url("https://", TweetValidator.config.short_url_length_https)
+    end
+
+    def self.dummy_url(prefix, max_length)
+      prefix + "x" * (max_length - prefix.length)
+    end
   end
 end

data/lib/tweet_validator/version.rb

@@ -1,3 +1,3 @@
 module TweetValidator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/tweet_validator/tweet_length_validator_spec.rb

@@ -1,4 +1,7 @@
 describe TweetValidator::TweetLengthValidator do
+  let(:short_url_length)      { TweetValidator.config.short_url_length }
+  let(:short_url_length_https){ TweetValidator.config.short_url_length_https }
+
   let(:model_class) do
     Struct.new(:message_template) do
       include ActiveModel::Validations
@@ -21,6 +24,8 @@ describe TweetValidator::TweetLengthValidator do
           ["a"],
           ["a" * 130 + "%<this_is_variable>"],
           ["a" * 130 + "%{this_is_variable}"],
+          ["a" * 110 + "http://github.com/sue445/tweet_validator"],
+          ["a" * 110 + "https://github.com/sue445/tweet_validator"],
         ]
       end
 
@@ -62,4 +67,26 @@ describe TweetValidator::TweetLengthValidator do
     end
 
   end
+
+  describe "#shorten_url_length" do
+    subject{ TweetValidator::TweetLengthValidator.shorten_url_length(tweet) }
+
+    where(:tweet, :shorten_length) do
+      [
+        ["github", 6],
+
+        ["http://github.com/"                       , short_url_length],
+        ["http://github.com/sue445/tweet_validator" , short_url_length],
+        ["github http://github.com/"                , short_url_length + 7],
+
+        ["https://github.com/"                      , short_url_length_https],
+        ["https://github.com/sue445/tweet_validator", short_url_length_https],
+        ["github https://github.com/"               , short_url_length_https + 7],
+      ]
+    end
+
+    with_them do
+      it { should eq shorten_length }
+    end
+  end
 end

data/tweet_validator.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activemodel"
+  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "codeclimate-test-reporter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tweet_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - sueyoshi_go
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,7 @@ files:
 - README.md
 - Rakefile
 - lib/tweet_validator.rb
+- lib/tweet_validator/config.rb
 - lib/tweet_validator/railtie.rb
 - lib/tweet_validator/tweet_length_validator.rb
 - lib/tweet_validator/version.rb
@@ -165,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: tweet length check validator