zendesk_api 1.3.5 → 1.3.7

data/spec/core/spec_helper.rb

@@ -15,6 +15,10 @@ require 'logger'
 require 'stringio'
 require 'multi_json'
 
+class String
+  def encoding_aware?; false; end
+end
+
 require File.join(File.dirname(__FILE__), '..', 'macros', 'resource_macros')
 require File.join(File.dirname(__FILE__), '..', 'fixtures', 'zendesk')
 require File.join(File.dirname(__FILE__), '..', 'fixtures', 'test_resources')
@@ -27,7 +31,29 @@ def client
       if File.exist?(credentials)
         data = YAML.load(File.read(credentials))
         config.username = data["username"]
-        config.password = data["password"]
+
+        if data["token"]
+          config.access_token = data["token"]
+          config.url_based_access_token = true
+        else
+          config.password = data["password"]
+        end
+
+        if data["auth"]
+          config.extend(Module.new do
+            attr_accessor :authorization
+
+            def options
+              super.tap do |options|
+                options[:headers].merge!(
+                  :authorization => "Basic #{Base64.urlsafe_encode64(authorization)}"
+                )
+              end
+            end
+          end)
+          config.authorization = data["auth"]
+        end
+
         config.url = data["url"]
 
         if data["url"].start_with?("http://")

data/spec/live/user_spec.rb

@@ -18,12 +18,14 @@ describe ZendeskAPI::User, :delete_after do
   end
 
   context "passwords", :vcr do
+    let(:password) { client.config.password || ENV['PASSWORD'] }
+
     it "sets the password" do
-      agent.set_password!(:password => client.config.password)
+      agent.set_password!(:password => password)
     end
 
     it "changes the password" do
-      current_user.change_password!(:previous_password => client.config.password, :password => client.config.password)
+      current_user.change_password!(:previous_password => password, :password => password)
     end
   end
 

data/spec/live/user_view_spec.rb

@@ -0,0 +1,16 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::UserView, :delete_after do
+  def valid_attributes
+    {
+      :title => "Overseas gold member",
+      :all   => [
+        { field: "name", operator: "is", value: "abcd" },
+      ]
+    }
+  end
+
+  it_should_be_readable :user_views
+  it_should_be_creatable
+  it_should_be_deletable
+end

data/spec/live/voice/phone_number_spec.rb

@@ -1,3 +1,5 @@
+require 'core/spec_helper'
+
 describe ZendeskAPI::Voice::PhoneNumber, :delete_after do
   def valid_attributes
     {:number => "+14434064759", :country_code => "US", :toll_free => "false"}

data/zendesk_api.gemspec

@@ -22,12 +22,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "vcr"
-  s.add_development_dependency "webmock", "~> 1.9.0"
+  s.add_development_dependency "webmock"
   s.add_development_dependency "yard"
 
-# Optional. Only used for uploads testing.
-#  s.add_development_dependency "actionpack"
-
   s.add_runtime_dependency "faraday", "~> 0.9"
   s.add_runtime_dependency "hashie", ">= 1.2"
   s.add_runtime_dependency "inflection"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.7
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -71,16 +71,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -194,13 +194,8 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- Procfile
 - README.md
 - Rakefile
-- bin/zendesk
-- config.ru
-- config/mongoid.yml
-- config/newrelic.yml
 - lib/zendesk_api.rb
 - lib/zendesk_api/actions.rb
 - lib/zendesk_api/association.rb
@@ -208,10 +203,6 @@ files:
 - lib/zendesk_api/client.rb
 - lib/zendesk_api/collection.rb
 - lib/zendesk_api/configuration.rb
-- lib/zendesk_api/console/base.rb
-- lib/zendesk_api/console/console.rb
-- lib/zendesk_api/console/extensions.rb
-- lib/zendesk_api/console/options.rb
 - lib/zendesk_api/core_ext/inflection.rb
 - lib/zendesk_api/delegator.rb
 - lib/zendesk_api/error.rb
@@ -221,6 +212,7 @@ files:
 - lib/zendesk_api/middleware/request/etag_cache.rb
 - lib/zendesk_api/middleware/request/retry.rb
 - lib/zendesk_api/middleware/request/upload.rb
