chh_moretext 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49afca13ea0866780e19bd17c7c78874df333d7f
-  data.tar.gz: 75585adf47dfc79dd4bc5df4f7da3e007c34db13
+  metadata.gz: fa8a96b54b660219f824f82363b77f3499a9dfee
+  data.tar.gz: e5a929a2352770224860d5e098184e259d983b07
 SHA512:
-  metadata.gz: 0bcf88a26649cc6ee65450a88626e5ddc8ec90775c2bbd60a72d439826b8a9e5a5edde20b6e6ff6716c2bab233f0c478175333ba9f1a185800b9d42a2d7621d3
-  data.tar.gz: 0edeaa29f7f64e5ee8e74157648d23b664126bda6f988f3b51b4cb2fc6435efd40d85d297d941760bfd9b95302fcd4a453f957dcc21089e4b2efb8f34c35bb94
+  metadata.gz: 0a2c48238d23d6e337a2b38b09ee5a683c85ce0b5b7356e112caf38b61953352e0ee036ffd6aac2aba1c92ae2cf7aebd549f8b1da9f22bfb7763d02c6b5c8a90
+  data.tar.gz: 44c9cb58ca55445b7da1ea63237a520c21ee4cb5aced41f352e0c2644dd59427a0aa9ab5d75f49be3c81838c5dd70c0a93e7743267547f603696acac3ff1afe6

data/README.md

@@ -47,18 +47,6 @@ ChhMoretext::Moretext.paragraphs(5)
 # 也可以指定要有幾個段落
 ```
 
-## Issues
-
-目前已知的問題……
-
-* limit 如果設一個字，例如給出 /sentences.json?n=3&limit=1 這個 URL 請求，Moretext 伺服器就會死機好一陣子；
-
-## TODO
-
-* 目前每呼叫一個方法就是一個 request，造成產生假文的速度非常緩慢，打算弄個「快取層」先把資料抓來，呼叫方法時從快取裡面去拿；
-* 目前的 `paragraphs` 方法是將 `sentences` 用 `"\r\n\r\n"` 合併的，應該讓開發者可以自訂要用什麼拼接，例如用 HTML 的 `<p></p>` 等等；
-* 想做一個中文姓名產生器……
-
 ## Contributing
 
 1. Fork it
@@ -66,3 +54,9 @@ ChhMoretext::Moretext.paragraphs(5)
 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
+
+## Changelog
+
+### 0.1.6
+
+* Fixed `sentence` method: callback type should be String rather than Array.

data/chh_moretext.gemspec

@@ -10,7 +10,9 @@ Gem::Specification.new do |gem|
   gem.email         = ["chh@chh.tw"]
   gem.description   = %q{Generate random Traditional Chinese text from Moretext API}
   gem.summary       = %q{Generate random Traditional Chinese text from Moretext API}
-  gem.homepage = "https://github.com/chinghanho/chh_moretext"
+  gem.homepage      = "https://github.com/chinghanho/chh_moretext"
+
+  gem.add_runtime_dependency("faraday_middleware", '~> 0.9.0')
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/chh_moretext/configuration.rb

@@ -0,0 +1,5 @@
+module ChhMoretext
+  module Configuration
+    MORETEXT_DEFAULT_ENDPOINT = "http://more.handlino.com"
+  end
+end

data/lib/chh_moretext/moretext.rb

@@ -2,7 +2,7 @@ module ChhMoretext
   class Moretext < Base
     class << self
       def sentence(sentence_length_range = nil)
-        fetch_moretext(1, sentence_length_range)
+        fetch_moretext(1, sentence_length_range)[0]
       end
 
       def sentences(sentence_count = 1, sentence_length_range = nil)

data/lib/chh_moretext/request.rb

@@ -0,0 +1,27 @@
+module ChhMoretext
+  module Request
+    def fetch_moretext(number, limit)
+      number = {:n => "#{number}".to_i}
+      limit  = parse(limit)
+      condition = limit.nil? ? number : number.merge(limit)
+
+      connection.get("sentences.json", condition).body["sentences"]
+    end
+
+    private
+
+      def connection
+        options = {
+          :headers => { "Accept" => "application/json",
+                        "User-Agent" => "ChhMoretext Ruby Gem #{ChhMoretext::VERSION}" },
+          :url => Configuration::MORETEXT_DEFAULT_ENDPOINT,
+        }
+
+        Faraday.new(options) do |conn|
+          conn.request  :json
+          conn.response :json
+          conn.adapter Faraday.default_adapter
+        end
+      end
+  end
+end

data/lib/chh_moretext/version.rb

@@ -1,3 +1,3 @@
 module ChhMoretext
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/chh_moretext.rb

@@ -1,25 +1,16 @@
-require "chh_moretext/version"
-require "json"
-require "open-uri"
+require "chh_moretext/request"
+require "chh_moretext/configuration"
+require "faraday_middleware"
 
 module ChhMoretext
   class Base
-    MORETEXT_API_URL = "http://more.handlino.com/sentences.json"
-
-    class << self
-      def fetch_moretext(number, limit)
-        number = "n=#{number}"
-        limit  = parse(limit)
-        condition = limit.nil? ? "?#{number}" : "?#{number}&#{limit}"
-        return JSON(open("#{MORETEXT_API_URL}#{condition}").read)["sentences"]
-      end
-    end
+    extend Request
 
     private
       def self.parse(type)
         case type
-        when Range   then "limit=#{type.min},#{type.max}"
-        when Integer then "limit=#{type}"
+        when Range   then {:limit => "#{type.min},#{type.max}"}
+        when Integer then {:limit => "#{type}"}
         else nil
         end
       end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: chh_moretext
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - CHH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
-dependencies: []
+date: 2013-04-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: Generate random Traditional Chinese text from Moretext API
 email:
 - chh@chh.tw
@@ -24,7 +38,9 @@ files:
 - Rakefile
 - chh_moretext.gemspec
 - lib/chh_moretext.rb
+- lib/chh_moretext/configuration.rb
 - lib/chh_moretext/moretext.rb
+- lib/chh_moretext/request.rb
 - lib/chh_moretext/version.rb
 - test/test_helper.rb
 - test/test_moretext.rb