localwiki_client 0.2.0 → 0.3.0

data/spec/basic_crud_spec.rb

@@ -12,6 +12,7 @@ describe 'LocalwikiClient' do
     @path_matcher = lambda do |request_1, request_2|
       URI(request_1.uri).path.match(/TestPage/) && URI(request_2.uri).path.match(/TestPage/)
     end
+    @create_response = @wiki.create('page', {name: @pagename, content: '<p>Created!</p>'}.to_json)
   end
 
   after(:all) do
@@ -21,14 +22,20 @@ describe 'LocalwikiClient' do
   context "CRUD method" do
 
     it "#create('page', json) response.status is 201" do
-      response = @wiki.create('page', {name: @pagename, content: '<p>Created!</p>'}.to_json)
-      response.status.should eq 201
+      @create_response.status.should eq 201
     end
 
-    it "#read('page', pagename) response.status should match(/Created!/)" do
+    it "#read('page', pagename) returns page content" do
       VCR.use_cassette 'basic_crud_read_success', :match_requests_on => [:method, @path_matcher] do
-        response = @wiki.read('page', @pagename)
-        response["content"].should match(/Created!/)
+        page = @wiki.read('page', @pagename)
+        page.content.should match(/Created!/)
+      end
+    end
+
+    it "#page_by_name(pagename) returns page content" do
+      VCR.use_cassette 'basic_crud_page_by_name_success', :match_requests_on => [:method, @path_matcher] do
+        page = @wiki.page_by_name(@pagename)
+        page.content.should match(/Created!/)
       end
     end
 

data/spec/basic_spec.rb

@@ -24,8 +24,8 @@ describe 'LocalwikiClient' do
       end
       @wiki.create('page', {name: page_name, content: '<p>Created page with spaces!</p>'}.to_json)
       VCR.use_cassette 'basic_page_by_name_spaces', :match_requests_on => [:method, path_matcher] do
-        response = @wiki.page_by_name(page_name)
-        response["content"].should match(/Created page with spaces!/)
+        page = @wiki.page_by_name(page_name)
+        page.content.should match(/Created page with spaces!/)
       end
     end
 

data/spec/fixtures/cassettes/basic.yml

@@ -7,23 +7,23 @@ http_interactions:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:07:51 GMT
+      - Fri, 29 Mar 2013 02:07:16 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Transfer-Encoding:
@@ -31,8 +31,8 @@ http_interactions:
       Content-Type:
       - application/vnd.api.v1+json; charset=utf-8
     body:
-      encoding: US-ASCII
-      string: ! '{"domain": "example.com", "id": 1, "language_code": "en-us", "license":
+      encoding: UTF-8
+      string: '{"domain": "example.com", "id": 1, "language_code": "en-us", "license":
         "<p>Except where otherwise noted, this content is licensed under a <a rel=\"license\"
         href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution
         License</a>. See <a href=\"/Copyrights\">Copyrights.</p>", "name": "example.com",
@@ -42,50 +42,52 @@ http_interactions:
         See <a href=\"/Copyrights\" target=\"_blank\">Copyrights</a>.", "time_zone":
         "America/Chicago"}'
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:07:20 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:32 GMT
 - request:
     method: post
     uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/
     body:
       encoding: UTF-8
-      string: ! '{"name":"Test Page0c230d1d-7442-42f2-bbc9-e2768c5a562e","content":"<p>Created
+      string: '{"name":"Test Pagec2026982-a27d-414a-baff-8c23b703d958","content":"<p>Created
         page with spaces!</p>"}'
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Content-Type:
       - application/json
       Authorization:
       - ApiKey testuser:key
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 201
       message: CREATED
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:07:51 GMT
+      - Fri, 29 Mar 2013 02:07:16 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Vary:
       - Cookie,Accept-Encoding
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Set-Cookie:
-      - sessionid=c8e100346799ef6074dec276b229bac1; expires=Sat, 30-Mar-2013 01:07:52
+      - sessionid=27e0e18f9a79bb69dad291d0ac1fc3cb; expires=Fri, 12-Apr-2013 02:07:17
         GMT; Max-Age=1209600; Path=/
       Location:
-      - http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/Test_Page0c230d1d-7442-42f2-bbc9-e2768c5a562e
+      - http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/Test_Pagec2026982-a27d-414a-baff-8c23b703d958
       Content-Length:
-      - '0'
+      - '20'
       Content-Type:
       - text/html; charset=utf-8
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:07:21 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:32 GMT
 recorded_with: VCR 2.4.0

data/spec/fixtures/cassettes/basic_crud.yml

@@ -7,23 +7,23 @@ http_interactions:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:07:50 GMT
+      - Fri, 29 Mar 2013 02:07:14 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Transfer-Encoding:
@@ -31,8 +31,8 @@ http_interactions:
       Content-Type:
       - application/vnd.api.v1+json; charset=utf-8
     body:
-      encoding: US-ASCII
-      string: ! '{"domain": "example.com", "id": 1, "language_code": "en-us", "license":
+      encoding: UTF-8
+      string: '{"domain": "example.com", "id": 1, "language_code": "en-us", "license":
         "<p>Except where otherwise noted, this content is licensed under a <a rel=\"license\"
         href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution
         License</a>. See <a href=\"/Copyrights\">Copyrights.</p>", "name": "example.com",
@@ -42,49 +42,51 @@ http_interactions:
         See <a href=\"/Copyrights\" target=\"_blank\">Copyrights</a>.", "time_zone":
         "America/Chicago"}'
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:07:19 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:29 GMT
 - request:
     method: post
     uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/
     body:
       encoding: UTF-8
-      string: ! '{"name":"TestPage533b1957-d395-4edf-81a6-f38a60f1459c","content":"<p>Created!</p>"}'
+      string: '{"name":"TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a","content":"<p>Created!</p>"}'
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Content-Type:
       - application/json
       Authorization:
       - ApiKey testuser:key
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 201
       message: CREATED
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:07:50 GMT
+      - Fri, 29 Mar 2013 02:07:14 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Vary:
       - Cookie,Accept-Encoding
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Set-Cookie:
-      - sessionid=e6ca591c90fc5bb8964c53dd2e6436eb; expires=Sat, 30-Mar-2013 01:07:50
+      - sessionid=b7d912565459dbec5668a08d4a10f2f5; expires=Fri, 12-Apr-2013 02:07:14
         GMT; Max-Age=1209600; Path=/
       Location:
-      - http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage533b1957-d395-4edf-81a6-f38a60f1459c
+      - http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a
       Content-Length:
-      - '0'
+      - '20'
       Content-Type:
       - text/html; charset=utf-8
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:07:19 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:30 GMT
 recorded_with: VCR 2.4.0

data/spec/fixtures/cassettes/basic_crud_delete_fail.yml

@@ -2,41 +2,43 @@
 http_interactions:
 - request:
     method: delete
-    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage506da7d1-4cb8-4aa1-bc50-455e7ed8ef02
+    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Content-Type:
       - application/json
       Authorization:
       - ApiKey testuser:key
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 404
       message: NOT FOUND
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:17:55 GMT
+      - Fri, 29 Mar 2013 02:07:16 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Vary:
       - Accept-Encoding
       Content-Length:
-      - '0'
+      - '20'
       Content-Type:
       - text/html; charset=utf-8
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:17:24 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:31 GMT
 recorded_with: VCR 2.4.0

data/spec/fixtures/cassettes/basic_crud_delete_success.yml

@@ -2,30 +2,32 @@
 http_interactions:
 - request:
     method: delete
-    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage533b1957-d395-4edf-81a6-f38a60f1459c
+    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Content-Type:
       - application/json
       Authorization:
       - ApiKey testuser:key
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 204
       message: NO CONTENT
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:07:51 GMT
+      - Fri, 29 Mar 2013 02:07:15 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Content-Length:
@@ -35,8 +37,8 @@ http_interactions:
       Content-Type:
       - text/html; charset=utf-8
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:07:20 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:31 GMT
 recorded_with: VCR 2.4.0

data/spec/fixtures/cassettes/basic_crud_page_by_name_success.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a?format=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.8.7
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 29 Mar 2013 02:07:15 GMT
+      Server:
+      - Apache/2.2.22 (Ubuntu)
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Methods:
+      - POST,GET,OPTIONS,PUT,DELETE
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - application/vnd.api.v1+json; charset=utf-8
+    body:
+      encoding: UTF-8
+      string: '{"content": "<p>Created!</p>", "id": 364, "map": null, "name": "TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a",
+        "page_tags": null, "resource_uri": "/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a",
+        "slug": "testpage16de81aa-036e-410f-a2c8-c96bddcdf39a"}'
+    http_version: 
+  recorded_at: Fri, 29 Mar 2013 02:06:30 GMT
+recorded_with: VCR 2.4.0

data/spec/fixtures/cassettes/basic_crud_read_fail.yml

@@ -2,51 +2,39 @@
 http_interactions:
 - request:
     method: get
-    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage506da7d1-4cb8-4aa1-bc50-455e7ed8ef02?format=json
+    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a?format=json
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 404
-      message: !binary |-
-        Tk9UIEZPVU5E
+      message: NOT FOUND
     headers:
-      !binary "RGF0ZQ==":
-      - !binary |-
-        U2F0LCAxNiBNYXIgMjAxMyAwMToxNzo1NSBHTVQ=
-      !binary "U2VydmVy":
-      - !binary |-
-        QXBhY2hlLzIuMi4yMiAoVWJ1bnR1KQ==
-      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
-      - !binary |-
-        Kg==
-      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctTWV0aG9kcw==":
-      - !binary |-
-        UE9TVCxHRVQsT1BUSU9OUyxQVVQsREVMRVRF
-      !binary "VmFyeQ==":
-      - !binary |-
-        QWNjZXB0LUVuY29kaW5n
-      !binary "Q29udGVudC1FbmNvZGluZw==":
-      - !binary |-
-        Z3ppcA==
-      !binary "Q29udGVudC1MZW5ndGg=":
-      - !binary |-
-        MjA=
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        dGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04
+      Date:
+      - Fri, 29 Mar 2013 02:07:16 GMT
+      Server:
+      - Apache/2.2.22 (Ubuntu)
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Methods:
+      - POST,GET,OPTIONS,PUT,DELETE
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '20'
+      Content-Type:
+      - text/html; charset=utf-8
     body:
-      encoding: ASCII-8BIT
-      string: !binary |-
-        H4sIAAAAAAAAAwMAAAAAAAAAAAA=
+      encoding: UTF-8
+      string: ''
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:17:24 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:31 GMT
 recorded_with: VCR 2.4.0

data/spec/fixtures/cassettes/basic_crud_read_success.yml

@@ -2,28 +2,28 @@
 http_interactions:
 - request:
     method: get
-    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage533b1957-d395-4edf-81a6-f38a60f1459c?format=json
+    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a?format=json
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:07:50 GMT
+      - Fri, 29 Mar 2013 02:07:14 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Transfer-Encoding:
@@ -31,10 +31,10 @@ http_interactions:
       Content-Type:
       - application/vnd.api.v1+json; charset=utf-8
     body:
-      encoding: US-ASCII
-      string: ! '{"content": "<p>Created!</p>", "id": 254, "map": null, "name": "TestPage533b1957-d395-4edf-81a6-f38a60f1459c",
-        "page_tags": null, "resource_uri": "/api/page/TestPage533b1957-d395-4edf-81a6-f38a60f1459c",
-        "slug": "testpage533b1957-d395-4edf-81a6-f38a60f1459c"}'
+      encoding: UTF-8
+      string: '{"content": "<p>Created!</p>", "id": 364, "map": null, "name": "TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a",
+        "page_tags": null, "resource_uri": "/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a",
+        "slug": "testpage16de81aa-036e-410f-a2c8-c96bddcdf39a"}'
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:07:19 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:30 GMT
 recorded_with: VCR 2.4.0

data/spec/fixtures/cassettes/basic_crud_update_success.yml

@@ -2,30 +2,32 @@
 http_interactions:
 - request:
     method: put
-    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage533b1957-d395-4edf-81a6-f38a60f1459c
+    uri: http://ec2-54-234-151-52.compute-1.amazonaws.com/api/page/TestPage16de81aa-036e-410f-a2c8-c96bddcdf39a
     body:
       encoding: UTF-8
-      string: ! '{"content":"<foo>"}'
+      string: '{"content":"<foo>"}'
     headers:
+      User-Agent:
+      - Faraday v0.8.7
       Content-Type:
       - application/json
       Authorization:
       - ApiKey testuser:key
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
+      - '*/*'
   response:
     status:
       code: 204
       message: NO CONTENT
     headers:
       Date:
-      - Sat, 16 Mar 2013 01:07:50 GMT
+      - Fri, 29 Mar 2013 02:07:15 GMT
       Server:
       - Apache/2.2.22 (Ubuntu)
       Access-Control-Allow-Origin:
-      - ! '*'
+      - '*'
       Access-Control-Allow-Methods:
       - POST,GET,OPTIONS,PUT,DELETE
       Content-Length:
@@ -35,8 +37,8 @@ http_interactions:
       Content-Type:
       - text/html; charset=utf-8
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Sat, 16 Mar 2013 01:07:20 GMT
+  recorded_at: Fri, 29 Mar 2013 02:06:31 GMT
 recorded_with: VCR 2.4.0