gast 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc3ee213f4e5d86b1bc8a6dc8b6b4da7810421ed
-  data.tar.gz: 2c68262859282689cf90740a7b537ecb3d27b8dd
+  metadata.gz: 91f1374024d46848fe452f840328d6e33b55baf6
+  data.tar.gz: ecbb056ed54a9a71f9d70b1c58ce4f523f8d917f
 SHA512:
-  metadata.gz: 0886827a727068ae5cbc01049d8ad4ef534d4541be3fa7f0813d634a55351558d004482cf7e98dcad62c4b68bd233946b8302dee7b133a0b93fa85edc31e1da1
-  data.tar.gz: 6af61f29398256d0df3985e9c0420623be58db8828db6900d1915f73b8ace6dc49cf978099b0ea6a355a445edced309ec92bef2cd15f8aedc45eaafb197153c2
+  metadata.gz: c1874b5081fafd14d9e82460b2defe9d4ab6558031fde3d21912c55da51bca072cc2e511b5665e8a6a10531a3a7b569c664eaeb023d7fa11ab4a07fa9b9f100c
+  data.tar.gz: 4d79c0d38b33f15577a71d651feb45f41c93864ebe7ed65c72c13c8d1f7a96d642d5c14383d142001684f017cf041b4afcf2279097335aecde71c95351cf26ca

data/Gemfile

@@ -11,4 +11,5 @@ group :development do
   gem 'guard-rspec'
   gem 'pry'
   gem 'pry-remote'
+  gem 'rubocop'
 end

data/README.md

@@ -5,6 +5,8 @@
 
 memo application of using git.
 
+![screen shot v0.0.4](https://cloud.githubusercontent.com/assets/72997/3080641/a04ba064-e4b3-11e3-9e8c-8adecc8873e4.png)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -28,7 +30,7 @@ Or install it yourself as:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/gast/fork )
+1. Fork it ( https://github.com/futoase/gast/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/config/path.yml

@@ -0,0 +1 @@
+save_dir: '/tmp/gast'

data/gast.gemspec

@@ -34,6 +34,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "capybara"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-remote"
 end

data/lib/gast/app.rb

@@ -2,7 +2,6 @@ require 'gast'
 
 module Gast
   class App < Sinatra::Base
-
     enable :method_override
     set :sprockets, Sprockets::Environment.new(root)
     set :assets_prefix, '/assets'
@@ -20,7 +19,7 @@ module Gast
         config.digest      = digest_assets
         config.public_path = '/public'
 
-        config.debug       = true 
+        config.debug       = true
       end
 
       register Sinatra::Reloader
@@ -31,21 +30,19 @@ module Gast
     end
 
     before do
-      @languages = YAML.load_file(
-        File.expand_path('../../config/languages.yml', __dir__)
-      )
+      @languages = Gast::LANGUAGES
     end
 
     before %r{/posts/\w+/(\w+)} do |id|
       unless /[a-zA-Z0-9]{30}/ =~ id.to_s
-        halt haml(:error, locals: { message: "error is format of id" })
+        halt haml(:error, locals: { message: 'error is format of id' })
       end
     end
 
     not_found do
       haml :not_found
     end
-    
+
     error do
       haml :error
     end
@@ -59,34 +56,34 @@ module Gast
       haml :list
     end
 
-    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
+    get '/posts/view/:content_id' do
+      @item = Gast::Memo.item(params[:content_id].to_s)
+      @language = Gast::Memo.language(params[:content_id].to_s)
+      @content_hash = params[:content_id].to_s
       haml :view
     end
 
-    get '/posts/edit/:id' do
-      @item = Gast::Memo.item(params[:id].to_s)
-      @content_hash = params[:id].to_s
+    get '/posts/edit/:content_id' do
+      @item = Gast::Memo.item(params[:content_id].to_s)
+      @content_hash = params[:content_id].to_s
       haml :edit
     end
 
-    put '/posts/update/:id' do
+    put '/posts/update/:content_id' do
       @result = Gast::Memo.update(
-        id=params[:id].to_s, 
-        content=params[:content].to_s,
-        language=params[:language].to_s
+        params[:content_id].to_s,
+        params[:content].to_s,
+        params[:language].to_s
       )
-      redirect to("/posts/view/#{params[:id]}")
+      redirect to("/posts/view/#{params[:content_id]}")
     end
 
     post '/posts/new' do
       results = Gast::Memo.save(
-        params[:content].to_s, params[:language].to_s
+        params[:content].to_s,
+        params[:language].to_s
       )
-      redirect to("/posts/view/#{results[:id]}")
+      redirect to("/posts/view/#{results[:content_id]}")
     end
-
   end
 end

data/lib/gast/memo.rb

@@ -1,30 +1,28 @@
 require 'gast'
 
 module Gast
-
   class Memo
-
-    def self.save(content, language="no-highlight")
+    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!
-      { 
-        id: @repo.dir_name,
+      {
+        content_id: @repo.dir_name,
         language: language
       }
     end
 
-    def self.update(id, content, language="no-highlight")
-      return id if content.to_s.chomp == item(id).chomp
-      @repo = Gast::Repository.new(id)
+    def self.update(content_id, content, language = 'no-highlight')
+      return content_id if content.to_s.chomp == item(content_id).chomp
+      @repo = Gast::Repository.new(content_id)
       @repo.content = CGI.unescapeHTML(content.to_s)
       @repo.language = CGI.unescapeHTML(language.to_s)
       @repo.publish
       @repo.commit!
-      { 
-        id: @repo.dir_name,
+      {
+        content_id: @repo.dir_name,
         language: language
       }
     end
@@ -52,6 +50,5 @@ module Gast
     end
 
     def initialize; end
-
   end
 end

data/lib/gast/repository.rb

@@ -2,10 +2,10 @@ require 'gast'
 
 module Gast
   class Repository
-
     attr_reader :path, :dir_name
+    attr_writer :content, :language
 
-    def initialize(dir_name=nil)
+    def initialize(dir_name = nil)
       if dir_name.nil?
         @dir_name = Digest::SHA512.new.update(rand.to_s).to_s[0..30]
       else
@@ -19,14 +19,6 @@ module Gast
       @git = Git.init(@path)
     end
 
-    def content=(content)
-      @content = content
-    end
-
-    def language=(language)
-      @language = language.to_s
-    end
-
     def publish
       save_content
       save_language
@@ -38,7 +30,7 @@ module Gast
 
     def save!
       @git.add(all: true)
-      @git.commit_all("commit: #{DateTime.now.to_s}")
+      @git.commit_all("commit: #{DateTime.now}")
     end
 
     def commit!
@@ -49,22 +41,27 @@ module Gast
     private
 
     def create_dir
-      unless File.exists?(@path)
-        FileUtils.mkdir_p(@path)
-        FileUtils.chmod(0755, @path)
-      end
+      return unless File.exist?(@path)
+      FileUtils.mkdir_p(@path)
+      FileUtils.chmod(0755, @path)
     end
 
     def save_content
-      path = File.expand_path(@path + "/content")
-      open(path, 'w', 0644) { |io| io.write(@content) }
+      path = File.expand_path(@path + '/content')
+      open(path, 'w', 0644) do |io|
+        io.flock(File::LOCK_EX)
+        io.write(@content)
+        io.flock(File::LOCK_UN)
+      end
     end
 
     def save_language
       path = File.expand_path(@path + '/language')
-      open(path, 'w', 0644) { |io| io.write(@language) }
+      open(path, 'w', 0644) do |io|
+        io.flock(File::LOCK_EX)
+        io.write(@language)
+        io.flock(File::LOCK_UN)
+      end
     end
-
   end
-
 end

data/lib/gast/version.rb

@@ -1,3 +1,3 @@
 module Gast
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/gast.rb

@@ -13,5 +13,13 @@ require 'cgi'
 require 'yaml'
 
 module Gast
-  PATH = '/tmp/gast'
+  setting_of_path = YAML.load_file(
+    File.expand_path('../config/path.yml', __dir__)
+  )
+  
+  PATH = setting_of_path['save_dir']
+
+  LANGUAGES = YAML.load_file(
+    File.expand_path('../config/languages.yml', __dir__)
+  )
 end

data/spec/controller_spec.rb

@@ -6,130 +6,120 @@ end
 
 describe Gast::App do
 
-  let(:repo_dir) { File.expand_path("/tmp/gast") }
-
   after(:each) do
-    FileUtils.rm_r(Dir.glob(repo_dir + '/**'), secure: true)
+    FileUtils.rm_r(Dir.glob(Gast::PATH + '/**'), secure: true)
   end
 
-  let(:hello_world) { "Hello World" }
-  let(:welcome_to_underground) { "Welcome to underground" }
+  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]+/ }
+  let(:view_path) { %r{.+/posts/view/[a-z0-9]+} }
 
-  it "should be get index" do
-    get '/' 
+  it 'should be get index' do
+    get '/'
     expect(last_response).to be_ok
   end
-  
-  it "should be get title of index" do
+
+  it 'should be get title of index' do
     get '/'
     expect(last_response.body).to match(/Gast/)
   end
 
-  it "should be get error" do
+  it 'should be get error' do
     get '/hogehoge'
     expect(last_response).not_to be_ok
   end
 
-  it "should be get list" do
+  it 'should be get list' do
     get '/posts/list'
     expect(last_response).to be_ok
   end
 
-  it "should be save of content on git directory" do
-    post '/posts/new', { content: hello_world }
+  it 'should be save of content on git directory' do
+    post('/posts/new', content: hello_world)
     expect(last_response.status).to eq 302
     expect(last_response.location).to match(view_path)
   end
 
-  it "should be update content" do
-    post '/posts/new', { content: hello_world }
-    
+  it 'should be update content' do
+    post('/posts/new', content: hello_world)
+
     expect(last_response.status).to eq 302
     expect(last_response.location).to match(view_path)
 
-    post '/posts/new', { content: welcome_to_underground }
+    post('/posts/new', content: welcome_to_underground)
     expect(last_response.status).to eq 302
     expect(last_response.location).to match(view_path)
   end
 
-  it "should be view of item" do
-    post '/posts/new', { content: hello_world }
-
-    repository = File.expand_path(Dir.glob(repo_dir + '/**').first)
+  it 'should be view of item' do
+    post('/posts/new', content: hello_world)
 
-    get "/posts/view/#{repository.split('/').last}"
+    get "/posts/view/#{dir_name_of_latest_repository}"
 
     expect(last_response).to be_ok
-    expect(File.read(repository + '/content')).to eq hello_world
+    expect(latest_content).to eq hello_world
   end
 
-  it "should be can update of item" do
-    post '/posts/new', { content: hello_world }
+  it 'should be can update of item' do
+    post('/posts/new', content: hello_world)
 
-    repository = File.expand_path(Dir.glob(repo_dir + '/**').first)
-
-    get "/posts/view/#{repository.split('/').last}"
+    get "/posts/view/#{dir_name_of_latest_repository}"
 
     expect(last_response).to be_ok
 
-    put "/posts/update/#{repository.split('/').last}", { content: welcome_to_underground }
-    get "/posts/view/#{repository.split('/').last}"
+    put("/posts/update/#{dir_name_of_latest_repository}",
+        content: welcome_to_underground)
+    get "/posts/view/#{dir_name_of_latest_repository}"
 
     expect(last_response).to be_ok
 
-    expect(File.read(repository + '/content')).to eq welcome_to_underground
+    expect(latest_content).to eq welcome_to_underground
   end
 
-  it "should be get not found" do
-    get "/posts/hoge"
+  it 'should be get not found' do
+    get '/posts/hoge'
 
     expect(last_response).not_to be_ok
     expect(last_response.status).to be 404
     expect(last_response.body).to match(/Not Found/)
   end
 
-  it "should be get content is escaped by HTML" do
-
-    post '/posts/new', { content: inline_html }
+  it 'should be get content is escaped by HTML' do
+    post('/posts/new', content: inline_html)
 
-    repository = File.expand_path(Dir.glob(repo_dir + '/**').first)
+    expect(latest_content).to eq inline_html
 
-    expect(File.read(repository + '/content')).to eq inline_html
-
-    get "/posts/view/#{repository.split('/').last}"
+    get "/posts/view/#{dir_name_of_latest_repository}"
 
     expect(last_response).to be_ok
     expect(last_response.body).to include(CGI.escapeHTML(inline_html))
-
   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)
+  it 'should be post language type the code highlight' do
+    post('/posts/new', content: sample_of_code_ruby, language: 'ruby')
 
-    expect(File.read(repository + '/content')).to eq sample_of_code_ruby
-    expect(File.read(repository + '/language')).to eq "ruby"
+    expect(latest_content).to eq sample_of_code_ruby
+    expect(latest_language_of_content).to eq 'ruby'
 
-    get "/posts/view/#{repository.split('/').last}"
+    get "/posts/view/#{dir_name_of_latest_repository}"
 
     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)
