angus 0.0.12 → 0.0.13.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba8e29585ccc3f4558ce66fdf257c696d65bb10
-  data.tar.gz: 1f0b401af56b8462ca00bc53f223a54100bcc69f
+  metadata.gz: 52dfb62300b9cd894eb0c790f4aed070d537f66e
+  data.tar.gz: 8d162a39add6eabc1c96c3ab8f9699b7502f429f
 SHA512:
-  metadata.gz: 289a56869ebd21adfda4f6ca58ab068e8c89e5454ec3a8a4cc1ffcedeba44915fb270134e4deca77594e262f02f8044a2d28d2260cfc86382a59743e3f484a02
-  data.tar.gz: 26e891f72a1371f1547aca5b780d7cda9a95657f07f77bd2280580f87afe15d928f1f24b21dc069149927d32cafaccfb39a2ff63e3dc33d213fb8ae5a3e0eda1
+  metadata.gz: 4a8dd6e0e7f172aebb653f2e1016c4df724c8db0cc9a3499ee49189dde2d0f3073597e2457add8534a766074673c6fe7468fca1722fc9186e5d36cc86fd8e86f
+  data.tar.gz: 798aaecae287b2a3481b887ecbfa68dc8bf952536263c38d11c5ce89e38df9162c23c6b755470e6acfa4bc531d1e33cf43846768e24d0383978b10c698b22e99

data/lib/angus/generator/templates/config.ru.erb

@@ -1,4 +1,4 @@
-$: << (File.dirname(__FILE__))
+$LOAD_PATH << (File.dirname(__FILE__))
 
 require 'bundler'
 
@@ -7,4 +7,4 @@ Bundler.setup
 require 'angus'
 require 'services/<%= underscore(app_name) %>'
 
-run <%= classify(name) %>.new
+run <%= classify(underscore(name)) %>.new

data/lib/angus/generator/templates/definitions/messages.yml.erb

@@ -1,4 +1,4 @@
-<% if is_demo? %>
+<% if is_demo? -%>
 ResourceNotFound:
   status_code: 404
   level: error

data/lib/angus/generator/templates/definitions/operations.yml.erb

@@ -1,26 +1,30 @@
-<% unless actions.nil? %>
-<% actions.each do |action_name| %>
+<% unless actions.nil? -%>
+<% actions.each_with_index do |action_name, index| -%>
+<% unless index.zero? -%>
+
+<% end -%>
 <%= action_name %>:
   name: '<%= action_name %>'
   description: '<%= action_description(action_name) %>'
   path: '<%= action_path(action_name) %>'
   method: '<%= action_method(action_name) %>'
-  <% unless is_demo? %>
+  <% if action_has_id_in_path?(action_name) -%>
+
   uri:
-    - element:
-      description:
-  <% end %>
+  - element: id
+    description: <%= resource_name %> id.
+  <% end -%>
 
   response:
     - element: '<%= response_element(action_name) %>'
       description: '<%= response_description(action_name) %>'
       required: <%= response_required(action_name) %>
       type: <%= response_type(action_name) %>
+  <% if is_demo? -%>
 
-  <% if is_demo? %>
   messages:
     - key: <%= message_key(action_name) %>
       description: '<%= message_description(action_name) %>'
-  <% end %>
-<% end %>
-<% end %>
+  <% end -%>
+<% end -%>
+<% end -%>

data/lib/angus/generator/templates/definitions/service.yml.erb

@@ -1,3 +1,3 @@
-service:   '<%= classify(app_name) %>'
+service:   '<%= classify(underscore(app_name)) %>'
 code_name: '<%= app_name %>'
 version:   '0.1'

data/lib/angus/generator/templates/services/service.rb.erb

@@ -1,4 +1,4 @@
-class <%= classify(app_name) %> < Angus::Base
+class <%= classify(underscore(app_name)) %> < Angus::Base
   def configure
   end
 end

data/lib/angus/generator/thor/resource.rb

@@ -65,11 +65,10 @@ class Thor
         if is_demo?
           '/users'
         elsif is_scaffold?
-          case action_name
-            when 'show', 'update', 'destroy'
-              "#{underscore(resource_name)}/:id"
-            else
-              "#{underscore(resource_name)}"
+          if action_has_id_in_path?(action_name)
+            "/#{underscore(resource_name)}/:id"
+          else
+            "/#{underscore(resource_name)}"
           end
         end
       end
@@ -91,6 +90,10 @@ class Thor
         end
       end
 
+      def action_has_id_in_path?(action_name)
+        %w[show update destroy].include?(action_name)
+      end
+
       def response_element(action_name)
         'users' if is_demo?
       end

data/lib/angus/version.rb

@@ -1,3 +1,3 @@
 module Angus
-  VERSION = '0.0.12'
+  VERSION = '0.0.13.beta1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angus
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13.beta1
 platform: ruby
 authors:
 - Pablo Ifran
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -305,9 +305,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -315,48 +315,48 @@ signing_key:
 specification_version: 4
 summary: A web services summary
 test_files:
-- spec/support/matchers/have_in_message_matcher.rb
-- spec/support/matchers/have_error_response_matcher.rb
-- spec/support/matchers/have_success_response_matcher.rb
 - spec/spec_helper.rb
-- spec/angus/request_handler_spec.rb
-- spec/angus/middleware/exception_handler_spec.rb
-- spec/angus/rspec/examples/describe_errors_spec.rb
-- spec/functional/filters/exceptions/user_errors.rb
-- spec/functional/filters/models/user.rb
-- spec/functional/filters/resources/users.rb
-- spec/functional/filters/services/filters.rb
-- spec/functional/filters/definitions/representations.yml
-- spec/functional/filters/definitions/users/operations.yml
-- spec/functional/filters/definitions/messages.yml
-- spec/functional/filters/definitions/service.yml
-- spec/functional/no_resources_spec.rb
 - spec/functional/empty_resource_spec.rb
-- spec/functional/basic/exceptions/user_errors.rb
-- spec/functional/basic/models/user.rb
+- spec/functional/type_validation_spec.rb
+- spec/functional/type_validation/resources/admins.rb
+- spec/functional/type_validation/models/admin.rb
+- spec/functional/type_validation/definitions/admins/operations.yml
+- spec/functional/type_validation/definitions/representations.yml
+- spec/functional/type_validation/definitions/messages.yml
+- spec/functional/type_validation/definitions/service.yml
+- spec/functional/type_validation/services/type_validation.rb
 - spec/functional/basic/resources/users.rb
-- spec/functional/basic/services/basic.rb
-- spec/functional/basic/definitions/representations.yml
+- spec/functional/basic/models/user.rb
+- spec/functional/basic/exceptions/user_errors.rb
 - spec/functional/basic/definitions/users/operations.yml
+- spec/functional/basic/definitions/representations.yml
 - spec/functional/basic/definitions/messages.yml
 - spec/functional/basic/definitions/service.yml
+- spec/functional/basic/services/basic.rb
+- spec/functional/no_resources/definitions/representations.yml
+- spec/functional/no_resources/definitions/messages.yml
+- spec/functional/no_resources/definitions/service.yml
+- spec/functional/no_resources/services/no_resources.rb
 - spec/functional/filters_spec.rb
+- spec/functional/filters/resources/users.rb
+- spec/functional/filters/models/user.rb
+- spec/functional/filters/exceptions/user_errors.rb
+- spec/functional/filters/definitions/users/operations.yml
+- spec/functional/filters/definitions/representations.yml
+- spec/functional/filters/definitions/messages.yml
+- spec/functional/filters/definitions/service.yml
+- spec/functional/filters/services/filters.rb
+- spec/functional/no_resources_spec.rb
 - spec/functional/empty_resource/resources/users.rb
-- spec/functional/empty_resource/services/empty_resource.rb
-- spec/functional/empty_resource/definitions/representations.yml
 - spec/functional/empty_resource/definitions/users/operations.yml
+- spec/functional/empty_resource/definitions/representations.yml
 - spec/functional/empty_resource/definitions/messages.yml
 - spec/functional/empty_resource/definitions/service.yml
-- spec/functional/type_validation/models/admin.rb
-- spec/functional/type_validation/resources/admins.rb
-- spec/functional/type_validation/services/type_validation.rb
-- spec/functional/type_validation/definitions/admins/operations.yml
-- spec/functional/type_validation/definitions/representations.yml
-- spec/functional/type_validation/definitions/messages.yml
-- spec/functional/type_validation/definitions/service.yml
+- spec/functional/empty_resource/services/empty_resource.rb
 - spec/functional/basic_spec.rb
-- spec/functional/type_validation_spec.rb
-- spec/functional/no_resources/services/no_resources.rb
-- spec/functional/no_resources/definitions/representations.yml
-- spec/functional/no_resources/definitions/messages.yml
-- spec/functional/no_resources/definitions/service.yml
+- spec/angus/request_handler_spec.rb
+- spec/angus/middleware/exception_handler_spec.rb
+- spec/angus/rspec/examples/describe_errors_spec.rb
+- spec/support/matchers/have_in_message_matcher.rb
+- spec/support/matchers/have_success_response_matcher.rb
+- spec/support/matchers/have_error_response_matcher.rb