katgut 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8697ef6393b674720a4de45f8afdde983cb50ae
-  data.tar.gz: 732d22aee2fbf4c09283b424fe3ae51cdd079536
+  metadata.gz: 546779d691ef73b0f21d4298a4b7323663253069
+  data.tar.gz: 3e9434498c14261e1f2a077211311b9317a92552
 SHA512:
-  metadata.gz: c192da2e1ac888d7bf7cb84de20fb217978c26c4f40f02db1ee0532a9ec94a9cb06660211d8a88c59cb83dfa9377b8b96227ecaf711f1e78f1442696d8423e83
-  data.tar.gz: 9f676b81ac6c783e09ac3b0f736ff2a63219a76bf2d1043eed566a85ada1b1bc9537fa3eda17a2d4e7889feb6947e33754db2bedeb743c087aa4f550580ee934
+  metadata.gz: d534e9754180055ca41160cd81ad544f538d8afbdfb16deb0319f8bef4fd55263c567b105110fc2d721604dcdcd4da6f62362fe956897656b4f5de07fdda4942
+  data.tar.gz: 21d0e3fb67ff64de59eff501d4617cc5e29c9be042feaf82dd99c894cde2ac0d3f3dd1eaa0d124eb7bca5ecc174d021de308ab0db98f316ab4957654fe417e84

data/app/models/katgut/rule.rb

@@ -2,9 +2,10 @@ require 'securerandom'
 
 module Katgut
   class Rule < ActiveRecord::Base
-    ALLOWED_SCHEMES       = [:https, :http]
-    DEFAULT_SCHEME        = :http
-    MINIMUM_SOURCE_LENGTH = 5
+    ALLOWED_SCHEMES            = [:https, :http]
+    DEFAULT_SCHEME             = :http
+    MINIMUM_SOURCE_LENGTH      = 5
+    MAXIMUM_DESTINATION_LENGTH = 2083    # Limitation for IE / Edge
 
     scope :active, -> { where(active: true) }
 
@@ -15,8 +16,8 @@ module Katgut
       length:     { in: MINIMUM_SOURCE_LENGTH .. 255 }
     validates :destination,
       presence: true,
-      format:   { without: URI::UNSAFE },
-      length:   { maximum: 255 }
+      length:   { maximum: MAXIMUM_DESTINATION_LENGTH }
+    validate :ensure_destination_is_full_url_or_path
     validate :ensure_destination_has_no_unallowed_scheme
 
     after_initialize :set_random_source, if: -> { new_record? && source.nil? }
@@ -58,6 +59,16 @@ module Katgut
       end
     end
 
+    def ensure_destination_is_full_url_or_path
+      if destination =~ /\A#{URI::regexp}\z/
+        true
+      elsif "#{ALLOWED_SCHEMES.first}://example.com#{destination}" =~ /\A#{URI::regexp}\z/
+        true
+      else
+        errors.add(:destination, "is neither in full URL format nor path format")
+      end
+    end
+
     def set_random_source
       self.source = SecureRandom.urlsafe_base64(6)
     end

data/db/migrate/20161219050212_change_type_of_destination_on_katgut_rules_to_text.rb

@@ -0,0 +1,9 @@
+class ChangeTypeOfDestinationOnKatgutRulesToText < ActiveRecord::Migration
+  def self.up
+    change_column :katgut_rules, :destination, :text, null: false
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/katgut/version.rb

@@ -1,3 +1,3 @@
 module Katgut
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/dummy/db/schema.rb

@@ -11,11 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160704065128) do
+ActiveRecord::Schema.define(version: 20161219050212) do
 
   create_table "katgut_rules", force: :cascade do |t|
     t.string   "source",                      null: false
-    t.string   "destination",                 null: false
+    t.text     "destination",                 null: false
     t.boolean  "active",      default: false, null: false
     t.datetime "created_at",                  null: false
     t.datetime "updated_at",                  null: false

data/spec/models/katgut/rule_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Katgut::Rule, type: :model do
       expect(rule).not_to be_valid
     end
 
-    it 'doesn\'t allow unsafe characters in destination col' do
+    it 'doesn\'t allow invalid characters in destination col' do
       rule.destination = '/test/<>'
       expect(rule).not_to be_valid
     end
@@ -37,6 +37,11 @@ RSpec.describe Katgut::Rule, type: :model do
       rule.destination = 'ftp://ftp.naist.jp'
       expect(rule).not_to be_valid
     end
+
+    it 'doesn\'t allow destination url longer than 2083 characters' do
+      rule.destination += 'a' * (2083 - rule.destination.length) + 'X'
+      expect(rule).not_to be_valid
+    end
   end
 
   describe "#regular_destination" do

data/spec/rails_helper.rb

@@ -5,6 +5,8 @@ require File.expand_path('../dummy/config/environment', __FILE__)
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'spec_helper'
 require 'rspec/rails'
+require 'pry'
+require 'awesome_print'
 
 ActiveRecord::Migration.maintain_test_schema!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katgut
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - HAMADA Kazuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,6 +86,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: It Sutures a URL onto another with a redirection path
 email:
 - hamada.kazuki.mum@gmail.com
@@ -105,6 +133,7 @@ files:
 - app/views/layouts/katgut/application.html.erb
 - config/routes.rb
 - db/migrate/20160704065128_create_katgut_rules.rb
+- db/migrate/20161219050212_change_type_of_destination_on_katgut_rules_to_text.rb
 - lib/generators/katgut/initializer/USAGE
 - lib/generators/katgut/initializer/initializer_generator.rb
 - lib/generators/katgut/initializer/templates/initializer.rb
@@ -145,11 +174,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -217,11 +242,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html