+  it 'should be succeeded change of language type' do
+    post('/posts/new', content: sample_of_code_ruby, language: 'ruby')
 
-    expect(File.read(repository + '/content')).to eq sample_of_code_ruby
-    expect(File.read(repository + '/language')).to eq "ruby"
+    expect(latest_content).to eq sample_of_code_ruby
+    expect(latest_language_of_content).to eq 'ruby'
 
-    put "/posts/update/#{repository.split('/').last}", { content: sample_of_code_ruby, language: "python" }
+    put("/posts/update/#{dir_name_of_latest_repository}",
+        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"
+    expect(latest_content).to eq sample_of_code_ruby
+    expect(latest_language_of_content).to eq 'python'
   end
 
 end

data/spec/memo_spec.rb

@@ -1,23 +1,14 @@
 require 'spec_helper'
 
 describe Gast::Memo do
+  let(:welcome_to_underground) { 'Welcome to underground' }
 
-  def repo_path(num)
-    File.expand_path("/tmp/gast/#{num}")
+  after(:each) do
+    FileUtils.rm_r(Dir.glob(Gast::PATH + '/**'), secure: true)
   end
 
-  def repo_dir
-    '/tmp/gast'
-  end
-
-  let(:welcome_to_underground) { "Welcome to underground" }
-
-  after(:each) {
-    FileUtils.rm_r(Dir.glob(repo_dir + '/**'), secure: true)
-  }
-
-  it "should be get list of directory" do
-    0.upto(9) do |i|
+  it 'should be get list of directory' do
+    10.times do |i|
       Gast::Memo.save(welcome_to_underground)
     end
     expect(Gast::Memo.number).to eq 10

data/spec/repository_spec.rb

@@ -6,39 +6,35 @@ describe Gast::Repository do
 
   let(:git) { Git.init(repo.path) }
 
-  let(:repo_path) { File.expand_path("/tmp/gast/1") }
+  let(:user_content) { 'Hello World' }
+  let(:selected_language) { 'ruby' }
 
-  let(:repo_dir) { "/tmp/gast" }
-
-  let(:user_content) { "Hello World" }
-  let(:selected_language) { "ruby" }
-
-  before(:each) {
+  before(:each) do
     repo.content = user_content
     repo.language = selected_language
     repo.publish
     repo.commit!
-  }
+  end
 
-  after(:each) {
-    FileUtils.rm_r(Dir.glob(repo_dir + '/**'), secure: true)
-  }
+  after(:each) do
+    FileUtils.rm_r(Dir.glob(Gast::PATH + '/**'), secure: true)
+  end
 
-  it "should be create of repository" do
+  it 'should be create of repository' do
     expect(FileTest.exists?(repo.path)).to be_true
   end
 
-  it "should be content is a Hello world" do
-    expect(File.read(repo.path + '/content')).to eq user_content
+  it 'should be content is a Hello world' do
+    expect(latest_content).to eq user_content
   end
 
-  it "should be language is a ruby" do
-    expect(File.read(repo.path + '/language')).to eq selected_language
+  it 'should be language is a ruby' do
+    expect(latest_language_of_content).to eq selected_language
   end
 
-  it "should be save of commit message is correct" do
+  it 'should be save of commit message is correct' do
     Timecop.freeze
-    expect(git.log.first.message).to eq "commit: #{DateTime.now.to_s}"
+    expect(git.log.first.message).to eq "commit: #{DateTime.now}"
     Timecop.return
   end
 

data/spec/spec_helper.rb

@@ -49,3 +49,19 @@ end
 def get_languages
   YAML.load_file(File.expand_path('../config/languages.yml', __dir__))
 end
+
+def latest_repository
+  File.expand_path(Dir.glob(Gast::PATH + '/**').first)
+end
+
+def dir_name_of_latest_repository
+  latest_repository.split('/').last
+end
+
+def latest_content
+  File.read(latest_repository + '/content')
+end
+
+def latest_language_of_content
+  File.read(latest_repository + '/language')
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gast
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - futoase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,34 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-remote
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: memo application of using git
 email:
 - futoase@gmail.com
@@ -267,6 +239,7 @@ files:
 - bin/gast
 - config.ru
 - config/languages.yml
+- config/path.yml
 - gast.gemspec
 - lib/gast.rb
 - lib/gast/app.rb