actionframework 0.2 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzkzOWM1OTQ5NzU1MTNkZjczYzk0OTYyY2E1Y2NmOGVlZTJjYTgwYg==
+    MWFhZWM0YWE5ZGNiNGZmOTliMjFhNWY2NjUzNWJmMGE2NzRjNzRmNA==
   data.tar.gz: !binary |-
-    ZWIyOWE3ZjIxMjg2NGMyNDgyYTkwMDE4YmI1ZGZiNmE5MWIyOTY2Nw==
+    NDFjZDIwYTFlMWQxNGFiYjAyOWI2MzlhMjJlZDZjZGFkMzU2YWYxMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWE5YmRhODNkNjQ2ZjM2MGYwNDJkMWQ4Yzc3YTk5MTAzODM1ZTkxZmZhZTFj
-    ZDBiOGQ3YTg5M2VjYzJiMzQzM2IzNmY4N2UxMGFmNzRlOWMwNGRkN2JhMTZj
-    NzAwNGU0ODIzNTA1MTgyODVjYzkxZWY1NGYwOGM3OWNhZDUxZmU=
+    NjkyNTlkODJkZDI3MmIyN2IyMTAxNTg5MTlmMTk4ZmQwMDIwZmJmYzA0NjNk
+    MWMzYTZhNDc3NzlmMjE1MjljNzkwZWU1ZDQxNDQyNTJhYmE4OGM4Nzk5MjYy
+    ZDFhNjc5NDdkMGIwMzNlYzE4MzkzMjJkY2E1MDMyYWYzNTIxODg=
   data.tar.gz: !binary |-
-    YTY2MmIxYjA0N2M1Y2JmYWJkMDI3MjgzNDEzYmU2Y2I4Y2ZkZWZmMWE3YTlh
-    NDc5NjY2Zjg2M2Y4NTU4ZWM4NDMzNzc3OTJlNzEzOWNiNWUxNDA5ODViMmIw
-    MzlmMGEzZWM3ZmVmZThhNTVkZWFlNWI0NmM0NmFmNGM4YTZlZTM=
+    YTM3NmFlODM2ZTA0MmU3MGFhMzVmNWVjMTFjNmNhYzA0ZDQ2MTNkNWM0YjY5
+    MGUxMjMwNWFhYjg3ZmRhMDg4OTUzY2M2NDhmZWZjOGJkZmU0NThkMzlmOTY1
+    NDdiMjJlNDcyNDY2NTE0ODg0ZmM4ZmIxYzUwNWRiZTY2M2JlMzk=

data/bin/action

@@ -30,13 +30,13 @@ end
 class ActionFrameworkCLI < Optitron::CLI
 	desc "About ActionFramework"
 	def about
-		puts "ActionFramework (previously called ActionFramework) is a web application framework that tries to be as flexible as sinatra and at the same time have the structure of rails.Enjoy!"
+		puts "ActionFramework is a web application framework that tries to be as flexible as sinatra and at the same time have the structure of rails.Enjoy!"
 	end
 	desc "Create ActionFramework project"
 	def new projectname
 		puts "Creating project directory"
 		Dir.mkdir("#{projectname}")
-		puts "Copying project template"		
+		puts "Copying project template"
 	    path = ActionFramework::Gem.root.resources.project_template.to_s
 		FileUtils.cp_r(Dir.glob(path+"/*"),"#{projectname}")
 		system("cd #{projectname} && bundle install")
@@ -45,43 +45,19 @@ class ActionFrameworkCLI < Optitron::CLI
 	end
 
 	desc "Start ActionFramework server"
-	def s  
+	def s
 		`rackup`
 	end
 
 	desc "Start ActionFramework console"
 	def c
-		$runningserver = ActionFramework::Server.new
+		$runningserver = ActionFramework::Server.current
 		puts "Starting ActionFramework IRB"
 		require 'irb'
-		ARGV.clear	
+		ARGV.clear
 		IRB.start
 	end
 
-	desc "Install Stock plugables and add sources list"
-	def init
-		Dir.mkdir(Dir.home+"/.actionframework/")
-		MiniGit.git(:clone ,"https://github.com/actionframework/plugables ~/.actionframework/plugables/")
-	end	
-
-	desc "Update plugables"
-	def update
-		git  = MiniGit.new(Dir.home+"/.actionframework/plugables")
-		git.pull
-	end
-
-	desc "Generate command - see action g help"
-	def g command
-		case command;
-		when "help"
-			puts "action g authentication # Generates neccesary files for authentication"
-		when "authentication"
-			puts "Generation of neccesary files".green
-			
-		else
-			puts "Undefined command #{command}"
-		end
-	end
 end
 
-ActionFrameworkCLI.dispatch
+ActionFrameworkCLI.dispatch

data/lib/actionframework.rb

@@ -2,20 +2,24 @@ require 'rack'
 require 'tilt'
 require 'json'
 require 'erb'
+require 'action_mailer'
 
 require 'actionframework/string'
 require 'actionframework/gemextra'
 require 'actionframework/gem'
 require 'actionframework/routes'
 require 'actionframework/controller'
+require 'actionframework/controller_supervisor'
 require 'actionframework/settings'
 require 'actionframework/error_handler'
 require 'actionframework/modelhelper'
 require 'actionframework/realtime'
 require 'actionframework/base'
 require 'actionframework/authentication'
+require 'actionframework/mailer'
 require 'event_emitter'
 
+
 $runningserver = nil
 
 module ActionFramework
@@ -23,7 +27,7 @@ module ActionFramework
 		def initialize
 			require 'bundler'
 			Bundler.require(:default)
-			
+
 			@routesklass = ActionFramework::Routes.new
 			@settings = ActionFramework::Settings.new
 		end
@@ -37,7 +41,7 @@ module ActionFramework
 	         $runningserver
 	       end
 	    end
-	    
+
 	    def self.current=(runningserver)
 	      $runningserver = runningserver
 	    end
@@ -47,6 +51,10 @@ module ActionFramework
 	        require './'+file
 	      end
 
+	      Dir.glob("controller/mailers/*.rb") do |file|
+	      	require './'+file
+	      end
+
 	      Dir.glob("models/*.rb").each do |file|
 	        require './'+file
 	      end
@@ -54,6 +62,7 @@ module ActionFramework
 	      require './config/routes'
 	      require './config/settings'
 	      require './config/plugables'
+	      require './config/mailer'
 
 	      Dir.glob("initializers/*.rb").each do |file|
 	        require './'+file
@@ -71,7 +80,7 @@ module ActionFramework
 				res.redirect(redirect.to)
 				return res.finish
 			end
-			
+
 
 			# auto-api feature (only at path /api/*)
 			reso = getModelResponse(req,res)
@@ -84,13 +93,12 @@ module ActionFramework
 				res.body = [ActionFramework::ErrorHandler.new(env,req,res,{}).send("error_404")]
 				res.status = 404
 				return res.finish
-			end	
+			end
 
 			controller = controllerinfo[0]
 			matcheddata = controllerinfo[1]
 
-			control = controller.split("#")
-			result = Object.const_get(control[0]).new(env,req,res,matcheddata).send(control[1])			
+			result = ActionFramework::ControllerSupervisor.new.run(controller,env,req,res,matcheddata)
 			res.write result
 			res.finish
 		end
@@ -113,7 +121,7 @@ module ActionFramework
 	    def getModelResponse req,res
 	    	if(matcheddata = req.path.match(Regexp.new("/api/(?<modelname>(.*))")))
 	    			return nil unless @routesklass.models.include?(matcheddata[:modelname])
-					
+
 					res["Content-type"] = "application/json"
 					model = Object.const_get(matcheddata[:modelname].capitalize)
 					model.instance_variable_set("@req",req)
@@ -126,12 +134,12 @@ module ActionFramework
 					when "UPDATE"
 						return ActionFramework::ModelHelper.update model,res
 					when "DELETE"
-						
+
 					else
 
 					end
 			end
 			nil
 	    end
-	end	
+	end
 end

data/lib/actionframework/controller.rb

@@ -5,6 +5,8 @@
 
 module ActionFramework
 	class Controller
+		@@run_before = []
+
 		def initialize env,req,res,url
 			@req = req
 			@res = res
@@ -65,5 +67,27 @@ module ActionFramework
 			response.redirect path
 			""
 		end
+
+		def self.run_before(*args)
+			args.each do |methodname|
+					@@run_before << methodname
+			end
+		end
+
+		def execute_run_before
+			output = nil
+			@@run_before.each do |methodname|
+				returns = self.send(methodname)
+
+				if(returns.class.to_s == "String")
+					output = returns
+					break
+				end
+				
+			end
+
+			return output
+		end
+
 	end
-end
+end

data/lib/actionframework/controller_supervisor.rb

@@ -0,0 +1,12 @@
+module ActionFramework
+  class ControllerSupervisor
+    def run(execute_cmd,env,req,res,url)
+      classname, methodname = execute_cmd.split("#")[0], execute_cmd.split("#")[1]
+
+      controller = Object.const_get(classname).new(env,req,res,url)
+      object_from_run_before = controller.execute_run_before
+      return object_from_run_before unless object_from_run_before.nil?
+      return controller.send(methodname);
+    end
+  end
+end

data/lib/actionframework/mailer.rb

@@ -0,0 +1,8 @@
+module ActionFramework
+	class Mailer
+		def self.config &block
+			ActionMailer::Base.class_eval &block
+			ActionMailer::Base.view_paths = "./views/mailer/"
+		end
+	end
+end

data/resources/project_template/config/mailer.rb

@@ -0,0 +1,12 @@
+ActionFramework::Mailer.config do 
+	delivery_method = :smtp
+	smtp_settings = {
+	   :address   => "smtp.example.com",
+	   :port      => 587,
+	   :domain    => "example.com",
+	   :authentication => :plain,
+	   :user_name      => "root",
+	   :password       => "password",
+	   :enable_starttls_auto => true
+	}
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionframework
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.2
 platform: ruby
 authors:
 - Bram Vandenbogaerde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -164,6 +164,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A web framework built on top of Rack, it has the simplicity of sinatra
   and the structure of rails
 email: bram.vandenbogaerde@gmail.com
@@ -177,9 +191,11 @@ files:
 - lib/actionframework/authentication.rb
 - lib/actionframework/base.rb
 - lib/actionframework/controller.rb
+- lib/actionframework/controller_supervisor.rb
 - lib/actionframework/error_handler.rb
 - lib/actionframework/gem.rb
 - lib/actionframework/gemextra.rb
+- lib/actionframework/mailer.rb
 - lib/actionframework/model.rb
 - lib/actionframework/modelhelper.rb
 - lib/actionframework/plugables.rb
@@ -191,15 +207,18 @@ files:
 - lib/actionframework/routes.rb
 - lib/actionframework/settings.rb
 - lib/actionframework/string.rb
+- lib/actionframework/untitled
 - resources/config/auth.rb
 - resources/project_template/Gemfile
 - resources/project_template/authentication/README.md
 - resources/project_template/config.ru
 - resources/project_template/config/auth.rb
+- resources/project_template/config/mailer.rb
 - resources/project_template/config/plugables.rb
 - resources/project_template/config/routes.rb
 - resources/project_template/config/settings.rb
 - resources/project_template/controllers/default_controller.rb
+- resources/project_template/controllers/mailers/README.md
 - resources/project_template/initializers/README.md
 - resources/project_template/models/README.md
 - resources/project_template/static/README.md
@@ -209,6 +228,7 @@ files:
 - resources/templates/layout.html.erb
 - resources/views/errors/404.html.erb
 - resources/views/errors/layout.html.erb
+- resources/views/mailer/README.md
 homepage: http://actionframework.io
 licenses:
 - MIT