raml_parser 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abe1cc6ee7e11604113e202e4c9b301b96bdcbe5
-  data.tar.gz: 98af92840d95058855e4bfe9f599886fffafe2a3
+  metadata.gz: ff9e7a1f4e30b306aef82ac79df6419da2965b39
+  data.tar.gz: fbb5b40f82f8da01c76006b19eda007632caee27
 SHA512:
-  metadata.gz: f47f74ef12621fe8156078eb71df570f89390e379ec2d46682b5406a3bee6ef872810a03c5105c6b795fe2618fdd12df781f540c18105f1af046293456553050
-  data.tar.gz: 97557ac026a4dc26aaab273e4d9556f30b6e8255d0c92061aa1ac7895c83739a2d32930f4b9da581d30d4ef698341f67bf0771a177f9add568b577bf2760e54c
+  metadata.gz: 41753e3578d079704dd08fa98049ffe5a78aef722e159f89006c262f2a757e6637f56568ac78dd87585e4ed21236c48c8adfd8f8dfffb64b696da7700af3f74d
+  data.tar.gz: 785ad520d0b6f48509e693fad7a60ee5241f01cf9524104de759bdc2107daba4b30b4753545081cb2ab3ddc1fdd948df09b0ce0a6f42ba1b4267c796f26a30e6

data/lib/raml_parser.rb

@@ -82,7 +82,6 @@ module RamlParser
     def self.parse_method(node, root, resource, as_trait)
       node = node.or_default({})
       method = Model::Method.new(node.key.upcase)
-      method.display_name = node.hash('displayName').value
       method.description = node.hash('description').value
       method.query_parameters = node.hash('queryParameters').hash_map { |n| parse_named_parameter(n) }
       method.bodies = node.hash('body').hash_map { |n| parse_body(n, root) }
@@ -93,7 +92,6 @@ module RamlParser
 
       unless as_trait
         method = mixin_traits(node, root, method, resource)
-        method.display_name = method.method + ' ' + resource.relative_uri unless method.display_name
       end
 
       method

data/lib/raml_parser/model.rb

@@ -52,11 +52,10 @@ module RamlParser
     end
 
     class Method
-      attr_accessor :method, :display_name, :description, :query_parameters, :responses, :bodies, :headers, :is, :secured_by
+      attr_accessor :method, :description, :query_parameters, :responses, :bodies, :headers, :is, :secured_by
 
-      def initialize(method, display_name = nil, description = nil, query_parameters = {}, responses = {}, bodies = {}, headers = {}, is = {}, secured_by = [])
+      def initialize(method, description = nil, query_parameters = {}, responses = {}, bodies = {}, headers = {}, is = {}, secured_by = [])
         @method = method
-        @display_name = display_name
         @description = description
         @query_parameters = query_parameters
         @responses = responses
@@ -69,7 +68,6 @@ module RamlParser
       def self.merge(a, b)
         method = Method.new(b.method)
 
-        method.display_name = if b.display_name then b.display_name else a.display_name end
         method.description = if b.description then b.description else a.description end
         method.query_parameters = a.query_parameters.merge(b.query_parameters)
         method.responses = a.responses.merge(b.responses)

data/lib/raml_parser/version.rb

@@ -1,3 +1,3 @@
 module RamlParser
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/spec/examples/raml/methods.raml

@@ -6,4 +6,4 @@ baseUri: http://localhost:3000
   get:
   /b:
     get:
-      displayName: This is /a/b
+      description: This is /a/b

data/spec/examples/raml/traits.raml

@@ -4,7 +4,6 @@ title: Example API
 baseUri: http://localhost:3000
 traits:
   - searchable:
-      displayName: Foo
       description: This is searchable
       queryParameters:
         q:
@@ -19,7 +18,6 @@ traits:
   /b:
     get:
       is: [ searchable, sortable ]
-      displayName: /a/b
       description: This is resource /a/b
       queryParameters:
         sort:

data/spec/lib/raml_parser_spec.rb

@@ -48,9 +48,7 @@ RSpec.describe RamlParser::Parser do
   it 'parses methods' do
     raml = RamlParser::Parser.parse_file('spec/examples/raml/methods.raml')
     expect(raml.resources[0].methods['get'].method).to eq 'GET'
-    expect(raml.resources[0].methods['get'].display_name).to eq 'GET /a'
     expect(raml.resources[1].methods['get'].method).to eq 'GET'
-    expect(raml.resources[1].methods['get'].display_name).to eq 'This is /a/b'
   end
 
   it 'parses responses' do
@@ -144,10 +142,8 @@ RSpec.describe RamlParser::Parser do
   it 'mixes in traits' do
     raml = RamlParser::Parser.parse_file('spec/examples/raml/traits.raml')
     expect(raml.resources[0].methods['get'].query_parameters.map { |name,_| name }).to eq ['q', 'key', 'order']
-    expect(raml.resources[0].methods['get'].display_name).to eq 'Foo'
     expect(raml.resources[0].methods['get'].description).to eq 'This is sortable'
     expect(raml.resources[1].methods['get'].query_parameters.map { |name,_| name }).to eq ['q', 'key', 'order', 'sort']
-    expect(raml.resources[1].methods['get'].display_name).to eq '/a/b'
     expect(raml.resources[1].methods['get'].description).to eq 'This is resource /a/b'
     expect(raml.resources[2].methods['get'].query_parameters.map { |name,_| name }).to eq ['key', 'order']
     expect(raml.resources[3].methods['get'].query_parameters.map { |name,_| name }).to eq ['key', 'order', 'q']
@@ -174,13 +170,9 @@ RSpec.describe RamlParser::Parser do
     expect(raml3.resources[0].methods['get'].query_parameters['q1'].display_name).to eq 'q1'
     expect(raml3.resources[1].methods['get'].query_parameters['q2'].display_name).to eq 'This is the second query parameter'
 
-    raml4 = RamlParser::Parser.parse_file('spec/examples/raml/methods.raml')
-    expect(raml4.resources[0].methods['get'].display_name).to eq 'GET /a'
-    expect(raml4.resources[1].methods['get'].display_name).to eq 'This is /a/b'
-
-    raml5 = RamlParser::Parser.parse_file('spec/examples/raml/headers.raml')
-    expect(raml5.resources[0].methods['get'].headers['X-Foobar-Ping'].display_name).to eq 'X-Foobar-Ping'
-    expect(raml5.resources[0].methods['get'].responses[200].headers['X-Foobar-Pong'].display_name).to eq 'PingPong'
+    raml4 = RamlParser::Parser.parse_file('spec/examples/raml/headers.raml')
+    expect(raml4.resources[0].methods['get'].headers['X-Foobar-Ping'].display_name).to eq 'X-Foobar-Ping'
+    expect(raml4.resources[0].methods['get'].responses[200].headers['X-Foobar-Pong'].display_name).to eq 'PingPong'
   end
 
   it 'fixed issue #2' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raml_parser
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Christian Hoffmeister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,7 +77,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile