apimaster 0.0.4 → 0.0.5

data/apimaster.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'apimaster'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.date        = '2012-07-12'
   s.summary     = "ApiMaster!"
   s.description = "A simple restful api framework."

data/lib/apimaster/generators/app_generator.rb

@@ -17,32 +17,34 @@ module Apimaster::Generators
       record do |m|
         # Ensure appropriate folder(s) exists
         m.directory ''
-        BASEDIRS.each { |path| m.directory path }
-        m.directory "lib/#{app_name}"
+        BASEDIRS.each { |path| m.directory(app_name + '/' + path) }
+        m.directory "#{app_name}/lib/#{app_name}"
 
         # config
-        m.template "config/boot.rb.erb", "config/boot.rb"
-        m.template "config/patches.rb.erb", "config/patches.rb"
-        m.template "config/initializer.rb.erb", "config/initializer.rb"
-        m.template "config/application.rb.erb", "config/application.rb"
-        m.template "config/settings/mongoid.yml.erb", "config/settings/mongoid.yml"
-        m.template "config/settings/app.yml.erb", "config/settings/app.yml"
-        m.template "config/settings/oauth.yml.erb", "config/settings/oauth.yml"
+        templates = {
+          "config/boot.rb.erb" => "config/boot.rb",
+          "config/patches.rb.erb" => "config/patches.rb",
+          "config/initializer.rb.erb" => "config/initializer.rb",
+          "config/application.rb.erb" => "config/application.rb",
+          "config/settings/mongoid.yml.erb" => "config/settings/mongoid.yml",
+          "config/settings/app.yml.erb" => "config/settings/app.yml",
+          "config/settings/oauth.yml.erb" => "config/settings/oauth.yml",
 
-        # Create stubs
-        m.template "config.ru.erb", "config.ru"
-        m.template "gitignore", ".gitignore"
-        m.template "lib/module.rb.erb", "lib/#{app_name}.rb"
-        m.template "app/tasks/test.rake.erb", "app/tasks/test.rake"
-        m.template "app/tasks/stat.rake.erb", "app/tasks/stat.rake"
-        m.template "app/controllers/index_controller.rb.erb", "app/controllers/index_controller.rb"
-        m.template "app/controllers/befores_controller.rb.erb", "app/controllers/befores_controller.rb"
+          # Create stubs
+          "config.ru.erb" => "config.ru",
+          "gitignore" => ".gitignore",
+          "lib/module.rb.erb" => "lib/#{app_name}.rb",
+          "app/tasks/test.rake.erb" => "app/tasks/test.rake",
+          "app/tasks/stat.rake.erb" => "app/tasks/stat.rake",
+          "app/controllers/index_controller.rb.erb" => "app/controllers/index_controller.rb",
+          "app/controllers/befores_controller.rb.erb" => "app/controllers/befores_controller.rb",
 
-        # Test stubs
-        m.template "test/test_helper.rb.erb", "test/test_helper.rb"
+          # Test stubs
+          "test/test_helper.rb.erb" => "test/test_helper.rb"
+        }.each { |k, v| m.template(k, app_name + '/' + v) }
 
         %w(LICENSE Rakefile README.md Gemfile TODO test.watchr).each do |file|
-          m.template file, file
+          m.template file, app_name + '/' + file
         end
       end
     end

data/lib/apimaster/generators/controller_generator.rb

@@ -5,6 +5,7 @@ module Apimaster::Generators
 
     def initialize(runtime_args, runtime_options = {})
       super
+      raise 'Unknown app directory.' unless File.exists?('./Gemfile')
       @app_name     = File.basename(File.expand_path('./'))
       @module_name  = camelize(app_name)
       @name     = args[0]

data/lib/apimaster/generators/model_generator.rb

@@ -5,6 +5,7 @@ module Apimaster::Generators
 
     def initialize(runtime_args, runtime_options = {})
       super
+      raise 'Unknown app directory.' unless File.exists?('./Gemfile')
       @app_name     = File.basename(File.expand_path('./'))
       @module_name  = camelize(app_name)
       @name     = args[0]

data/lib/apimaster/generators/templates/app/models/example.rb.erb

@@ -3,17 +3,23 @@
 # Copyright (C) 2011-2012  AdMaster, Inc.
 
 module <%= module_name %>
-  class <%= camelize name %> < Apimaster::Mapper
+  class <%= camelize name %>
+    include Apimaster::Mapper
     include Mongoid::Document
 
     field :title, type: String
     field :content, type: String
 
-    attr_options :title, accessor: [:get, :list], required: [:post], optional: [:patch]
-    attr_options :content, accessor: [:get], required: [:post], optional: [:patch]
+    attr_options :title, accessor: [:get, :list], required: [:post],
+                         optional: [:patch]
+    attr_options :content, accessor: [:get], required: [:post],
+                           optional: [:patch]
 
     validates :title, length: { minimum: 2, maximum: 30 }
 
+    # Embedded 1-1
+    # embeds_one :label, class_name: "<%= module_name %>::Label"
+
     class << self
 
       def get id

data/lib/apimaster/generators/templates/config/application.rb.erb

@@ -8,9 +8,11 @@ module <%= module_name %>
     use Apimaster::Application
 
     # controllers
-    use BeforesController
-    use IndexController
-    # use YourCountroller
+    <%= module_name %>.constants.each do |k|
+      if k =~ /Controller$/
+        use <%= module_name %>.const_get(k)
+      end
+    end
 
   end
 end

data/lib/apimaster/mapper.rb

@@ -3,8 +3,7 @@
 # Copyright (C) 2011-2012  AdMaster, Inc.
 
 module Apimaster
-  class Mapper
-    #include ::Mongoid::Document
+  module Mapper
 
     def post hash
       save_with_hash hash, :post
@@ -23,7 +22,7 @@ module Apimaster
       if valid?
         save
       else
-        raise InvalidFieldError.new(class_name, errors.keys.first)
+        raise Apimaster::InvalidFieldError.new(class_name, errors.keys.first)
       end
       self
     end
@@ -61,7 +60,8 @@ module Apimaster
       fields = self.class.find_attrs_in_options(:accessor, accessor)
       fields.each do |field|
         if self.respond_to?(field)
-          record[field] = self.send(field)
+          val = self.send(field)
+          record[field] = val.respond_to?(:to_hash) ? val.to_hash(accessor) : val
         else
           raise "Dataset #{self.class} has no method with the name of #{field}"
         end
@@ -73,7 +73,11 @@ module Apimaster
       @class_name ||= self.class.to_s.split("::").last
     end
 
-    class << self
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
 
       OPTION_TYPES = [:accessor, :required, :optional]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apimaster
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: