semi_static 0.0.2 → 0.1.0

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 *.log
+.rvmrc
+tmp/

data/app/controllers/semi_static/news_controller.rb

@@ -1,9 +1,3 @@
 class SemiStatic::NewsController < SemiStatic::PageController
-  def index
-    super
-    respond_to do |f|
-      f.html 
-      f.atom { render :layout => false }
-    end
-  end
+  include SemiStatic::Controller::News
 end

data/app/controllers/semi_static/page_controller.rb

@@ -1,14 +1,3 @@
 class SemiStatic::PageController < ApplicationController
-  def index
-    @articles = resource.all
-  end
-
-  def show
-    @article = resource.find(params[:id])
-    raise ActionController::RoutingError.new(url_for(:id => params[:id], :only_path => true)) unless @article
-  end
-
-  def resource
-    env["semi_static.mapping"]
-  end
+  include SemiStatic::Controller::Page
 end

data/lib/semi_static/backend.rb

@@ -11,8 +11,7 @@ class SemiStatic::Backend < SemiStatic::Page
       @cache[page_type] = Dir.glob(path).map do |f|
         yaml, body = File.read(f).split("\n...\n", 2)
         h = YAML.load(yaml)
-        template = Tilt.new(f) {|template| body }
-        page_type.new(template, h)
+        page_type.new(SemiStatic::TiltWrapper.template(f,body), h)
       end
     end
     @cache[page_type]

data/lib/semi_static/controller/news.rb

@@ -0,0 +1,13 @@
+module SemiStatic::Controller::News
+  def self.included(klass)
+    klass.send :include, SemiStatic::Controller::Page
+  end
+
+  def index
+    super
+    respond_to do |f|
+      f.html 
+      f.atom { render :layout => false }
+    end
+  end
+end

data/lib/semi_static/controller/page.rb

@@ -0,0 +1,16 @@
+module SemiStatic::Controller::Page
+  def index
+    @articles = resource.all
+  end
+
+  def show
+    @article = resource.find(params[:id])
+    raise ActionController::RoutingError.new(url_for(:id => params[:id], :only_path => true)) unless @article
+  end
+
+  private
+
+  def resource
+    env["semi_static.mapping"]
+  end
+end

data/lib/semi_static/controller.rb

@@ -0,0 +1,4 @@
+module SemiStatic::Controller
+  autoload :News, "semi_static/controller/news"
+  autoload :Page, "semi_static/controller/page"
+end

data/lib/semi_static/tilt_wrapper.rb

@@ -0,0 +1,30 @@
+class SemiStatic::TiltWrapper
+  class << self
+    def template(filename, body)
+      wrap Tilt.new(filename) {|t| body }
+    end
+
+    private
+
+    def wrap(template)
+      components = File.basename(template.file).split(".")
+      if components.size > 2
+        filename = template.file.chomp('.' + components.last)
+        wrap new(template, filename)
+      else
+        template
+      end
+    end
+  end
+
+  attr_reader :file
+
+  def initialize(wrapping_template, filename)
+    @wrapping_template, @file = wrapping_template, filename
+  end
+
+  def render(scope=Object.new, locals={}, &block)
+    template = Tilt.new(@file) {|t| @wrapping_template.render(scope, locals, &block) }
+    template.render(scope, locals, &block)
+  end
+end

data/lib/semi_static/version.rb

@@ -1,3 +1,3 @@
 module SemiStatic
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/semi_static.rb

@@ -14,6 +14,8 @@ module SemiStatic
   autoload :Article, "semi_static/article"
   autoload :Page, "semi_static/page"
   autoload :Backend, "semi_static/backend"
+  autoload :TiltWrapper, "semi_static/tilt_wrapper"
+  autoload :Controller, "semi_static/controller"
 
   class << self
     attr_writer :backend

data/spec/acceptance/custom_controllers_spec.rb

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

data/spec/acceptance/fake/app/controllers/admin/faqs_controller.rb

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

data/spec/acceptance/fake/app/controllers/faqs_controller.rb

@@ -0,0 +1,12 @@
+# encoding: UTF-8
+class FaqsController < SemiStatic::PageController
+  def show
+    case params[:id]
+    when "管理端末とはなんですか？"
+      redirect_to :id => "チェックイン端末とはなんですか？", :status => 301
+    else
+      super
+    end
+  end
+
+end

