angus-sdoc 0.0.3 → 0.0.4

data/lib/angus/definitions/operation.rb

@@ -19,9 +19,9 @@ module Angus
       #   @return [String] the path of the operation.
       attr_accessor :path
 
-      # @!attribute [rw] method
+      # @!attribute [rw] http_method
       #   @return [String] the HTTP method of the operation.
-      attr_accessor :method
+      attr_accessor :http_method
 
       # @!attribute [rw] messages
       #   @return [Hash<String, Message>] the messages associated with the operation.

data/lib/angus/definitions/proxy_operation.rb

@@ -11,9 +11,9 @@ module Angus
       #   @return [String] the path of the operation.
       attr_accessor :path
 
-      # @!attribute [rw] method
+      # @!attribute [rw] http_method
       #   @return [String] the HTTP method of the operation.
-      attr_accessor :method
+      attr_accessor :http_method
 
       # @!attribute [rw] service_name
       #   @return [String] the service name of the operation.

data/lib/angus/definitions/service.rb

@@ -52,14 +52,12 @@ module Angus
       #   Possible values are the *_LEVEL constants from {Message}
       #
       # @return [Message] the message or nil if no one matches.
-      def message(key, level)
-        msg = nil
-
-        @operations.find do |operation|
-          msg = operation.message(key.to_s, level)
+      def message(key, level = nil)
+        message = self.messages.find do |message_key, message|
+          message_key == key && (!level || message.level.downcase == level)
         end
 
-        msg
+        message.last if message
       end
 
       # Merge the following definitions:

data/lib/angus/definitions_reader.rb

@@ -156,7 +156,7 @@ module Angus
             proxy_op.code_name = code_name
 
             proxy_op.path = fields['path']
-            proxy_op.method = fields['method']
+            proxy_op.http_method = fields['method']
             proxy_op.service_name = fields['service']
 
             proxy_op
@@ -221,7 +221,7 @@ module Angus
               operation.code_name = code_name
               operation.description = op_metadata['description']
               operation.path = op_metadata['path']
-              operation.method = op_metadata['method']
+              operation.http_method = op_metadata['method']
 
               op_metadata['uri'] ||= []
               operation.uri_elements = op_metadata['uri'].map do |element_hash|

data/lib/angus/sdoc/json_formatter.rb

@@ -91,7 +91,7 @@ module Angus
             :name => operation_definition.name,
             :description => operation_definition.description,
             :path => operation_definition.path,
-            :method => operation_definition.method
+            :method => operation_definition.http_method
           }
 
           if operation_definition.uri_elements && !operation_definition.uri_elements.empty?
@@ -140,7 +140,7 @@ module Angus
         def proxy_operation_for_json(proxy_operation_definition)
           {
             :path => proxy_operation_definition.path,
-            :method => proxy_operation_definition.method,
+            :method => proxy_operation_definition.http_method,
             :service => proxy_operation_definition.service_name
           }
         end

data/lib/angus/sdoc/templates/doc.erb

@@ -77,7 +77,7 @@
             <tbody>
               <tr>
                 <td>M&eacute;todo</td>
-                <td><%= operation.method %></td>
+                <td><%= operation.http_method %></td>
               </tr>
               <tr>
                 <td>URI</td>
@@ -256,7 +256,7 @@
               <td>
                 <%= operation.code_name %>
               </td>
-              <td><%= operation.method %></td>
+              <td><%= operation.http_method %></td>
               <td><%= operation.path %></td>
               <td><%= operation.service_name %></td>
             </tr>

data/lib/angus/sdoc/version.rb

@@ -1,5 +1,5 @@
 module Angus
   module SDoc
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,186 +1,176 @@
 --- !ruby/object:Gem::Specification
 name: angus-sdoc
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.3
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Pablo Ifran
 - Adrian Gomez
 - Gianfranco Zas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.7
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json_expressions
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.3
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov-text
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
-description: |2
-      Used to read the documentation of a service built in angus (but also is able to read any kind
-      of documentation that follow the angus structure), and generate an object representation of
-      that documentation.
+        version: '0'
+description: ! "    Used to read the documentation of a service built in angus (but
+  also is able to read any kind\n    of documentation that follow the angus structure),
+  and generate an object representation of\n    that documentation.\n"
 email:
 - angus@moove-it.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/angus/exceptions/invalid_service_message.rb
+- lib/angus/exceptions/base.rb
 - lib/angus/definitions_utils.rb
 - lib/angus/definitions_reader.rb
 - lib/angus/sdoc.rb
-- lib/angus/base.rb
-- lib/angus/exceptions/invalid_service_message.rb
-- lib/angus/exceptions/base.rb
 - lib/angus/definitions/proxy_operation.rb
 - lib/angus/definitions/representation.rb
 - lib/angus/definitions/glossary_term.rb
@@ -193,37 +183,36 @@ files:
 - lib/angus/definitions/request_element.rb
 - lib/angus/definitions/base.rb
 - lib/angus/definitions/service.rb
+- lib/angus/base.rb
+- lib/angus/sdoc/templates/styles.erb
+- lib/angus/sdoc/templates/doc.erb
 - lib/angus/sdoc/version.rb
 - lib/angus/sdoc/json_formatter.rb
 - lib/angus/sdoc/html_formatter.rb
-- lib/angus/sdoc/templates/styles.erb
-- lib/angus/sdoc/templates/doc.erb
 homepage: http://www.moove-it.com/angus
 licenses:
 - MIT
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.25
+signing_key: 
 specification_version: 3
 summary: Read documentation of services built on angus
 test_files: []
-has_rdoc:
+has_rdoc: