lissio 0.1.0.beta3 → 0.1.0

data/opal/lissio/adapter/storage.rb

@@ -63,19 +63,21 @@ class Storage < Adapter
 					self.class.storage
 				end
 
-				def self.fetch(id, &block)
-					proc {
-						block.call(storage[id] || :error)
-					}.defer
+				def self.fetch(id)
+					if value = storage[id]
+						Promise.value(value)
+					else
+						Promise.error(:missing)
+					end
 				end
 
-				def create(&block)
-					proc {
-						key = id!
+				def create
+					key = id!
 
-						if key && storage[key]
-							block.call(:error) if block
-						else
+					if key && storage[key]
+						Promise.error(:exists)
+					else
+						Promise.defer {
 							adapter.autoincrement.each {|name|
 								unless __send__ name
 									__send__ "#{name}=", adapter.autoincrement!(name, storage)
@@ -83,34 +85,28 @@ class Storage < Adapter
 							}
 
 							storage[id!] = self
-
-							block.call(:ok) if block
-						end
-					}.defer
+						}
+					end
 				end
 
-				def save(&block)
-					proc {
-						if storage[id!]
+				def save
+					if storage[id!]
+						Promise.defer {
 							storage[id!] = self
-
-							block.call(:ok) if block
-						else
-							block.call(:error) if block
-						end
-					}.defer
+						}
+					else
+						Promise.error(:missing)
+					end
 				end
 
 				def destroy(&block)
-					proc {
-						if storage[id!]
+					if storage[id!]
+						Promise.defer {
 							storage.delete(id!)
-
-							block.call(:ok) if block
-						else
-							block.call(:error) if block
-						end
-					}.defer
+						}
+					else
+						Promise.error(:missing)
+					end
 				end
 			}
 		else
@@ -124,15 +120,15 @@ class Storage < Adapter
 				end
 
 				def self.fetch(*args, &block)
-					proc {
-						block.call new(storage.map {|name, value|
+					Promise.defer {
+						new(storage.map {|name, value|
 							next if Array === name && name.length == 2 && name.first == :__autoincrement__
 
 							if !adapter.filter || adapter.filter.call(value, *args)
 								value
 							end
 						}.compact)
-					}.defer
+					}
 				end
 			}
 		end

data/opal/lissio/application.rb

@@ -9,7 +9,7 @@ class Application < Component
 
 		klass.include Singleton
 
-		$document.on :load do
+		$document.ready do
 			klass.start
 		end
 	end
@@ -39,6 +39,8 @@ class Application < Component
 	def_delegators :@router, :navigate, :route
 
 	def initialize
+		super()
+
 		@router = Lissio::Router.new(fragment: false)
 	end
 
@@ -54,10 +56,9 @@ class Application < Component
 
 	element :body
 
-	on :click, 'a[href^="/"]' do |e|
+	on :click, 'a[href^="/"], a[href="back"], a[href="forward"]' do |e|
 		unless e.alt? || e.ctrl? || e.meta? || e.shift?
-			e.stop!
-
+			e.prevent
 			navigate e.target[:href] || e.target.ancestors('a').first[:href]
 		end
 	end

data/opal/lissio/collection.rb

@@ -28,9 +28,7 @@ class Collection
 		klass ? @model = klass : @model
 	end
 
-	def self.parse(&block)
-		block ? @parse = block : @parse
-	end
+	include Enumerable
 
 	extend Forwardable
 	def_delegators :class, :adapter, :model
@@ -41,10 +39,8 @@ class Collection
 
 		if data
 			@items = data.map {|datum|
-				next datum if Model === datum
-
-				if block = self.class.parse
-					block.call(datum)
+				if Model === datum
+					datum
 				else
 					model.new(datum)
 				end
@@ -52,7 +48,15 @@ class Collection
 		end
 	end
 
-	include Enumerable
+	def [](id)
+		@items.find { |e| e.id! == id }
+	end
+
+	def replace(array)
+		@items = array
+
+		self
+	end
 
 	def each(&block)
 		return enum_for :each unless block

data/opal/lissio/component.rb

@@ -19,9 +19,19 @@ class Component
 		events  = @events
 
 		klass.instance_eval {
-			@element = element if element
-			@tag     = tag if tag
-			@events  = events.clone if events
+			@element = element
+
+			if tag
+				@tag = tag.dup
+				@tag[:class] = @tag[:class].dup
+			end
+
+			if events
+				@events = events.dup
+				@events.each_key {|key|
+					@events[key] = @events[key].dup
+				}
+			end
 		}
 	end
 
@@ -30,9 +40,49 @@ class Component
 	end
 
 	def self.tag(options = nil)
+		return @tag unless options
+
+		@tag ||= {}
+
+		if cls = options.delete(:class)
+			@tag[:class] = Array(@tag[:class]).concat(Array(cls))
+		end
+
+		@tag.merge!(options)
+	end
+
+	def self.tag!(options = nil)
 		options ? @tag = options : @tag
 	end
 
+	def self.inheritance
+		ancestors.take_while {|klass|
+			klass != Component
+		}.map {|klass|
+			next unless klass.ancestors.include?(Component)
+			next unless klass.css
+
+			tag     = klass.tag
+			element = klass.element
+			parent  = klass.superclass
+
+			if parent != Component
+				next if element != parent.element
+				next if tag && !parent.tag
+				next if tag && (tag[:class] != parent.tag[:class] || tag[:id] != parent.tag[:id])
+			else
+				next if element
+				next if tag && (tag[:class] || tag[:id])
+			end
+
+			if klass.name
+				klass.name.gsub(/::/, '-').downcase
+			else
+				"lissio-#{klass.object_id}"
+			end
+		}.compact
+	end
+
 	def self.events
 		@events ||= Hash.new { |h, k| h[k] = [] }
 	end
@@ -40,16 +90,10 @@ class Component
 	def self.on(name, selector = nil, method = nil, &block)
 		if block
 			events[name] << [selector, block]
-
-			[name, selector, block]
 		elsif method
 			events[name] << [selector, method]
-
-			[name, selector, method]
 		else
-			events[name] << [nil, method]
-
-			[name, nil, method]
+			events[name] << [nil, selector]
 		end
 	end
 
@@ -85,23 +129,63 @@ class Component
 		end
 	end
 
-	def self.css(content = nil, &block)
+	def self.text(string = nil, &block)
+		if block
+			render {
+				element.inner_text = instance_exec(&block)
+			}
+		else
+			render {
+				element.inner_text = string
+			}
+		end
+	end
+
+	def self.css!(content = nil, &block)
 		if content || block
-			@style.remove if @style
+			@global.remove if @global
 
-			@style = CSS(content, &block)
-			@style.append_to($document.head)
+			@global = CSS(content, &block)
+			@global.append_to($document.head)
 		else
-			CSS::StyleSheet.new(@style)
+			CSS::StyleSheet.new(@global) if @global
 		end
 	end
 
-	attr_accessor :parent
+	def self.css(&block)
+		if block
+			selector = if @tag && id = @tag[:id]
+				"##{id}"
+			elsif @tag && cls = @tag[:class]
+				".#{Array(cls).join('.')}"
+			elsif @element
+				@element
+			elsif self.name
+				".#{self.name.gsub(/::/, '-').downcase}"
+			else
+				".lissio-#{object_id}"
+			end
+
+			@local.remove if @local
 
-	def initialize(parent = nil)
-		@parent = parent
+			@local = CSS do
+				rule selector do
+					if block.arity == 0
+						instance_exec(&block)
+					else
+						block.call(self)
+					end
+				end
+			end
+
+			@local.append_to($document.head)
+		else
+			CSS::StyleSheet.new(@local) if @local
+		end
 	end
 
+	attr_accessor :parent
+
 	def tag
 		{ name: :div }.merge(self.class.tag || {})
 	end
@@ -121,17 +205,27 @@ class Component
 		end
 
 		elem.add_class(*tag[:class]) if tag[:class]
-		elem[:id] = tag[:id] if tag[:id]
+		elem.add_class(*self.class.inheritance)
 
-		self.class.events.each {|name, blocks|
-			blocks.each {|selector, block|
-				if block.is_a? Symbol
-					elem.on(name, selector, &method(block))
-				else
-					elem.on(name, selector) {|*args|
-						instance_exec(*args, &block)
-					}
-				end
+		tag.each {|name, value|
+			if name != :class && name != :name
+				elem[name] = value
+			end
+		}
+
+		[self.class.events, @events].compact.each {|events|
+			events.each {|name, blocks|
+				blocks.each {|selector, block|
+					if Symbol === block
+						elem.on name, selector do |*args|
+							__send__ block, *args
+						end
+					else
+						elem.on name, selector do |*args|
+							instance_exec(*args, &block)
+						end
+					end
+				}
 			}
 		}
 
@@ -139,29 +233,49 @@ class Component
 	end
 
 	def on(name, selector = nil, method = nil, &block)
-		self.class.on(name, selector, method, &block)
-
 		if @element
 			if block
-				@element.on(name, selector) {|*args|
+				@element.on name, selector do |*args|
 					instance_exec(*args, &block)
-				}
+				end
 			elsif method
-				@element.on(name, selector, &method(method))
+				@element.on name, selector do |*args|
+					__send__ method, *args
+				end
 			else
-				@element.on(name, &method(method))
+				@element.on name do |*args|
+					__send__ method, *args
+				end
 			end
-		end
+		else
+			@events ||= Hash.new { |h, k| h[k] = [] }
 
-		self
+			if block
+				@events[name] << [selector, block]
+			elsif method
+				@events[name] << [selector, method]
+			else
+				@events[name] << [nil, selector]
+			end
+		end
 	end
 
 	# When overriding, remember to call super as last.
 	def render(*)
-		element.trigger :render, self
+		element.trigger! :render, self
 		element
 	end
 
+	def trigger(*args, &block)
+		element.trigger(*args, &block)
+		self
+	end
+
+	def trigger!(*args, &block)
+		element.trigger!(*args, &block)
+		self
+	end
+
 	def remove
 		@element.remove if @element
 	end
@@ -169,7 +283,6 @@ class Component
 	alias destroy remove
 end
 
-
 Browser::DOM::Builder.for Component do |_, item|
 	item.render
 end

data/opal/lissio/component/alert.rb

@@ -13,10 +13,21 @@ class Alert < Component
 	end
 
 	def render
-		if @options[:escape] == false
+		if Exception === @message
+			element << @message.inspect
+			element << DOM { br; br }
+
+			@message.backtrace.each {|line|
+				element << line
+				element << DOM { br }
+			}
+		elsif @options[:escape] == false
 			element.inner_html = @message
 		else
-			element << @message
+			@message.each_line {|line|
+				element << line
+				element << DOM { br }
+			}
 		end
 
 		super
@@ -25,82 +36,61 @@ class Alert < Component
 	tag class: :alert
 
 	css do
-		rule '.alert' do
-			border 1.px, :solid, :transparent
+		border 1.px, :solid, :transparent
 
-			padding 15.px
+		padding 15.px
 
-			rule 'a' do
-				font weight: :bold
-			end
+		rule 'a' do
+			font weight: :bold
 		end
 	end
 
-	def self.customize(*args, &block)
-		if args.length == 1
-			options = args.first
-		else
-			name, options = args
-		end
-
-		name    ||= "alert-custom-#{rand(10000)}"
-		options ||= {}
-
-		if self == Alert
-			inherited = []
-		else
-			inherited = class_names
-		end
-
+	def self.customize(options = {}, &block)
 		Class.new(self) {
-			define_singleton_method :class_names do
-				inherited + [name]
-			end
-
-			tag class: [:alert, name, *inherited]
-
 			css do
-				rule ".alert#{".#{inherited.join('.')}" unless inherited.empty?}.#{name}" do
-					instance_exec(&block) if block
-
-					if value = options[:background] || options[:bg]
-						background color: value
-					end
+				if value = options[:background] || options[:bg]
+					background color: value
+				end
 
-					if value = options[:foreground] || options[:fg]
-						color value
-					end
+				if value = options[:foreground] || options[:fg]
+					color value
+				end
 
-					if value = options[:border]
-						border color: value
-					end
+				if value = options[:border]
+					border color: value
+				end
 
-					if value = options[:padding]
-						padding value
-					end
+				if value = options[:padding]
+					padding value
 				end
+
+				if block.arity == 0
+					instance_exec(&block)
+				else
+					block.call(self)
+				end if block
 			end
 		}
 	end
 
-	Info = customize :info,
+	Info = customize \
 		background: '#d9edf7',
 		foreground: '#3a87ad',
 		border:     '#bce8f1'
 
-	Success = customize :success,
+	Success = customize \
 		message:    "The operation was successful.",
 		background: '#dff0d8',
 		foreground: '#468847',
 		border:     '#d6e9c6'
 
-	Warning = customize :warning,
+	Warning = customize \
 		message:    "Something might have gone wrong.",
 		background: '#fcf8e3',
 		foreground: '#c09853',
 		border:     '#fbeed5'
 
-	Danger = customize :danger,
+	Danger = customize \
 		message:    "An unexpected error has occurred.",
 		background: '#f2dede',
 		foreground: '#b94a48',