gast 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f0f0b4b03eaf63cbfb2e6ddb5d41137b174ddd
-  data.tar.gz: 5d18e8c2a79ade92fb5c3ca3881a24f75d0549c4
+  metadata.gz: ff0f8ec7fce32cf0d453a25839940dc20580b28e
+  data.tar.gz: 5444c833df7d594157daffaf413d6139a047975a
 SHA512:
-  metadata.gz: beee6f573bde844c995656b335571892c1e7a45fdff0679b18b4c23fc1c07acf2527ed636f956272769eab887084345eb1ea239a26bf9e49967dbf39629b88f1
-  data.tar.gz: f42392c4a42e9f6cde24c7a98b08fdf600663b0f3aeb51c49874d58538b9c9627ba918f6eca3a42a0ab164ead6bc830d63bbc1af1a071671fbe534488578206e
+  metadata.gz: 7e6464539b961580930079e0a4e9c11be05cbfb8e6256d995915b5f15f58a178ceed9ab96e567a00caea90d355c8d96f356993db13b69515cf0b712a132c1d20
+  data.tar.gz: b2479da1e1f4393620114c180534b24a3c684c76e65dc8d8186de4521dd571384f5e37e1983ecb50e931eda2764bb3330d2ddf1ad2fe953423aeea6f22cf99dd

data/Guardfile

@@ -3,9 +3,7 @@
 
 guard :spork, :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' } do
   watch('lib/gast.rb')
-  watch('lib/gast/app.rb')
-  watch('lib/gast/memo.rb.rb')
-  watch('lib/gast/version.rb')
+  watch(%r{^lib/gast/(.+)\.rb$})
   watch('Gemfile.lock')
   watch('spec/spec_helper.rb') { :rspec }
   watch('test/test_helper.rb') { :test_unit }

data/lib/gast/app.rb

@@ -55,6 +55,7 @@ module Gast
 
     get '/posts/view/:id' do
       @item = Gast::Memo.item(params[:id].to_s)
+      @language = Gast::Memo.language(params[:id].to_s)
       @content_hash = params[:id].to_s
       haml :view
     end
@@ -68,14 +69,17 @@ module Gast
     put '/posts/update/:id' do
       @result = Gast::Memo.update(
         id=params[:id].to_s, 
-        content=params[:content].to_s
+        content=params[:content].to_s,
+        language=params[:language].to_s
       )
       redirect to("/posts/view/#{params[:id]}")
     end
 
     post '/posts/new' do
-      new_id = Gast::Memo.save(params[:content].to_s)
-      redirect to("/posts/view/#{new_id}")
+      results = Gast::Memo.save(
+        params[:content].to_s, params[:language].to_s
+      )
+      redirect to("/posts/view/#{results[:id]}")
     end
 
   end

data/lib/gast/memo.rb

@@ -4,21 +4,29 @@ module Gast
 
   class Memo
 
-    def self.save(content)
+    def self.save(content, language="no-highlight")
       @repo = Gast::Repository.new
       @repo.content = CGI.unescapeHTML(content.to_s)
+      @repo.language = CGI.unescapeHTML(language.to_s)
       @repo.publish
       @repo.commit!
-      @repo.dir_name
+      { 
+        id: @repo.dir_name,
+        language: language
+      }
     end
 
-    def self.update(id, content)
+    def self.update(id, content, language="no-highlight")
       return id if content.to_s.chomp == item(id).chomp
       @repo = Gast::Repository.new(id)
       @repo.content = CGI.unescapeHTML(content.to_s)
+      @repo.language = CGI.unescapeHTML(language.to_s)
       @repo.publish
       @repo.commit!
-      @repo.dir_name
+      { 
+        id: @repo.dir_name,
+        language: language
+      }
     end
 
     def self.number
@@ -37,6 +45,12 @@ module Gast
       )
     end
 
+    def self.language(id)
+      CGI.escapeHTML(
+        File.read(File.expand_path(Gast::PATH + "/#{id}/language"))
+      )
+    end
+
     def initialize; end
 
   end

data/lib/gast/repository.rb

@@ -23,9 +23,13 @@ module Gast
       @content = content
     end
 
+    def language=(language)
+      @language = language.to_s
+    end
+
     def publish
-      @save_path = File.expand_path(@path + '/content')
-      open(@save_path, 'w', 0644) { |io| io.write(@content) }
+      save_content
+      save_language
     end
 
     def remove!
@@ -51,6 +55,16 @@ module Gast
       end
     end
 
+    def save_content
+      path = File.expand_path(@path + "/content")
+      open(path, 'w', 0644) { |io| io.write(@content) }
+    end
+
+    def save_language
+      path = File.expand_path(@path + '/language')
+      open(path, 'w', 0644) { |io| io.write(@language) }
+    end
+
   end
 
 end

data/lib/gast/templates/form_area.haml

@@ -1,8 +1,11 @@
 .form-group
-  %select
-    %option
+  %select{ name: "language" }
+    %option{ value: "python" }
       python
-  %textarea{ class: "form-control", style: "margin-top: 10px; height: 30em;", name: "content" }
-    = @item 
+    %option{ value: "ruby"}
+      ruby
+  = preserve do
+    %textarea{ class: "form-control", style: "margin-top: 10px; height: 30em;", name: "content", wrap: "hard" }
+      = @item 
 %button{ type: "submit", class: "btn btn-primary" }
   Submit

data/lib/gast/templates/header.haml

@@ -4,5 +4,7 @@
 %link{:href=>"//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css", :rel=>"stylesheet"}
 %script{:src=>"//code.jquery.com/jquery-2.1.0.min.js"}
 %script{:src=>"//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"}
-%link{ rel: 'stylesheet', href: stylesheet_path('application') }
-
+%script{ src: 'http://yandex.st/highlightjs/8.0/highlight.min.js' }
+%link{ rel: 'stylesheet', href: '//yandex.st/highlightjs/8.0/styles/default.min.css' }
+:javascript
+  hljs.initHighlightingOnLoad();

data/lib/gast/templates/layout.haml

@@ -6,3 +6,4 @@
     = haml :navbar
     .container
       = yield
+

data/lib/gast/templates/view.haml

@@ -3,5 +3,9 @@
 %form{ role: "form", action: "/posts/edit/#{params[:id].to_s}", method: "GET" }
   %button{ type: "submit", class: "btn btn-primary" }
     Update
-%p{ style: "margin-top: 20px;" }
-  = @item
+
+%div{ style: "margin-top: 20px;" }
+  = preserve do
+    %pre{ style: "white-space: pre-wrap;" }
+      %code{ class: "#{@language}" }
+        = @item

data/lib/gast/version.rb

@@ -1,3 +1,3 @@
 module Gast
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controller_spec.rb

@@ -15,6 +15,8 @@ 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(:sample_of_code_ruby) { get_fixture('sample_of_code.rb') }
+
   let(:view_path) { /.+\/posts\/view\/[a-z0-9]+/ }
 
   it "should be get index" do
@@ -105,4 +107,29 @@ describe Gast::App do
 
   end
 
+  it "should be post language type the code highlight" do
+    post '/posts/new', { content: sample_of_code_ruby, language: "ruby" }
+    repository = File.expand_path(Dir.glob(repo_dir + '/**').first)
+
+    expect(File.read(repository + '/content')).to eq sample_of_code_ruby
+    expect(File.read(repository + '/language')).to eq "ruby"
+
+    get "/posts/view/#{repository.split('/').last}"
+
+    expect(last_response).to be_ok
+  end
+
+  it "should be succeeded change of language type" do
+    post '/posts/new', { content: sample_of_code_ruby, language: "ruby" }
+    repository = File.expand_path(Dir.glob(repo_dir + '/**').first)
+
+    expect(File.read(repository + '/content')).to eq sample_of_code_ruby
+    expect(File.read(repository + '/language')).to eq "ruby"
+
+    put "/posts/update/#{repository.split('/').last}", { content: sample_of_code_ruby, language: "python" }
+
+    expect(File.read(repository + '/content')).to eq sample_of_code_ruby
+    expect(File.read(repository + '/language')).to eq "python"
+  end
+
 end

data/spec/fixtures/sample_of_code.rb

@@ -0,0 +1,13 @@
+require 'cgi'
+
+module Gast
+  class Post
+    def initalize(content)
+      @content = content
+    end
+
+    def view
+      CGI.escapeHTML(@content)
+    end
+  end
+end

data/spec/repository_spec.rb

@@ -11,9 +11,11 @@ describe Gast::Repository do
   let(:repo_dir) { "/tmp/gast" }
 
   let(:user_content) { "Hello World" }
+  let(:selected_language) { "ruby" }
 
   before(:each) {
     repo.content = user_content
+    repo.language = selected_language
     repo.publish
     repo.commit!
   }
@@ -30,6 +32,10 @@ describe Gast::Repository do
     expect(File.read(repo.path + '/content')).to eq user_content
   end
 
+  it "should be language is a ruby" do
+    expect(File.read(repo.path + '/language')).to eq selected_language
+  end
+
   it "should be save of commit message is correct" do
     Timecop.freeze
     expect(git.log.first.message).to eq "commit: #{DateTime.now.to_s}"

data/spec/spec_helper.rb

@@ -38,3 +38,7 @@ RSpec.configure do |config|
 
   config.order = 'random'
 end
+
+def get_fixture(name)
+  File.read(File.expand_path('./fixtures/' + name, __dir__))
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gast
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - futoase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -271,6 +271,7 @@ files:
 - lib/gast/templates/view.haml
 - lib/gast/version.rb
 - spec/controller_spec.rb
+- spec/fixtures/sample_of_code.rb
 - spec/memo_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
@@ -300,6 +301,7 @@ specification_version: 4
 summary: memo application of using git
 test_files:
 - spec/controller_spec.rb
+- spec/fixtures/sample_of_code.rb
 - spec/memo_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb