gast 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f1374024d46848fe452f840328d6e33b55baf6
-  data.tar.gz: ecbb056ed54a9a71f9d70b1c58ce4f523f8d917f
+  metadata.gz: ec83adad16b7da1940d4ad7dcb4de850b804b7b1
+  data.tar.gz: 854a253b2bdc656cb92d63e8256cdee8246f09fd
 SHA512:
-  metadata.gz: c1874b5081fafd14d9e82460b2defe9d4ab6558031fde3d21912c55da51bca072cc2e511b5665e8a6a10531a3a7b569c664eaeb023d7fa11ab4a07fa9b9f100c
-  data.tar.gz: 4d79c0d38b33f15577a71d651feb45f41c93864ebe7ed65c72c13c8d1f7a96d642d5c14383d142001684f017cf041b4afcf2279097335aecde71c95351cf26ca
+  metadata.gz: 4443e060971ee973f8b4484fc55c91126e7914ee170b78a1aeddd027b91fa8a608bfb8ad8d9f3ad42a80b2927508edec82f1ee357c679cc8c14b3df520757826
+  data.tar.gz: 26f036921b25862629e282781319a34bf65420868ca66de0c0a30e4ae6cb0f64914a964ee372f4e5df9c0595631ee28a169c2f96bf89a7b403d0de8d5b1129fd

data/lib/gast/app.rb

@@ -1,89 +1,31 @@
 require 'gast'
 
 module Gast
-  class App < Sinatra::Base
-    enable :method_override
-    set :sprockets, Sprockets::Environment.new(root)
-    set :assets_prefix, '/assets'
-    set :digest_assets, false
-    set :views, settings.root + '/templates'
-
-    configure do
-      sprockets.append_path File.join(root, 'assets', 'stylesheets')
-      sprockets.append_path File.join(root, 'assets', 'javascripts')
-      sprockets.append_path File.join(root, 'assets', 'images')
-
-      Sprockets::Helpers.configure do |config|
-        config.environment = sprockets
-        config.prefix      = assets_prefix
-        config.digest      = digest_assets
-        config.public_path = '/public'
-
-        config.debug       = true
-      end
-
-      register Sinatra::Reloader
-    end
-
-    helpers do
-      include Sprockets::Helpers
-    end
-
-    before do
-      @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' })
-      end
-    end
-
-    not_found do
-      haml :not_found
-    end
-
-    error do
-      haml :error
-    end
-
+  class App < Gast::Base
     get '/' do
       haml :index, locals: { new_post: true }
     end
 
-    get '/posts/list' do
-      @lists = Gast::Memo.lists
-      haml :list
-    end
+    namespace '/posts' do
+      get '/list' do
+        haml :list
+      end
 
-    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 '/view/:content_id' do
+        haml :view
+      end
 
-    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
+      get '/edit/:content_id' do
+        haml :edit
+      end
 
-    put '/posts/update/:content_id' do
-      @result = Gast::Memo.update(
-        params[:content_id].to_s,
-        params[:content].to_s,
-        params[:language].to_s
-      )
-      redirect to("/posts/view/#{params[:content_id]}")
-    end
+      put '/update/:content_id' do
+        redirect to("/posts/view/#{@content_id}")
+      end
 
-    post '/posts/new' do
-      results = Gast::Memo.save(
-        params[:content].to_s,
-        params[:language].to_s
-      )
-      redirect to("/posts/view/#{results[:content_id]}")
+      post '/new' do
+        redirect to("/posts/view/#{@content_id}")
+      end
     end
   end
 end

data/lib/gast/base.rb

@@ -0,0 +1,95 @@
+require 'gast'
+
+module Gast
+  class Base < Sinatra::Base
+    register Sinatra::Namespace
+    enable :method_override
+    set :sprockets, Sprockets::Environment.new(root)
+    set :assets_prefix, '/assets'
+    set :digest_assets, false
+    set :views, settings.root + '/templates'
+
+    configure do
+      sprockets.append_path File.join(root, 'assets', 'stylesheets')
+      sprockets.append_path File.join(root, 'assets', 'javascripts')
+      sprockets.append_path File.join(root, 'assets', 'images')
+
+      Sprockets::Helpers.configure do |config|
+        config.environment = sprockets
+        config.prefix      = assets_prefix
+        config.digest      = digest_assets
+        config.public_path = '/public'
+
+        config.debug       = true
+      end
+
+      register Sinatra::Reloader
+    end
+
+    helpers do
+      include Sprockets::Helpers
+    end
+
+    before do
+      @languages = Gast::LANGUAGES
+      @content_id = params[:content_id].to_s
+    end
+
+    not_found do
+      haml :not_found
+    end
+
+    error do
+      haml :error
+    end
+
+    namespace '/posts' do
+      before %r{/\w+/(\w+)} do |id|
+        unless /[a-zA-Z0-9]{30}/ =~ id.to_s
+          halt haml(:error, locals: { 
+            message: 'error is format of id'
+        })
+        end
+      end
+
+      before '/new' do
+        @content = params[:content].to_s
+        @language = params[:language].to_s
+
+        if @content.length == 0
+          halt haml(:error, locals: {
+            message: 'require of content!'
+          })
+        end
+
+        result = Gast::Memo.save(@content, @language)
+        @content_id = result[:content_id]
+      end
+
+      before '/list' do
+        @lists = Gast::Memo.lists
+      end
+
+      before '/*/:content_id' do
+        if %w[view 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
+        end
+      end
+
+      before '/view/:content_id' do
+        @item = Gast::Memo.item(@content_id)
+        @language = Gast::Memo.language(@content_id)
+      end
+
+      before '/edit/:content_id' do
+        @item = Gast::Memo.item(@content_id)
+      end
+
+      before '/update/:content_id' do
+        Gast::Memo.update(@content_id, @content, @language)
+      end
+    end
+  end
+end

data/lib/gast/memo.rb

@@ -4,6 +4,7 @@ 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
@@ -16,7 +17,9 @@ module Gast
 
     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 = 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

data/lib/gast/repository.rb

@@ -2,20 +2,16 @@ require 'gast'
 
 module Gast
   class Repository
-    attr_reader :path, :dir_name
+    attr_reader :path
     attr_writer :content, :language
+    attr_accessor :dir_name
 
-    def initialize(dir_name = nil)
-      if dir_name.nil?
-        @dir_name = Digest::SHA512.new.update(rand.to_s).to_s[0..30]
-      else
-        @dir_name = dir_name.to_s
-      end
-
-      @path = File.expand_path(File.join(Gast::PATH, @dir_name))
+    def initialize; end
 
+    def create
+      @dir_name = new_name_of_repository if @dir_name.nil?
+      @path = path_of_repository
       create_dir
-
       @git = Git.init(@path)
     end
 
@@ -63,5 +59,13 @@ module Gast
         io.flock(File::LOCK_UN)
       end
     end
+
+    def new_name_of_repository
+      Digest::SHA512.new.update(rand.to_s).to_s[0..30]
+    end
+
+    def path_of_repository
+      File.expand_path(File.join(Gast::PATH, @dir_name))
+    end
   end
 end

data/lib/gast/templates/edit.haml

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

data/lib/gast/templates/view.haml

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

data/lib/gast/version.rb

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

data/lib/gast.rb

@@ -1,11 +1,14 @@
 require 'digest/sha2'
 require 'sinatra/base'
 require 'sinatra/reloader'
+require 'sinatra/contrib'
+require 'sinatra/namespace'
 require 'sprockets'
 require 'sprockets-helpers'
 require 'gast/memo'
 require 'gast/app'
 require 'gast/repository'
+require 'gast/base'
 require 'haml'
 require 'sass'
 require 'git'

data/spec/repository_spec.rb

@@ -12,6 +12,7 @@ describe Gast::Repository do
   before(:each) do
     repo.content = user_content
     repo.language = selected_language
+    repo.create
     repo.publish
     repo.commit!
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gast
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - futoase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -243,6 +243,7 @@ files:
 - gast.gemspec
 - lib/gast.rb
 - lib/gast/app.rb
+- lib/gast/base.rb
 - lib/gast/memo.rb
 - lib/gast/repository.rb
 - lib/gast/templates/edit.haml