gutsy 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5963cf88c6a7dcb3b18da8262c68823c33093fa8
-  data.tar.gz: 2407339cb81184ee02333253302ac6f8af9160be
+  metadata.gz: 261800a946f412cfe776f19051edddf5cfd296e3
+  data.tar.gz: 72dcb72e7f2318575aab5fca18bb5caa9586e9f7
 SHA512:
-  metadata.gz: a968f381f49cf8a8c2af6be6a7d4d96f9568a5462d1a0955c717a55361411ede9e0031c19f50814a6d3e9a4a2f77661421b7e493e5b7af49c2e937269916125a
-  data.tar.gz: 0c3a94133ee40fd29fc7951e98a5cea5352f95b8c3c638c6d3175b495b9c5b34447af2706068c439f2b7aff30364955df4f0366c1704e6d5810739372d2c4cd9
+  metadata.gz: f0cac6d2341bdeec70616f17fb2b6513b55858a40bbc34ba96138f61306ec2d9e682fcfcdc7e96dd680a8ba8a6550f6ef6b1e4c59382458dde25cad3b0698727
+  data.tar.gz: daf9052b6a53e5f89c3f27f12e48e6ddb8c9429ffdfc922c39c60deff823bbfcf3b09633fb405e28dc3e5fcb34d6efd3441a921a810e506ca7de2d7e6f20a545

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Gutsy Changelog
 
+## 1.1.0
+
+* Supports multiple API versions. `namespace_path` configuration replaced the
+  short-lived `resource_namespace` config
+
 ## 1.0.3
 
 * Adds `resource_namespace` configuration

data/examples/config.yml

@@ -15,5 +15,5 @@ gutsy:
     gem_version: 0.2.0                      # Gem version
     versions:
       - name: v1
-        resource_namespace: features          # (optional) additional URL namespacing
+        namespace_path: api/features/v1     # (optional) for additional URL namespacing. Would default to `api/v1` in this example
         schema_path: docs/api/v1/schema.json

data/lib/gutsy/generator/api_version_state.rb

@@ -3,14 +3,14 @@ module Gutsy
     class ApiVersionState
       extend Forwardable
 
-      attr_reader :name, :schema, :schema_path, :resource_namespace
+      attr_reader :name, :schema, :schema_path, :namespace_path
 
       def_delegators :gem_state, :gem_name_pascal, :gem_name_snake, :app_name, :base_url
 
       def initialize(api_version_config, gem_state)
         @name = api_version_config[:name]
         @schema_path = api_version_config[:schema_path]
-        @resource_namespace = api_version_config[:resource_namespace]
+        @namespace_path = api_version_config[:namespace_path] || "api/#{@name.downcase}"
         @gem_state = gem_state
       end
 

data/lib/gutsy/generator/heroics.rb

@@ -27,15 +27,7 @@ module Gutsy
       end
 
       def api_url
-        @api_url ||= "#{api_version_state.base_url}/api/#{resource_namespace}#{api_version_state.name.downcase}"
-      end
-
-      def resource_namespace
-        if api_version_state.resource_namespace
-          "#{api_version_state.resource_namespace}/"
-        else
-          ''
-        end
+        @api_url ||= "#{api_version_state.base_url}/#{api_version_state.namespace_path}"
       end
 
       def client_output_path

data/lib/gutsy/version.rb

@@ -1,3 +1,3 @@
 module Gutsy
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/templates/app_client/lib/app_client.rb.erb

@@ -37,34 +37,6 @@ module <%= gem_name_pascal %>
   end
 
   class Configuration
-    attr_accessor :access_token, :api_key, :api_secret,
-                  :base_url, :options,
-                  :adapter_factory, :api_version
-
-    def options
-      @options ||= {}
-    end
-
-    def api_version
-      @api_version ||= '<%= api_versions.first.name %>'
-    end
-
-    def api_version=(version)
-      options[:url] = "#{base_url}/api/#{resource_namespace}#{version}"
-      @api_version = version
-    end
-
-    def adapter_factory
-      @adapter_factory ||= <%= gem_name_pascal %>.const_get("#{api_version.upcase}")::Adapters::Http
-    end
-
-    def base_url=(url)
-      options[:url] = "#{url}/api/#{resource_namespace}#{api_version}"
-      @base_url = url
-    end
-
-    def resource_namespace
-      '<%= "#{api_versions.first.resource_namespace}/" if api_versions.first.resource_namespace %>'
-    end
+    attr_accessor :access_token, :api_key, :api_secret, :base_url
   end
 end

data/templates/app_client/lib/app_client/api_version/adapter.rb.erb

@@ -18,16 +18,18 @@ module <%= gem_name_pascal %>
           access_token  ||= config.access_token
           api_key       ||= config.api_key
           api_secret    ||= config.api_secret
-          options         = config.options.merge!(options)
+          url             = "#{config.base_url}/<%= namespace_path %>"
 
           # Workaround issue with some TLS setups (haproxy)
           # Prevents :443 being added to hostname for TLS
           Excon.defaults[:omit_default_port] = true
 
+          options = { url: url }.merge(options)
+
           if access_token
-            config.adapter_factory.connect_oauth(access_token, options)
+            Adapters::Http.connect_oauth(access_token, options)
           elsif api_key && api_secret
-            config.adapter_factory.connect(api_secret, options.merge!({
+            Adapters::Http.connect(api_secret, options.merge!({
               user: config.api_key
             }))
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gutsy
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Iora Health
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroics