gyazz 1.0.2 → 1.0.3

data/lib/gyazz/page.rb

@@ -3,6 +3,8 @@ module Gyazz
   class Page
 
     attr_reader :wiki, :name
+    alias_method :title, :name
+
     def initialize(name, wiki)
       @name = name
       @wiki = wiki
@@ -12,35 +14,37 @@ module Gyazz
       "#{@wiki.url}/#{URI.encode @name}"
     end
 
-    def text
-      @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/text")
+    def text(opts={})
+      @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/text", opts)
     end
 
-    def text=(str_or_arr)
+    def text=(str_or_arr, opts={})
       data = str_or_arr.kind_of?(Array) ? str_or_arr.join("\n") : str_or_arr
-      @wiki.post("/__write__",
-                 :body => {
-                   :name => @wiki.name,
-                   :title => @name,
-                   :data => data
-                 })
+      unless opts.has_key? :body
+        opts[:body] = {
+          :name => @wiki.name,
+          :title => @name,
+          :data => data
+        }
+      end
+      @wiki.post("/__write__", opts)
     end
 
-    def data(query = {:version => 0})
-      JSON.parse @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/json", query)
+    def data(opts={:query => {:version => 0}})
+      JSON.parse @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/json", opts)
     end
 
-    def access
-      JSON.parse @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/__access")
+    def access(opts={})
+      JSON.parse @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/__access", opts)
     end
 
-    def modify
-      JSON.parse @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/__modify")
+    def modify(opts={})
+      JSON.parse @wiki.get("/#{URI.encode @wiki.name}/#{URI.encode @name}/__modify", opts)
     end
 
-    def related_pages
+    def related_pages(opts={})
       url = "/#{URI.encode @wiki.name}/#{URI.encode @name}/related"
-      JSON.parse(@wiki.get(url)).map{|name|
+      JSON.parse(@wiki.get(url, opts)).map{|name|
         Page.new name, @wiki
       }
     end

data/lib/gyazz/version.rb

@@ -1,3 +1,3 @@
 module Gyazz
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/gyazz/wiki.rb

@@ -25,8 +25,9 @@ module Gyazz
       Page.new name, self
     end
 
-    def get(path, query={})
-      res = HTTParty.get "#{@host}#{path}", :query => query, :basic_auth => @basic_auth
+    def get(path, opts={})
+      opts[:basic_auth] = @basic_auth if @basic_auth and !opts.has_key?(:basic_auth)
+      res = HTTParty.get "#{@host}#{path}", opts
       case res.code
       when 200
         return res.body
@@ -35,8 +36,8 @@ module Gyazz
       end
     end
 
-    def post(path, opts)
-      opts[:basic_auth] = @basic_auth if @basic_auth
+    def post(path, opts={})
+      opts[:basic_auth] = @basic_auth if @basic_auth and !opts.has_key?(:basic_auth)
       res = HTTParty.post "#{@host}#{path}", opts
       case res.code
       when 200
@@ -46,8 +47,8 @@ module Gyazz
       end
     end
 
-    def pages
-      JSON.parse(self.get "/#{URI.encode @name}/__list").map{|i|
+    def pages(opts={})
+      JSON.parse(self.get "/#{URI.encode @name}/__list", opts).map{|i|
         Page.new(i[0], self)
       }
     end

data/test/test_auth.rb

@@ -5,6 +5,7 @@ class TestWikiAuth < MiniTest::Test
   def setup
     @wiki = Gyazz::Wiki.new 'test_auth'
     @wiki.host = ENV['GYAZZ_HOST'] if ENV.has_key? 'GYAZZ_HOST'
+    @auth = {:username => 'test_username', :password => 'test_password'}
   end
 
   def test_auth_fail
@@ -18,7 +19,7 @@ class TestWikiAuth < MiniTest::Test
   end
 
   def test_auth
-    @wiki.auth = {:username => 'test_username', :password => 'test_password'}
+    @wiki.auth = @auth
     pages = @wiki.pages
     assert_equal pages.class, Array
     pages.each do |page|
@@ -37,8 +38,16 @@ class TestWikiAuth < MiniTest::Test
     assert_equal err.class, Gyazz::Error
   end
 
+  def test_manually_auth
+    pages = @wiki.pages(:basic_auth => @auth)
+    assert_equal pages.class, Array
+    pages.each do |page|
+      assert_equal page.class, Gyazz::Page
+    end
+  end
+
   def test_auth_page_get_set
-    @wiki.auth = {:username => 'test_username', :password => 'test_password'}
+    @wiki.auth = @auth
     page = @wiki.page('aaa')
     body = ["foo", "bar", Time.now.to_s].join("\n")
     page.text = body

data/test/test_page.rb

@@ -8,6 +8,10 @@ class TestPage < MiniTest::Test
     @page = @wiki.page('aaa')
   end
 
+  def test_title_name
+    assert_equal @page.title, @page.name
+  end
+
   def test_url
     host = ENV['GYAZZ_HOST'] || 'http://gyazz.com'
     assert_equal @page.url , "#{host}/#{@wiki.name}/#{@page.name}"

data/test/test_wiki.rb

@@ -20,4 +20,12 @@ class TestWiki < MiniTest::Test
     end
   end
 
+  def test_pages_with_options
+    pages = @wiki.pages :timeout => 120
+    assert_equal pages.class, Array
+    pages.each do |page|
+      assert_equal page.class, Gyazz::Page
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyazz
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler