praxis 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c55f5d3363aed4bc5157e0064e35b399e1bcf20
-  data.tar.gz: 2bf66b28b0d80ea8e57de43b69dc5c76e7e504ea
+  metadata.gz: 56c2fbb99665a6c0af6430bb7975fd82f469e58f
+  data.tar.gz: 8b8c200026e69903049082b28dc43cceaf2e8365
 SHA512:
-  metadata.gz: 32fdd9a038fa46b129d1da10a9edee94d032c2ff7ce14889cf45f162b57e3d2aaf4d3ecc4f5827ddb84a2bc33490259293a4b84a3905cd2dd269f1fb0a2a29c2
-  data.tar.gz: 04b7c664a294d7766e65640855112fb80455f6ba3fe7c840bb5b70e5de4d8bcf13b58f8cefaf151ea3787644185c4e20070f5f5cb2edcf2c58d78822ca2fef63
+  metadata.gz: cd790aa9cb59f989310a1977e2b0584717973ed2ab4090a11643cdeb514227c9c504f6260214839e00ccb472170bf507e9de942129c95ce7f25ea913c71624b0
+  data.tar.gz: e4746483a28b0e48e39de2ee7b4dec0aaaa06714dc20112a9f306ce0141af1a525e60bc23a09765d5e124a30fd3263bf2c876f4c54f47f5c4482a9d57105c236

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## next
 
+## 0.18.1
+
+* Fix Doc Browser regression, which would not show the schema in the Resource Definition home page.
+
 ## 0.18.0
 
 * Added `display_name` DSL to `ResourceDefinition` and `MediaType`

data/lib/api_browser/app/js/controllers/type.js

@@ -1,5 +1,5 @@
 app.controller('TypeCtrl', function ($scope, $stateParams, Documentation, normalizeAttributes) {
-  $scope.typeId = $stateParams.type || $scope.controller.media_type;
+  $scope.typeId = $stateParams.type || $scope.controller.media_type.id;
   $scope.apiVersion = $stateParams.version;
   $scope.controllers = [];
   $scope.views = [];

data/lib/api_browser/app/views/controller.html

@@ -42,9 +42,13 @@
     </div>
     </div>
   </div>
-  <div ng-if="controller.media_type" ng-controller="TypeCtrl">
+  <div ng-if="controller.media_type && controller.media_type.family != 'string'" ng-controller="TypeCtrl">
     <ng-include src="'views/type/details.html'" />
   </div>
+  <div ng-if="controller.media_type && controller.media_type.family == 'string'">
+    <h2>Schema</h2>
+    <p ><b>Internet Media-type: {{ controller.media_type.identifier }}</b></p>
+  </div>
   <h1>Actions</h1>
   <div ng-controller="ActionCtrl" ng-repeat="action in controller.actions">
     <div id="action-{{action.name}}" ng-include="'views/action.html'"></div>

data/lib/api_browser/app/views/type/details.html

@@ -1,7 +1,7 @@
 <div class="row" ng-if="type">
   <div class="col-lg-12">
     <h2>Schema</h2>
-    <p ng-if="type.identifier"><b>Media-type: {{ type.identifier }}</b></p>
+    <p ng-if="type.identifier"><b>Media-type identifier: {{ type.identifier }}</b></p>
     <div ng-if="type.description" ng-bind-html="type.description | markdown"></div>
 
     <attribute-table attributes="type.attributes"></attribute-table>

data/lib/praxis/simple_media_type.rb

@@ -15,7 +15,7 @@ module Praxis
     end
 
     def describe(shallow=true)
-      {identifier: identifier}
+      {name: name, family: "string", id: id, identifier: identifier}
     end
 
   end

data/lib/praxis/version.rb

@@ -1,3 +1,3 @@
 module Praxis
-  VERSION = '0.18.0'
+  VERSION = '0.18.1'
 end

data/spec/praxis/response_definition_spec.rb

@@ -522,7 +522,7 @@ describe Praxis::ResponseDefinition do
         subject(:examples) { payload[:examples] }
         its(['json', :content_type]) { 'application/vnd.acme.instance+json '}
         its(['xml', :content_type]) { 'application/vnd.acme.instance+xml' }
-        
+
         it 'properly encodes the example bodies' do
           json = Praxis::Application.instance.handlers['json'].parse(examples['json'][:body])
           xml = Praxis::Application.instance.handlers['xml'].parse(examples['xml'][:body])
@@ -556,7 +556,7 @@ describe Praxis::ResponseDefinition do
         end
 
         it{ should be_kind_of(::Hash) }
-        its([:payload]){ should == { identifier: 'foobar'} }
+        its([:payload]){ should ==  {id: 'Praxis-SimpleMediaType', name: 'Praxis::SimpleMediaType', family: 'string', identifier: 'foobar' } }
         its([:status]){ should == 200 }
       end
       context 'using a full response definition block' do
@@ -572,7 +572,7 @@ describe Praxis::ResponseDefinition do
         end
 
         it{ should be_kind_of(::Hash) }
-        its([:payload]) { should == { identifier: 'custom_media'} }
+        its([:payload]) { should == {id: 'Praxis-SimpleMediaType', name: 'Praxis::SimpleMediaType', family: 'string', identifier: 'custom_media'} }
         its([:status]) { should == 234 }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack