angus 0.0.7 → 0.0.8

data/bin/angus

@@ -8,6 +8,12 @@ bin_file = Pathname.new(__FILE__).realpath
 # add self to libpath
 $:.unshift File.expand_path('../../lib', bin_file)
 
-require 'angus/command'
+require 'angus/commands/angus_command'
+require 'angus/commands/demo_command'
+require 'angus/commands/help_command'
+require 'angus/commands/new_service_command'
+require 'angus/commands/resource_command'
+require 'angus/commands/scaffold_command'
+require 'angus/commands/server_command'
 
-Angus::Command.start
+Angus::AngusCommand.start

data/lib/angus/commands/angus_command.rb

@@ -0,0 +1,11 @@
+require 'erb'
+require 'thor'
+require 'thor/runner'
+
+require_relative 'command_processor'
+
+module Angus
+  class AngusCommand < ::Thor::Runner
+
+  end
+end

data/lib/angus/commands/command_processor.rb

@@ -0,0 +1,28 @@
+require 'erb'
+require 'thor'
+require 'thor/actions'
+require_relative '../generator/thor/new_project'
+require_relative '../generator/thor/resource'
+
+module Angus
+  class CommandProcessor < Thor
+    include Thor::Actions
+
+    RESOURCES_DIR   = 'resources'
+    DEFINITIONS_DIR = 'definitions'
+    SERVICES_DIR    = 'services'
+
+    no_tasks do
+      def new_service(name, config = {})
+        new_project(name, config)
+      end
+
+      def new_resource(name, actions, config = {})
+        resource(name, actions, config)
+      end
+
+    end
+  end
+end
+
+Angus::CommandProcessor.source_root(File.join(File.dirname(File.expand_path(__FILE__)), '..', 'generator', 'templates'))

data/lib/angus/commands/demo_command.rb

@@ -0,0 +1,26 @@
+require_relative 'angus_command'
+
+module Angus
+  class DemoCommand < Thor::Group
+
+    def demo
+      project_name = 'demo'
+
+      command_processor.new_service(project_name, {demo: true})
+
+      command_processor.run("cd #{project_name}")
+      Dir.chdir(File.join(Dir.pwd, project_name))
+
+      command_processor.resource('user', ['index'], {demo: true})
+    end
+
+    private
+
+    def command_processor
+      @command_processor ||= Angus::CommandProcessor.new
+    end
+
+  end
+end
+
+Angus::AngusCommand.register(Angus::DemoCommand, 'demo', 'demo [NAME]', 'Generate an empty angus project')

data/lib/angus/commands/help_command.rb

@@ -0,0 +1,21 @@
+module Angus
+  class HelpCommand < Thor::Group
+
+    def help
+      puts <<-HELP
+        Usages:
+          angus new [API NAME]  # This generate an empty angus project.
+
+          angus demo # This generate an demo angus project.
+
+        Examples:
+          angus new great-api
+
+          This generates a skeletal angus installation in great-api.
+      HELP
+    end
+
+  end
+end
+
+Angus::AngusCommand.register(Angus::HelpCommand, 'help', 'help', 'Help using the angus command')

data/lib/angus/commands/new_service_command.rb

@@ -0,0 +1,18 @@
+module Angus
+  class NewServiceCommand < Thor::Group
+
+    argument :name, desc: 'Name of the resource', type: :string
+    def new
+      command_processor.new_service(self.name)
+    end
+
+    private
+
+    def command_processor
+      @command_processor ||= Angus::CommandProcessor.new
+    end
+
+  end
+end
+
+Angus::AngusCommand.register(Angus::NewServiceCommand, 'new', 'new', 'Generate a new service')

data/lib/angus/commands/resource_command.rb