+- lib/zendesk_api/middleware/request/url_based_access_token.rb
 - lib/zendesk_api/middleware/response/callback.rb
 - lib/zendesk_api/middleware/response/deflate.rb
 - lib/zendesk_api/middleware/response/gzip.rb
@@ -230,174 +222,6 @@ files:
 - lib/zendesk_api/middleware/response/raise_error.rb
 - lib/zendesk_api/resource.rb
 - lib/zendesk_api/resources.rb
-- lib/zendesk_api/server/base.rb
-- lib/zendesk_api/server/docs/account_settings.md
-- lib/zendesk_api/server/docs/activity_stream.md
-- lib/zendesk_api/server/docs/attachments.md
-- lib/zendesk_api/server/docs/autocomplete.md
-- lib/zendesk_api/server/docs/automations.md
-- lib/zendesk_api/server/docs/categories.md
-- lib/zendesk_api/server/docs/changes_roadmap.md
-- lib/zendesk_api/server/docs/custom_roles.md
-- lib/zendesk_api/server/docs/forum_subscriptions.md
-- lib/zendesk_api/server/docs/forums.md
-- lib/zendesk_api/server/docs/group_memberships.md
-- lib/zendesk_api/server/docs/groups.md
-- lib/zendesk_api/server/docs/introduction.md
-- lib/zendesk_api/server/docs/job_statuses.md
-- lib/zendesk_api/server/docs/locales.md
-- lib/zendesk_api/server/docs/macros.md
-- lib/zendesk_api/server/docs/organizations.md
-- lib/zendesk_api/server/docs/problems.md
-- lib/zendesk_api/server/docs/requests.md
-- lib/zendesk_api/server/docs/satisfaction_ratings.md
-- lib/zendesk_api/server/docs/search.md
-- lib/zendesk_api/server/docs/sharing_agreements.md
-- lib/zendesk_api/server/docs/side_loading.md
-- lib/zendesk_api/server/docs/suspended_tickets.md
-- lib/zendesk_api/server/docs/tags.md
-- lib/zendesk_api/server/docs/ticket_audits.md
-- lib/zendesk_api/server/docs/ticket_export.md
-- lib/zendesk_api/server/docs/ticket_fields.md
-- lib/zendesk_api/server/docs/ticket_import.md
-- lib/zendesk_api/server/docs/ticket_metrics.md
-- lib/zendesk_api/server/docs/tickets.md
-- lib/zendesk_api/server/docs/topic_comments.md
-- lib/zendesk_api/server/docs/topic_subscriptions.md
-- lib/zendesk_api/server/docs/topic_votes.md
-- lib/zendesk_api/server/docs/topics.md
-- lib/zendesk_api/server/docs/triggers.md
-- lib/zendesk_api/server/docs/user_identities.md
-- lib/zendesk_api/server/docs/users.md
-- lib/zendesk_api/server/docs/views.md
-- lib/zendesk_api/server/helper.rb
-- lib/zendesk_api/server/html_renderer.rb
-- lib/zendesk_api/server/models/user_request.rb
-- lib/zendesk_api/server/models/zlib_json.rb
-- lib/zendesk_api/server/public/config.rb
-- lib/zendesk_api/server/public/doc/ZendeskAPI.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Ability.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Activity.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Attachment.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Automation.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Bookmark.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/CRMData.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/CRMDataStatus.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Category.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Client.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Collection.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Configuration.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Create.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Create/ClassMethods.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/CreateResource.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/CustomRole.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Data.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/DataResource.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/DeleteResource.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Destroy.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Destroy/ClassMethod.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Error.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Error/ClientError.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Error/NetworkError.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Error/RecordInvalid.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Error/RecordNotFound.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Forum.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/ForumSubscription.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Group.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/GroupMembership.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/JobStatus.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Locale.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Macro.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/MobileDevice.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/OAuthClient.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/OAuthToken.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Organization.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/OrganizationField.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Read.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/ReadResource.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Request.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Request/Comment.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Resource.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Role.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Rule.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/RuleExecution.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/SatisfactionRating.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Save.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Search.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Search/Result.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Setting.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/SharingAgreement.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/SingularResource.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/SuspendedTicket.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Ticket.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Ticket/Audit.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Ticket/Comment.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Ticket/Tag.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/TicketField.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/TicketMetric.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Topic.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Topic/TopicComment.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Topic/TopicVote.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/TopicComment.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/TopicSubscription.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Trigger.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Update.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Update/ClassMethod.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/UpdateResource.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Upload.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/User.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/User/Identity.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/User/TopicComment.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/UserField.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/Verbs.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/View.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/ViewCount.html
-- lib/zendesk_api/server/public/doc/ZendeskAPI/ViewRow.html
-- lib/zendesk_api/server/public/doc/_index.html
-- lib/zendesk_api/server/public/doc/class_list.html
-- lib/zendesk_api/server/public/doc/css/common.css
-- lib/zendesk_api/server/public/doc/css/full_list.css
-- lib/zendesk_api/server/public/doc/css/style.css
-- lib/zendesk_api/server/public/doc/file.Readme.html
-- lib/zendesk_api/server/public/doc/file_list.html
-- lib/zendesk_api/server/public/doc/frames.html
-- lib/zendesk_api/server/public/doc/index.html
-- lib/zendesk_api/server/public/doc/js/app.js
-- lib/zendesk_api/server/public/doc/js/full_list.js
-- lib/zendesk_api/server/public/doc/js/jquery.js
-- lib/zendesk_api/server/public/doc/method_list.html
-- lib/zendesk_api/server/public/doc/top-level-namespace.html
-- lib/zendesk_api/server/public/favicon.ico
-- lib/zendesk_api/server/public/images/glyphicons-halflings-white.png
-- lib/zendesk_api/server/public/images/glyphicons-halflings.png
-- lib/zendesk_api/server/public/images/spinner.gif
-- lib/zendesk_api/server/public/images/zendesk_developers_bg.png
-- lib/zendesk_api/server/public/images/zendesk_developers_header.png
-- lib/zendesk_api/server/public/javascripts/application.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-alert.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-button.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-carousel.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-collapse.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-dropdown.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-modal.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-popover.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-scrollspy.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-tab.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-tooltip.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-transition.js
-- lib/zendesk_api/server/public/javascripts/bootstrap-typeahead.js
-- lib/zendesk_api/server/public/sass/screen.scss
-- lib/zendesk_api/server/public/sass/styles.scss
-- lib/zendesk_api/server/public/stylesheets/developer.screen.css
-- lib/zendesk_api/server/public/stylesheets/screen.css
-- lib/zendesk_api/server/public/stylesheets/styles.css
-- lib/zendesk_api/server/templates/footer.haml
-- lib/zendesk_api/server/templates/header.haml
-- lib/zendesk_api/server/templates/index.haml
-- lib/zendesk_api/server/templates/layout.haml
-- lib/zendesk_api/server/templates/param.haml
-- lib/zendesk_api/server/templates/search.haml
-- lib/zendesk_api/server/templates/sidebar.haml
 - lib/zendesk_api/sideloading.rb
 - lib/zendesk_api/track_changes.rb
 - lib/zendesk_api/trackie.rb
@@ -481,13 +305,10 @@ files:
 - spec/live/upload_spec.rb
 - spec/live/user_field_spec.rb
 - spec/live/user_spec.rb
+- spec/live/user_view_spec.rb
 - spec/live/view_spec.rb
 - spec/live/voice/phone_number_spec.rb
 - spec/macros/resource_macros.rb
-- spec/server/app_spec.rb
-- spec/server/helper_spec.rb
-- spec/server/html_renderer_spec.rb
-- spec/server/spec_helper.rb
 - util/resource_handler.rb
 - util/verb_handler.rb
 - zendesk_api.gemspec
@@ -594,11 +415,8 @@ test_files:
 - spec/live/upload_spec.rb
 - spec/live/user_field_spec.rb
 - spec/live/user_spec.rb
+- spec/live/user_view_spec.rb
 - spec/live/view_spec.rb
 - spec/live/voice/phone_number_spec.rb
 - spec/macros/resource_macros.rb
-- spec/server/app_spec.rb
-- spec/server/helper_spec.rb
-- spec/server/html_renderer_spec.rb
-- spec/server/spec_helper.rb
 has_rdoc: 

data/Procfile

@@ -1 +0,0 @@
-web: bundle exec rackup config.ru -p $PORT

data/bin/zendesk

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-require 'bundler'
-
-ARGV[0] ||= "console"
-
-if %w(s server).include?(ARGV[0])
-  Bundler.setup(:default, :server)
-
-  require 'optparse'
-  require 'zendesk_api'
-  require 'zendesk_api/server/base'
-
-  OptionParser.new do |op|
-    op.banner = "Usage: zendesk s[erver] [options]"
-
-    op.on('-e env', 'Set the environment') {|val| ZendeskAPI::Server::App.set(:environment, val.to_sym)}
-    op.on('-p port', 'Bind to a port') {|val| ZendeskAPI::Server::App.set(:port, val.to_i)}
-    op.on('-o addr', 'Bind to a location') {|val| ZendeskAPI::Server::App.set(:bind, val)}
-  end.parse!(ARGV.dup)
-
-  ZendeskAPI::Server::App.run!
-else
-  Bundler.setup(:default, :console)
-
-  require 'zendesk_api'
-  require 'zendesk_api/console/base'
-end

data/config.ru

@@ -1,6 +0,0 @@
-require 'rack/ssl-enforcer'
-require 'zendesk_api'
-require 'zendesk_api/server/base'
-
-use Rack::SslEnforcer if ZendeskAPI::Server::App.production?
-run ZendeskAPI::Server::App

data/config/mongoid.yml

@@ -1,81 +0,0 @@
-development: &defaults
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
-    default: &default_session
-      # Defines the name of the default database that Mongoid can connect to.
-      # (required).
-      database: zendesk_api_development
-      # Provides the hosts the default session can connect to. Must be an array
-      # of host:port pairs. (required)
-      hosts:
-        - localhost:27017
-      options:
-        # Change whether the session persists in safe mode by default.
-        # (default: false)
-        # safe: false
-
-        # Change the default consistency model to :eventual or :strong.
-        # :eventual will send reads to secondaries, :strong sends everything
-        # to master. (default: :eventual)
-        # consistency: :strong
-  # Configure Mongoid specific options. (optional)
-  options:
-    # Configuration for whether or not to allow access to fields that do
-    # not have a field definition on the model. (default: true)
-    # allow_dynamic_fields: true
-
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: false
-
-    # Includes the root model name in json serialization. (default: false)
-    # include_root_in_json: false
-
-    # Include the _type field in serializaion. (default: false)
-    # include_type_for_serialization: false
-
-    # Preload all models in development, needed when models use
-    # inheritance. (default: false)
-    preload_models: true
-
-    # Protect id and type from mass assignment. (default: true)
-    # protect_sensitive_fields: true
-
-    # Raise an error when performing a #find and the document is not found.
-    # (default: true)
-    raise_not_found_error: false
-
-    # Raise an error when defining a scope with the same name as an
-    # existing method. (default: false)
-    # scope_overwrite_exception: false
-
-    # Skip the database version check, used when connecting to a db without
-    # admin access. (default: false)
-    # skip_version_check: false
-
-    # User Active Support's time zone in conversions. (default: true)
-    # use_activesupport_time_zone: true
-
-    # Ensure all times are UTC in the app side. (default: false)
-    # use_utc: false
-
-test:
-  <<: *defaults
-  sessions:
-    default:
-      <<: *default_session
-      database: zendesk_api_test
-
-<% if ENV['MONGOLAB_URI'] %>
-  <% uri = URI.parse(ENV['MONGOLAB_URI']) %>
-production:
-  <<: *defaults
-  sessions:
-    default:
-      <<: *default_session
-      database: <%= uri.path.sub('/','') %>
-      username: <%= uri.user %>
-      password: <%= uri.password %>
-      hosts:
-        - <%= uri.host %>:<%= uri.port %>
-<% end %>