nwiki 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a4af7ee8548ac25f7892bd7699217b0f6b672876
+  data.tar.gz: 40a584882c9bb6e9fe52f53eab247331c1a175d9
+SHA512:
+  metadata.gz: 2e3c928266ce7eb664e99cf80308b5faaaedfedaeee2992c9df005dbf9cf45eaeda823dc5682866a5313f9015a322fcbdd6143b2ea682fe596be7446c9706330
+  data.tar.gz: 7e27e2dc6ca1bb1280f85a4b3cd8ad5e509114d4d83e0bc62243a2bf1e5c0714dd7e5aae0fc1b59d0f65763cc38ed01e6327b452c8a9572c56e338fa0f1b422f

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p362
+2.0.0-p247

data/.travis.yml

@@ -1 +1 @@
-rvm: 1.9.3
+rvm: 2.0.0

data/CHANGELOG.org

@@ -1,4 +1,8 @@
 * CHANGELOG
+** 0.1.4
+ - [feature] remove dependency of `gollum-lib`
+ - [feature] work on Ruby2.0
+ - [feature] optimize rendering for smartphone
 ** 0.1.3
  - [feature] apply twitter bootstrap 3 style
  - [fix] fix mime-type when render 404(Not Found) page

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in nwiki.gemspec
 gemspec
 
+gem 'rugged', git: 'git://github.com/libgit2/rugged.git', branch: 'development', submodules: true
 gem 'coveralls', require: false

data/lib/nwiki/core/git_access.rb

@@ -1,8 +1,104 @@
-require 'gollum-lib'
+require 'rugged'
+require 'forwardable'
 
 module Nwiki
   module Core
-    # copy from gollum
-    GitAccess = ::Gollum::GitAccess
+    class Entry
+      extend Forwardable
+
+      attr_reader :path
+
+      def initialize path, blob_object
+        @path = path
+        @blob_object = blob_object
+      end
+
+      def text
+        @blob_object.text.force_encoding('UTF-8')
+      end
+
+      def_delegators :@blob_object, :size, :content, :binary?
+    end
+
+    class Diff
+      extend Forwardable
+
+      attr_reader :time
+
+      def initialize entry, time
+        @entry = entry
+        @time = time
+      end
+
+      def_delegators :@entry, :size, :content, :text, :binary?, :path
+    end
+
+    class GitAccess
+      def initialize repo_path
+        @repo = Rugged::Repository.new(::File.expand_path(repo_path))
+      end
+
+      def config
+        Rugged::Branch.lookup(@repo, 'config')
+      end
+
+      def title
+        title_entry = config.tip.tree.get_entry('title')
+        title_blob = @repo.lookup(title_entry[:oid])
+        title_blob.text.chomp.force_encoding('UTF-8')
+      end
+
+      def subtitle
+        subtitle_entry = config.tip.tree.get_entry('subtitle')
+        subtitle_blob = @repo.lookup(subtitle_entry[:oid])
+        subtitle_blob.text.chomp.force_encoding('UTF-8')
+      end
+
+      def author
+        author_entry = config.tip.tree.get_entry('author')
+        author_blob = @repo.lookup(author_entry[:oid])
+        author_blob.text.chomp.force_encoding('UTF-8')
+      end
+
+      def find_file
+        target =  @repo.head.target
+        @repo.lookup(target).tree.walk_blobs do |path, object|
+          fullpath = path + object[:name]
+          if yield(fullpath)
+            return Entry.new(fullpath, @repo.lookup(object[:oid]))
+          end
+        end
+      end
+
+      def all_files
+        [].tap do |result|
+          target =  @repo.head.target
+          @repo.lookup(target).tree.walk_blobs do |path, object|
+            fullpath = path + object[:name]
+            result << Entry.new(fullpath, @repo.lookup(object[:oid]))
+          end
+        end
+      end
+
+      def log
+        walker = Rugged::Walker.new(@repo).tap do |w|
+          w.sorting(Rugged::SORT_DATE) # new -> old
+          w.push(@repo.head.target)
+        end
+        [].tap do |result|
+          walker.walk.each do |commit|
+            commit_time = Time.at(commit.epoch_time)
+            parent = commit.parents.first
+            next unless parent
+            diff = parent.diff(commit)
+            diff.deltas.reject(&:deleted?).each do |delta|
+              new_file_object = delta.new_file
+              path = new_file_object[:path].force_encoding('UTF-8')
+              result << Diff.new(Entry.new(path, @repo.lookup(new_file_object[:oid])), commit_time)
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/nwiki/core/wiki.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'org-ruby'
 
 module Nwiki
   module Core
@@ -16,8 +17,6 @@ module Nwiki
         unescaped_path.sub(/^\//, '')
       end
 
-      attr_reader :access
-
       def initialize path
         @path = path
         @access = GitAccess.new(path)
@@ -33,57 +32,38 @@ module Nwiki
       end
 
       def find_page_or_file path
-        blob_entry = @access
-          .tree('master')
-          .find { |e| path == e.path.sub(/\.org$/){ '' } }
-        return nil unless blob_entry
-        byte_string = blob_entry.blob(@access.repo).data
-        if blob_entry.name =~ /\.org$/
-          byte_string.force_encoding(self.class.repo_filename_encoding)
-          Page.new(::File.basename(blob_entry.name, '.org'), byte_string, self.class.parser)
+        entry = @access.find_file do |entry_path|
+          path == entry_path.sub(/\.org$/){ '' }
+        end
+        return nil unless entry
+        if entry.path =~ /\.org$/
+          path = entry.path.sub(/\.org$/){ '' }
+          Page.new(path, entry.text, self.class.parser)
         else
-          File.new(blob_entry.name, byte_string)
+          File.new(entry.path, entry.content)
         end
       end
 
       def find_directory path
-        sha = @access.tree('master')
+        files = @access.all_files
         Directory.encoding = self.class.repo_filename_encoding
-        Directory.new(path, sha.map(&:path))
+        Directory.new(path, files.map(&:path))
       end
 
       def title
-        blob_entry = @access
-          .tree('config')
-          .find { |e| e.path == 'title' }
-        return '' unless blob_entry
-        byte_string = blob_entry.blob(@access.repo).data
-        byte_string.force_encoding(self.class.repo_filename_encoding)
-        byte_string.chomp
+        @access.title
       end
 
       def subtitle
-        blob_entry = @access
-          .tree('config')
-          .find { |e| e.path == 'subtitle' }
-        return '' unless blob_entry
-        byte_string = blob_entry.blob(@access.repo).data
-        byte_string.force_encoding(self.class.repo_filename_encoding)
-        byte_string.chomp
+        @access.subtitle
       end
 
       def author
-        blob_entry = @access
-          .tree('config')
-          .find { |e| e.path == 'author' }
-        return '' unless blob_entry
-        byte_string = blob_entry.blob(@access.repo).data
-        byte_string.force_encoding(self.class.repo_filename_encoding)
-        byte_string.chomp
+        @access.author
       end
 
-      def exist?
-        @access.exist?
+      def log
+        @access.log
       end
     end
   end

data/lib/nwiki/frontend/app/feed.rb

@@ -7,7 +7,6 @@ module Nwiki
 
       def initialize git_repo_path, opts = {}
         @wiki = Nwiki::Core::Wiki.new git_repo_path
-        raise unless @wiki.exist?
         @articles_path = opts[:articles_path] || ''
       end
 
@@ -22,42 +21,27 @@ module Nwiki
               maker.channel.link = Rack::Request.new(env).url
 
               maker.channel.author = @wiki.author
-              maker.channel.date = latest_update
+              maker.channel.date = @wiki.log.max_by(&:time).time
               maker.channel.id = Rack::Request.new(env).url
 
               maker.items.do_sort = true
               maker.items.max_size = 50
 
-              log = @wiki.access.repo.log
-              log.each do |commit|
-                date = commit.date
-                commit.show.each do |diff|
-                  next unless diff.new_file
+              @wiki.log.each do |diff|
+                path = Nwiki::Core::Wiki.canonicalize_path(diff.path)
+                next if path =~ /\.gif|png|jpg$/ # FIXME Don't display binary file at feed
+                path.gsub!(/\.org$/, '')
 
-                  path = Nwiki::Core::Wiki.canonicalize_path(diff.b_path)
-                  path.gsub!(/\.org$/, '')
-
-                  maker.items.new_item do |item|
-                    item.link = Rack::Request.new(env).url.gsub(Regexp.new(Rack::Request.new(env).fullpath), "#{articles_path}/#{path}")
-                    item.title = File.basename(path)
-                    item.date = date
-                  end
+                maker.items.new_item do |item|
+                  item.link = Rack::Request.new(env).url.gsub(Regexp.new(Rack::Request.new(env).fullpath), "#{articles_path}/#{path}")
+                  item.title = path
+                  item.date = diff.time
                 end
               end
             }.to_s
           ]
         ]
       end
-
-      private
-      def latest_update
-        log = @wiki.access.repo.log
-        latest_update = Time.parse('1900-01-01')
-        log.each do |commit|
-          latest_update = commit.date if commit.date > latest_update
-        end
-        latest_update
-      end
     end
   end
 end

data/lib/nwiki/frontend/app/html.rb

@@ -5,7 +5,6 @@ module Nwiki
     class Html
       def initialize git_repo_path
         @wiki = Nwiki::Core::Wiki.new git_repo_path
-        raise unless @wiki.exist?
       end
 
       def call env
@@ -27,11 +26,10 @@ module Nwiki
 <html>
 <head>
   <title><%= page.title %> - <%= @wiki.title %></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="alternate" type="application/atom+xml" title="ATOM Feed" href="/articles.xml">
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
-  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 </head>
 <body>
   <div class="container">
@@ -45,6 +43,8 @@ module Nwiki
       </div>
     </div>
   </div>
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 </body>
 </html>
 EOS

data/lib/nwiki/frontend/app/top.rb

@@ -23,11 +23,10 @@ module Nwiki
 <head>
   <meta http-equiv="refresh" content="5;URL=http://niku.name/articles/">
   <title><%= @wiki.title %></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="alternate" type="application/atom+xml" title="ATOM Feed" href="/articles.xml">
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
-  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 </head>
 <body>
   <div class="container">
@@ -42,6 +41,8 @@ module Nwiki
       </div>
     </div>
   </div>
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 </body>
 </html>
 EOS

data/lib/nwiki/version.rb

@@ -1,3 +1,3 @@
 module Nwiki
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/nwiki.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Nwiki::VERSION
 
-  gem.add_dependency('gollum-lib')
   gem.add_dependency('rack')
   gem.add_dependency('org-ruby')
 

data/spec/nwiki/core/git_access_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 module Nwiki
@@ -7,10 +8,38 @@ module Nwiki
 
       subject { described_class.new(path) }
 
-      describe '#tree' do
-        let(:ref) { '63c0856958172223da3309e653f837a3485be4ae' }
+      describe '#title' do
+        it { expect(subject.title).to eq 'ヽ（´・肉・｀）ノログ' }
+      end
+
+      describe '#subtitle' do
+        it { expect(subject.subtitle).to eq 'How do we fighting without fighting?' }
+      end
+
+      describe '#author' do
+        it { expect(subject.author).to eq 'niku' }
+      end
+
+      describe '#find_file' do
+        it { expect(subject.find_file { |path| path == '1/2/b.org' }.text).to eq "* b\n\n" }
+      end
+
+      describe '#all_files' do
+        subject { super().all_files }
+
+        it { expect(subject).to have(5).items }
+        it { expect(subject.first).to be_kind_of Entry}
+        it { expect(subject.first.path).to eq '1/2/a.org'}
+      end
+
+      describe '#log' do
+        subject { super().log }
 
-        it { subject.tree(ref).should have_at_least(1).blob_entries }
+        it { expect(subject).to be_kind_of Enumerable }
+        it { expect(subject.first.path).to eq 'foo.org' }
+        it { expect(subject.first.time).to eq Time.parse('2012-08-09 20:15:07 +0900') }
+        it { expect(subject.last.path).to eq '1/2/b.org' }
+        it { expect(subject.last.time).to eq Time.parse('2012-06-14 21:55:15 +0900') }
       end
     end
   end

data/spec/requests/articles_spec.rb

@@ -45,10 +45,10 @@ module Nwiki
           it { subject.title.content.should eq 'ヽ（´・肉・｀）ノログ' }
           it { subject.subtitle.content.should eq 'How do we fighting without fighting?' }
           it { subject.author.name.content.should eq 'niku' }
-          it { subject.date.should eq Time.parse('2013-02-07 23:25:44 +0900') }
+          it { subject.date.should eq Time.parse('2012-08-09 20:15:07 +0900') }
           it { subject.id.content.should eq 'http://example.org/articles.xml' }
-          it { subject.items.first.link.href.should eq 'http://example.org/articles/icon.png' }
-          it { subject.items.first.title.content.should eq "icon.png" }
+          it { subject.items.first.link.href.should eq 'http://example.org/articles/foo' }
+          it { subject.items.first.title.content.should eq 'foo' }
           it { subject.items.first.date.should eq Time.parse('2012-08-09 20:15:07 +0900') }
         end
 
@@ -59,6 +59,7 @@ module Nwiki
         let(:path) { '/articles/foo' }
 
         it { subject.should be_ok }
+        it { subject.should match %r!<title[^>]*>foo - ヽ（´・肉・｀）ノログ</title>!}
         it { subject.should match %r!<h2[^>]*>Foo</h2>! }
         it { subject.should match %r!<h3[^>]*>Bar</h3>! }
       end
@@ -92,6 +93,7 @@ module Nwiki
         let(:path) { URI.encode '/articles/日本語ディレクトリ/わたしだ' }
 
         it { subject.should be_ok }
+        it { subject.body.should match %r!<title[^>]*>日本語ディレクトリ/わたしだ - ヽ（´・肉・｀）ノログ</title>!}
         it { subject.body.should match %r!<h2[^>]*>お前だったのか</h2>! }
         it { subject.body.should match %r!<h3[^>]*>気づかなかったな</h3>! }
       end

metadata

@@ -1,158 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: nwiki
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - niku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: gollum-lib
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Write a gem description
@@ -252,33 +219,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2850042242604829177
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2850042242604829177
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Write a gem summary
 test_files:
 - spec/examples/sample.git/HEAD