@@ -0,0 +1,19 @@
+module Angus
+  class ResourceCommand < Thor::Group
+
+    argument :name,    desc: 'Name of the resource', type: :string
+    argument :actions, desc: 'Actions to be generated', type: :array, optional: true
+    def resource
+      command_processor.new_resource(self.name, self.actions)
+    end
+
+    private
+
+    def command_processor
+      @command_processor ||= Angus::CommandProcessor.new
+    end
+
+  end
+end
+
+Angus::AngusCommand.register(Angus::ResourceCommand, 'resource', 'resource [NAME] [ACTIONS]', 'Generate a new resource')

data/lib/angus/commands/scaffold_command.rb

@@ -0,0 +1,20 @@
+require_relative 'angus_command'
+
+module Angus
+  class ScaffoldCommand < Thor::Group
+
+    argument :name,    desc: 'Name of the resource', type: :string
+    def scaffold
+      command_processor.resource(self.name, %w(create update destroy show index), {scaffold: true})
+    end
+
+    private
+
+    def command_processor
+      @command_processor ||= Angus::CommandProcessor.new
+    end
+
+  end
+end
+
+Angus::AngusCommand.register(Angus::ScaffoldCommand, 'scaffold', 'scaffold [NAME]', 'Generate a scaffold of a given model')

data/lib/angus/commands/server_command.rb

@@ -0,0 +1,17 @@
+module Angus
+  class ServerCommand < Thor::Group
+
+    def server
+      command_processor.run('rackup', verbose: false)
+    end
+
+    private
+
+    def command_processor
+      @command_processor ||= Angus::CommandProcessor.new
+    end
+
+  end
+end
+
+Angus::AngusCommand.register(Angus::ServerCommand, 'server', 'server', 'Run the angus server')

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

@@ -0,0 +1,6 @@
+<% if is_demo? %>
+ResourceNotFound:
+  status_code: 404
+  level: error
+  description: 'Resource Not Found'
+<% end %>

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

@@ -1,21 +1,24 @@
-<% resource_actions.each do |action_name| %>
-<%= action_name%>:
-  name:
-  description: |
-
-  path:
-  method:
+<% unless actions.nil? %>
+<% actions.each do |action_name| %>
+<%= action_name %>:
+  name: '<%= action_name %>'
+  description: '<%= action_description(action_name) %>'
+  path: '<%= action_path(action_name) %>'
+  method: '<%= action_method(action_name) %>'
+  <% unless is_demo? %>
   uri:
     - element:
       description:
+  <% end %>
 
   response:
-    - element:
-      description:
-      required:
-      type:
+    - element: '<%= response_element(action_name) %>'
+      description: '<%= response_description(action_name) %>'
+      required: <%= response_required(action_name) %>
+      type: <%= response_type(action_name) %>
 
   messages:
-    - key:
-      description:
+    - key: <%= message_key(action_name) %>
+      description: '<%= message_description(action_name) %>'
+<% end %>
 <% end %>

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

@@ -0,0 +1,11 @@
+<% if is_demo? %>
+user_profile:
+  - field: id
+    description: User identifier
+    required: true
+    type: integer
+  - field: name
+    description: User name
+    required: true
+    type: string
+<% end %>

data/lib/angus/generator/templates/resources/resource.rb.erb

@@ -1,6 +1,11 @@
 class <%= classify(resource_name) %> < Angus::BaseResource
-<% resource_actions.each do |action_name| %>
-  def <%= action_name %>
+<% unless actions.nil? %>
+<% actions.each do |action_name| %>
+  def
+
+  {users: [{id: 1, name: 'User one'}, {id: 2, name: 'User two'}]}
+    <% end %>
   end
 <% end %>
+<% end %>
 end

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

@@ -0,0 +1,36 @@
+module Angus
+  module FileHandler
+
+    # Override if you want a custom file mapping.
+    def mapping
+      {}
+    end
+
+    def is_erb?(file)
+      file.end_with?('.erb')
+    end
+
+    def copy_erb_file(file, name, base_path = nil)
+      base_path = name if base_path.nil?
+
+      tmp_file = Tempfile.new(File.basename(file))
+
+      source = File.expand_path(base.find_in_source_paths(file.to_s))
+      content  = ERB.new(File.binread(source)).result(binding)
+
+      File.open(tmp_file.path, 'w') { |f| f << content }
+      tmp_file.close
+
+      base.copy_file(tmp_file.path, File.join(base_path, filename_resolver(file, name)))
+    end
+
+    def filename_resolver(file, app_name)
+      if mapping[file].nil?
+        file.gsub('.erb', '')
+      else
+        mapping[file].call(self, app_name)
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,65 @@
+module Angus
+  module HelperMethods
+
+    def pluralize(word)
+      uncountable = %w(equipment information rice money species series fish sheep)
+      rules = []
+
+      irregular   = {
+          'person' => 'people',
+          'man'    => 'men',
+          'child'  => 'children',
+          'sex'    => 'sexes',
+          'move'   => 'moves'
+      }
+
+      irregular.each do |word, replacement|
+        rules << [word, replacement]
+        rules << [replacement, replacement]
+      end
+
+      rules << [/^(ox)$/i               , '\1en'   ]
+      rules << [/(quiz)$/i              , '\1zes'  ]
+      rules << [/([m|l])ouse$/i         , '\1ice'  ]
+      rules << [/(matr|vert|ind)ix|ex$/i, '\1ices' ]
+      rules << [/(x|ch|ss|sh)$/i        , '\1es'   ]
+      rules << [/([^aeiouy]|qu)ies$/i   , '\1y'    ]
+      rules << [/([^aeiouy]|qu)y$/i     , '\1ies'  ]
+      rules << [/(hive)$/i              , '\1s'    ]
+      rules << [/(?:([^f])fe|([lr])f)$/i, '\1\2ves']
+      rules << [/sis$/i                 , 'ses'    ]
+      rules << [/([ti])um$/i            , '\1a'    ]
+      rules << [/(buffal|tomat)o$/i     , '\1oes'  ]
+      rules << [/(bu)s$/i               , '\1ses'  ]
+      rules << [/(alias|status)$/i      , '\1es'   ]
+      rules << [/(octop|vir)us$/i       , '\1i'    ]
+      rules << [/(ax|test)is$/i         , '\1es'   ]
+      rules << [/s$/i                   , 's'      ]
+      rules << [/$/                     , 's'      ]
+
+      result = word.to_s.dup
+
+      if word.empty? || uncountable.include?(result.downcase[/\b\w+\Z/])
+        result
+      else
+        rules.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
+        result
+      end
+    end
+
+    def classify(string)
+      string.sub(/^[a-z\d]*/) { $&.capitalize }.gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+    end
+
+    def underscore(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!('-', '_')
+      word.downcase!
+      word
+    end
+
+  end
+end

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

@@ -0,0 +1,92 @@
+require_relative 'helper_methods'
+require_relative 'file_handler'
+
+class Thor
+  module Actions
+
+    # Creates a new project.
+    #
+    # @param [String] name The name of the resource.
+    # @param [Hash] config
+    #
+    # @example
+    #
+    #   new_project 'great-api'
+    #
+    def new_project(name, config = {})
+      action NewProject.new(self, name, config)
+    end
+
+    class NewProject #:nodoc:
+      include Angus::HelperMethods
+      include Angus::FileHandler
+
+      FILE_MAPPINGS = {
+        'services/service.rb.erb' => -> command, app_name { File.join(Angus::CommandProcessor::SERVICES_DIR, "#{command.underscore(command.classify(app_name))}.rb") },
+        'resources/resource.rb.erb' => -> command, name { "#{command.underscore(command.classify(name))}.rb" },
+        'definitions/operations.yml.erb' => -> command, _ { File.join(command.resource_name, 'operations.yml') }
+      }
+
+      attr_accessor :base, :config, :app_name
+
+      # Creates a new project.
+      #
+      # @param [Thor::Base] base A Thor::Base instance
+      def initialize(base, name, config)
+        @base, @config   = base, { :verbose => true }.merge(config)
+
+        self.app_name = name
+      end
+
+      def invoke!
+        base.empty_directory(app_name)
+
+        new_app_directories.each do |directory|
+          base.empty_directory(File.join(app_name, directory))
+        end
+
+        new_app_files.each do |file|
+          if is_erb?(file)
+            copy_erb_file(file, app_name)
+          else
+            base.copy_file(file, File.join(app_name, file))
+          end
+        end
+      end
+
+      def revoke!
+
+      end
+
+      def mapping
+        FILE_MAPPINGS
+      end
+
+      protected
+
+      def is_generating_demo?
+        @config[:demo]
+      end
+
+      def new_app_directories
+        [
+          Angus::CommandProcessor::DEFINITIONS_DIR,
+          Angus::CommandProcessor::RESOURCES_DIR,
+          Angus::CommandProcessor::SERVICES_DIR
+        ]
+      end
+
+      def new_app_files
+        %w(
+          Gemfile.erb
+          config.ru.erb
+          services/service.rb.erb
+          definitions/messages.yml.erb
+          definitions/representations.yml.erb
+          definitions/service.yml.erb
+        )
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,141 @@
+require_relative 'helper_methods'
+require_relative 'file_handler'
+
+class Thor
+  module Actions
+
+    # Creates a new resource.
+    #
+    # @param [String] name The name of the resource.
+    # @param [Hash] config
+    #
+    # @example
+    #
+    #   resource 'user', 'resouces', 'definitions'
+    #
+    def resource(name, actions, config = {})
+      action Resource.new(self, name, actions, config)
+    end
+
+    class Resource #:nodoc:
+      include Angus::HelperMethods
+      include Angus::FileHandler
+
+      FILE_MAPPINGS = {
+        'resources/resource.rb.erb' => -> command, name { "#{command.underscore(command.classify(name))}.rb" },
+        'definitions/operations.yml.erb' => -> command, _ { File.join(command.underscore(command.resource_name), 'operations.yml') }
+      }
+
+      attr_accessor :base, :config, :resource_name, :actions,
+                    :resource_directory, :definition_directory, :service_directory
+
+      # Creates a new resource.
+      #
+      # @param [Thor::Base] base A Thor::Base instance
+      def initialize(base, name, actions, config)
+        @base, @config   = base, { :verbose => true }.merge(config)
+
+        self.resource_name = pluralize(name)
+        self.actions       = actions
+        self.resource_directory   = File.join(Dir.pwd, Angus::CommandProcessor::RESOURCES_DIR)
+        self.definition_directory = File.join(Dir.pwd, Angus::CommandProcessor::DEFINITIONS_DIR)
+        self.service_directory    = File.join(Dir.pwd, Angus::CommandProcessor::SERVICES_DIR)
+      end
+
+      def invoke!
+        base.empty_directory(resource_directory)
+        base.empty_directory(definition_directory)
+
+        copy_erb_file('resources/resource.rb.erb', underscore(resource_name), resource_directory)
+        copy_erb_file('definitions/operations.yml.erb', underscore(resource_name), definition_directory)
+        insert_into_services("    register :#{underscore(resource_name)}\n")
+      end
+
+      def revoke!
+
+      end
+
+      protected
+
+      def action_description(action_name)
+        action_name if is_demo?
+      end
+
+      def action_path(action_name)
+        if is_demo?
+          '/users'
+        elsif is_scaffold?
+          case action_name
+            when 'show', 'update', 'destroy'
+              "#{underscore(resource_name)}/:id"
+            else
+              "#{underscore(resource_name)}"
+          end
+        end
+      end
+
+      def action_method(action_name)
+        if is_demo?
+          'get'
+        elsif is_scaffold?
+          case action_name
+            when 'create'
+              'post'
+            when 'update'
+              'put'
+            when 'destroy'
+              'delete'
+            else
+              'get'
+          end
+        end
+      end
+
+      def response_element(action_name)
+        'users' if is_demo?
+      end
+
+      def response_description(action_name)
+        'Users profiles' if is_demo?
+      end
+
+      def response_required(action_name)
+        true if is_demo?
+      end
+
+      def response_type(action_name)
+        'user_profile' if is_demo?
+      end
+
+      def message_key(action_name)
+        'ResourceNotFound' if is_demo?
+      end
+
+      def message_description(action_name)
+        'Resource Not Found' if is_demo?
+      end
+
+      def mapping
+        FILE_MAPPINGS
+      end
+
+      def is_scaffold?
+        config[:scaffold]
+      end
+
+      def is_demo?
+        config[:demo]
+      end
+
+      def insert_into_services(content)
+        config = {}
+        config.merge!(:after => /def configure\n|def configure .*\n/)
+
+        file = Dir[File.join(service_directory, '*.*')].first
+
+        base.insert_into_file(file, *([content] << config))
+      end
+
+    end
+  end
+end

data/lib/angus/version.rb

@@ -1,3 +1,3 @@
 module Angus
-  VERSION = '0.0.7'
-end
+  VERSION = '0.0.8'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -213,9 +213,16 @@ files:
 - lib/angus/marshallings/marshalling.rb
 - lib/angus/marshallings/exceptions.rb
 - lib/angus/marshallings/base.rb
-- lib/angus/generator.rb
 - lib/angus/status_codes.rb
 - lib/angus/version.rb
+- lib/angus/commands/angus_command.rb
+- lib/angus/commands/new_service_command.rb
+- lib/angus/commands/server_command.rb
+- lib/angus/commands/resource_command.rb
+- lib/angus/commands/scaffold_command.rb
+- lib/angus/commands/demo_command.rb
+- lib/angus/commands/command_processor.rb
+- lib/angus/commands/help_command.rb
 - lib/angus/base_actions.rb
 - lib/angus/request_handler.rb
 - lib/angus/renders/html_render.rb
@@ -226,12 +233,15 @@ files:
 - lib/angus/generator/templates/README.md
 - lib/angus/generator/templates/config.ru.erb
 - lib/angus/generator/templates/services/service.rb.erb
-- lib/angus/generator/templates/definitions/representations.yml
 - lib/angus/generator/templates/definitions/service.yml.erb
 - lib/angus/generator/templates/definitions/operations.yml.erb
-- lib/angus/generator/templates/definitions/messages.yml
+- lib/angus/generator/templates/definitions/representations.yml.erb
+- lib/angus/generator/templates/definitions/messages.yml.erb
+- lib/angus/generator/thor/new_project.rb
+- lib/angus/generator/thor/resource.rb
+- lib/angus/generator/thor/helper_methods.rb
+- lib/angus/generator/thor/file_handler.rb
 - lib/angus/base_resource.rb
-- lib/angus/command.rb
 - lib/angus/response.rb
 - lib/angus/exceptions.rb
 - lib/angus/middleware/exception_handler.rb

data/lib/angus/command.rb

@@ -1,27 +0,0 @@
-require 'erb'
-require 'thor'
-
-require_relative 'generator'
-
-module Angus
-  class Command < Thor
-
-    desc 'new [NAME]', 'Generate a new service'
-    def new(name)
-      generator.new_service(name)
-    end
-
-    desc 'resource [NAME]', 'Generate a new resource'
-    method_option :actions, aliases: '-a', type: :array, desc: 'Generate the given actions for the resource'
-    def resource(name)
-      generator.resource(name)
-    end
-
-    private
-
-    def generator
-      @generator ||= Angus::Generator.new
-    end
-
-  end
-end

data/lib/angus/generator.rb

@@ -1,141 +0,0 @@
-require 'erb'
-require 'thor'
-require 'thor/actions'
-
-module Angus
-  class Generator < Thor
-    include Thor::Actions
-
-    RESOURCES_DIR   = 'resources'
-    DEFINITIONS_DIR = 'definitions'
-    SERVICES_DIR    = 'services'
-
-    NEW_APP_DIRECTORIES = %W(#{DEFINITIONS_DIR} #{RESOURCES_DIR} #{SERVICES_DIR})
-
-    NEW_APP_FILES = %w(
-      Gemfile.erb
-      config.ru.erb
-      services/service.rb.erb
-      definitions/messages.yml
-      definitions/representations.yml
-      definitions/service.yml.erb
-    )
-
-    FILE_MAPPINGS = {
-      'services/service.rb.erb' => -> command, app_name { File.join(SERVICES_DIR, "#{command.underscore(command.classify(app_name))}.rb") },
-      'resources/resource.rb.erb' => -> command, name { "#{command.underscore(command.classify(name))}.rb" },
-      'definitions/operations.yml.erb' => -> command, _ { File.join(command.resource_name, 'operations.yml') }
-    }
-
-    no_commands do
-      def new_service(name)
-        app_name(name)
-
-        empty_directory(app_name)
-
-        NEW_APP_DIRECTORIES.each do |directory|
-          empty_directory(File.join(app_name, directory))
-        end
-
-        NEW_APP_FILES.each do |file|
-          if is_erb?(file)
-            copy_erb_file(file, app_name)
-          else
-            copy_file(file, File.join(app_name, file))
-          end
-        end
-      end
-
-      def resource(name)
-        resource_name(name)
-        resource_actions(options[:actions])
-
-        empty_directory(RESOURCES_DIR)
-        empty_directory(DEFINITIONS_DIR)
-
-        copy_erb_file('resources/resource.rb.erb', resource_name, RESOURCES_DIR)
-        copy_erb_file('definitions/operations.yml.erb', resource_name, DEFINITIONS_DIR)
-        insert_into_services("    register :#{resource_name}\n")
-      end
-
-      def app_name(name = nil)
-        if name.nil?
-          @app_name
-        else
-          @app_name = name
-        end
-      end
-
-      def resource_name(name = nil)
-        if name.nil?
-          @resource_name
-        else
-          @resource_name = name
-        end
-      end
-
-      def resource_actions(actions = nil)
-        if actions.nil?
-          @resource_actions || []
-        else
-          @resource_actions = actions
-        end
-      end
-
-      def classify(string)
-        string.sub(/^[a-z\d]*/) { $&.capitalize }.gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
-      end
-
-      def underscore(camel_cased_word)
-        word = camel_cased_word.to_s.dup
-        word.gsub!(/::/, '/')
-        word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-        word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-        word.tr!('-', '_')
-        word.downcase!
-        word
-      end
-    end
-
-    private
-
-    def is_erb?(file)
-      file.end_with?('.erb')
-    end
-
-    def copy_erb_file(file, name, base_path = nil)
-      base_path = name if base_path.nil?
-
-      tmp_file = Tempfile.new(File.basename(file))
-
-      source = File.expand_path(find_in_source_paths(file.to_s))
-      content  = ERB.new(File.binread(source)).result(binding)
-
-      File.open(tmp_file.path, 'w') { |f| f << content }
-      tmp_file.close
-
-      copy_file(tmp_file.path, File.join(base_path, filename_resolver(file, name)))
-    end
-
-    def insert_into_services(content)
-      config = {}
-      config.merge!(:after => /def configure\n|def configure .*\n/)
-
-      file = Dir[File.join(Dir.pwd, SERVICES_DIR, '*.*')].first
-
-      insert_into_file(file, *([content] << config))
-    end
-
-    def filename_resolver(file, app_name)
-      if FILE_MAPPINGS[file].nil?
-        file.gsub('.erb', '')
-      else
-        FILE_MAPPINGS[file].call(self, app_name)
-      end
-    end
-
-  end
-end
-
-Angus::Generator.source_root(File.join(File.dirname(File.expand_path(__FILE__)), 'generator',
-                                       'templates'))