tdiary-style-org 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 712002e7d2b01589e3316a3b18430056a45e16fd
-  data.tar.gz: 73c33b65eadbd31184d0f75aa1448b0951f8f712
+  metadata.gz: a961f0bd21f0ee116a4b6c99b45bac05c1c25e3e
+  data.tar.gz: fffb5dcef1272fe53d6d648912697a2d5671d21c
 SHA512:
-  metadata.gz: 17dc82f980faec9afd5871597787631499aee31b1787af46bd1b59026080a1e8725dc570229441e9f0c291faf7f2beb9231e99e31ea455e471e8c0d545a8c56a
-  data.tar.gz: 193e68fcd1fe778e03e519b692ca9bb89d6b7193947a68f45be07a9a7278f68a6482416a6296f4a61e57df0c83f6bc54a2d275d763b3ef4d8a21cf9451b12477
+  metadata.gz: 64c0f24decf4693f0c64357e30169331287f1f2417145ab3d3db7d7feccd9414f11152b22468ebd003bcaafae737ce03dab8bf1f37cf1f0eab06025a8229051b
+  data.tar.gz: 754458236a5a0b47703aedf05d55442ecd2e0c1d010b7c45f1411135a8a90b9e9360c42e77e65ede34bdbad03ecea109c25cb308c08ecbddf626c928dd68e576

data/.gitignore

@@ -0,0 +1,14 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+test/tmp

data/.travis.yml

@@ -1,6 +1,15 @@
 language: ruby
+sudo: false
+cache:
+  bundler: true
 rvm:
   - 2.1
   - 2.2
-  - 2.3
+  - 2.3.0
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+before_install:
+  - gem update bundler
 script: bundle exec rake test

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'tdiary', github: 'tdiary/tdiary-core'
+gem 'emot'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Youhei SASAKI <uwabami@gfd-dennou.org>
+Copyright (c) 2015-2016 Youhei SASAKI <uwabami@gfd-dennou.org>
 
 MIT License
 

data/README.org

@@ -1,58 +1,56 @@
-* TDiary::Style::Org
+#+TITLE: TDiary::Style::Org
 Org-mode style for tDiary format.
-
-** Installation
-Add this line to your application's Gemfile:
-#+BEGIN_SRC ruby
-  gem 'tdiary-style-org'
-#+END_SRC
-
-And then execute:
-#+BEGIN_EXAMPLE
-  % bundle
-#+END_EXAMPLE
-Or install it yourself as:
-#+BEGIN_EXAMPLE
-  % gem install tdiary-style-org
-#+END_EXAMPLE
-
-** Usage
-If you want to use this style, add @style into tdiary.conf below:
-#+BEGIN_SRC ruby
-  @style = 'Org'
-#+END_SRC
-
-** Contributing
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-** TODO ToDo [/]
-   - [ ] can't handlinng "alt" in image link: due to org-ruby limitation.
-
-** Copyright
+* Installation
+  Add this line to your application's Gemfile.local:
+  #+BEGIN_SRC ruby
+    gem 'tdiary-style-org'
+  #+END_SRC
+  And then execute:
   #+BEGIN_EXAMPLE
-    Copyright (c) 2015 Youhei SASAKI <uwabami@gfd-dennou.org>
-
-    MIT License
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-    .
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-    .
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    % bundle install
+  #+END_EXAMPLE
+  Or install it yourself as:
+  #+BEGIN_EXAMPLE
+    % gem install tdiary-style-org
   #+END_EXAMPLE
+* Usage
+  If you want to use this style, add @style into tdiary.conf below:
+  #+BEGIN_SRC ruby
+    @style = 'Org'
+  #+END_SRC
+* Contributing
+  1. Fork it
+  2. Create your feature branch (`git checkout -b my-new-feature`)
+  3. Commit your changes (`git commit -am 'Add some feature'`)
+  4. Push to the branch (`git push origin my-new-feature`)
+  5. Create new Pull Request
+* TODO
+  - on going... [2/3]
+    - [X] can't convert TAG to CATEGORY of tDiary
+    - [X] How to use plugin? -> RD style like: =((%plugin, 'val'%))=
+      - Is this syntax best?
+    - [ ] can't handlinng "alt" in image link: due to org-ruby limitation.
+* Copyright
+ #+BEGIN_EXAMPLE
+   Copyright (c) 2015-2016 Youhei SASAKI <uwabami@gfd-dennou.org>
+
+   MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+   .
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+   .
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #+END_EXAMPLE

data/lib/tdiary/style/org.rb

@@ -10,7 +10,7 @@
 # You can redistribute it and/or modify it under MIT/X11
 
 require 'org-ruby'
-require 'pp'
+require 'pygments'
 
 module TDiary
 	module Style
@@ -21,8 +21,8 @@ module TDiary
 				@body ||= ''
 				@categories = get_categories
 				@stripped_subtitle = strip_subtitle
-				@subtitle_to_html = @subtitle ? to_html(@subtitle).strip.gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
-				@stripped_subtitle_to_html = @stripped_subtitle ? to_html('* ' + @stripped_subtitle).strip.gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
+				@subtitle_to_html = @subtitle ? to_html('* ' + @subtitle).strip.gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
+				@stripped_subtitle_to_html = @stripped_subtitle ? to_html(@stripped_subtitle).strip.gsub(/\A<h\d>|<\/h\d>\z/io, '') : nil
 				@body_to_html = to_html(@body)
 			end
 
@@ -58,18 +58,19 @@ module TDiary
 
 			def to_html(string)
 				r = string.dup
-				renderer = Orgmode::Parser.new(string, {markup_file: File.dirname(__FILE__) + '/html_tags.yml'} )
+				renderer = Orgmode::Parser.new(string, {markup_file: File.dirname(__FILE__) + '/org/html_tags.yml', skip_syntax_highlight: false } )
 				r = renderer.to_html
-				r = r.gsub(/{{(.+?)}}/m,'<%=\1%>')
+				# for tDiary plugin
+				r = r.gsub(/\(\(%(.+?)%\)\)/m,'<%=\1%>')
 				r = r.gsub('&#8216;','\'').gsub('&#8217;','\'')
 				r = r.gsub('&#8220;','"').gsub('&#8221;','"')
 			end
 
 			def get_categories
 				return [] unless @subtitle
-				org = Orgmode::Parser.new(@subtitle, {markup_file: File.dirname(__FILE__) + 'html_tags.yml'} )
+				org = Orgmode::Parser.new(@subtitle, {markup_file: File.dirname(__FILE__) + '/org/html_tags.yml', skip_syntax_highlight: false} )
 				unless org.headlines[0] == nil
-					cat = org.headlines[0].tags
+					cat = org.headlines[0].tags.flatten
 				else
 					cat = []
 				end
@@ -80,7 +81,7 @@ module TDiary
 				unless @subtitle
 					return nil
 				else
-					return '* ' + Orgmode::Parser.new(@subtitle, {markup_file: File.dirname(__FILE__) + 'html_tags.yml'} ).headlines[0].headline_text
+					return '* ' + Orgmode::Parser.new(@subtitle, {markup_file: File.dirname(__FILE__) + '/org/html_tags.yml'} ).headlines[0].headline_text
 				end
 			end
 

data/lib/tdiary/style/org/version.rb

@@ -1,7 +1,7 @@
 module TDiary
   module Style
     module Org
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
     end
   end
 end

data/tdiary-style-org.gemspec

@@ -13,12 +13,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/uwabami/tdiary-style-org'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = [".gitignore",".travis.yml","Gemfile","LICENSE","README.org","Rakefile","lib/tdiary-style-org.rb","lib/tdiary/style/org.rb","lib/tdiary/style/org/html_tags.yml","lib/tdiary/style/org/version.rb","tdiary-style-org.gemspec","test/tdiary/style/org-test.rb","test/test_helper.rb"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'org-ruby'
+  spec.add_dependency 'pygments.rb'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/tdiary/style/org-test.rb

@@ -152,9 +152,9 @@ EOF
   def test_plugin_syntax
     @source = <<-'EOF'
 * Title
-{{plugin 'val'}}
+((%plugin 'val'%))
 
-{{plugin "val", 'val'}}
+((%plugin "val", 'val'%))
 
     EOF
     @diary.append(@source)
@@ -174,7 +174,7 @@ EOF
   def test_plugin_syntax_with_url
     @source = <<-'EOF'
 * Title
-{{plugin 'http://www.example.com/foo.html', "https://www.example.com/bar.html"}}
+((%plugin 'http://www.example.com/foo.html', "https://www.example.com/bar.html"%))
 
     EOF
     @diary.append(@source)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-style-org
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Youhei SASAKI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: org-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +87,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".travis.yml"
 - Gemfile
 - LICENSE
 - README.org
 - Rakefile
 - lib/tdiary-style-org.rb
-- lib/tdiary/style/html_tags.yml
 - lib/tdiary/style/org.rb
+- lib/tdiary/style/org/html_tags.yml
 - lib/tdiary/style/org/version.rb
 - tdiary-style-org.gemspec
 - test/tdiary/style/org-test.rb
@@ -105,11 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: org-mode style for tDiary, using org-ruby
 test_files:
 - test/tdiary/style/org-test.rb
 - test/test_helper.rb
-has_rdoc: