gast 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeec572eb871ef31ca23050fea49e461ede8ada4
-  data.tar.gz: 49b8eef7b16e2eca899312247849e9eb75a38dad
+  metadata.gz: 6d28db257ac5b3ca94999e73923159eb1103d44f
+  data.tar.gz: b333fa902740c3fedc0f690f2f4d27d3aa560fb1
 SHA512:
-  metadata.gz: bd55502f4bcebddb356eac5e5e83bf8264885df993af1307d7b28cc2834fe60656272e29d0682b6d384f68f0f848923d63caa578f1d651bf65a43a4156792998
-  data.tar.gz: b59aae1a8a878bdc00d823a5e961bf00d488f55c469fdbced068fa95f190394841005ab8129873a8e718d4bcef4f0c799a962f833356b47f32a93f4886c9fabc
+  metadata.gz: fd83c840284896c541cd0ead58e0ab41b35a7ac517ea1fa4f8c814216187fe5e49a35ab067f593489a5392f284e1a5069b35d6f27ddb475e1710ed675d4fe139
+  data.tar.gz: d45e7f45e793873742db3ef4ac255aebea6abbc619ac14a7dbad0cf3d8e7eda401e190b78cc8c759d20d4f3813b4327e2649cb14b060bc801ebe261b43cb8760

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gast (0.0.9)
+    gast (0.0.10)
       bundler (~> 1.6)
       git
       haml
@@ -87,7 +87,7 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    puma (2.11.0)
+    puma (2.11.1)
       rack (>= 1.1, < 2.0)
     rack (1.6.0)
     rack-protection (1.5.3)
@@ -119,8 +119,8 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.1)
     safe_yaml (1.0.4)
-    sass (3.4.10)
-    sequel (4.18.0)
+    sass (3.4.13)
+    sequel (4.19.0)
     shellany (0.0.1)
     sinatra (1.4.5)
       rack (~> 1.4)

data/lib/gast/base.rb

@@ -46,15 +46,16 @@ module Gast
     namespace '/posts' do
       before %r{/\w+/(\w+)} do |id|
         unless /[a-zA-Z0-9]{30}/ =~ id.to_s
-          halt haml(:error, locals: { 
+          halt haml(:error, locals: {
             message: 'error is format of id'
         })
         end
       end
 
       before '/new' do
-        @content = params[:content].to_s
+        @content  = params[:content].to_s
         @language = params[:language].to_s
+        @title    = params[:title].to_s
 
         if @content.length == 0
           halt haml(:error, locals: {
@@ -62,7 +63,7 @@ module Gast
           })
         end
 
-        result = Gast::Memo.create(@content, @language)
+        result = Gast::Memo.create(@content, @language, @title)
         @content_id = result.content_id
       end
 
@@ -73,14 +74,16 @@ module Gast
       before '/*/:content_id' do
         if %w[view log edit update].include? request.path_info.split('/')[2]
           @content_id = params[:content_id].to_s
-          @content = params[:content].to_s
-          @language = params[:language].to_s
+          @content    = params[:content].to_s
+          @language   = params[:language].to_s
+          @title      = params[:title].to_s
         end
       end
 
       before '/view/:content_id' do
-        @item = Gast::Memo.item(@content_id)
+        @item     = Gast::Memo.item(@content_id)
         @language = Gast::Memo.language(@content_id)
+        @title    = Gast::Memo.title(@content_id)
       end
 
       before '/log/:content_id' do
@@ -88,12 +91,14 @@ module Gast
       end
 
       before '/edit/:content_id' do
-        @item = Gast::Memo.item(@content_id)
+        @item     = Gast::Memo.item(@content_id)
+        @language = Gast::Memo.language(@content_id)
+        @title    = Gast::Memo.title(@content_id)
       end
 
       before '/update/:content_id' do
-        if Gast::Memo.changed?(@content_id, @content)
-          Gast::Memo.update(@content_id, @content, @language)
+        if Gast::Memo.changed?(@content_id, @content, @language, @title)
+          Gast::Memo.update(@content_id, @content, @language, @title)
         end
       end
     end

data/lib/gast/helper.rb

@@ -13,7 +13,7 @@ module Gast
     def get_content(id)
       File.read(File.expand_path(Gast::PATH + "/#{id}/content"))
     end
-    
+
     def get_content_dir(id)
       File.expand_path(Gast::PATH + "/#{id}")
     end
@@ -21,5 +21,10 @@ module Gast
     def get_language(id)
       File.read(File.expand_path(Gast::PATH + "/#{id}/language"))
     end
+
+    def get_title(id)
+      path = File.expand_path(Gast::PATH + "/#{id}/title")
+      File.exists?(path) ? File.read(path) : nil
+    end
   end
 end

data/lib/gast/memo.rb

@@ -5,61 +5,66 @@ module Gast
     extend Helper
 
     class Response
-      attr_reader :content_id, :language, :content
+      attr_reader :content_id, :language, :content, :title
 
-      def initialize(content_id, language, content)
+      def initialize(content_id, language, content, title)
         @content_id = content_id
-        @language = language
-        @content = content
+        @language   = language
+        @content    = content
+        @title      = title
       end
     end
 
     class Request
-      attr_reader :content_id, :language, :content
+      attr_reader :content_id, :language, :content, :title
 
-      def initialize(content_id, language, content)
+      def initialize(content_id, language, content, title)
         @content_id = content_id
-        @language = language
-        @content = content
+        @language   = language
+        @content    = content
+        @title      = title
       end
     end
 
-    def response(content_id, language, content)
-      Response.new(content_id, language, content)
+    def response(content_id, language, content, title)
+      Response.new(content_id, language, content, title)
     end
     module_function :response
 
-    def request(content_id, language, content)
-      Request.new(content_id, language, content)
+    def request(content_id, language, content, title)
+      Request.new(content_id, language, content, title)
     end
     module_function :request
 
-    def repository(content, language, content_id = nil)
+    def repository(content, language, content_id = nil, title)
       repo = Repository.new
       repo.dir_name = content_id
       repo.create
       repo.content = unescape_html { content }
       repo.language = unescape_html { language }
+      repo.title = unescape_html { title }
       repo.write
       repo.commit!
 
       repo.dir_name
     end
 
-    def create(content, language = DEFAULT_HIGHLIGHT)
-      content_id = repository(content, language)
-      response(content_id, language, content)
+    def create(content, language = DEFAULT_HIGHLIGHT, title = nil)
+      content_id = repository(content, language, nil, title)
+      response(content_id, language, content, title)
     end
     module_function :create
 
-    def update(content_id, content, language = DEFAULT_HIGHLIGHT)
-      content_id = repository(content, language, content_id)
-      response(content_id, language, content)
+    def update(content_id, content, language = DEFAULT_HIGHLIGHT, title = nil)
+      content_id = repository(content, language, content_id, title)
+      response(content_id, language, content, title)
     end
     module_function :update
 
-    def changed?(content_id, content)
-      content.to_s.chomp != item(content_id).chomp
+    def changed?(content_id, content, language, title)
+      content.to_s.chomp  != item(content_id).chomp     ||
+      language.to_s.chomp != language(content_id).chomp ||
+      title.to_s.chomp    != title(content_id).chomp
     end
     module_function :changed?
 
@@ -72,6 +77,7 @@ module Gast
       Dir.glob(File.expand_path(Gast::PATH + '/**')).map do |dir|
         {
           content_id: dir.split('/').last,
+          title:      File.exist?(dir + '/title') ? File.open(dir + '/title').read : nil,
           updated_at: File.stat(dir + '/content').mtime
         }
       end
@@ -92,6 +98,10 @@ module Gast
     def language(id)
       escape_html { get_language(id) }
     end
+
+    def title(id)
+      escape_html { get_title(id) }
+    end
     module_function :language
 
     extend Memo

data/lib/gast/repository.rb

@@ -3,7 +3,7 @@ require 'gast'
 module Gast
   class Repository
     attr_reader :path
-    attr_writer :content, :language
+    attr_writer :content, :language, :title
     attr_accessor :dir_name
 
     def initialize; end
@@ -18,6 +18,7 @@ module Gast
     def write
       write_content
       write_language
+      write_title
     end
 
     def log
@@ -64,6 +65,15 @@ module Gast
       end
     end
 
+    def write_title
+      path = File.expand_path(@path + '/title')
+      open(path, 'w', 0644) do |io|
+        io.flock(File::LOCK_EX)
+        io.write(@title)
+        io.flock(File::LOCK_UN)
+      end
+    end
+
     def new_name_of_repository
       if @dir_name.nil?
         @dir_name = Digest::SHA512.new.update(rand.to_s).to_s[0..30]

data/lib/gast/templates/form_area.haml

@@ -1,7 +1,8 @@
 .form-group
   = haml :languages
+  = haml :title
   = preserve do
     %textarea{ class: "form-control", style: "margin-top: 10px; height: 30em;", name: "content", wrap: "hard" }
-      = @item 
+      = @item
 %button{ type: "submit", class: "btn btn-primary" }
   Submit

data/lib/gast/templates/languages.haml

@@ -1,4 +1,4 @@
 %select{ name: "language" }
   - @languages.map do |language|
-    %option{ value: "#{language}" }
-      = language
+    %option{ value: "#{language}", :selected => @language == language }
+      = language

data/lib/gast/templates/list.haml

@@ -2,9 +2,11 @@
   Items
 %table{ class: "table table-striped" }
   %thead
-    %tr 
+    %tr
       %th
         Content ID
+      %th
+        Title
       %th
         Updated At
   %tbody
@@ -13,5 +15,7 @@
         %td
           %a{ href: url("/posts/view/#{list[:content_id]}") }
             = list[:content_id]
+        %td
+          = CGI.escapeHTML(list[:title])
         %td
           = list[:updated_at]

data/lib/gast/templates/title.haml

@@ -0,0 +1 @@
+%input{name: "title", placeholder: "Title...", value:(!@title || @title == '') ? '' : @title, maxlength:40, size:40, style:"margin-left:30px;padding-left:10px;"}

data/lib/gast/templates/view.haml

@@ -1,8 +1,12 @@
 %h1
   = @content_id
 %form{ role: "form", action: "/posts/edit/#{@content_id}", method: "GET" }
-  %button{ type: "submit", class: "btn btn-primary" }
-    Update
+  %div.col-xs-2
+    %button{ type: "submit", class: "btn btn-primary" }
+      Update
+  %div.col-xs-10
+    %h3{ style:"margin-top: 3px;" }
+      = (@title == "") ? "&nbsp" : @title
 
 %div{ style: "margin-top: 20px;" }
   = preserve do

data/lib/gast/version.rb

@@ -1,3 +1,3 @@
 module Gast
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/controller_spec.rb

@@ -5,6 +5,7 @@ describe Gast::App do
   let(:hello_world) { 'Hello World' }
   let(:welcome_to_underground) { 'Welcome to underground' }
   let(:inline_html) { "<script>alert('Hello world!');</script>" }
+  let(:inline_html_title) {"<b>hoge</b>"}
   let(:sample_of_code_ruby) { get_fixture('sample_of_code.rb') }
   let(:view_path) { %r{.+/posts/view/[a-z0-9]+} }
 
@@ -100,6 +101,21 @@ describe Gast::App do
     expect(last_response.body).to include(CGI.escapeHTML(inline_html))
   end
 
+  it 'should be title is escaped by HTML' do
+    post('/posts/new', content: inline_html, title:inline_html_title)
+
+    expect(latest_title).to eq inline_html_title
+
+    get "/posts/view/#{dir_name_of_latest_repository}"
+
+    expect(last_response).to be_ok
+    expect(last_response.body).to include(CGI.escapeHTML(inline_html_title))
+
+    get '/posts/list'
+    expect(last_response).to be_ok
+    expect(last_response.body).to include('&lt;b&gt;hoge&lt;/b&gt;')
+  end
+
   it 'should be post language type the code highlight' do
     post('/posts/new', content: sample_of_code_ruby, language: 'ruby')
 

data/spec/feature/index_spec.rb

@@ -24,4 +24,11 @@ describe 'the index page', type: :feature do
     find('//textarea').set 'Hello world'
     find('//textarea').text eq 'Hello world'
   end
+
+  it 'should be able to write text on the title input' do
+    visit '/'
+
+    find('//input').set 'My Title'
+    find('//input').text eq 'My Title'
+  end
 end

data/spec/repository_spec.rb

@@ -5,10 +5,12 @@ describe Gast::Repository do
   let(:git) { Git.init(repo.path) }
   let(:user_content) { 'Hello World' }
   let(:selected_language) { 'ruby' }
+  let(:title) { 'My awesome title' }
 
   before(:each) do
     repo.content = user_content
     repo.language = selected_language
+    repo.title = title
     repo.create
     repo.write
     repo.commit!
@@ -28,6 +30,10 @@ describe Gast::Repository do
     expect(latest_language_of_content).to eq selected_language
   end
 
+  it 'should be title is My awesome title' do
+    expect(latest_title).to eq title
+  end
+
   it 'should be save of commit message is correct' do
     Timecop.freeze
     expect(git.log.first.message).to eq "commit: #{DateTime.now}"

data/spec/spec_helper.rb

@@ -71,6 +71,10 @@ def latest_language_of_content
   File.read(latest_repository + '/language')
 end
 
+def latest_title
+  File.read(latest_repository + '/title')
+end
+
 def cleanup_in_the_dir
   FileUtils.rm_r(Dir.glob(Gast::PATH + '/**'), secure: true)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gast
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - futoase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,6 +261,7 @@ files:
 - lib/gast/templates/navbar.haml
 - lib/gast/templates/not_found.haml
 - lib/gast/templates/save.haml
+- lib/gast/templates/title.haml
 - lib/gast/templates/view.haml
 - lib/gast/version.rb
 - spec/controller_spec.rb