jekyll-msgcat 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd1c394a9012e2a4e4dc70eb60bf122c6c65b4b9
-  data.tar.gz: 00b325db55ee9a2f1a079310e9e70ebe4da15e41
+  metadata.gz: 8612d0a2fc3c09579441d4d149812aa8c8012037
+  data.tar.gz: 1f2f8ebc959ca985d52280e7319ee4810ae096fb
 SHA512:
-  metadata.gz: 5da70d037575e0fd62b853495b4e0dbbc80be866faba1ddacd4c245d846d3a2a844df1f767a77991c7edcba2d1da72bc531fb5faa6de835674649a53ec38190d
-  data.tar.gz: c43d6388ce8beaab68754b8c378fc0f14e4572df0014ebd79419541571faa1925b7a1971adf5bd2929bcc3046bcc030671f195a3556471281956e06f5cdb9805
+  metadata.gz: 859a6d39c139a34f477dc3fedda54c9d4b63ab71a585da96dfd05bd038f2734f0e5c4e629255cab2bbe6de5596fc9bac2e09186cf8244102ecb695cb1551b2ff
+  data.tar.gz: 78d3b08c0314c5864f50a65aa197d841835f44b89a9882824338730d60309c360659e35a2241b740408e8e85c26f8af7b4fc175581cae24556a34a6af4592667

data/Gemfile

@@ -1,4 +1,4 @@
-#ruby=ruby-2.0.0
+#ruby=ruby-2.1.3
 #ruby-gemset=msgcat
 source 'https://rubygems.org'
 

data/README.md

@@ -2,21 +2,21 @@
 
 Multi-lingual interface with Jekyll via .yaml message catalogs.
 
-Tested with Jekyll 1.2.1.
+Updated for Jekyll 2.5.3.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'jekyll-msgcat'
+	gem 'jekyll-msgcat'
 
 And then execute:
 
-    $ bundle
+	$ bundle
 
 Or install it yourself as:
 
-    $ gem install jekyll-msgcat
+	$ gem install jekyll-msgcat
 
 ## Usage
 
@@ -37,6 +37,10 @@ Create ``_msgcat.yaml``:
 	uk:
 	  'Home': На головну сторiнку
 
+``_msgcat.yaml`` file **must** be in a directory where the site
+sources are (e.g. the same directory you provide in ``jekyll -s
+foo/bar`` command).
+
 And use in Liquid templates:
 
 	{{ 'Home' | mc }}
@@ -44,7 +48,19 @@ And use in Liquid templates:
 If 'Home' key wasn't found anywhere in the message catalog, or you
 didn't select any locale, a string 'Home' will be used.
 
-More info [here](http://gromnitsky.blogspot.com/2013/10/multi-lingual-interface-with-jekyll.html).
+More info (for version 0.0.2)
+[here](http://gromnitsky.blogspot.com/2013/10/multi-lingual-interface-with-jekyll.html).
+
+## News
+
+* 1.0.0
+
+	- The 2nd parameter for `cur_page_in_another_locale` filter in not a
+	  class name, but an anchor name. The optional class name is a 3rd
+	  parameter now.
+
+	- ``_msgcat.yaml`` file must be in a site source directory (see Usage
+	  section).
 
 ## License
 

data/example/_plugins/msgcat.rb

@@ -13,9 +13,10 @@ module Jekyll
       return @@__msgcat if @@__msgcat
 
       begin
-        @@__msgcat = YAML.load_file MSGCAT_DB, :safe => false
+        file = File.join (__get_site["source"] || "./"), MSGCAT_DB
+        @@__msgcat = YAML.load_file file, :safe => false
       rescue
-        $stderr.puts "msgcat warning: #{MSGCAT_DB} not found"
+        $stderr.puts "msgcat warning: `#{file}` not found: #{$!}"
         return nil
       end
 
@@ -45,11 +46,11 @@ module Jekyll
       (msg = msgcat[locale][input]) ? msg : input
     end
 
-    def cur_page_in_another_locale targetLocale, cssClass = 'btn btn-primary btn-xs'
+    def cur_page_in_another_locale targetLocale, label = nil, cssClass = nil
       raise 'target locale requred' if targetLocale =~ /^\s*$/
 
       site = __get_site
-      pattern = "<a href='%s' class='#{cssClass} %s'>#{targetLocale}</a>"
+      pattern = "<a href='%s' class='#{cssClass} %s'>#{label || targetLocale}</a>"
       locale = __get_locale || 'en'
 
       # current site

data/jekyll-msgcat.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bundler", "~> 1.3"
+  spec.add_dependency "bundler", "~> 1.7"
   spec.add_dependency "andand", "~> 1.3.3"
   spec.add_dependency "safe_yaml"
 

data/lib/jekyll/msgcat.rb

@@ -13,9 +13,10 @@ module Jekyll
       return @@__msgcat if @@__msgcat
 
       begin
-        @@__msgcat = YAML.load_file MSGCAT_DB, :safe => false
+        file = File.join (__get_site["source"] || "./"), MSGCAT_DB
+        @@__msgcat = YAML.load_file file, :safe => false
       rescue
-        $stderr.puts "msgcat warning: #{MSGCAT_DB} not found"
+        $stderr.puts "msgcat warning: `#{file}` not found: #{$!}"
         return nil
       end
 
@@ -45,11 +46,11 @@ module Jekyll
       (msg = msgcat[locale][input]) ? msg : input
     end
 
-    def cur_page_in_another_locale targetLocale, cssClass = 'btn btn-primary btn-xs'
+    def cur_page_in_another_locale targetLocale, label = nil, cssClass = nil
       raise 'target locale requred' if targetLocale =~ /^\s*$/
 
       site = __get_site
-      pattern = "<a href='%s' class='#{cssClass} %s'>#{targetLocale}</a>"
+      pattern = "<a href='%s' class='#{cssClass} %s'>#{label || targetLocale}</a>"
       locale = __get_locale || 'en'
 
       # current site

data/lib/jekyll/msgcat/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Msgcat
-    VERSION = "0.0.2"
+    VERSION = "1.0.0"
   end
 end

data/test/test_msgcat.rb

@@ -26,7 +26,7 @@ end
 
 require 'minitest/autorun'
 
-class MsgcatTest < Minitest::Test
+class MsgcatTest < Minitest::Unit::TestCase
   include Site_ru
   include Jekyll::Msgcat
 
@@ -62,11 +62,15 @@ class MsgcatTest < Minitest::Test
 
 
   def test_cur_page_in_another_locale__this_locale
-    assert_equal "<a href='#' class='btn btn-primary btn-xs disabled'>ru</a>", cur_page_in_another_locale('ru')
+    assert_equal "<a href='#' class=' disabled'>ru</a>", cur_page_in_another_locale('ru')
+  end
+
+  def test_cur_page_in_another_locale__this_locale_custom_label
+    assert_equal "<a href='#' class=' disabled'>Booo</a>", cur_page_in_another_locale('ru', 'Booo')
   end
 
   def test_cur_page_in_another_locale__this_locale_custom_class
-    assert_equal "<a href='#' class='myclass1 myclass2 disabled'>ru</a>", cur_page_in_another_locale('ru', "myclass1 myclass2")
+    assert_equal "<a href='#' class='myclass1 myclass2 disabled'>ru</a>", cur_page_in_another_locale('ru', nil, "myclass1 myclass2")
   end
 
   def test_cur_page_in_another_locale__no_url_in_config
@@ -81,19 +85,19 @@ class MsgcatTest < Minitest::Test
   def test_cur_page_in_another_locale__domain_no_deploy
     @context.registers[:site].config['msgcat']['deploy'] = nil
     @context.registers[:site].config['url'] = 'http://lt.example.com'
-    assert_equal "<a href='http://lt.example.com/foo/bar' class='btn btn-primary btn-xs '>lt</a>", cur_page_in_another_locale('lt')
+    assert_equal "<a href='http://lt.example.com/foo/bar' class=' '>lt</a>", cur_page_in_another_locale('lt')
   end
 
   def test_cur_page_in_another_locale__domain_no_deploy_no_msgcat
     @context.registers[:site].config['msgcat'] = nil
     @context.registers[:site].config['url'] = 'http://lt.example.com'
-    assert_equal "<a href='http://lt.example.com/foo/bar' class='btn btn-primary btn-xs '>lt</a>", cur_page_in_another_locale('lt')
+    assert_equal "<a href='http://lt.example.com/foo/bar' class=' '>lt</a>", cur_page_in_another_locale('lt')
   end
 
   def test_cur_page_in_another_locale__domain
     @context.registers[:site].config['msgcat']['deploy'] = 'domain'
     @context.registers[:site].config['url'] = 'http://lt.example.com'
-    assert_equal "<a href='http://lt.example.com/foo/bar' class='btn btn-primary btn-xs '>lt</a>", cur_page_in_another_locale('lt')
+    assert_equal "<a href='http://lt.example.com/foo/bar' class=' '>lt</a>", cur_page_in_another_locale('lt')
   end
 
   def test_cur_page_in_another_locale__nearby_no_baseurl
@@ -109,7 +113,7 @@ class MsgcatTest < Minitest::Test
     @context.registers[:site].config['msgcat']['locale'] = 'uk'
     @context.registers[:site].config['msgcat']['deploy'] = 'nearby'
     @context.registers[:site].config['baseurl'] = '/blog/lt'
-    assert_equal "<a href='/blog/lt/foo/bar' class='btn btn-primary btn-xs '>lt</a>", cur_page_in_another_locale('lt')
+    assert_equal "<a href='/blog/lt/foo/bar' class=' '>lt</a>", cur_page_in_another_locale('lt')
   end
 
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-msgcat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   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: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Multi-Lingual Interface With Jekyll
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Multi-lingual interface with Jekyll via .yaml message catalogs.