zendesk2 1.9.0 → 1.10.0

data/lib/zendesk2/users.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Zendesk2::Users
   include Zendesk2::Collection
 
@@ -7,13 +8,13 @@ class Zendesk2::Users
   model Zendesk2::User
 
   self.collection_method = :get_users
-  self.collection_root   = "users"
+  self.collection_root   = 'users'
   self.model_method      = :get_user
-  self.model_root        = "user"
-  self.search_type       = "user"
+  self.model_root        = 'user'
+  self.search_type       = 'user'
   self.search_request    = :search_user
 
   def current
-    new(cistern.get_current_user.body["user"])
+    new(cistern.get_current_user.body['user'])
   end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Zendesk2
-  VERSION = "1.9.0"
+  VERSION = '1.10.0'
 end

data/lib/zendesk2/view.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Zendesk2::View
   include Zendesk2::Model
 
@@ -24,32 +25,42 @@ class Zendesk2::View
   attribute :updated_at, type: :time
 
   def save!
+    new_record? ? create : update
+  end
+
+  def create
     requires :execution, :title
 
-    params = {
-      "title"  => self.title,
-      "active" => self.active,
-      "output" => Cistern::Hash.slice(self.execution, "sort_by", "sort_order", "group_by", "group_order", "columns")
-    }.merge(Cistern::Hash.slice(self.conditions, "any", "all"))
+    data = cistern.create_view('view' => request_data).body
+    merge_attributes(data['view'])
+  end
 
-    data = if new_record?
-             cistern.create_view("view" => params)
-           else
-             cistern.create_view("view" => params)
-           end.body
+  def update
+    requires :identity
 
-    merge_attributes(data["view"])
+    data = cistern.update_view('view' => request_data.merge('id' => identity)).body
+    merge_attributes(data['view'])
   end
 
   def tickets
     requires :identity
 
-    cistern.tickets(view_id: self.identity)
+    cistern.tickets(view_id: identity)
   end
 
   def destroy!
     requires :identity
 
-    cistern.destroy_view("view" => {"id" => self.identity})
+    cistern.destroy_view('view' => { 'id' => identity })
+  end
+
+  protected
+
+  def request_data
+    Cistern::Hash.slice(conditions, 'any', 'all').merge(
+      'title' => title,
+      'active' => active,
+      'output' => Cistern::Hash.slice(execution, 'sort_by', 'sort_order', 'group_by', 'group_order', 'columns')
+    )
   end
 end

data/lib/zendesk2/views.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Zendesk2::Views
   include Zendesk2::Collection
 
@@ -7,7 +8,7 @@ class Zendesk2::Views
   model Zendesk2::View
 
   self.collection_method = :get_views
-  self.collection_root   = "views"
+  self.collection_root   = 'views'
   self.model_method      = :get_view
-  self.model_root        = "view"
+  self.model_root        = 'view'
 end

data/spec/categories_spec.rb

@@ -1,51 +1,51 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe "categories" do
+describe 'categories' do
   let(:client) { create_client }
 
-  include_examples "zendesk#resource", {
-    :collection    => lambda { client.categories },
-    :create_params => lambda { { name: mock_uuid } },
-    :update_params => lambda { { name: mock_uuid } },
-  }
+  include_examples 'zendesk#resource', collection: -> { client.categories },
+                                       create_params: -> { { name: mock_uuid } },
+                                       update_params: -> { { name: mock_uuid } }
 
-  context "#create_category" do
-    it "should correctly respond" do
-      body = { "category" => {"name" => (name = mock_uuid)} }
+  context '#create_category' do
+    it 'should correctly respond' do
+      body = { 'category' => { 'name' => (name = mock_uuid) } }
 
       response = client.create_category(body)
 
       expect(response.status).to eq(201)
-      expect(response.env[:url].path).to eq("/api/v2/categories.json")
+      expect(response.env[:url].path).to eq('/api/v2/categories.json')
       expect(response.env[:method]).to eq(:post)
       expect(client.last_request).to match(body)
-      expect(response.env[:body]["category"]).to match(
+      expect(response.env[:body]['category']).to match(
         a_hash_including(
-          "name" => name,
-        ))
+          'name' => name
+        )
+      )
     end
   end
 
-  context "with a category" do
+  context 'with a category' do
     let!(:category) { client.categories.create!(name: mock_uuid) }
 
-    context "#destroy_category" do
-      it "should require a valid category" do
-        expect {
+    context '#destroy_category' do
+      it 'should require a valid category' do
+        expect do
           client.destroy_category(
-            "category" => {
-              "id" => 999999999,
+            'category' => {
+              'id' => 999_999_999,
             }
           )
-        }.to raise_error(Zendesk2::Error) { |e|
+        end.to raise_error(Zendesk2::Error) { |e|
           expect(e.response[:status]).to eq(404)
         }
       end
 
-      it "should correctly respond" do
+      it 'should correctly respond' do
         response = client.destroy_category(
-          "category" => {
-            "id" => category.id,
+          'category' => {
+            'id' => category.id,
           }
         )
 
@@ -57,39 +57,40 @@ describe "categories" do
       end
     end
 
-    context "#get_categories" do
-      it "should correctly respond" do
+    context '#get_categories' do
+      it 'should correctly respond' do
         response = client.get_categories
 
         expect(response.status).to eq(200)
-        expect(response.env[:url].path).to eq("/api/v2/categories.json")
+        expect(response.env[:url].path).to eq('/api/v2/categories.json')
         expect(response.env[:method]).to eq(:get)
         expect(client.last_request).to eq(nil)
         skip unless Zendesk2.mocking?
-        expect(response.env[:body]["categories"]).to match([
-          a_hash_including(
-            "id"   => category.id,
-          )])
+        expect(response.env[:body]['categories']).to match([
+                                                             a_hash_including(
+                                                               'id' => category.id
+                                                             ),
+                                                           ])
       end
     end
 
-    context "#get_category" do
-      it "should require a valid category" do
-        expect {
+    context '#get_category' do
+      it 'should require a valid category' do
+        expect do
           client.get_category(
-            "category" => {
-              "id" => 999999999,
+            'category' => {
+              'id' => 999_999_999,
             }
           )
-        }.to raise_error(Zendesk2::Error) { |e|
+        end.to raise_error(Zendesk2::Error) { |e|
           expect(e.response[:status]).to eq(404)
         }
       end
 
-      it "should correctly respond" do
+      it 'should correctly respond' do
         response = client.get_category(
-          "category" => {
-            "id" => category.id,
+          'category' => {
+            'id' => category.id,
           }
         )
 
@@ -97,46 +98,48 @@ describe "categories" do
         expect(response.env[:url].path).to eq("/api/v2/categories/#{category.id}.json")
         expect(response.env[:method]).to eq(:get)
         expect(client.last_request).to eq(nil)
-        expect(response.env[:body]["category"]).to match(
+        expect(response.env[:body]['category']).to match(
           a_hash_including(
-            "id"   => category.id,
-            "url"  => response.env[:url].to_s,
-          ))
+            'id'   => category.id,
+            'url'  => response.env[:url].to_s
+          )
+        )
       end
     end
 
-    context "#update_category" do
-      it "should require a valid category" do
-        expect {
+    context '#update_category' do
+      it 'should require a valid category' do
+        expect do
           client.update_category(
-            "category" => {
-              "id"   => 999999999,
-              "name" => mock_uuid,
+            'category' => {
+              'id'   => 999_999_999,
+              'name' => mock_uuid,
             }
           )
-        }.to raise_error(Zendesk2::Error) { |e|
+        end.to raise_error(Zendesk2::Error) { |e|
           expect(e.response[:status]).to eq(404)
         }
       end
 
-      it "should correctly respond" do
+      it 'should correctly respond' do
         response = client.update_category(
-          "category" => {
-            "id"   => category.id,
-            "name" => (name = mock_uuid),
+          'category' => {
+            'id'   => category.id,
+            'name' => (name = mock_uuid),
           }
         )
 
         expect(response.status).to eq(200)
         expect(response.env[:url].path).to eq("/api/v2/categories/#{category.id}.json")
         expect(response.env[:method]).to eq(:put)
-        expect(client.last_request).to eq("category" => {"name" => name})
-        expect(response.env[:body]["category"]).to match(
+        expect(client.last_request).to eq('category' => { 'name' => name })
+        expect(response.env[:body]['category']).to match(
           a_hash_including(
-            "id"   => category.id,
-            "url"  => response.env[:url].to_s,
-            "name" => name,
-          ))
+            'id'   => category.id,
+            'url'  => response.env[:url].to_s,
+            'name' => name
+          )
+        )
       end
     end
   end

data/spec/client_spec.rb

@@ -1,12 +1,13 @@
-#encoding: utf-8
+# encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Zendesk2 do
-  context "when mocking", mock_only: true do
+  context 'when mocking', mock_only: true do
     # this used to cause user creation conflicts
-    it "allows the client to be intialized more than once" do
-      Zendesk2.new(username: "steve@example.org", url: "http://example.org")
-      Zendesk2.new(username: "steve@example.org", url: "http://example.org")
+    it 'allows the client to be intialized more than once' do
+      Zendesk2.new(username: 'steve@example.org', url: 'http://example.org')
+      Zendesk2.new(username: 'steve@example.org', url: 'http://example.org')
     end
   end
 end

data/spec/forums_spec.rb

@@ -1,52 +1,52 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe "forums" do
+describe 'forums' do
   let(:client) { create_client }
 
-  include_examples "zendesk#resource", {
-    :collection      => lambda { client.forums },
-    :create_params   => lambda { { name: mock_uuid } },
-    :update_params   => lambda { { name: mock_uuid } },
-    :delayed_destroy => true,
-  }
+  include_examples 'zendesk#resource', collection: -> { client.forums },
+                                       create_params: -> { { name: mock_uuid } },
+                                       update_params: -> { { name: mock_uuid } },
+                                       delayed_destroy: true
 
-  context "#create_forum" do
-    it "should correctly respond" do
-      body = { "forum" => {"name" => (name = mock_uuid)} }
+  context '#create_forum' do
+    it 'should correctly respond' do
+      body = { 'forum' => { 'name' => (name = mock_uuid) } }
 
       response = client.create_forum(body)
 
       expect(response.status).to eq(201)
-      expect(response.env[:url].path).to eq("/api/v2/forums.json")
+      expect(response.env[:url].path).to eq('/api/v2/forums.json')
       expect(response.env[:method]).to eq(:post)
       expect(client.last_request).to match(body)
-      expect(response.env[:body]["forum"]).to match(
+      expect(response.env[:body]['forum']).to match(
         a_hash_including(
-          "name" => name,
-        ))
+          'name' => name
+        )
+      )
     end
   end
 
-  context "with a forum" do
+  context 'with a forum' do
     let!(:forum) { client.forums.create!(name: mock_uuid) }
 
-    context "#destroy_forum" do
-      it "should require a valid forum" do
-        expect {
+    context '#destroy_forum' do
+      it 'should require a valid forum' do
+        expect do
           client.destroy_forum(
-            "forum" => {
-              "id" => 999999999,
+            'forum' => {
+              'id' => 999_999_999,
             }
           )
-        }.to raise_error(Zendesk2::Error) { |e|
+        end.to raise_error(Zendesk2::Error) { |e|
           expect(e.response[:status]).to eq(404)
         }
       end
 
-      it "should correctly respond" do
+      it 'should correctly respond' do
         response = client.destroy_forum(
-          "forum" => {
-            "id" => forum.id,
+          'forum' => {
+            'id' => forum.id,
           }
         )
 
@@ -58,39 +58,40 @@ describe "forums" do
       end
     end
 
-    context "#get_forums" do
-      it "should correctly respond" do
+    context '#get_forums' do
+      it 'should correctly respond' do
         response = client.get_forums
 
         expect(response.status).to eq(200)
-        expect(response.env[:url].path).to eq("/api/v2/forums.json")
+        expect(response.env[:url].path).to eq('/api/v2/forums.json')
         expect(response.env[:method]).to eq(:get)
         expect(client.last_request).to eq(nil)
         skip unless Zendesk2.mocking?
-        expect(response.env[:body]["forums"]).to match([
-          a_hash_including(
-            "id"   => forum.id,
-          )])
+        expect(response.env[:body]['forums']).to match([
+                                                         a_hash_including(
+                                                           'id' => forum.id
+                                                         ),
+                                                       ])
       end
     end
 
-    context "#get_forum" do
-      it "should require a valid forum" do
-        expect {
+    context '#get_forum' do
+      it 'should require a valid forum' do
+        expect do
           client.get_forum(
-            "forum" => {
-              "id" => 999999999,
+            'forum' => {
+              'id' => 999_999_999,
             }
           )
-        }.to raise_error(Zendesk2::Error) { |e|
+        end.to raise_error(Zendesk2::Error) { |e|
           expect(e.response[:status]).to eq(404)
         }
       end
 
-      it "should correctly respond" do
+      it 'should correctly respond' do
         response = client.get_forum(
-          "forum" => {
-            "id" => forum.id,
+          'forum' => {
+            'id' => forum.id,
           }
         )
 
@@ -98,46 +99,48 @@ describe "forums" do
         expect(response.env[:url].path).to eq("/api/v2/forums/#{forum.id}.json")
         expect(response.env[:method]).to eq(:get)
         expect(client.last_request).to eq(nil)
-        expect(response.env[:body]["forum"]).to match(
+        expect(response.env[:body]['forum']).to match(
           a_hash_including(
-            "id"   => forum.id,
-            "url"  => response.env[:url].to_s,
-          ))
+            'id'   => forum.id,
+            'url'  => response.env[:url].to_s
+          )
+        )
       end
     end
 
-    context "#update_forum" do
-      it "should require a valid forum" do
-        expect {
+    context '#update_forum' do
+      it 'should require a valid forum' do
+        expect do
           client.update_forum(
-            "forum" => {
-              "id"   => 999999999,
-              "name" => mock_uuid,
+            'forum' => {
+              'id'   => 999_999_999,
+              'name' => mock_uuid,
             }
           )
-        }.to raise_error(Zendesk2::Error) { |e|
+        end.to raise_error(Zendesk2::Error) { |e|
           expect(e.response[:status]).to eq(404)
         }
       end
 
-      it "should correctly respond" do
+      it 'should correctly respond' do
         response = client.update_forum(
-          "forum" => {
-            "id"   => forum.id,
-            "name" => (name = mock_uuid),
+          'forum' => {
+            'id'   => forum.id,
+            'name' => (name = mock_uuid),
           }
         )
 
         expect(response.status).to eq(200)
         expect(response.env[:url].path).to eq("/api/v2/forums/#{forum.id}.json")
         expect(response.env[:method]).to eq(:put)
-        expect(client.last_request).to eq("forum" => {"name" => name})
-        expect(response.env[:body]["forum"]).to match(
+        expect(client.last_request).to eq('forum' => { 'name' => name })
+        expect(response.env[:body]['forum']).to match(
           a_hash_including(
-            "id"   => forum.id,
-            "url"  => response.env[:url].to_s,
-            "name" => name,
-          ))
+            'id'   => forum.id,
+            'url'  => response.env[:url].to_s,
+            'name' => name
+          )
+        )
       end
     end
   end