zendesk_apps_support 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ad3567f597664ad8ce94c872134e67f2e9bda7
-  data.tar.gz: 2a3f1251f376c3e59f81ec773586aafa559c50f9
+  metadata.gz: 3c3fca724e7f35785484603ca55af83855f552b4
+  data.tar.gz: 0d43d9895907802f2b78e2254b51fd9071cfd81b
 SHA512:
-  metadata.gz: b56372c5c05c92f5e17b213a53fcfabdbdf4533691ad0cab5738eb0c28aa31719ae22f6ba7488432565f537ca39605bec0abd611ce8586588d47b1f1ce62a8e1
-  data.tar.gz: a5661aba54f00f86803467580fc11eb04ccda18d7ef808e72275548e8c55267675d9475b50a9fe68e5b89696e842783be12e75a8cfa8eee52774df9984d9b9c6
+  metadata.gz: ab5d576101b539d7ae1f03a2e8ee3d19dba79ae06ac63c99e81aed69f82892b6223214ca1fe604c19c2b6f6b247616e6969ae0b4954604184412d450356ae69d
+  data.tar.gz: f0055a8a80058d9dc1418c01ead238e9baa10f2ead12599cbaf2e0f1b69b3fe198cc43ee5d1e4814207de159f6434bb1300e21b4f82395618ddf5109587883fb

data/lib/zendesk_apps_support.rb

@@ -1,5 +1,4 @@
 module ZendeskAppsSupport
-  require 'zendesk_apps_support/sass_functions'
   require 'zendesk_apps_support/engine'
 
   autoload :AppFile,                'zendesk_apps_support/app_file'

data/lib/zendesk_apps_support/app_version.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module ZendeskAppsSupport
   # At any point in time, we support up to three versions:
   #  * deprecated -- we will still serve apps targeting the deprecated version,

data/lib/zendesk_apps_support/manifest/no_override_hash.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'json'
-
 module ZendeskAppsSupport
   class Manifest
     class OverrideError < StandardError

data/lib/zendesk_apps_support/package.rb

@@ -155,7 +155,7 @@ module ZendeskAppsSupport
 
     def requirements_json
       return nil unless has_requirements?
-      @requirements ||= read_json('requirements.json')
+      @requirements ||= read_json('requirements.json', object_class: Manifest::NoOverrideHash)
     end
 
     def is_no_template

data/lib/zendesk_apps_support/stylesheet_compiler.rb

@@ -1,4 +1,5 @@
 require 'sass'
+require 'zendesk_apps_support/sass_functions'
 
 module ZendeskAppsSupport
   class StylesheetCompiler

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'uri'
 
 module ZendeskAppsSupport

data/lib/zendesk_apps_support/validations/requirements.rb

@@ -1,6 +1,3 @@
-require 'json'
-require 'json/stream'
-
 module ZendeskAppsSupport
   module Validations
     module Requirements
@@ -8,17 +5,14 @@ module ZendeskAppsSupport
 
       class <<self
         def call(package)
-          requirements_file = package.files.find { |f| f.relative_path == 'requirements.json' }
-
-          return [ValidationError.new(:missing_requirements)] unless requirements_file
+          return [ValidationError.new(:missing_requirements)] unless package.has_file? 'requirements.json'
 
-          requirements_stream = requirements_file.read
-          duplicates = non_unique_type_keys(requirements_stream)
-          unless duplicates.empty?
-            return [ValidationError.new(:duplicate_requirements, duplicate_keys: duplicates.join(', '), count: duplicates.length)]
+          begin
+            requirements = package.requirements_json
+          rescue ZendeskAppsSupport::Manifest::OverrideError => e
+            return [ValidationError.new(:duplicate_requirements, duplicate_keys: e.key, count: 1)]
           end
 
-          requirements = JSON.load(requirements_stream)
           [].tap do |errors|
             errors << invalid_requirements_types(requirements)
             errors << excessive_requirements(requirements)
@@ -86,19 +80,6 @@ module ZendeskAppsSupport
             ValidationError.new(:invalid_requirements_types, invalid_types: invalid_types.join(', '), count: invalid_types.length)
           end
         end
-
-        def non_unique_type_keys(requirements)
-          keys = []
-          duplicates = []
-          parser = JSON::Stream::Parser.new do
-            start_object { keys.push({}) }
-            end_object { keys.pop }
-            key { |k| duplicates.push(k) if keys.last.include? k; keys.last[k] = nil }
-          end
-          parser << requirements
-
-          duplicates
-        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -55,20 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json-stream
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement