middleman-ya_lorem_ja 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d98eef68c1d13f0e6b77bf0b562350f80c3c5dd
-  data.tar.gz: a321eb59f37f5fca918d9d94acf74cd2cd082838
+  metadata.gz: 78c5154189946790ac8556de5fb98eaf528f68c2
+  data.tar.gz: d63e33f31aa7ea6af0719023eae942516de189f5
 SHA512:
-  metadata.gz: e12af62faa5f3ad66ac969a441c65a6d243bd203abf6516230764af4168644ec59943e58cb0c1d19e7ee19594b1bc0c77614030538bcf2921123278cd5de1cbd
-  data.tar.gz: b59b604b4a17d296b414eccd44e66b4a80b696a5301b7cd973dde21ba5cffd6e292ed9b8edfd8544e3dbdaba98b81c1b75fa69045a488031a613edf790f05915
+  metadata.gz: 2e9756734abb797dd8446667c6e50cfe06f9697efab0bd07c52371654df49de27ea60759b28eda24d361504f7b5d1c1080fea3071388fe4b060240100036a080
+  data.tar.gz: 42585321d0f19591b0a04923a943fc492d3d9fff56c3fcc7a3da65182ea3ff4d5a15d7523e6d46d8b9b45c51419cf46541ffe7490d84de5b1feff942041ea8b5

data/features/helpers_ya_lorem_ja.feature

@@ -1,19 +1,17 @@
 Feature: Lorem generating helper
-
   Scenario: Lorem Helper
     Given the Server is running at "test-app"
     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 "#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 "#paragraph" contents match "</p>"
     Then I should see "#paragraphs3" contents have "3" paragraphs
-    Then I should see "#paragraphs3" contents match "</p>" 
-    Then I should see "#date" contents match "\d{4}年\d{2}月\d{2}日"    
+    Then I should see "#paragraphs3" contents match "</p>"
+    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

@@ -1,21 +1,15 @@
 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 "#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 "#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/helpers_ya_lorem_ja_reload_resource.feature

@@ -0,0 +1,27 @@
+Feature: Lorem generating helper
+  Scenario: Lorem Helper
+    Given the Server is running at "reload_resource"
+    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"
+
+    Then I should see "#k-resource_name" contents match "kazehakase"
+    Then I should see "#k-word" contents have over "2" chars
+    Then I should see "#k-words5" contents have over "10" chars
+    Then I should see "#k-sentence" contents have over "#{2*6}" chars
+    Then I should see "#k-sentence" contents have "1" sentences
+    Then I should see "#k-sentences3" contents have over "6" chars
+    Then I should see "#k-sentences3" contents have "3" sentences
+    Then I should see "#k-paragraph" contents have "1" paragraphs
+    Then I should see "#k-paragraphs3" contents have "3" paragraphs
+    Then I should see "#k-date" contents match "\d{4}年\d{2}月\d{2}日"
+    Then I should see "#k-image" contents match "^http://placehold.it/20x20"

data/fixtures/reload_resource/config.rb

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

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

@@ -0,0 +1,20 @@
+<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>
+
+<% lorem_ja.reload_resource(:kazehakase) %>
+<div id="#k-resource_name"><%= lorem_ja.resource_name %></div>
+<div id="#k-word"><%= lorem_ja.word %></div>
+<div id="#k-words5"><%= lorem_ja.words(5) %></div>
+<div id="#k-sentence"><%= lorem_ja.sentence %></div>
+<div id="#k-sentences3"><%= lorem_ja.sentences(3) %></div>
+<div id="#k-paragraph"><%= lorem_ja.paragraph %></div>
+<div id="#k-paragraphs3"><%= lorem_ja.paragraphs(3) %></div>
+<div id="#k-date"><%= lorem_ja.date %></div>
+<div id="#k-image"><%= lorem_ja.image("20x20") %></div>

data/lib/middleman-ya_lorem_ja/extension.rb

@@ -46,15 +46,25 @@ module Middleman
         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__           
+            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.reload_resource(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)
+          @@singleton__mutex__.synchronize {
+            if @@singleton__instance__ == nil
+              @@singleton__instance__ = new(resource_name, char_count_range, word_count_range, sentence_count_range)
+            else
+              @@singleton__instance__.reload_resource(resource_name, char_count_range, word_count_range, sentence_count_range)
+            end
+          }
+        end
+
         def self.reset_instance
           @@singleton__mutex__.synchronize {
-            @@singleton__instance__  = nil if @@singleton__instance__           
+            @@singleton__instance__  = nil if @@singleton__instance__
           }
         end
 
@@ -67,7 +77,7 @@ module Middleman
           merged_opts = default_options.merge(opts)
           super(total, merged_opts)
         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)
@@ -93,4 +103,4 @@ end
 # version of class name
 
 # MyExtension.register(:my_extension)
-::Middleman::YaLoremJa::Extension.register(::Middleman::YaLoremJa::Extension::EXTENSION_NAME) 
+::Middleman::YaLoremJa::Extension.register(::Middleman::YaLoremJa::Extension::EXTENSION_NAME)

data/lib/middleman-ya_lorem_ja/step_definitions/server_steps.rb

@@ -33,7 +33,6 @@ end
 Given /^the Server is running$/ do
   root_dir = File.expand_path(current_dir)
 
-
   if File.exists?(File.join(root_dir, 'source'))
     ENV['MM_SOURCE'] = 'source'
   else
@@ -76,7 +75,7 @@ end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
   cd('.') do
-    
+
     expect{ visit(URI.encode(url).to_s) }.to_not raise_exception
   end
 end
@@ -171,4 +170,3 @@ Then /^I should see "([^\"]*)" contents match "(.*)"$/ do |id, regex|
     expect(content).to match(/#{ regex }/m)
   end
 end
-

data/lib/middleman-ya_lorem_ja/version.rb

@@ -1,6 +1,6 @@
 module Middleman
   # GeoPattern
   module YaLoremJa
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/middleman-ya_lorem_ja.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   # The version of middleman-core your extension depends on
   s.add_runtime_dependency("middleman-core", [">= 3.3.12"])
-  
+
   # Additional dependencies
-  s.add_runtime_dependency("ya_lorem_ja", ">= 0.0.4")
+  s.add_runtime_dependency("ya_lorem_ja", ">= 0.0.5")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-ya_lorem_ja
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kenji tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-12-05 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.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 description: Yet Another Japanese Lorem Ipsum generator For Middleman
 email: 
 executables: []
@@ -50,10 +50,13 @@ files:
 - Rakefile
 - features/helpers_ya_lorem_ja.feature
 - features/helpers_ya_lorem_ja_change_resource.feature
+- features/helpers_ya_lorem_ja_reload_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/reload_resource/config.rb
+- fixtures/reload_resource/source/word.html.erb
 - fixtures/test-app/config.rb
 - fixtures/test-app/source/word.html.erb
 - lib/middleman-ya_lorem_ja.rb
@@ -90,6 +93,7 @@ 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/helpers_ya_lorem_ja_reload_resource.feature
 - features/support/env.rb
 - features/support/hook.rb
 has_rdoc: