middleman-ya_lorem_ja 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd215f63eb865660c549565c3d067b4a48107892
-  data.tar.gz: 516ba19d25390f9e6be45dedbc171fa254b58d98
+  metadata.gz: fc24b3fba7ae575aea5f5bd676730f1eadba19cb
+  data.tar.gz: 6e10933c024dc696b9bf22a25ded771a78d0d6da
 SHA512:
-  metadata.gz: fc2cbea03212230f243aa91b85a9f06a665910aa09fb99a03a8e59c7fa16ebfa9b1106c34523b741001be52d96a487e6c9373a3821bab4c10c67b77926b5509c
-  data.tar.gz: 1d771a2d103c506a5996af31663f2b8de32a02c3d0f1f3a640cd18ef69f28a73d6cfb7c1a9bcc5a584953760615910b6900ef30ebfe03a1490e9d42d755f109e
+  metadata.gz: f3f10ef94327ae8fa57f3e5d8f47c66de3d08934034e64111a969f03e31faa860a9b9469029ab5b453b4bd49bd5133e0c8bcdf8463cd0d4cdafefa8f8e6bbad9
+  data.tar.gz: 4d3466fc13266d841a830fac40738b6e28ad436de6a45037a8ddd2e6aed1235bd6311ea000034232e1c68f519913417c309f34c17b18a888f6794b236267df19

data/README.md

@@ -2,13 +2,20 @@
 
 Middleman 用の日本語 lorem 拡張です。
 
-## インストール方法 ##
+## Installation
 
-Gemfile に以下を追加し、"bundle install"してください。
+Add this line to your application's Gemfile:
+
+    gem 'middleman-ya_lorem_ja'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install middleman-ya_lorem_ja
 
-```
-gem "middleman-ya_lorem_ja" , :git => 'git://github.com/tanalab2/middleman-ya_lorem_ja'
-```
 
 あとは、 middleman の config.rb に以下を追加し、 ya_lorem_ja を有効化してください。
 
@@ -16,12 +23,21 @@ gem "middleman-ya_lorem_ja" , :git => 'git://github.com/tanalab2/middleman-ya_lo
 activate :ya_lorem_ja
 ```
 
+また、以下により、文章リソースを変更できます。(:resource_nameを指定しない場合は、坂口安吾「風博士」が使用されます。)
+
+```ruby
+# 宮沢賢治「注文の多い料理店」を使用する場合
+activate :ya_lorem_ja, :resource_name => :chuumon_no_ooi_ryouriten
+```
+
 ya_lorem_ja が有効になり、 erb ファイルなどで、
 lorem_ja オブジェクトが使用できるようになります。
 
 erb に以下を記載した場合は、
 
 ``` ruby
+<h1><%= lorem_ja.date%></h1>
+<img src="<%= lorem_ja.image('200x200')%>"/>
 <h1><%= lorem_ja.word %></h1>
 <h2><%= lorem_ja.words(5) %></h2>
 <p><%= lorem_ja.sentence %></p>
@@ -35,6 +51,8 @@ erb に以下を記載した場合は、
 以下のように出力されます。
 
 ``` html
+<h1>2001年03月19日</h1>
+<img src="http://placehold.it/200x200"/>
 <h1>風博士の遺書</h1>
 <h2>諸氏よ、誰人かよく蛸を懲す勇士なきや</h2>
 <p>余の妻は麗わしきこと高山植物の如く、実に単なる植物ではなかったのである！</p>
@@ -87,13 +105,6 @@ erb に以下を記載した場合は、
 
 * [lorem.rb](https://github.com/middleman/middleman/middleman-core/lib/middleman-more/extensions/lorem.rb )
 
-* [坂口安吾「風博士」](http://www.aozora.gr.jp/cards/001095/card42616.html)
-
-  文の配列は、青空文庫から拝借しました。
-
-* [middleman-ya_lorem_ja を使用したサンプルページ](http://discountinnovations.com/articles/middleman/lorem_ja.html) 
-
-
 ## License
 * MIT
     

data/features/helpers_ya_lorem_ja.feature

@@ -13,7 +13,5 @@ Feature: Lorem generating helper
     Then I should see "#paragraphs3" contents have "3" paragraphs
     Then I should see "#date" contents match "\d{4}年\d{2}月\d{2}日"    
     Then I should see "#image" contents match "^http://placehold.it/20x20"
-
-
-    
+    Then I should see "#resource_name" contents match "kazehakase"
     

data/features/helpers_ya_lorem_ja_change_resource.feature

@@ -0,0 +1,21 @@
+Feature: Lorem generating helper
+
+  Scenario: Lorem Helper
+    Given the Server is running at "chuumon_no_ooi_ryouriten"
+    Then going to "/word.html" should not raise an exception
+    Then I should see "#word" contents have over "2" chars
+    Then I should see "#words5" contents have over "10" chars
+    Then I should see "#sentence" contents have over "#{2*6}" chars
+    Then I should see "#sentence" contents have "1" sentences    
+    Then I should see "#sentences3" contents have over "6" chars
+    Then I should see "#sentences3" contents have "3" sentences
+    Then I should see "#paragraph" contents have "1" paragraphs
+    Then I should see "#paragraphs3" contents have "3" paragraphs
+    Then I should see "#date" contents match "\d{4}年\d{2}月\d{2}日"    
+    Then I should see "#image" contents match "^http://placehold.it/20x20"
+    Then I should see "#resource_name" contents match "chuumon_no_ooi_ryouriten"
+    
+
+
+    
+    

data/features/support/hook.rb

@@ -0,0 +1,8 @@
+After do |scenario|
+  # Do something after each scenario.
+  # The +scenario+ argument is optional, but
+  # if you use it, you can inspect status with
+  # the #failed?, #passed? and #exception methods.
+
+  ::Middleman::YaLoremJa::Extension::YaLoremJaObj.reset_instance
+end

data/fixtures/chuumon_no_ooi_ryouriten/config.rb

@@ -0,0 +1 @@
+activate :ya_lorem_ja, :resource_name => :chuumon_no_ooi_ryouriten

data/fixtures/chuumon_no_ooi_ryouriten/source/word.html.erb

@@ -0,0 +1,10 @@
+<div id="#resource_name"><%= lorem_ja.resource_name %></div>
+<div id="#word"><%= lorem_ja.word %></div>
+<div id="#words5"><%= lorem_ja.words(5) %></div>
+<div id="#sentence"><%= lorem_ja.sentence %></div>
+<div id="#sentences3"><%= lorem_ja.sentences(3) %></div>
+<div id="#paragraph"><%= lorem_ja.paragraph %></div>
+<div id="#paragraphs3"><%= lorem_ja.paragraphs(3) %></div>
+<div id="#date"><%= lorem_ja.date %></div>
+<div id="#image"><%= lorem_ja.image("20x20") %></div>
+

data/fixtures/test-app/source/word.html.erb

@@ -1,3 +1,4 @@
+<div id="#resource_name"><%= lorem_ja.resource_name %></div>
 <div id="#word"><%= lorem_ja.word %></div>
 <div id="#words5"><%= lorem_ja.words(5) %></div>
 <div id="#sentence"><%= lorem_ja.sentence %></div>

data/lib/middleman-ya_lorem_ja/extension.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'ya_lorem_ja'
-require 'singleton'
+require 'thread'
 
 # -*- coding: utf-8 -*-
 # https://github.com/middleman/middleman/blob/v3-stable/middleman-core/lib/middleman-more/extensions/lorem.rb
@@ -8,7 +8,12 @@ require 'singleton'
 module Middleman
   module YaLoremJa
     class Extension < ::Middleman::Extension
-      option :my_option, 'default', 'An example option'
+
+      EXTENSION_NAME = :ya_lorem_ja
+      option :resource_name, ::YaLoremJa::Lorem::DEFAULT_RESOURCE_NAME, 'resource name'
+      option :char_count_range, ::YaLoremJa::Lorem::DEFAULT_CHAR_COUNT_RANGE_IN_WORD, 'character count range in a word'
+      option :word_count_range, ::YaLoremJa::Lorem::DEFAULT_WORD_COUNT_RANGE_IN_SENTENCE, 'word count range in a sentence'
+      option :sentence_count_range, ::YaLoremJa::Lorem::DEFAULT_SENTENCE_COUNT_RANGE_IN_PARAGRAPH, 'sentence count range in a paragraph'
 
       def initialize(app, options_hash={}, &block)
         # Call super to build options from the options_hash
@@ -18,7 +23,8 @@ module Middleman
         # require 'necessary/library'
 
         # set up your extension
-        # puts options.my_option        
+        # puts options.my_option
+        app.set EXTENSION_NAME, options
       end
 
       def after_configuration
@@ -35,12 +41,37 @@ module Middleman
       # end
 
       class YaLoremJaObj < ::YaLoremJa::Lorem
-        include Singleton     
+        @@singleton__instance__ = nil
+        @@singleton__mutex__ = Mutex.new
+        def self.instance(resource_name=DEFAULT_RESOURCE_NAME, char_count_range=DEFAULT_CHAR_COUNT_RANGE_IN_WORD, word_count_range=DEFAULT_WORD_COUNT_RANGE_IN_SENTENCE, sentence_count_range=DEFAULT_SENTENCE_COUNT_RANGE_IN_PARAGRAPH)
+          return @@singleton__instance__ if @@singleton__instance__
+          @@singleton__mutex__.synchronize {
+            return @@singleton__instance__ if @@singleton__instance__           
+            @@singleton__instance__ = new(resource_name, char_count_range, word_count_range, sentence_count_range)
+          }
+          @@singleton__instance__
+        end
+
+        def self.reset_instance
+          @@singleton__mutex__.synchronize {
+            @@singleton__instance__  = nil if @@singleton__instance__           
+          }
+        end
+        
+        private
+        def initialize(resource_name, char_count_range, word_count_range, sentence_count_range)
+          super(resource_name, char_count_range, word_count_range, sentence_count_range)
+        end
+        private_class_method :new
       end
 
       helpers do
         def lorem_ja
-          return YaLoremJaObj.instance
+          ext_settings = config[::Middleman::YaLoremJa::Extension::EXTENSION_NAME]
+          return YaLoremJaObj.instance(ext_settings.resource_name,
+                                       ext_settings.char_count_range,
+                                       ext_settings.word_count_range,
+                                       ext_settings.sentence_count_range)
         end
       end
     end
@@ -52,4 +83,4 @@ end
 # version of class name
 
 # MyExtension.register(:my_extension)
-::Middleman::YaLoremJa::Extension.register(:ya_lorem_ja) 
+::Middleman::YaLoremJa::Extension.register(::Middleman::YaLoremJa::Extension::EXTENSION_NAME) 

data/lib/middleman-ya_lorem_ja/version.rb

@@ -1,6 +1,6 @@
 module Middleman
   # GeoPattern
   module YaLoremJa
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/middleman-ya_lorem_ja.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("middleman-core", [">= 3.3.12"])
   
   # Additional dependencies
-  s.add_runtime_dependency("ya_lorem_ja", ">= 0.0.2")
+  s.add_runtime_dependency("ya_lorem_ja", ">= 0.0.3")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-ya_lorem_ja
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kenji tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 description: Yet Another Japanese Lorem Ipsum generator For Middleman
 email: 
 executables: []
@@ -49,7 +49,11 @@ files:
 - README.md
 - Rakefile
 - features/helpers_ya_lorem_ja.feature
+- features/helpers_ya_lorem_ja_change_resource.feature
 - features/support/env.rb
+- features/support/hook.rb
+- fixtures/chuumon_no_ooi_ryouriten/config.rb
+- fixtures/chuumon_no_ooi_ryouriten/source/word.html.erb
 - fixtures/test-app/config.rb
 - fixtures/test-app/source/word.html.erb
 - lib/middleman-ya_lorem_ja.rb
@@ -79,11 +83,13 @@ 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: Yet Another Japanese Lorem Ipsum generator For Middleman
 test_files:
 - features/helpers_ya_lorem_ja.feature
+- features/helpers_ya_lorem_ja_change_resource.feature
 - features/support/env.rb
+- features/support/hook.rb
 has_rdoc: