the86-client 0.0.5 → 0.0.6

data/lib/the86-client.rb

@@ -6,6 +6,7 @@
 
   resource
   resource_collection
+  can_be_hidden
   access_token
   user
   site

data/lib/the86-client/can_be_hidden.rb

@@ -0,0 +1,21 @@
+module The86::Client
+  module CanBeHidden
+
+    def hide(attributes = {})
+      set_hidden(true, attributes)
+    end
+
+    def unhide(attributes = {})
+      set_hidden(false, attributes)
+    end
+
+    private
+
+    def set_hidden(hidden, attributes)
+      self.oauth_token = attributes[:oauth_token]
+      key = oauth_token ? :hidden_by_user : :hidden_by_site
+      patch(key => hidden)
+    end
+
+  end
+end

data/lib/the86-client/conversation.rb

@@ -10,5 +10,7 @@ module The86::Client
     belongs_to :site
     has_many :posts, ->{ Post }
 
+    include CanBeHidden
+
   end
 end

data/lib/the86-client/post.rb

@@ -12,6 +12,8 @@ module The86::Client
     has_one :user, ->{ User }
     has_one :in_reply_to, ->{ Post }
 
+    include CanBeHidden
+
     def reply?
       !!in_reply_to_id
     end
@@ -22,21 +24,5 @@ module The86::Client
       )
     end
 
-    def hide(attributes = {})
-      set_hidden(true, attributes)
-    end
-
-    def unhide(attributes = {})
-      set_hidden(false, attributes)
-    end
-
-    private
-
-    def set_hidden(hidden, attributes)
-      self.oauth_token = attributes[:oauth_token]
-      key = oauth_token ? :hidden_by_user : :hidden_by_site
-      patch(key => hidden)
-    end
-
   end
 end

data/lib/the86-client/version.rb

@@ -1,5 +1,5 @@
 module The86
   module Client
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/spec/conversations_spec.rb

@@ -4,6 +4,10 @@ module The86::Client
 
   describe "Conversations" do
 
+    let(:site) { The86::Client.site("test") }
+    let(:site_url) { "https://example.org/api/v1/sites/test" }
+    let(:conversations_url) { "#{site_url}/conversations" }
+
     describe "listing conversations" do
       it "returns empty array for site without conversations" do
         expect_get_conversations(response_body: [])
