semi_static 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e78d2c887c9864aeca093ceb4613ec35eec5316a
-  data.tar.gz: 799edf4a73d1a078a1c89c34db52689c806fd253
+  metadata.gz: 3858969d960851aac2a526e58a77c5ea8bf60e90
+  data.tar.gz: 91ea7acfd26f2b652aff02c3cdd3b7fc0521ff38
 SHA512:
-  metadata.gz: 000122461de9d14e3a03d20b21dda0b2a29f2ec7254d48a758cfa80faffde19fa1a4773296851bf636dea260480bf25170e1e17c5abc65e5e26c343a2e2b37dc
-  data.tar.gz: eb920b374576b5ac899b509d1ac91180e405838e6ae67d4cf72b83a1c7b233d1711c4223ac58adc4cd98b458c01283b5660fdcebe4669cfcb74b1f621cdde905
+  metadata.gz: bbbbf86c4132f478f63ea3022de271eade1d5f0fdee99f462906269e2b8387485b86b4259dc11a4bc46525a063cfec1b879b2fad556352f0973b172651ca7bbe
+  data.tar.gz: 4facbede2541763b876aec97d9e06cb83a4b877969983763e89664ffaaa8373eed04171e4fb70c537adee14c3a0ec8e1e6a2162682908446dfbd595b6449c2d8

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## v0.7.1
+
+- Use request.env to avoid deprecation warning under Rails 5.

data/lib/semi_static/controller/page.rb

@@ -19,6 +19,6 @@ module SemiStatic::Controller::Page
   private
 
   def resource
-    env["semi_static.mapping"]
+    request.env["semi_static.mapping"]
   end
 end

data/lib/semi_static/version.rb

@@ -1,3 +1,3 @@
 module SemiStatic
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/semi_static.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'babosa'
   s.add_dependency 'tilt', '>= 1.3.4'
 
-  s.add_development_dependency 'rspec-rails', '~> 2.0'
+  s.add_development_dependency 'rspec-rails', '>= 3.0'
   s.add_development_dependency 'capybara', '~> 2.1'
 end

data/spec/backend_spec.rb

@@ -12,15 +12,15 @@ describe SemiStatic::Backend do
 
   context "all" do
     before { @all = @backend.all(News) }
-    it { @all.size.should == 1 }
+    it { expect(@all.size).to eq(1) }
 
     context "item" do
       before { @item = @all.first }
-      it { @item.title.should == "請求書のダウンロードが可能になりました" }
-      it { @item.published_at.should == Date.parse("2011-07-26") }
+      it { expect(@item.title).to eq("請求書のダウンロードが可能になりました") }
+      it { expect(@item.published_at).to eq(Date.parse("2011-07-26")) }
       context "body" do
         subject { @item.body.render(self) }
-        it { should include("<br>") } 
+        it { is_expected.to include("<br>") } 
       end
     end
   end

data/spec/{acceptance → features}/custom_controllers_spec.rb

@@ -1,19 +1,19 @@
 # encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
 
-feature 'custom controllers' do
+feature 'custom controllers', type: :feature do
   scenario "index" do
     visit faqs_path
-    find("h1 a").text.should == "チェックイン端末とはなんですか？" 
+    expect(find("h1 a").text).to eq("チェックイン端末とはなんですか？")
   end
 
   scenario "overwritten method" do
     visit faq_path(:id => "管理端末とはなんですか？")
-    find("h1").text.should == "チェックイン端末とはなんですか？" 
+    expect(find("h1").text).to eq("チェックイン端末とはなんですか？")
   end
 
   scenario "namespaced controller" do
     visit admin_faqs_path
-    find("body").text.should == "Namespaced"
+    expect(find("body").text).to eq("Namespaced")
   end
 end

data/spec/{acceptance → features}/fake/app/controllers/admin/faqs_controller.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 class Admin::FaqsController < SemiStatic::PageController
   def index
-    render :text => "Namespaced"
+    render :plain => "Namespaced"
   end
 end

data/spec/features/news_spec.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+feature 'news', type: :feature do
+  scenario "index" do
+    visit news_index_path
+    expect(page.find("h1 a").text).to eq("請求書のダウンロードが可能になりました")
+    expect(page.find("date").text).to eq("July 26, 2011")
+    expect(page.find("p").text).to eq("各請求書のページに「ダウンロード」ボタンを設置し、作成した請求書をPDFファイルとしてダウンロードできるようになりました。")
+  end
+
+  scenario 'show markdown page' do
+    visit "/news/2011/7/26/#{CGI.escape("請求書のダウンロードが可能になりました")}"
+    expect(page.find("h1").text).to eq("請求書のダウンロードが可能になりました")
+    expect(page.find("date").text).to eq("July 26, 2011")
+    expect(page.find("p").text).to eq("各請求書のページに「ダウンロード」ボタンを設置し、作成した請求書をPDFファイルとしてダウンロードできるようになりました。")
+  end
+
+  scenario 'show non-existant page' do
+    visit "/news/1999/1/23/foo"
+    expect(page.status_code).to eq(404)
+  end
+end

data/spec/features/page_spec.rb

@@ -0,0 +1,49 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+feature 'page', type: :feature do
+  scenario "index" do
+    visit '/event_planning_tips'
+    expect(page).to have_css("h1 a")
+    expect(page).to have_content("イベント時に気をつけたいマナー")
+  end
+
+  scenario 'show markdown page' do
+    visit "/event_planning_tips/#{CGI.escape("イベント時に気をつけたいマナー")}"
+    expect(page.find("h1").text).to eq("イベント時に気をつけたいマナー")
+    expect(page.find("section h2").text).to eq("1. 無断に写真や動画の撮影、公開しない")
+  end
+
+  scenario 'show multibyte bang' do
+    visit "/event_planning_tips/#{CGI.escape("イベントやろう")}"
+    expect(current_path).to eq("/event_planning_tips/#{CGI.escape("イベントやろう")}")
+    expect(page.find("h1").text).to eq("イベントやろう！")
+  end
+
+  scenario 'show erb page' do
+    visit "/event_planning_tips/erb-test"
+    expect(page.find(".erb").text).to eq("1 + 1 = 2")
+  end
+
+  scenario 'show erb chained' do
+    visit "/event_planning_tips/erb-chained"
+    expect(page.find("h2").text).to eq("1 + 1 = 2")
+    expect(page).to have_css "img"
+  end
+
+  scenario 'non standard slug' do
+    visit "/event_planning_tips/non-standard-slug"
+    expect(page.find("h1").text).to eq("Title is different than slug")
+  end
+
+  scenario 'slug is not validly encoded' do
+    visit "/event_planning_tips/%8e%8f"
+    expect(page.status_code).to eq(400)
+  end
+
+  scenario 'redirect in case of double escape' do
+    visit "/event_planning_tips/#{CGI.escape(CGI.escape("イベントやろう"))}"
+    expect(current_path).to eq("/event_planning_tips/#{CGI.escape("イベントやろう")}")
+    expect(page.find("h1").text).to eq("イベントやろう！")
+  end
+end

data/spec/news_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 describe SemiStatic::News do
   before do
     @page = described_class.new("body", :title => "ほげ", :published_at => Date.parse("2001-01-31"))
-    SemiStatic.backend = mock(:all => [ @page ])
+    SemiStatic.backend = double(:all => [ @page ])
   end
 
-  it { @page.to_param.should == "2001/1/31/ほげ" }
-  it { News.find("2001/1/31/ほげ").should == @page }
+  it { expect(@page.to_param).to eq("2001/1/31/ほげ") }
+  it { expect(SemiStatic::News.find("2001/1/31/ほげ")).to eq(@page) }
 end

data/spec/page_spec.rb

@@ -5,15 +5,15 @@ describe SemiStatic::Page do
   before do
     @japanese_page = described_class.new("body", :title => "ほげ")
     @english_page = described_class.new("body", :title => "foo bar") 
-    SemiStatic.backend = mock(:all => [ @japanese_page, @english_page ])
+    SemiStatic.backend = double(:all => [ @japanese_page, @english_page ])
   end
 
-  it { @japanese_page.to_param.should == "ほげ" }
-  it { @japanese_page.to_s.should == "ほげ" }
-  it { @english_page.to_param.should == "foo-bar" }
-  it { @english_page.to_s.should == "foo bar" }
-  it { described_class.new(nil, {}).to_s.should == "" }
-  it { SemiStatic::Page.find("foo-bar").should == @english_page }
-  it { SemiStatic::Page.find("ほげ").should == @japanese_page }
-  it { SemiStatic::Page.find(CGI.escape("ほげ")).should == @japanese_page }
+  it { expect(@japanese_page.to_param).to eq("ほげ") }
+  it { expect(@japanese_page.to_s).to eq("ほげ") }
+  it { expect(@english_page.to_param).to eq("foo-bar") }
+  it { expect(@english_page.to_s).to eq("foo bar") }
+  it { expect(described_class.new(nil, {}).to_s).to eq("") }
+  it { expect(SemiStatic::Page.find("foo-bar")).to eq(@english_page) }
+  it { expect(SemiStatic::Page.find("ほげ")).to eq(@japanese_page) }
+  it { expect(SemiStatic::Page.find(CGI.escape("ほげ"))).to eq(@japanese_page) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semi_static
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Paul McMahon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,16 +70,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -125,25 +126,25 @@ files:
 - lib/semi_static/tilt_wrapper.rb
 - lib/semi_static/version.rb
 - semi_static.gemspec
-- spec/acceptance/acceptance_helper.rb
-- spec/acceptance/custom_controllers_spec.rb
-- spec/acceptance/fake/app.rb
-- spec/acceptance/fake/app/controllers/admin/faqs_controller.rb
-- spec/acceptance/fake/app/controllers/faqs_controller.rb
-- spec/acceptance/fake/app/models/event_planning_tip.rb
-- spec/acceptance/fake/app/models/faq.rb
-- spec/acceptance/fake/app/models/news.rb
-- spec/acceptance/fake/app/views/application.html.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_chained.md.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_page.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/manner.md
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/multibyte-bang.md
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/non_standard_slug.md
-- spec/acceptance/fake/semi_static_pages/faqs/checkin_devices.md
-- spec/acceptance/fake/semi_static_pages/news/2011-07-26-replaced-download.md
-- spec/acceptance/news_spec.rb
-- spec/acceptance/page_spec.rb
 - spec/backend_spec.rb
+- spec/features/acceptance_helper.rb
+- spec/features/custom_controllers_spec.rb
+- spec/features/fake/app.rb
+- spec/features/fake/app/controllers/admin/faqs_controller.rb
+- spec/features/fake/app/controllers/faqs_controller.rb
+- spec/features/fake/app/models/event_planning_tip.rb
+- spec/features/fake/app/models/faq.rb
+- spec/features/fake/app/models/news.rb
+- spec/features/fake/app/views/application.html.erb
+- spec/features/fake/semi_static_pages/event_planning_tips/erb_chained.md.erb
+- spec/features/fake/semi_static_pages/event_planning_tips/erb_page.erb
+- spec/features/fake/semi_static_pages/event_planning_tips/manner.md
+- spec/features/fake/semi_static_pages/event_planning_tips/multibyte-bang.md
+- spec/features/fake/semi_static_pages/event_planning_tips/non_standard_slug.md
+- spec/features/fake/semi_static_pages/faqs/checkin_devices.md
+- spec/features/fake/semi_static_pages/news/2011-07-26-replaced-download.md
+- spec/features/news_spec.rb
+- spec/features/page_spec.rb
 - spec/news_spec.rb
 - spec/page_spec.rb
 - spec/semi_static_pages/news/2011-07-26-replaced-download.md
@@ -167,30 +168,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: semi_static
-rubygems_version: 2.2.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Text file based CMS for Rails
 test_files:
-- spec/acceptance/acceptance_helper.rb
-- spec/acceptance/custom_controllers_spec.rb
-- spec/acceptance/fake/app.rb
-- spec/acceptance/fake/app/controllers/admin/faqs_controller.rb
-- spec/acceptance/fake/app/controllers/faqs_controller.rb
-- spec/acceptance/fake/app/models/event_planning_tip.rb
-- spec/acceptance/fake/app/models/faq.rb
-- spec/acceptance/fake/app/models/news.rb
-- spec/acceptance/fake/app/views/application.html.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_chained.md.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_page.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/manner.md
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/multibyte-bang.md
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/non_standard_slug.md
-- spec/acceptance/fake/semi_static_pages/faqs/checkin_devices.md
-- spec/acceptance/fake/semi_static_pages/news/2011-07-26-replaced-download.md
-- spec/acceptance/news_spec.rb
-- spec/acceptance/page_spec.rb
 - spec/backend_spec.rb
+- spec/features/acceptance_helper.rb
+- spec/features/custom_controllers_spec.rb
+- spec/features/fake/app.rb
+- spec/features/fake/app/controllers/admin/faqs_controller.rb
+- spec/features/fake/app/controllers/faqs_controller.rb
+- spec/features/fake/app/models/event_planning_tip.rb
+- spec/features/fake/app/models/faq.rb
+- spec/features/fake/app/models/news.rb
+- spec/features/fake/app/views/application.html.erb
+- spec/features/fake/semi_static_pages/event_planning_tips/erb_chained.md.erb
+- spec/features/fake/semi_static_pages/event_planning_tips/erb_page.erb
+- spec/features/fake/semi_static_pages/event_planning_tips/manner.md
+- spec/features/fake/semi_static_pages/event_planning_tips/multibyte-bang.md
+- spec/features/fake/semi_static_pages/event_planning_tips/non_standard_slug.md
+- spec/features/fake/semi_static_pages/faqs/checkin_devices.md
+- spec/features/fake/semi_static_pages/news/2011-07-26-replaced-download.md
+- spec/features/news_spec.rb
+- spec/features/page_spec.rb
 - spec/news_spec.rb
 - spec/page_spec.rb
 - spec/semi_static_pages/news/2011-07-26-replaced-download.md

data/spec/acceptance/news_spec.rb

@@ -1,23 +0,0 @@
-# encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
-
-feature 'news' do
-  scenario "index" do
-    visit news_index_path
-    page.find("h1 a").text.should == "請求書のダウンロードが可能になりました"
-    page.find("date").text.should == "July 26, 2011"
-    page.find("p").text.should == "各請求書のページに「ダウンロード」ボタンを設置し、作成した請求書をPDFファイルとしてダウンロードできるようになりました。"
-  end
-
-  scenario 'show markdown page' do
-    visit "/news/2011/7/26/#{CGI.escape("請求書のダウンロードが可能になりました")}"
-    page.find("h1").text.should == "請求書のダウンロードが可能になりました"
-    page.find("date").text.should == "July 26, 2011"
-    page.find("p").text.should == "各請求書のページに「ダウンロード」ボタンを設置し、作成した請求書をPDFファイルとしてダウンロードできるようになりました。"
-  end
-
-  scenario 'show non-existant page' do
-    visit "/news/1999/1/23/foo"
-    page.status_code.should == 404
-  end
-end

data/spec/acceptance/page_spec.rb

@@ -1,49 +0,0 @@
-# encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
-
-feature 'page' do
-  scenario "index" do
-    visit '/event_planning_tips'
-    page.should have_css("h1 a")
-    page.should have_content("イベント時に気をつけたいマナー")
-  end
-
-  scenario 'show markdown page' do
-    visit "/event_planning_tips/#{CGI.escape("イベント時に気をつけたいマナー")}"
-    page.find("h1").text.should == "イベント時に気をつけたいマナー"
-    page.find("section h2").text.should == "1. 無断に写真や動画の撮影、公開しない"
-  end
-
-  scenario 'show multibyte bang' do
-    visit "/event_planning_tips/#{CGI.escape("イベントやろう")}"
-    current_path.should == "/event_planning_tips/#{CGI.escape("イベントやろう")}"
-    page.find("h1").text.should == "イベントやろう！"
-  end
-
-  scenario 'show erb page' do
-    visit "/event_planning_tips/erb-test"
-    page.find(".erb").text.should == "1 + 1 = 2"
-  end
-
-  scenario 'show erb chained' do
-    visit "/event_planning_tips/erb-chained"
-    page.find("h2").text.should == "1 + 1 = 2"
-    page.should have_css "img"
-  end
-
-  scenario 'non standard slug' do
-    visit "/event_planning_tips/non-standard-slug"
-    page.find("h1").text.should == "Title is different than slug"
-  end
-
-  scenario 'slug is not validly encoded' do
-    visit "/event_planning_tips/%8e%8f"
-    page.status_code.should == 400
-  end
-
-  scenario 'redirect in case of double escape' do
-    visit "/event_planning_tips/#{CGI.escape(CGI.escape("イベントやろう"))}"
-    current_path.should == "/event_planning_tips/#{CGI.escape("イベントやろう")}"
-    page.find("h1").text.should == "イベントやろう！"
-  end
-end