trahald 0.0.3 → 0.0.4

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
+services:
+  - redis-server

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in trahald.gemspec
 gemspec
+
+group :git do
+  gem 'grit', '~> 2.5.0'
+end
+
+group :redis do
+  gem 'redis', '~> 3.0.3'
+end

data/README.md

@@ -6,12 +6,12 @@ Yet another simple wiki on git.
 
 You need:
 
-* git
+* git or redis as backend database.
 * ruby 1.9.3 (2.0.0 does not work with this wiki by now.)
 * linux or mac. (now engage in support for windows.)
 
-This project will not support ruby 1.8.7.
-it will no longer supported in all senses after June 2013.
+This project does not support ruby 1.8.7.
+It will no longer supported in all senses after June 2013.
 
 [http://www.ruby-lang.org/en/news/2011/10/06/plans-for-1-8-7/](Plans for 1.8.7 - ruby-lang.org)
 
@@ -20,6 +20,43 @@ it will no longer supported in all senses after June 2013.
 This is just a library.
 To use Trahald as your wiki, see [3100/a_trahald](https://github.com/3100/a_trahald).
 
+## In development
+
+### Preparation
+
+```
+bundle install
+```
+
+By default, Bundler installs git and redis gems. You can use --without option with these groups:
+
+* git
+* redis
+
+e.g. If you do not need redis gem, add the option:
+
+```
+bundle install --without redis
+```
+
+### Running App
+
+```
+rackup -p $PORT
+```
+
+By default, Trahald use git. If you want to use redis alternatively, add -E option:
+
+```
+rackup -p $PORT -E "redis"
+```
+
+### Test
+
+```
+bundle exec rspec
+```
+
 ## Contributing
 
 1. Fork it

data/lib/trahald.rb

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-require_relative "trahald/version"
+require_relative "trahald/backend-base"
 require_relative "trahald/git"
-require 'sinatra/base'
+require_relative "trahald/redis-client"
+require_relative "trahald/version"
 
 module Trahald
   require 'kramdown'
@@ -13,10 +14,15 @@ module Trahald
 
   class App < Sinatra::Base
 
-    configure do
+    configure :production, :development, :git do
       dir = Dir::pwd + "/data"
       Git::init_repo_if_needed dir
-      GIT = Git.new dir
+      DB = Git.new dir
+    end
+
+    configure :redis do
+      url = "redis://localhost:6379"
+      DB = RedisClient.new url
     end
 
     get '/' do
@@ -24,7 +30,7 @@ module Trahald
     end
 
     get '/list' do
-      @keys = GIT.list
+      @keys = DB.list
       slim :list
     end
 
@@ -32,7 +38,7 @@ module Trahald
       puts "edit"
       puts params[:captures]
       @name = params[:captures][0]
-      @body = GIT.body(@name)
+      @body = DB.body(@name)
       @body = "" unless @body
       slim :edit
     end
@@ -41,7 +47,7 @@ module Trahald
       puts "md"
       puts params[:captures]
       @name = params[:captures][0]
-      @body = GIT.body(@name)
+      @body = DB.body(@name)
       puts @body
       if @body
         slim :raw, :layout => :raw_layout
@@ -54,7 +60,7 @@ module Trahald
     get %r{^/(.+?)$} do
       puts params[:captures]
       @name = params[:captures][0]
-      @body = GIT.body(@name)
+      @body = DB.body(@name)
       puts "body:#{@body}"
       @style = scss :style
       puts "style:#{@style}"
@@ -77,8 +83,8 @@ module Trahald
         @message = "update"
       end
 
-      if GIT.add!(@name, @body)
-        GIT.commit!(@message)
+      if DB.add!(@name, @body)
+        DB.commit!(@message)
       end
 
       puts @name

data/lib/trahald/backend-base.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+module Trahald
+  class BackendBase
+    def initialize
+    end
+
+    def add!(name, body)
+      raise "Called abstract method: add!"
+    end
+
+    def body(name)
+      raise "Called abstract method: body"
+    end
+
+    def commit!(message)
+      raise "Called abstract method: commit!"
+    end
+
+    def list
+      raise "Called abstract method: list"
+    end
+
+    def self.init_repo_if_needed(dir)
+      raise "Called abstract method: self.init_repo_if_needed"
+    end
+  end
+end
+
+

data/lib/trahald/git.rb

@@ -3,7 +3,7 @@
 module Trahald
   require 'grit'
 
-  class Git
+  class Git < BackendBase
     def initialize(repo_path, ext="md")
       @repo_dir = repo_path
       @ext = ext

data/lib/trahald/redis-client.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+module Trahald
+  require 'redis'
+  require 'uri'
+
+  class RedisClient < BackendBase
+    def initialize(url)
+      uri = URI.parse url
+      @redis = Redis.new(
+        :host => uri.host,
+        :port => uri.port
+      )
+
+      @params = Hash::new
+    end
+
+    # This method does not set data to Redis DB. To confirm, use commit! after add!.
+    def add!(name, body)
+      @params[name] = body
+    end
+
+    def body(name)
+      @redis.get name
+    end
+
+    # message is not used.
+    def commit!(message)
+      @params.each{|name, body|
+        @redis.set(name, body)
+      }
+    end
+
+    # CAUTION! This method flush data on current db.
+    def flush!
+      @redis.flushdb
+    end
+
+    def list
+      @redis.keys.sort
+    end
+
+    def self.init_repo_if_needed(dir)
+      # do nothing.
+    end
+  end
+end
+
+

data/lib/trahald/version.rb

@@ -1,3 +1,3 @@
 module Trahald
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/redis-client_spec.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Trahald::RedisClient" do
+  before(:all) do
+    @url = "redis://localhost:6379/"
+    @redis = Trahald::RedisClient.new(@url)
+    @redis.flush!
+  end
+
+  it "should contains no data at first" do
+    @redis.list.should == []
+  end
+
+  it "should enable to save some data." do
+    name1 = "sample"
+    body1 = "# title\n\n* hoge\n* huga\n* 123"
+    name2 = "サンプル"
+    body2 = "# タイトル\n\n* いち\n* に\n* さん"
+    name3 = "サンプル/初夢"
+    body3 = "# タイトル\n\n* 富士\n* 鷹\n* なすび"
+    @redis.add!(name1, body1)
+    @redis.add!(name2, body2)
+    @redis.add!(name3, body3)
+    message = "コミット"
+
+    @redis.commit!(message).should be_true
+    @redis.body(name1).should == body1
+    @redis.body(name2).should == body2
+    @redis.body(name3).should == body3
+  end
+
+  it "should enable to output list." do
+    @redis.list.should == ['sample', 'サンプル', 'サンプル/初夢']
+  end
+
+  it "should enable to flush data" do
+    @redis.flush!
+    @redis.list.should == []
+  end
+
+  after(:all) do
+  end
+end
+
+

data/trahald.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('grit', '~> 2.5.0')
   gem.add_dependency('kramdown', '~> 0.14.2')
   gem.add_dependency('sass', '~>3.2.6')
   gem.add_dependency('sinatra', '~>1.3.5')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trahald
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: grit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +122,9 @@ files:
 - Rakefile
 - config.ru
 - lib/trahald.rb
+- lib/trahald/backend-base.rb
 - lib/trahald/git.rb
+- lib/trahald/redis-client.rb
 - lib/trahald/version.rb
 - lib/views/edit.slim
 - lib/views/index.slim
@@ -149,6 +135,7 @@ files:
 - lib/views/raw_layout.slim
 - lib/views/style.scss
 - spec/git_spec.rb
+- spec/redis-client_spec.rb
 - spec/spec_helper.rb
 - trahald.gemspec
 homepage: ''
@@ -165,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -182653521
+      hash: -233894239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,13 +161,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -182653521
+      hash: -233894239
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: a simple wiki on git
 test_files:
 - spec/git_spec.rb
+- spec/redis-client_spec.rb
 - spec/spec_helper.rb