@@ -24,7 +28,7 @@ module The86::Client
     describe "creating conversations" do
       it "posts and returns a conversation with the first post content" do
         expect_request(
-          url: "https://example.org/api/v1/sites/test/conversations",
+          url: conversations_url,
           method: :post,
           status: 201,
           request_body: {content: "A new conversation."},
@@ -58,13 +62,45 @@ module The86::Client
       end
     end
 
-    def site
-      The86::Client.site("test")
+    describe "hiding and unhiding a conversation" do
+      let(:conversation) { site.conversations.build(id: 2) }
+      let(:oauth_url) { "#{conversations_url}/2" }
+      let(:basic_auth_url) { oauth_url.sub("//", "//user:pass@") }
+      let(:headers) { Hash.new }
+      def expectation(url, hidden_param)
+        {
+          url: url,
+          method: :patch,
+          status: 200,
+          request_body: hidden_param,
+          request_headers: headers,
+          response_body: {id: 2}.merge(hidden_param),
+        }
+      end
+      describe "without oauth" do
+        it "patches the conversation as hidden_by_site when no oauth_token" do
+          expect_request(expectation(basic_auth_url, hidden_by_site: true))
+          conversation.hide
+
+          expect_request(expectation(basic_auth_url, hidden_by_site: false))
+          conversation.unhide
+        end
+      end
+      describe "with oauth" do
+        let(:headers) { {"Authorization" => "Bearer secret"} }
+        it "patches the conversation as hidden_by_user when oauth_token present" do
+          expect_request(expectation(oauth_url, hidden_by_user: true))
+          conversation.hide(oauth_token: "secret")
+
+          expect_request(expectation(oauth_url, hidden_by_user: false))
+          conversation.unhide(oauth_token: "secret")
+        end
+      end
     end
 
     def expect_get_conversations(options)
       expect_request({
-        url: "https://user:pass@example.org/api/v1/sites/test/conversations",
+        url: conversations_url.sub("//", "//user:pass@"),
         method: :get,
         status: 200,
       }.merge(options))

data/spec/posts_spec.rb

@@ -4,10 +4,19 @@ module The86::Client
 
   describe Post do
 
+    let(:site) { The86::Client.site("test") }
+    let(:conversation) { Conversation.new(id: 32, site: site) }
+    let(:original_post) do
+      Post.new(id: 64, conversation: conversation, content: "Hello!")
+    end
+    let(:site_url) { "https://example.org/api/v1/sites/test" }
+    let(:conversation_url) { "#{site_url}/conversations/32" }
+    let(:posts_url) { "#{conversation_url}/posts" }
+
     describe "replying to a post" do
       it "sends in_reply_to_id" do
         expect_request(
-          url: "https://example.org/api/v1/sites/test/conversations/32/posts",
+          url: posts_url,
           method: :post,
           status: 201,
           request_body: {content: "Hi!", in_reply_to_id: 64},
@@ -37,7 +46,7 @@ module The86::Client
     describe "following up to a conversation" do
       it "creates new Post in the Conversation" do
         expect_request(
-          url: "https://example.org/api/v1/sites/test/conversations/32/posts",
+          url: posts_url,
           method: :post,
           status: 201,
           request_body: {content: "+1"},
@@ -54,68 +63,40 @@ module The86::Client
       end
     end
 
-    describe "#hide" do
+    describe "hiding and unhiding posts" do
       let(:post) { conversation.posts.build(id: 2) }
-      let(:url) { "https://example.org/api/v1/sites/test/conversations/32/posts/2" }
-      it "patches the post as hidden_by_site when no oauth_token" do
-        expect_request(
-          url: url.sub("https://", "https://user:pass@"),
-          method: :patch,
-          status: 200,
-          request_body: {hidden_by_site: true},
-          response_body: {id: 2, hidden_by_site: true},
-        )
-        post.hide
-      end
-      it "patches the post as hidden_by_user when oauth_token present" do
-        expect_request(
+      let(:oauth_url) { "#{posts_url}/2" }
+      let(:basic_auth_url) { oauth_url.sub("//", "//user:pass@") }
+      let(:headers) { Hash.new }
+      def expectation(url, hidden_param)
+        {
           url: url,
           method: :patch,
           status: 200,
-          request_body: {hidden_by_user: true},
-          request_headers: {"Authorization" => "Bearer secret"},
-          response_body: {id: 2, hidden_by_site: true},
-        )
-        post.hide(oauth_token: "secret")
+          request_body: hidden_param,
+          request_headers: headers,
+          response_body: {id: 2}.merge(hidden_param),
+        }
       end
-    end
+      describe "without oauth" do
+        it "patches the post as hidden_by_site when no oauth_token" do
+          expect_request(expectation(basic_auth_url, hidden_by_site: true))
+          post.hide
 
-    describe "#unhide" do
-      let(:post) { conversation.posts.build(id: 2) }
-      let(:url) { "https://example.org/api/v1/sites/test/conversations/32/posts/2" }
-      it "patches the post as hidden_by_site when no oauth_token" do
-        expect_request(
-          url: url.sub("https://", "https://user:pass@"),
-          method: :patch,
-          status: 200,
-          request_body: {hidden_by_site: false},
-          response_body: {id: 2, hidden_by_site: false},
-        )
-        post.unhide
-      end
-      it "patches the post as hidden_by_user when oauth_token present" do
-        expect_request(
-          url: url,
-          method: :patch,
-          status: 200,
-          request_body: {hidden_by_user: false},
-          request_headers: {"Authorization" => "Bearer secret"},
-          response_body: {id: 2, hidden_by_site: false},
-        )
-        post.unhide(oauth_token: "secret")
+          expect_request(expectation(basic_auth_url, hidden_by_site: false))
+          post.unhide
+        end
       end
-    end
-
-    def original_post
-      Post.new(id: 64, conversation: conversation, content: "Hello!")
-    end
+      describe "with oauth" do
+        let(:headers) { {"Authorization" => "Bearer secret"} }
+        it "patches the post as hidden_by_user when oauth_token present" do
+          expect_request(expectation(oauth_url, hidden_by_user: true))
+          post.hide(oauth_token: "secret")
 
-    def conversation
-      Conversation.new(id: 32, site: site)
-    end
-
-    def site
-      The86::Client.site("test")
+          expect_request(expectation(oauth_url, hidden_by_user: false))
+          post.unhide(oauth_token: "secret")
+        end
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the86-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -203,6 +203,7 @@ files:
 - lib/the86-client.rb
 - lib/the86-client/access_token.rb
 - lib/the86-client/active_model.rb
+- lib/the86-client/can_be_hidden.rb
 - lib/the86-client/connection.rb
 - lib/the86-client/conversation.rb
 - lib/the86-client/errors.rb