magi 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a310270effb9fb28e7bb7d5305c49cf7ed12c3
-  data.tar.gz: 68a7ca5195cce218b36f077d15842c01a6a9111e
+  metadata.gz: fd8670d413c9cc9a48fc8ab40a8a61bf7644df09
+  data.tar.gz: bdcde50c3ccb2bb39de71b4d706d36ceb59980a4
 SHA512:
-  metadata.gz: 339609bedc33c6839fbd3ae33e7aa15268ef9f0585cbfadd7ca9f32ab4d0ad453ce5ce80b296e12ca78e88c6b9824946524ddb9d72b575fc09fd9083504c5952
-  data.tar.gz: 3f2fd55ab271d85ec648d090079c3b1fa716d945f80d74c6480b5a7d931a2331a9904b8150183e9ccb6b98b220a3b562e6b1de7793806a8abed579566635a8ce
+  metadata.gz: 9d816fdc2a44c697af5bad160e83fc1e1dcf56eaee8b4270f560cc621372ed8d45966c874f19514563b36482533b8fbbe78ddd3eb6aeced1cf98f7cce5712878
+  data.tar.gz: 9fe5724e18f3063c5a800dedc4c6f3f5e076b40f6a82597d091351ca8768bebce04cb7095160062d509b81141bdc9a0fa18075938f0d7144ea2051d6254333f1

data/Gemfile

@@ -7,12 +7,14 @@ gem "jquery-rails"
 gem "quiet_assets"
 gem "resque"
 gem "slim"
+gem "weak_parameters"
 
 group :development, :test do
   gem "pry-rails"
 end
 
 group :test do
+  gem "autodoc"
   gem "factory_girl_rails"
   gem "response_code_matchers"
   gem "rspec-json_matcher"

data/README.md

@@ -16,15 +16,18 @@ $ magi start # open http://localhost:3000
 ```
 
 ## Hack
-Magi is just a rails application.
-Feel free to do what you want.
+Magi is just a rails application with some middlewares.
 
-### tools
-* Rails: HTTP server
-* Sidekiq: background worker
-* Redis: worker queue
-* MySQL: store jobs & builds
+* clockwork: scheduler
+* foreman: process manager
+* mysql: store jobs & builds
+* resque: background worker using redis
 
-### todo
+## Todo
+* async update by ajax
 * plugin system
-* cli options (e.g. http port, rails env, redis conf)
+* git integration
+* command-line options
+
+## API
+[API documents](https://github.com/r7kamura/magi/blob/master/doc)

data/app/controllers/application_controller.rb

@@ -3,6 +3,10 @@ class ApplicationController < ActionController::Base
 
   respond_to :html, :json
 
+  rescue_from WeakParameters::ValidationError do
+    head 400
+  end
+
   private
 
   def require_resource_params

data/app/controllers/builds_controller.rb

@@ -2,7 +2,10 @@ class BuildsController < ApplicationController
   before_filter :require_job
   before_filter :require_resources, only: :index
   before_filter :require_resource, only: [:show, :update, :destroy]
-  before_filter :require_resource_params, only: :update
+
+  validates :update do
+    integer :status
+  end
 
   def index
     respond_with @resources
@@ -18,7 +21,7 @@ class BuildsController < ApplicationController
   end
 
   def update
-    respond_with @resource.update_attributes(resource_params.slice(:status))
+    respond_with @resource.update_attributes(params.slice(:status))
   end
 
   def destroy

data/app/controllers/jobs_controller.rb

@@ -1,8 +1,17 @@
 class JobsController < ApplicationController
-  before_filter :require_resource_params, only: [:create, :update]
   before_filter :require_resources, only: :index
   before_filter :require_resource, only: [:show, :edit, :update, :destroy]
 
+  validates :create do
+    string :name, required: true
+    hash :config
+  end
+
+  validates :update do
+    string :name
+    hash :config
+  end
+
   def index
     respond_with @resources
   end
@@ -16,11 +25,11 @@ class JobsController < ApplicationController
   end
 
   def create
-    respond_with @resource = scope.create_with_properties(resource_params)
+    respond_with @resource = scope.create_with_properties(params.slice(:config, :name))
   end
 
   def update
-    respond_with @resource.update_attributes_with_properties(resource_params)
+    respond_with @resource.update_attributes_with_properties(params.slice(:config, :name))
   end
 
   def destroy

data/lib/magi/version.rb

@@ -1,3 +1,3 @@
 module Magi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/magi.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sass-rails", "~> 3.2.3"
   spec.add_dependency "slim"
   spec.add_dependency "uglifier", ">= 1.0.3"
+  spec.add_dependency "weak_parameters", ">= 0.0.2"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-rails"
   spec.add_development_dependency "thin"

data/spec/requests/builds_spec.rb

@@ -22,7 +22,7 @@ describe "Builds" do
       build
     end
 
-    it "returns builds of the job" do
+    it "returns builds of the job", :autodoc do
       get "/jobs/#{job.id}/builds", params, env
       response.status.should == 200
       response.body.should be_json([Hash])
@@ -30,7 +30,7 @@ describe "Builds" do
   end
 
   describe "GET /jobs/:job_id/builds/:id" do
-    it "returns the build" do
+    it "returns the build", :autodoc do
       get "/jobs/#{job.id}/builds/#{build.id}", params, env
       response.status.should == 200
       response.body.should be_json(Hash)
@@ -38,7 +38,7 @@ describe "Builds" do
   end
 
   describe "POST /jobs/:job_id/builds" do
-    it "creates a new build and queue it" do
+    it "creates a new build and queue it", :autodoc do
       post "/jobs/#{job.id}/builds", params, env
       response.status.should == 201
       response.body.should be_json(Hash)
@@ -48,10 +48,10 @@ describe "Builds" do
 
   describe "PUT /jobs/:job_id/builds/:id" do
     before do
-      params[:build] = { status: true }
+      params[:status] = 1
     end
 
-    it "updates the build" do
+    it "updates the build", :autodoc do
       put "/jobs/#{job.id}/builds/#{build.id}", params, env
       response.status.should == 204
       build.reload.status.should == true
@@ -59,7 +59,7 @@ describe "Builds" do
   end
 
   describe "DELETE /jobs/:job_id/builds/:id" do
-    it "deletes the build" do
+    it "deletes the build", :autodoc do
       delete "/jobs/#{job.id}/builds/#{build.id}", params, env
       response.status.should == 204
       Build.should have(0).build

data/spec/requests/jobs_spec.rb

@@ -18,7 +18,7 @@ describe "Jobs" do
       job
     end
 
-    it "returns jobs" do
+    it "returns jobs", :autodoc do
       get "/jobs", params, env
       response.status.should == 200
       response.body.should be_json([Hash])
@@ -26,7 +26,7 @@ describe "Jobs" do
   end
 
   describe "GET /jobs/:id" do
-    it "returns the job" do
+    it "returns the job", :autodoc do
       get "/jobs/#{job.id}", params, env
       response.status.should == 200
       response.body.should be_json(Hash)
@@ -35,12 +35,12 @@ describe "Jobs" do
 
   describe "POST /jobs" do
     before do
-      params[:job] = { name: "name" }
+      params[:name] = "name"
     end
 
     context "with invalid params" do
       before do
-        params.delete(:job)
+        params.delete(:name)
       end
 
       it "returns 400" do
@@ -50,7 +50,7 @@ describe "Jobs" do
     end
 
     context "with valid condition" do
-      it "creates a new job" do
+      it "creates a new job", :autodoc do
         post "/jobs", params, env
         response.status.should == 201
         Job.should have(1).job
@@ -60,12 +60,12 @@ describe "Jobs" do
 
   describe "PUT /jobs/:id" do
     before do
-      params[:job] = { name: "name" }
+      params[:name] = "name"
     end
 
     context "with invalid params" do
       before do
-        params.delete(:job)
+        params[:config] = "invalid"
       end
 
       it "returns 400" do
@@ -75,7 +75,7 @@ describe "Jobs" do
     end
 
     context "with valid condition" do
-      it "updates the job" do
+      it "updates the job", :autodoc do
         put "/jobs/#{job.id}", params, env
         response.status.should == 204
         job.reload.name.should == "name"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clockwork
@@ -192,6 +192,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: weak_parameters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement