bijint 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa745db959dd179c133dd7ebf5f93ef2301a304d
-  data.tar.gz: a5e7fe4469e0bf19f8013eb89f8a92652d6aa46f
+  metadata.gz: 2b2e1670cab9bd113b3244cc857d9a34f69d4923
+  data.tar.gz: 929056ce920887b62342d0c312ea536aa30053e9
 SHA512:
-  metadata.gz: 26823536d67cdc8c4cb50bf09699fbe31eca403b933efc45a1e8c46d9b3c9cdf718f29e2ecd7847fdc3760e5fe471c07dcf5d8ccceb88ae5b5e1fb65e7aad1d3
-  data.tar.gz: f82f700fe276ef1d69d8a2aac1e086cb268592a684e21a09dfdfc93f97f9abc7a84d6421a4d4e775be414ca3a44d9bdc6905af4b6a49a1937a2a894fb8fec23c
+  metadata.gz: 9e20e2a5e05d0c5df50d84fe2d94cd6ac5da28fdef571e1bdaa036320efa8ae798c8efadc39a4d5014ff4aff0c8529d25797511e17e58b62201f824f96e9b405
+  data.tar.gz: 0e088ccf690247da1a73e7e89fa4d2497adb41bbc7ce2d817f7760ec77cc80c007d7c2e319ddbd2e9ff69a0b918b00b32634df0359f40dc8ec6113eebd514e32

data/README.md

@@ -36,6 +36,20 @@ http://www.bijint.com/assets/pict/tokyo/pc/2357.jpg
 http://www.bijint.com/assets/pict/tokyo/pc/0003.jpg
 ```
 
+### area
+
+```sh
+% bijint area hokkaido
+http://www.bijint.com/assets/pict/hokkaido/pc/2357.jpg
+```
+
+### area random
+
+```sh
+% bijint area_random hokkaido
+http://www.bijint.com/assets/pict/hokkaido/pc/0909.jpg
+```
+
 ### markdown
 
 ```sh
@@ -50,6 +64,20 @@ http://www.bijint.com/assets/pict/tokyo/pc/0003.jpg
 [![bijint](http://www.bijint.com/assets/pict/tokyo/pc/0025.jpg)](http://www.bijint.com/assets/pict/tokyo/pc/0025.jpg)
 ```
 
+### markdown area
+
+```sh
+% bijint md_area hokkaido
+[![bijint](http://www.bijint.com/assets/pict/hokkaido/pc/0105.jpg)](http://www.bijint.com/assets/pict/hokkaido/pc/0105.jpg)
+```
+
+### markdown area random
+
+```sh
+% bijint md_area_random hokkaido
+[![bijint](http://www.bijint.com/assets/pict/hokkaido/pc/1837.jpg)](http://www.bijint.com/assets/pict/hokkaido/pc/1837.jpg)
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/funnythingz/bijint/fork )

data/bin/bijint

@@ -7,7 +7,11 @@ bijint = Bijint::Bijint.new
 if ARGV.empty?
   puts bijint.now
 else
-  puts bijint.random    if ARGV.first == 'random'
-  puts bijint.md        if ARGV.first == 'md'
-  puts bijint.md_random if ARGV.first == 'md_random'
+  puts bijint.random                    if ARGV.first == 'random'
+  puts bijint.area(ARGV.last)           if ARGV.first == 'area'
+  puts bijint.area_random(ARGV.last)    if ARGV.first == 'area_random'
+  puts bijint.md                        if ARGV.first == 'md'
+  puts bijint.md_random                 if ARGV.first == 'md_random'
+  puts bijint.md_area(ARGV.last)        if ARGV.first == 'md_area'
+  puts bijint.md_area_random(ARGV.last) if ARGV.first == 'md_area_random'
 end

data/lib/bijint/version.rb

@@ -1,3 +1,3 @@
 module Bijint
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/bijint.rb

@@ -10,23 +10,54 @@ module Bijint
       url(set_area, time_rand)
     end
 
+    def area(area)
+      if area_list.include? area
+        url(area, Time.now)
+      else
+        url(set_area, Time.now)
+      end
+    end
+
+    def area_random(area)
+      if area_list.include? area
+        url(area, time_rand)
+      else
+        url(set_area, time_rand)
+      end
+    end
+
     def md
-      area = set_area
-      "[![bijint](#{url(area, Time.now)})](#{url(area, Time.now)})"
+      url = now
+      "[![bijint](#{now})](#{now})"
     end
 
     def md_random
-      area = set_area
-      date = time_rand
-      "[![bijint](#{url(area, date)})](#{url(area, date)})"
+      url = random
+      "[![bijint](#{url})](#{url})"
+    end
+
+    def md_area(area)
+      url = area(area)
+      "[![bijint](#{url})](#{url})"
     end
 
+    def md_area_random(area)
+      url = area_random(area)
+      "[![bijint](#{url})](#{url})"
+    end
+
+    private
+
     def url(area, time)
       "http://www.bijint.com/assets/pict/#{area}/pc/#{time.strftime('%H%M')}.jpg"
     end
 
+    def area_list
+      %w(kyoto shizuoka saga kobe tochigi miyazaki kagoshima hiroshima kanazawa nara hokkaido nagasaki okayama gunma sendai kanagawa fukui nagoya tottori osaka akita okinawa nagano saitama tokyo ibaraki iwate niigata kagawa fukuoka kumamoto yamaguchi aomori chiba yamanashi hanayome 2012jp tv-asahi sara 2013jp cc wasedastyle megane hairstyle 2011jp bimajo thailand hawaii taiwan jakarta)
+    end
+
     def set_area
-      %w(kyoto shizuoka saga kobe tochigi miyazaki kagoshima hiroshima kanazawa nara hokkaido nagasaki okayama gunma sendai kanagawa fukui nagoya tottori osaka akita okinawa nagano saitama tokyo ibaraki iwate niigata kagawa fukuoka kumamoto yamaguchi aomori chiba yamanashi hanayome 2012jp tv-asahi sara 2013jp cc wasedastyle megane hairstyle 2011jp bimajo thailand hawaii taiwan jakarta).shuffle.first
+      area_list.shuffle.first
     end
 
     def time_rand(from = 0.0, to = Time.now)

data/spec/bijint_spec.rb

@@ -14,6 +14,16 @@ describe Bijint do
       expect(bijint.random).to match /http:\/\/www\.bijint\.com\/assets\/pict\/[a-z0-9]+\/pc\/\d{4}\.jpg/
     end
 
+    it 'area' do
+      time = Time.now
+      expect(bijint.area 'tokyo').to eq "http://www.bijint.com/assets/pict/tokyo/pc/#{time.strftime('%H%M')}.jpg"
+    end
+
+    it 'area_random' do
+      time = Time.now
+      expect(bijint.area_random 'tokyo').to match /http:\/\/www\.bijint\.com\/assets\/pict\/tokyo\/pc\/\d{4}\.jpg/
+    end
+
     it 'md' do
       time = Time.now
       expect(bijint.md).to match /\[!\[bijint\]\(http:\/\/www\.bijint\.com\/assets\/pict\/[a-z0-9]+\/pc\/#{time.strftime('%H%M')}\.jpg\)\]\(http:\/\/www\.bijint\.com\/assets\/pict\/[a-z0-9]+\/pc\/#{time.strftime('%H%M')}\.jpg\)/
@@ -22,6 +32,15 @@ describe Bijint do
     it 'md_random' do
       expect(bijint.md_random).to match /\[!\[bijint\]\(http:\/\/www\.bijint\.com\/assets\/pict\/[a-z0-9]+\/pc\/\d{4}\.jpg\)\]\(http:\/\/www\.bijint\.com\/assets\/pict\/[a-z0-9]+\/pc\/\d{4}\.jpg\)/
     end
+
+    it 'md_area' do
+      time = Time.now
+      expect(bijint.md_area 'tokyo').to match /\[!\[bijint\]\(http:\/\/www\.bijint\.com\/assets\/pict\/tokyo\/pc\/\d{4}\.jpg\)\]\(http:\/\/www\.bijint\.com\/assets\/pict\/tokyo\/pc\/\d{4}\.jpg\)/
+    end
+
+    it 'md_area_random' do
+      expect(bijint.md_area_random 'tokyo').to match /\[!\[bijint\]\(http:\/\/www\.bijint\.com\/assets\/pict\/tokyo\/pc\/\d{4}\.jpg\)\]\(http:\/\/www\.bijint\.com\/assets\/pict\/tokyo\/pc\/\d{4}\.jpg\)/
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bijint
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - funnythingz