mado 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbe4f23725dba3638d08c82cb9fcf1f667b653eb
-  data.tar.gz: d34989f288c0b71e2dfd0d64786577ece18900a0
+  metadata.gz: 4c329e0374481522fcf73e06b26b5a20144583db
+  data.tar.gz: aa212634cdf08ca9c0a1ad249d83368a7a79cbec
 SHA512:
-  metadata.gz: 11e88821e283d1f1c6db26a3c8576240171e61bea505838c278d8385b996b7f1efe1da44c39e9c47e1cbd9fa59d7245ed5d5ed032a23166f3f0334b695546b40
-  data.tar.gz: 43e5fb7cd39bb3a91da726d55a4fb7323676fe052940b7bdecc9b883994364234025eaa9efe4eed2fc8bcf2a850989510e1e004698fbb3b7579752e99fe05c6e
+  metadata.gz: 2c654a8ae96f074800b91f49a2b8f01f0fb261ff2861b0093062968beb85fc46e2af0e1b1f9027fe6e8b62d0ba95b1a3512c0224cf7389729260511171c62880
+  data.tar.gz: 0276d4a49b280d25bd77c043fcde074e9d2263046628c465ebfd50b5e1de908b87fab071ed73cc7d120e5b548253854b9626c13519e44c31f785fcc6ed992093

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.0
+* Render Emoji :octocat:
+* Render GitHub-like tasklist
+
+## 0.1.1
+* Update CSS to be more similar to GitHub
+* Run Sinatra application in production environment to avoid loading sinatra-reloader
+
 ## 0.1.0
 * Show local image
 

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/mado.rb

@@ -1,3 +1,16 @@
+require "coffee-script"
+require "em-websocket"
+require "eventmachine"
+require "gemoji"
+require "html/pipeline"
+require "redcarpet"
+require "rouge"
+require "rouge/plugins/redcarpet"
+require "sass"
+require "sinatra/base"
+require "slim"
+require "task_list/filter"
+
 require "mado/version"
 require "mado/app"
 require "mado/file_handler"

data/lib/mado/app.rb

@@ -1,8 +1,3 @@
-require "coffee-script"
-require "sass"
-require "sinatra/base"
-require "slim"
-
 module Mado
   class App < Sinatra::Base
     set :root, File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "app"))
@@ -31,6 +26,16 @@ module Mado
       coffee :application
     end
 
+    get "/emoji/*" do
+      emoji_path = Mado::Markdown.emoji_path(params[:splat][0])
+
+      if File.exist?(emoji_path)
+        send_file emoji_path, disposition: "inline"
+      else
+        not_found
+      end
+    end
+
     get "/*" do
       path = File.expand_path(params[:splat][0], markdown_dir)
 

data/lib/mado/file_handler.rb

@@ -1,5 +1,3 @@
-require "eventmachine"
-
 module Mado
   class FileHandler < EventMachine::FileWatch
     def initialize(sockets)

data/lib/mado/markdown.rb

@@ -1,29 +1,40 @@
-require "redcarpet"
-require "rouge"
-require "rouge/plugins/redcarpet"
-
 module Mado
   class Markdown
     class HTML < Redcarpet::Render::HTML
       include Rouge::Plugins::Redcarpet
     end
 
-    def self.convert_markdown(path)
-      renderer_options = {
-                          filter_html: true,
-                          with_toc_data: true
-                         }
-      convert_options = {
-                         autolink: true,
-                         fenced_code_blocks: true,
-                         lax_spacing: true,
-                         no_intra_emphasis: true,
-                         strikethrough: true,
-                         superscript: true,
-                         tables: true
-                        }
-      renderer = HTML.new(renderer_options)
-      Redcarpet::Markdown.new(renderer, convert_options).render(open(path).read)
+    class << self
+      def convert_markdown(path)
+        renderer_options = {
+          filter_html: true,
+          with_toc_data: true
+        }
+        convert_options = {
+          autolink: true,
+          fenced_code_blocks: true,
+          lax_spacing: true,
+          no_intra_emphasis: true,
+          strikethrough: true,
+          superscript: true,
+          tables: true
+        }
+        pipeline_context = {
+          asset_root: ""
+        }
+        pipeline = ::HTML::Pipeline.new [
+          ::HTML::Pipeline::EmojiFilter,
+          TaskList::Filter
+        ]
+
+        renderer = HTML.new(renderer_options)
+        html = Redcarpet::Markdown.new(renderer, convert_options).render(open(path).read)
+        pipeline.call(html, pipeline_context)[:output].to_s
+      end
+
+      def emoji_path(file_path)
+        File.join(Emoji.images_path, "emoji", file_path)
+      end
     end
   end
 end

data/lib/mado/server.rb

@@ -1,6 +1,3 @@
-require "em-websocket"
-require "eventmachine"
-
 module Mado
   class Server
     def self.run(options)

data/lib/mado/version.rb

@@ -1,3 +1,3 @@
 module Mado
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/mado.gemspec

@@ -21,17 +21,20 @@ Gem::Specification.new do |spec|
   spec.add_dependency "coffee-script"
   spec.add_dependency "em-websocket"
   spec.add_dependency "eventmachine"
+  spec.add_dependency "gemoji"
+  spec.add_dependency "html-pipeline"
   spec.add_dependency "redcarpet"
   spec.add_dependency "rouge"
   spec.add_dependency "sass"
   spec.add_dependency "sinatra"
   spec.add_dependency "slim"
+  spec.add_dependency "task_list"
   spec.add_dependency "thin", "~> 1.6"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "sinatra-reloader"
   spec.add_development_dependency "terminal-notifier-guard"
 end

data/spec/fixtures/test.md

@@ -0,0 +1,14 @@
+# header
+
+hoge
+
+- item
+- item
+- :octocat:
+- [ ] todo
+
+```ruby
+def hello
+  puts "hello"
+end
+```

data/spec/mado/app_spec.rb

@@ -60,5 +60,25 @@ module Mado
         end
       end
     end
+
+    describe "GET /emoji/*" do
+      let(:emoji_name) do
+        "octocat.png"
+      end
+
+      context "when given emoji exists" do
+        it "should return the image of given emoji" do
+          get "/emoji/#{emoji_name}"
+          expect(last_response).to be_ok
+        end
+      end
+
+      context "when given emoji does not exist" do
+        it "should return 404" do
+          get "/emoji/#{emoji_name}.notfound"
+          expect(last_response).to be_not_found
+        end
+      end
+    end
   end
 end

data/spec/mado/markdown_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+module Mado
+  describe Markdown do
+    let(:markdown_path) do
+      fixture_path("test.md")
+    end
+
+    describe ".convert_markdown" do
+      subject { described_class.convert_markdown(markdown_path) }
+
+      it { is_expected.to match(%r(<h1 id="header">header</h1>)) }
+      it { is_expected.to match(%r(<li>item</li>)) }
+      it { is_expected.to match(%r(<pre class="highlight ruby"><code>)) }
+      it { is_expected.to match(%r(<img class="emoji" .+?src="/emoji/.+?">)) }
+      it { is_expected.to match(%r(<input [^<>]*type="checkbox"[^<>]*>)) }
+    end
+
+    describe ".emoji_path" do
+      let(:file_path) do
+        "octocat.png"
+      end
+
+      it "should return emoji path" do
+        expect(described_class.emoji_path(file_path)).to match(/octocat\.png/)
+      end
+
+      it "should return existed path" do
+        expect(File.exist?(described_class.emoji_path(file_path))).to be true
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mado
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - dtan4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gemoji
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: html-pipeline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: task_list
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +224,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-reloader
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +297,9 @@ files:
 - mado.gemspec
 - spec/fixtures/example/example.png
 - spec/fixtures/other/other.png
+- spec/fixtures/test.md
 - spec/mado/app_spec.rb
+- spec/mado/markdown_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dtan4/mado
 licenses:
@@ -277,12 +321,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Realtime Github Flavored Markdown Preview
 test_files:
 - spec/fixtures/example/example.png
 - spec/fixtures/other/other.png
+- spec/fixtures/test.md
 - spec/mado/app_spec.rb
+- spec/mado/markdown_spec.rb
 - spec/spec_helper.rb