rubko 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507cef7351098c01960413739e54b19d74ea872d
-  data.tar.gz: b6476fac467d2265b8777620e77b9557fc16e19f
+  metadata.gz: 6dda5882684cd22f6df19f6aae673980ab60b223
+  data.tar.gz: 2e480c180915d74789de1f3085787224726a8eb2
 SHA512:
-  metadata.gz: 926e843d6848ceb3dccb87affd87b1c57998a8d38822517e2cbc02ef077cdde55fb2944d62741c7b67e04388cc2fcf6deea4b5fe59626fa47cf5ca33ce0ca19d
-  data.tar.gz: 35f3021ce7bae47895be95216f0358314dd93a5c47b972d94540aa0df94dfdfac662a1768f610c67a5ed37007fbf4f3342cc81650192dfa134be946c0905d032
+  metadata.gz: 1c6fcdc3e99d8bb505c778c9e7ae0c4b832506231fb4467b33a55ba5ca84e1b048b7505c392d86719c0bb06fa4b257a95b6e1904cf2e9a989c8e09876bd4a6ac
+  data.tar.gz: 22dd3ac23cca2ec497f613c1c4589bba902f4d7237f6eda55a3811f9ffdc69e9e3f933f4959eadda4a961cb9ecb0ac20ac5cf7301cf5513b853a971c969686d9

data/bin/rubko-deploy

@@ -1,40 +1,50 @@
 #!/usr/bin/ruby
 
-	# settings
-
-	ssh = true
-	host = 'hetzner:54321'
-	user = 'root'
-	remote = '/srv/http/' + File.basename(Dir.getwd)
-
-	exclude = [
-		'log.txt',
-		#'config/db.rb',
-		'.deploy.rb',
-		'.dev/',
-		'.run/',
-		'.repo/',
-		'.gitignore',
-		'.git/'
-	]
-
-	# program
-
-	require 'io/console'
-	print 'Password: ';
-	pass = STDIN.noecho(&:gets).strip
-	puts
-
-	protocol = ssh ? 'sftp' : 'ftp'
-
-	commands = [
-		'set ftp:list-options -a',
-		"open #{protocol}://#{user}:#{pass}@#{host}",
-		'lcd ./',
-		"cd #{remote}",
-		'mirror -L --reverse --only-newer --verbose ' + exclude.map { |el|
-			'--exclude-glob ' + el
-		}.join(' ')
-	]
-
-	system 'lftp', '-c', commands.join(';')
+require 'rubko'
+
+class Rubko::Deploy
+	def initialize
+		@protocol = :sftp # :ftp
+		@remote = "/srv/http/#{File.basename Dir.getwd}"
+
+		@exclude = [
+			'.dev/',
+			'.run/',
+			'.repo/',
+			'.gitignore',
+			'.git/'
+		]
+	end
+
+	attr_reader :protocol, :remote, :user, :host, :exclude
+
+	def password
+		return @password if @password
+
+		require 'io/console'
+		print 'Password: ';
+		STDIN.noecho(&:gets).strip.tap {
+			puts
+		}
+	end
+
+	def deploy!
+		config
+
+		commands = [
+			'set ftp:list-options -a',
+			"open #{protocol}://#{user}:#{password}@#{host}",
+			'lcd ./',
+			"cd #{remote}",
+			'mirror -L --reverse --only-newer --verbose ' + exclude.map { |el|
+				'--exclude-glob ' + el
+			} * ' '
+		]
+
+		system 'lftp', '-c', commands * ';'
+	end
+end
+
+require './config/deploy.rb'
+
+Rubko::Deploy.new.deploy!

data/lib/rubko.rb

@@ -1,7 +1,7 @@
 require 'rubko/app'
 
 class Rubko
-	VERSION = '0.1'
+	VERSION = '0.2'
 
 	def initialize(shared = {})
 		@shared = shared

data/lib/rubko/app.rb

@@ -14,7 +14,7 @@ class Rubko::App
 		@finalizers = []
 
 		@env = env
-		params = Rack::Utils.parse_nested_query @env['rack.input'].read
+		params = Rack::Utils.parse_nested_query env['rack.input'].read
 		@params = Hash[ params.map { |k, v|
 			[ k.to_sym, v ]
 		} ]
@@ -31,49 +31,80 @@ class Rubko::App
 	end
 
 	def request(name = :welcome, action = nil, *path)
-		controller = loadController(name) || loadController(:error404)
+		@controller = loadController(name) || loadController(:error404)
 
 		calls = [ action ? "_#{action}" : 'index' ]
 		calls << calls.first + '_' + url.method
 
 		calls.map! { |call|
-			if controller.respond_to? call
-				@body = controller.__send__ call, *path
+			if @controller.respond_to? call
+				@body = @controller.__send__ call, *path
 				true
 			end
 		}
 		if calls.compact.empty?
-			@body = controller.other action, *path
+			@body = @controller.other action, *path
 		end
 
 		# finalize request
 		finalizers.reverse_each(&:finalize)
-		@headers['Content-Type'] = "#{mime}; charset=utf-8" unless @status == 304
+		prepareBody!
+		prepareHeaders!
 
-		# make sure body responds to :each
-		@body = @body.to_s if Integer === @body
-		@body = [@body] if String === @body
-		@body = [] unless @body.respond_to? :each
+		[status, headers, body]
+	end
+
+	def production?
+		ENV['RACK_ENV'] == 'production'
+	end
+
+private
+
+	def prepareBody!
+		# if object is a Hash, return JSON
+		if Hash === body
+			@mime = 'application/json'
+			@body = if production?
+				body.to_json
+			else
+				JSON.pretty_generate body, indent: "\t"
+			end
+		end
+
+		# make sure body responds to #each
+		@body = body.to_s if Integer === body
+		@body = [body] if String === body
+		@body = [] unless body.respond_to? :each
+	end
+
+	def prepareHeaders!
+		# apply mime type header
+		unless status == 304
+			headers['Content-Type'] = "#{mime}; charset=utf-8"
+		end
 
 		# compress
-		if controller.compressible?
+		if @controller.compressible?
 			headers['Content-Encoding'] = 'gzip'
-			@body = Rubko::Asset::GzipStream.new @body
+			@body = Rubko::Asset::GzipStream.new body
 		end
 
 		# add Content-Length header
-		if @body.respond_to? :bytesize
-			headers['Content-Length'] = @body.bytesize.to_s
-		elsif Array === @body
-			headers['Content-Length'] = @body.reduce(0) { |sum, x|
+		headers['Content-Length'] = if body.respond_to? :bytesize
+			body.bytesize
+		elsif Array === body
+			body.reduce(0) { |sum, x|
 				sum + x.bytesize
-			}.to_s
+			}
 		end
 
-		[@status, @headers, @body]
-	end
-
-	def production?
-		ENV['RACK_ENV'] == 'production'
+		# rack requires strings as values
+		headers.each { |k, v|
+			if v.nil?
+				headers.delete k
+			elsif not String === v
+				headers[k] = v.to_s
+			end
+		}
 	end
 end

data/lib/rubko/asset.rb

@@ -24,9 +24,9 @@ class Rubko::Asset < Rubko::Controller
 	private :hit, :cache, :miss
 
 	def compressible?
-		super && @mime != 'application/octet-stream' &&
+		super && mime != 'application/octet-stream' &&
 		['application', 'text'].any? { |type|
-			@mime.start_with? type+'/'
+			mime.start_with? type+'/'
 		}
 	end
 
@@ -43,10 +43,10 @@ class Rubko::Asset < Rubko::Controller
 		end
 
 		path.shift if path[0] =~ /^\d*$/
-		path = "#{@dir}/#{path * '/'}"
+		path = "#{dir}/#{path * '/'}"
 		@mime = Rack::Mime.mime_type File.extname(path)
 		if File.file? path
-			self.mime = @mime
+			self.mime = mime
 			headers['Cache-Control'] = 'public'
 			headers['Vary'] = 'Accept-Encoding'
 
@@ -55,7 +55,7 @@ class Rubko::Asset < Rubko::Controller
 			headers['Last-Modified'] = @modified.httpdate
 			headers['Expires'] = (DateTime.now >> 12).httpdate
 
-			if @modified.to_i <= since
+			if modified.to_i <= since
 				cache( *path )
 				self.status = 304
 				''

data/lib/rubko/base.rb

@@ -5,7 +5,7 @@ class Rubko
 	module Base
 		def initialize(parent = nil)
 			@parent = parent
-			finalizers << self if @parent
+			finalizers << self if parent
 			@plugins = {}
 			puts "#{self.class} initialized." unless production?
 		end

data/lib/rubko/plugins/db.rb

@@ -14,9 +14,9 @@ class DbPlugin < Rubko::Plugin
 	def handle
 		unless @handle
 			config if @handle.nil?
-			if @pool
-				@sig = [@host, @port, @user, @password, @db]
-				@handle = ( @pool[:db, *@sig] ||= [] ).pop
+			if pool
+				@sig = [host, port, user, password, db]
+				@handle = ( pool[:db, *@sig] ||= [] ).pop
 			end
 			@handle = connect unless @handle
 		end
@@ -27,20 +27,20 @@ class DbPlugin < Rubko::Plugin
 	attr_reader :affectedRows
 
 	def connect
-		PG.connect host: @host, port: @post, user: @user, password: @password, dbname: @db
+		PG.connect host: host, port: port, user: user, password: password, dbname: db
 	end
 
 	def release
 		return true unless @handle
-		if @pool && handle.transaction_status == 0
-			@pool[:db, *@sig].push @handle
+		if pool && handle.transaction_status == 0
+			pool[:db, *@sig].push @handle
 			@handle = false
 			return true
 		end
 	end
 
 	def poolSize
-		@pool.keys(:db, *@sig).size
+		pool.keys(:db, *@sig).size
 	end
 
 	# PostgreSQL array OIDs and coresponding data type
@@ -330,7 +330,7 @@ class DbPlugin < Rubko::Plugin
 				yield
 			raw 'COMMIT' if inTransaction
 		rescue => e
-			puts e
+			p e
 			puts e.backtrace
 			rollback
 			puts 'Transaction rolled back.'

data/lib/rubko/plugins/facebook.rb

@@ -31,7 +31,7 @@ class FacebookPlugin < Rubko::Plugin
 		})
 		@token = parse( httpGet url )['access_token']
 
-		jsonParse httpGet build 'https://graph.facebook.com/me', access_token: @token
+		jsonParse httpGet build 'https://graph.facebook.com/me', access_token: token
 	end
 
 private

data/lib/rubko/plugins/session.rb

@@ -24,7 +24,7 @@ class SessionPlugin < Rubko::Plugin
 
 			if @id
 				if time = storage[name, @id]
-					destroy if Time.now - time > @timeout
+					destroy if Time.now - time > timeout
 				end
 				storage[name, @id] = Time.new
 			end

data/lib/rubko/plugins/url.rb

@@ -10,8 +10,8 @@ class UrlPlugin < Rubko::Plugin
 	end
 
 	def path=(path)
-		len = path.start_with?(@base) ? @base.length : 1
-		@path = URI.unescape(path)[len..-1].chomp(@ending).split '/', -1
+		len = path.start_with?(base) ? base.length : 1
+		@path = URI.unescape(path)[len..-1].chomp(ending).split '/', -1
 		@newPath = nil
 
 		@protocol = env['rack.url_scheme'] + '://'
@@ -22,7 +22,7 @@ class UrlPlugin < Rubko::Plugin
 
 	def newPath
 		unless @newPath
-			@newPath = @path * '/'
+			@newPath = path * '/'
 			config
 			@newPath = @newPath.split '/', -1
 		end
@@ -47,14 +47,14 @@ class UrlPlugin < Rubko::Plugin
 	def generate(*path)
 		path.compact!
 		path.map! { |seg|
-			seg = @path[seg] if seg.kind_of? Integer
+			seg = path[seg] if seg.kind_of? Integer
 			URI.escape seg
 		}
-		(@protocol+@host if @fullPath).to_s + @base + path.join('/')
+		(protocol+host if fullPath).to_s + base + path.join('/')
 	end
 
 	def link(*path)
-		generate(*path) + (@ending unless path.empty?).to_s
+		generate(*path) + (ending unless path.empty?).to_s
 	end
 
 	def linkSlug(*path)
@@ -64,7 +64,7 @@ class UrlPlugin < Rubko::Plugin
 	def file(*path)
 		name = 'public/' + path.join('/')
 		time = File.mtime(name).to_i / 3 % 1000000 if File.exists? name
-		generate @fileBase, (time.to_s if @fileTime), *path
+		generate fileBase, (time.to_s if fileTime), *path
 	end
 
 	def redirect(*path)
@@ -79,11 +79,11 @@ class UrlPlugin < Rubko::Plugin
 	end
 
 	def refresh
-		redirect(*@path)
+		redirect(*path)
 	end
 
 	def forceSSL
-		if @protocol != 'https://'
+		if protocol != 'https://'
 			@protocol, @fullPath = 'https://', true
 			refresh
 		end

data/stamp/config/deploy.rb

@@ -0,0 +1,7 @@
+class Rubko::Deploy
+	def config
+		@host = 'valat.si:54321'
+		@user = 'root'
+		# @password = ''
+	end
+end

data/stamp/public/js/jquery/translate.js

@@ -43,7 +43,7 @@
 				if (translation) {
 					var temp=str.replace(value, translation);
 					if (value[0].toLowerCase()===value[0])
-						return temp[0].toLowerCase()+temp.slice(1)
+						return temp[0].toLowerCase()+temp.slice(1);
 					return temp[0].toUpperCase()+temp.slice(1);
 				}
 				$.each($.translate.dictionary[module][language].regex, function(key, val) {
@@ -74,13 +74,14 @@
 		language = language || $.translate.language;
 		$.translate.textNodes(this).each(function() {
 			$(this).untranslate(true);
-			if ($(this).data('translateO') || $.translate.clear($.translate.get(this))) {
-				if (!$(this).data('translateO'))
-					$(this).data('translateO', $.translate.get(this));
-				var translation = $(this).data('translateO');
-				if (language === $.translate.original || (translation = $.translate.lookup($(this).data('translateO'), module, language)) ) {
+			if (this.trO || $.translate.clear($.translate.get(this))) {
+				if (!this.trO)
+					this.trO = $.translate.get(this);
+				var translation = this.trO;
+				if (language === $.translate.original || (translation = $.translate.lookup(this.trO, module, language)) ) {
 					$.translate.set(this, translation);
-					$(this).data('translateM', module).data('translateL', language);
+					this.trM = module;
+					this.trL = language;
 				} else $(this).untranslate(true);
 			}
 		});
@@ -89,13 +90,14 @@
 
 	$.fn.retranslate = function(module_, language_) {
 		$.translate.textNodes(this).each(function() {
-			if ($(this).data('translateO')) {
-				var module = module_ || $(this).data('translateM');
-				var language = language_ || $(this).data('translateL');
-				var translation = $(this).data('translateO');
-				if (language === $.translate.original || (translation = $.translate.lookup($(this).data('translateO'), module, language)) ) {
+			if (this.trO) {
+				var module = module_ || this.trM;
+				var language = language_ || this.trL;
+				var translation = this.trO;
+				if (language === $.translate.original || (translation = $.translate.lookup(this.trO, module, language)) ) {
 					$.translate.set(this, translation);
-					$(this).data('translateM', module).data('translateL', language);
+					this.trM = module;
+					this.trL = language;
 				}
 			}
 		});
@@ -104,9 +106,11 @@
 
 	$.fn.untranslate = function(undo) {
 		$.translate.textNodes(this).each(function() {
-			if (undo && $(this).data('translateO'))
-				$.translate.set(this, $(this).data('translateO'));
-			$(this).removeData();
+			if (undo && this.trO)
+				$.translate.set(this, this.trO);
+			delete this.trM;
+			delete this.trL;
+			delete this.trO;
 		});
 	};
 //})();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubko
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Rok Kralj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -59,6 +59,7 @@ files:
 - stamp/.gitignore
 - stamp/config.ru
 - stamp/config/db.rb
+- stamp/config/deploy.rb
 - stamp/config/facebook.rb
 - stamp/config/session.rb
 - stamp/config/url.rb
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Web framework