gast 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec83adad16b7da1940d4ad7dcb4de850b804b7b1
-  data.tar.gz: 854a253b2bdc656cb92d63e8256cdee8246f09fd
+  metadata.gz: 2c76e56576ccffbd53ce37ad4435ff10fb77dbfe
+  data.tar.gz: 480980571d4a12a68d4039b1572a3297073d627f
 SHA512:
-  metadata.gz: 4443e060971ee973f8b4484fc55c91126e7914ee170b78a1aeddd027b91fa8a608bfb8ad8d9f3ad42a80b2927508edec82f1ee357c679cc8c14b3df520757826
-  data.tar.gz: 26f036921b25862629e282781319a34bf65420868ca66de0c0a30e4ae6cb0f64914a964ee372f4e5df9c0595631ee28a169c2f96bf89a7b403d0de8d5b1129fd
+  metadata.gz: e6743a9590249e60d166f427eaeeb0f2b300cb8368ad17630d46a5d5117e1275dcc4cde464f9e98c6a5012f9e1c24c5040bcbbb59dbc70e3e528a60f64a799ea
+  data.tar.gz: 492009ee035e492695fb47ba31fa8ad451026029fcafd97898feeab88c38917071dda5a685d5488d46d99a14072272d5f629d5e17197faaa650aea5730f34f07

data/Guardfile

@@ -13,9 +13,10 @@ end
 guard :rspec, cmd: 'bundle ex rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch('spec/spec_helper.rb')  { "spec" }
-  watch(%r{spec/feature/.+.rb$})
+  watch(%r{spec/feature/.+_spec\.rb$})
 
   watch(%r{^lib/gast/app.rb$})                        { |m| "spec/controller_spec.rb" }
+  watch(%r{^lib/gast/helper.rb$})                     { "spec" }
   watch(%r{^lib/gast/(.+)\.rb$})                      { |m| "spec/#{m[1]}_spec.rb" }
 end
 

data/lib/gast/base.rb

@@ -62,8 +62,8 @@ module Gast
           })
         end
 
-        result = Gast::Memo.save(@content, @language)
-        @content_id = result[:content_id]
+        result = Gast::Memo.create(@content, @language)
+        @content_id = result.content_id
       end
 
       before '/list' do
@@ -88,7 +88,9 @@ module Gast
       end
 
       before '/update/:content_id' do
-        Gast::Memo.update(@content_id, @content, @language)
+        if Gast::Memo.changed?(@content_id, @content)
+          Gast::Memo.update(@content_id, @content, @language)
+        end
       end
     end
   end

data/lib/gast/helper.rb

@@ -0,0 +1,21 @@
+require 'gast'
+
+module Gast
+  module Helper
+    def escape_html
+      CGI.escapeHTML(yield.to_s) if block_given?
+    end
+
+    def unescape_html
+      CGI.unescapeHTML(yield.to_s) if block_given?
+    end
+
+    def get_content(id)
+      File.read(File.expand_path(Gast::PATH + "/#{id}/content"))
+    end
+
+    def get_language(id)
+      File.read(File.expand_path(Gast::PATH + "/#{id}/language"))
+    end
+  end
+end

data/lib/gast/memo.rb

@@ -1,57 +1,90 @@
 require 'gast'
 
 module Gast
-  class Memo
-    def self.save(content, language = 'no-highlight')
-      @repo = Gast::Repository.new
-      @repo.create
-      @repo.content = CGI.unescapeHTML(content.to_s)
-      @repo.language = CGI.unescapeHTML(language.to_s)
-      @repo.publish
-      @repo.commit!
-      {
-        content_id: @repo.dir_name,
-        language: language
-      }
-    end
-
-    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
-      @repo.dir_name = content_id
-      @repo.create
-      @repo.content = CGI.unescapeHTML(content.to_s)
-      @repo.language = CGI.unescapeHTML(language.to_s)
-      @repo.publish
-      @repo.commit!
-      {
-        content_id: @repo.dir_name,
-        language: language
-      }
-    end
-
-    def self.number
+  module Memo
+    extend Helper
+
+    class Response
+      attr_reader :content_id, :language, :content
+
+      def initialize(content_id, language, content)
+        @content_id = content_id
+        @language = language
+        @content = content
+      end
+    end
+
+    class Request
+      attr_reader :content_id, :language, :content
+
+      def initialize(content_id, language, content)
+        @content_id = content_id
+        @language = language
+        @content = content
+      end
+    end
+
+    def response(content_id, language, content)
+      Response.new(content_id, language, content)
+    end
+    module_function :response
+
+    def request(content_id, language, content)
+      Request.new(content_id, language, content)
+    end
+    module_function :request
+
+    def repository(content, language, content_id = nil)
+      repo = Repository.new
+      repo.dir_name = content_id
+      repo.create
+      repo.content = unescape_html { content }
+      repo.language = unescape_html { language }
+      repo.write
+      repo.commit!
+
+      repo.dir_name
+    end
+
+    def create(content, language = DEFAULT_HIGHLIGHT)
+      content_id = repository(content, language)
+      response(content_id, language, content)
+    end
+    module_function :create
+
+    def update(content_id, content, language = DEFAULT_HIGHLIGHT)
+      content_id = repository(content, language, content_id)
+      response(content_id, language, content)
+    end
+    module_function :update
+
+    def changed?(content_id, content)
+      content.to_s.chomp != item(content_id).chomp
+    end
+    module_function :changed?
+
+    def number
       lists.length
     end
+    module_function :number
 
-    def self.lists
+    def lists
       Dir.glob(File.expand_path(Gast::PATH + '/**')).map do |dir|
         dir.split('/').last
       end
     end
+    module_function :lists
 
-    def self.item(id)
-      CGI.escapeHTML(
-        File.read(File.expand_path(Gast::PATH + "/#{id}/content"))
-      )
+    def item(id)
+      escape_html { get_content(id) }
     end
+    module_function :item
 
-    def self.language(id)
-      CGI.escapeHTML(
-        File.read(File.expand_path(Gast::PATH + "/#{id}/language"))
-      )
+    def language(id)
+      escape_html { get_language(id) }
     end
+    module_function :language
 
-    def initialize; end
+    extend Memo
   end
 end

data/lib/gast/repository.rb

@@ -9,15 +9,15 @@ module Gast
     def initialize; end
 
     def create
-      @dir_name = new_name_of_repository if @dir_name.nil?
-      @path = path_of_repository
+      new_name_of_repository
+      path_of_repository
       create_dir
-      @git = Git.init(@path)
+      setup_repository
     end
 
-    def publish
-      save_content
-      save_language
+    def write
+      write_content
+      write_language
     end
 
     def remove!
@@ -25,13 +25,11 @@ module Gast
     end
 
     def save!
-      @git.add(all: true)
-      @git.commit_all("commit: #{DateTime.now}")
+      commit_all
     end
 
     def commit!
-      return save! if @git.ls_files.length == 0
-      return save! if @git.status.changed.length != 0
+      return save! unless changed_of_contents?
     end
 
     private
@@ -42,7 +40,7 @@ module Gast
       FileUtils.chmod(0755, @path)
     end
 
-    def save_content
+    def write_content
       path = File.expand_path(@path + '/content')
       open(path, 'w', 0644) do |io|
         io.flock(File::LOCK_EX)
@@ -51,7 +49,7 @@ module Gast
       end
     end
 
-    def save_language
+    def write_language
       path = File.expand_path(@path + '/language')
       open(path, 'w', 0644) do |io|
         io.flock(File::LOCK_EX)
@@ -61,11 +59,28 @@ module Gast
     end
 
     def new_name_of_repository
-      Digest::SHA512.new.update(rand.to_s).to_s[0..30]
+      if @dir_name.nil?
+        @dir_name = Digest::SHA512.new.update(rand.to_s).to_s[0..30]
+      end
     end
 
     def path_of_repository
-      File.expand_path(File.join(Gast::PATH, @dir_name))
+      @path = File.expand_path(File.join(Gast::PATH, @dir_name))
+    end
+
+    def setup_repository
+      @git = Git.init(@path)
+    end
+
+    def changed_of_contents?
+      return false if @git.ls_files.length == 0
+      return false if @git.status.changed.length != 0
+      return true
+    end
+
+    def commit_all
+      @git.add(all: true)
+      @git.commit_all("commit: #{DateTime.now}")
     end
   end
 end

data/lib/gast/templates/edit.haml

@@ -1,5 +1,5 @@
 %h1
   = @content_id
-%form{ role: "form", action: "/posts/update/#{params[:id].to_s}", method: "POST" }
+%form{ role: "form", action: "/posts/update/#{@content_id}", method: "POST" }
   %input{ type: "hidden", name: "_method", value: "put" }
   = haml :form_area

data/lib/gast/templates/view.haml

@@ -1,6 +1,6 @@
 %h1
   = @content_id
-%form{ role: "form", action: "/posts/edit/#{params[:id].to_s}", method: "GET" }
+%form{ role: "form", action: "/posts/edit/#{@content_id}", method: "GET" }
   %button{ type: "submit", class: "btn btn-primary" }
     Update
 

data/lib/gast/version.rb

@@ -1,3 +1,3 @@
 module Gast
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/gast.rb

@@ -5,6 +5,7 @@ require 'sinatra/contrib'
 require 'sinatra/namespace'
 require 'sprockets'
 require 'sprockets-helpers'
+require 'gast/helper'
 require 'gast/memo'
 require 'gast/app'
 require 'gast/repository'
@@ -25,4 +26,6 @@ module Gast
   LANGUAGES = YAML.load_file(
     File.expand_path('../config/languages.yml', __dir__)
   )
+
+  DEFAULT_HIGHLIGHT = 'no-highlight'
 end

data/spec/controller_spec.rb

@@ -1,22 +1,19 @@
 require 'spec_helper'
 
-def app
-  Gast::App
-end
-
 describe Gast::App do
 
-  after(:each) do
-    FileUtils.rm_r(Dir.glob(Gast::PATH + '/**'), secure: true)
+  def app
+    Gast::App
   end
 
   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) { %r{.+/posts/view/[a-z0-9]+} }
 
+  after(:each) { cleanup_in_the_dir }
+
   it 'should be get index' do
     get '/'
     expect(last_response).to be_ok
@@ -121,5 +118,4 @@ describe Gast::App do
     expect(latest_content).to eq sample_of_code_ruby
     expect(latest_language_of_content).to eq 'python'
   end
-
 end

data/spec/feature/index_spec.rb

@@ -1,10 +1,27 @@
-describe "the index page", type: :feature do
-  it "get index in" do
+require 'spec_helper'
+
+describe 'the index page', type: :feature do
+  it 'get index in' do
     visit '/'
 
-    get_languages.each_with_index do |language, idx|
-      find(:xpath, "//select/option[#{idx+1}]").text eq language
+    Gast::LANGUAGES.each_with_index do |language, idx|
+      find("//select/option[#{idx+1}]").text eq language
     end
   end
-  :qa
+
+  it 'should be able to selected of multi language' do
+    visit '/'
+
+    find('//select').select('python')
+    find('//select').text eq 'python'
+    find('//select').select('ruby')
+    find('//select').text eq 'ruby'
+  end
+
+  it 'should be able to write text on the textarea' do
+    visit '/'
+
+    find('//textarea').set 'Hello world'
+    find('//textarea').text eq 'Hello world'
+  end
 end

data/spec/memo_spec.rb

@@ -3,15 +3,12 @@ require 'spec_helper'
 describe Gast::Memo do
   let(:welcome_to_underground) { 'Welcome to underground' }
 
-  after(:each) do
-    FileUtils.rm_r(Dir.glob(Gast::PATH + '/**'), secure: true)
-  end
+  after(:each) { cleanup_in_the_dir }
 
   it 'should be get list of directory' do
     10.times do |i|
-      Gast::Memo.save(welcome_to_underground)
+      Gast::Memo.create(welcome_to_underground)
     end
     expect(Gast::Memo.number).to eq 10
   end
-
 end

data/spec/repository_spec.rb

@@ -1,11 +1,8 @@
 require 'spec_helper'
 
 describe Gast::Repository do
-
   let(:repo) { Gast::Repository.new }
-
   let(:git) { Git.init(repo.path) }
-
   let(:user_content) { 'Hello World' }
   let(:selected_language) { 'ruby' }
 
@@ -13,13 +10,11 @@ describe Gast::Repository do
     repo.content = user_content
     repo.language = selected_language
     repo.create
-    repo.publish
+    repo.write
     repo.commit!
   end
 
-  after(:each) do
-    FileUtils.rm_r(Dir.glob(Gast::PATH + '/**'), secure: true)
-  end
+  after(:each) { cleanup_in_the_dir }
 
   it 'should be create of repository' do
     expect(FileTest.exists?(repo.path)).to be_true
@@ -38,5 +33,4 @@ describe Gast::Repository do
     expect(git.log.first.message).to eq "commit: #{DateTime.now}"
     Timecop.return
   end
-
 end

data/spec/spec_helper.rb

@@ -65,3 +65,7 @@ end
 def latest_language_of_content
   File.read(latest_repository + '/language')
 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.7
+  version: 0.0.8
 platform: ruby
 authors:
 - futoase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -244,6 +244,7 @@ files:
 - lib/gast.rb
 - lib/gast/app.rb
 - lib/gast/base.rb
+- lib/gast/helper.rb
 - lib/gast/memo.rb
 - lib/gast/repository.rb
 - lib/gast/templates/edit.haml