Skip to content

Commit 66e13b0

Browse files
committed
Merge branch 'supports-non-ascii-characters' of github.com:hanachin/rspec_api_documentation into hanachin-supports-non-ascii-characters
2 parents 135e697 + 7b3437a commit 66e13b0

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

lib/rspec_api_documentation/views/markup_example.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ def respond_to?(method, include_private = false)
1919
end
2020

2121
def dirname
22-
resource_name.downcase.gsub(/[^0-9a-z.\-]+/, '_')
22+
resource_name.downcase.gsub(/\s+/, '_')
2323
end
2424

2525
def filename
26-
basename = description.downcase.gsub(/\s+/, '_').gsub(/[^a-z_]/, '')
26+
basename = description.downcase.gsub(/\s+/, '_').gsub(Pathname::SEPARATOR_PAT, '')
2727
basename = Digest::MD5.new.update(description).to_s if basename.blank?
2828
"#{basename}.#{extension}"
2929
end

lib/rspec_api_documentation/writers/json_writer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def dirname
7878
end
7979

8080
def filename
81-
basename = description.downcase.gsub(/\s+/, '_').gsub(/[^a-z_]/, '')
81+
basename = description.downcase.gsub(/\s+/, '_').gsub(Pathname::SEPARATOR_PAT, '')
8282
"#{basename}.json"
8383
end
8484

spec/views/html_example_spec.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
end
1414

1515
describe "multi charctor example name" do
16-
let(:label) { "コーヒーが順番で並んでいること" }
16+
let(:label) { "Coffee / Teaが順番で並んでいること" }
1717
let(:example) { group.example(label) {} }
1818

1919
it "should have downcased filename" do
20-
filename = Digest::MD5.new.update(label).to_s
21-
expect(html_example.filename).to eq(filename + ".html")
20+
expect(html_example.filename).to eq("coffee__teaが順番で並んでいること.html")
2221
end
2322
end
2423
end

spec/writers/json_example_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# -*- coding: utf-8 -*-
2+
require 'spec_helper'
3+
4+
describe RspecApiDocumentation::Writers::JsonExample do
5+
let(:configuration) { RspecApiDocumentation::Configuration.new }
6+
7+
describe '#filename' do
8+
specify 'Hello!/ 世界' do |example|
9+
expect(described_class.new(example, configuration).filename).to eq("hello!_世界.json")
10+
end
11+
end
12+
end

0 commit comments

Comments
 (0)