data/spec/acceptance/fake/app/models/faq.rb

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+class Faq < SemiStatic::Page
+end

data/spec/acceptance/fake/app.rb

@@ -13,5 +13,9 @@ app.initialize!
 app.routes.draw do
   semi_static_for :news
   semi_static_for :event_planning_tips
+  semi_static_for :faqs, :controller => :faqs
+  namespace :admin do
+    semi_static_for :faqs, :controller => :faqs
+  end
 end
 class ApplicationController < ActionController::Base; end

data/spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_chained.md.erb

@@ -0,0 +1,5 @@
+title: ERB Chained
+...
+## 1 + 1 = <%= 1 + 1 %>
+
+<%= image_tag 'test.jpg' %>

data/spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_page.erb

@@ -0,0 +1,3 @@
+title: ERB Test
+...
+<div class="erb">1 + 1 = <%= 1 + 1 %></div>

data/spec/acceptance/fake/semi_static_pages/faqs/checkin_devices.md

@@ -0,0 +1,7 @@
+title: チェックイン端末とはなんですか？
+...
+チェックイン端末は、チケットをスキャンするために用いられます。携帯電話やスマートフォン、PC付属のウェブカメラなどでご利用になれます。iPhoneをお持ちの方は、[Doorkeeper iPhoneアプリ](http://itunes.apple.com/us/app/doorkeeper/id414643903)を使用すると、より簡単にチェックインが可能です。
+
+<b>注記：</b> チケットをスキャンする際には、各イベントごと事前にチェックイン端末の登録が必要です。
+
+チェックイン端末の登録につきましては、「[iPhoneでチケットを読み取るには](/how-to/iphone%E3%81%A7%E3%83%81%E3%82%B1%E3%83%83%E3%83%88%E3%82%92%E8%AA%AD%E3%81%BF%E5%8F%96%E3%82%8B%E3%81%AB%E3%81%AF)」を参照ください。

data/spec/acceptance/page_spec.rb

@@ -4,8 +4,8 @@ require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
 feature 'page' do
   scenario "index" do
     visit '/event_planning_tips'
-    page.find("h1 a").text.should == "イベント時に気をつけたいマナー"
-    page.find("section h2").text.should == "1. 無断に写真や動画の撮影、公開しない"
+    page.should have_css("h1 a")
+    page.should have_content("イベント時に気をつけたいマナー")
   end
 
   scenario 'show markdown page' do
@@ -14,4 +14,14 @@ feature 'page' do
     page.find("section h2").text.should == "1. 無断に写真や動画の撮影、公開しない"
   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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semi_static
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152911060 !ruby/object:Gem::Requirement
+  requirement: &2156249420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152911060
+  version_requirements: *2156249420
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152910640 !ruby/object:Gem::Requirement
+  requirement: &2156248400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152910640
+  version_requirements: *2156248400
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &2152910180 !ruby/object:Gem::Requirement
+  requirement: &2156247860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152910180
+  version_requirements: *2156247860
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2152909760 !ruby/object:Gem::Requirement
+  requirement: &2156247360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152909760
+  version_requirements: *2156247360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152909260 !ruby/object:Gem::Requirement
+  requirement: &2156246380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2152909260
+  version_requirements: *2156246380
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &2152908840 !ruby/object:Gem::Requirement
+  requirement: &2156236320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152908840
+  version_requirements: *2156236320
 description: Easily create content for your Rails apps using just textfiles
 email:
 - paul@mobalean.com
@@ -97,19 +97,30 @@ files:
 - app/views/semi_static/page/show.html.erb
 - lib/semi_static.rb
 - lib/semi_static/backend.rb
+- lib/semi_static/controller.rb
+- lib/semi_static/controller/news.rb
+- lib/semi_static/controller/page.rb
 - lib/semi_static/news.rb
 - lib/semi_static/page.rb
 - lib/semi_static/page/with_locale.rb
 - lib/semi_static/rails.rb
 - lib/semi_static/rails/routes.rb
+- 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/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
@@ -138,17 +149,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: semi_static
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 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/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