lissio 0.1.0.beta3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfaafd8786e4bd056829a65cd8f5a14f33949285
-  data.tar.gz: 7720815c7598b37bc3319cfbfb510c026cf9d7ba
+  metadata.gz: 4d4328cde93f67bc47a4aee2d593220645316d93
+  data.tar.gz: 62a22329ca4140f17bbb78e8f753b13d91a12232
 SHA512:
-  metadata.gz: 56951c1ca1358d86972136bc92c9795ae6c078c2fa1d84bf316ea7d7d0e5f874bdd080bda2c36a3ad4d0cc8bbf154e449c0585232b9bbdef254c6231eb3aced1
-  data.tar.gz: 491f8196d41e43b1c3ef8a9f11a9ddb67b7f128f893f37650747d403d54fcd1e278936b989d77b68c67578f13be30295a7c5cc62f68a21acd301112315af033a
+  metadata.gz: 257d8ce4b732fcd54222164a2b62982a3e5c1e1ab0e840ad62a4e08e21c8e13ec0660343649dbc36edd4579b5c4d789fe7bd6e54696794874b655ecc78e7692d
+  data.tar.gz: f99393744bbc3d089fea238aa8e57226ea8ab2b75a01dbfd804552476a73f2416017200628d3dd4dde468b875f7195d46006011baeee68df63ca313b87072db6

data/Gemfile

@@ -3,5 +3,4 @@ gemspec
 
 gem 'opal', github: 'opal/opal'
 gem 'opal-browser', github: 'opal/opal-browser'
-gem 'parslet', github: 'kschiess/parslet'
 gem 'rake'

data/README.md

@@ -6,6 +6,14 @@ implement frontends completely on the client side.
 [Here](http://www.youtube.com/watch?v=7JU5ssyKczw) you can find the best
 musical background while developing **lissio** applications.
 
+Getting Started
+---------------
+To create a new lissio application just run `lissio new <path>`, change to the
+created directory and run `lissio start`.
+
+By default it will run the server on port `9001`, you can change it with
+`--port`, run `lissio help start` to see a list of other options.
+
 Application
 -----------
 Every **lissio** frontend begins with an `Application` singleton.
@@ -43,8 +51,6 @@ in pure Ruby using various DSLs.
 
 ```ruby
 class MyComponent < Lissio::Component
-  tag class: 'my-component'
-
   on :click, '.title' do
     alert 'You clicked on the title'
   end
@@ -59,15 +65,13 @@ class MyComponent < Lissio::Component
   end
 
   css do
-    rule '.my-component' do
-      rule '.title' do
-        font size: 32.px
-      end
-
-      rule '.subtitle' do
-        font size:  18.px,
-             style: :italic
-      end
+    rule '.title' do
+      font size: 32.px
+    end
+
+    rule '.subtitle' do
+      font size:  18.px,
+           style: :italic
     end
   end
 end
@@ -131,20 +135,14 @@ end
 Now you'll be able to fetch a model like this.
 
 ```ruby
-Message.fetch(1) {|msg|
-  if Message === msg
-    alert msg.content
-  else
-    alert msg.inspect
-  end
+Message.fetch(1).then {|msg|
+  alert msg.content
+}.rescue {|error|
+  alert error.inspect
 }
 ```
 
-When you do operations using adapters you'll always have to provide a block
-that will be called, since all operations are asynchronous.
-
-The class check is done because the block will be either passed the model or an
-error.
+All operations using adapters use promises, since they're all asynchronous.
 
 Server
 ------

data/bin/lissio

@@ -8,49 +8,16 @@ end
 require 'thor'
 require 'rack'
 require 'fileutils'
+require 'yaml'
 
 require 'lissio'
-require 'opal/browser'
 
 class CLI < Thor
-	desc "start [OPTIONS]", "start the lissio server"
-
-	option :server, type: :string
-	option :port,   type: :numeric, default: 9001
-	option :host,   type: :string, default: '0.0.0.0'
-	option :use,    type: :array, default: []
-	option :path,   type: :array, default: ['app', 'js']
-	option :static, type: :array, default: ['/css', '/fonts', '/img']
-	option :index,  type: :string
-	option :debug,  type: :boolean
-
-	def start
-		options[:use].each {|u|
-			require u
-		}
-
-		Rack::Server.start(
-			Host: options[:host],
-			Port: options[:port],
-
-			app: Lissio::Server.new {|s|
-				options[:path].each {|path|
-					s.append_path path
-				}
-
-				s.static = options[:static]
+	desc "new [PATH]", "create a new lissio application"
 
-				if index = options[:index]
-					s.index = index
-				end
+	option :adapter, type: :string
+	option :components, type: :string
 
-				if options[:debug]
-					s.debug = true
-				end
-			})
-	end
-
-	desc "new [PATH]", "create a new lissio application"
 	def new(path = '.')
 		FileUtils.mkpath path
 		FileUtils.cd path do
@@ -106,6 +73,114 @@ class CLI < Thor
 			end
 		end
 	end
+
+	desc "start", "start the lissio server"
+
+	option :server,  aliases: '-S', type: :string
+	option :port,    aliases: '-p', type: :numeric
+	option :host,                   type: :string
+	option :main,    aliases: '-m', type: :string
+	option :require, aliases: '-r', type: :array, default: []
+	option :use,     aliases: '-u', type: :array, default: []
+	option :path,                   type: :array, default: ['app', 'js', 'opal']
+	option :static,  aliases: '-s', type: :array, default: ['/css', '/fonts', '/img', '/js']
+	option :index,   aliases: '-i', type: :string
+	option :debug,   aliases: '-d', type: :boolean
+
+	def start
+		options = prepare
+
+		Rack::Server.start(
+			Host:   options[:host] || '0.0.0.0',
+			Port:   options[:port] || 9292,
+			server: options[:server],
+
+			app: Lissio::Server.new {|s|
+				options[:path].each {|path|
+					s.append_path path
+				}
+
+				s.static = options[:static]
+
+				if main = options[:main]
+					s.main = main
+				end
+
+				if index = options[:index]
+					s.index = index
+				end
+
+				if options[:debug]
+					s.debug = true
+				end
+			})
+	end
+
+	desc "build [PATH]", "create a server-less distribution of the application"
+
+	option :main,    aliases: '-m', type: :string
+	option :require, aliases: '-r', type: :array, default: []
+	option :use,     aliases: '-u', type: :array, default: []
+	option :path,                   type: :array, default: ['app', 'js', 'opal']
+	option :index,   aliases: '-i', type: :string
+	option :force,   aliases: '-f', type: :boolean, default: false
+
+	def build(output = 'index.html')
+		if !options[:force] && File.exists?(output)
+			raise ArgumentError, "'#{output}' already exists"
+		end
+
+		options = prepare
+
+		File.open output, 'w' do |f|
+			builder = Lissio::Builder.new {|b|
+				options[:path].each {|path|
+					b.append_path path
+				}
+
+				if main = options[:main]
+					b.main = main
+				end
+
+				if index = options[:index]
+					b.index = index
+				end
+			}
+
+			f.write builder.build
+		end
+	end
+
+private
+	def prepare
+		options = self.options.dup
+
+		if File.readable? 'lissio.yml'
+			YAML.load_file('lissio.yml').tap {|opts|
+				%w[server port host index debug main].each {|name|
+					if opts.has_key?(name) && !options.has_key?(name)
+						options[name] = opts[name]
+					end
+				}
+
+				%w[use require path static].each {|name|
+					if opts.has_key? name
+						options[name] = Array(opts[name])
+					end
+				}
+			}
+		end
+
+		options[:require].each {|r|
+			require r
+		}
+
+		options[:use].each {|u|
+			Opal.use_gem u
+		}
+
+		options
+	end
 end
 
 CLI.start(ARGV)

data/lib/lissio.rb

@@ -1,5 +1,7 @@
 require 'opal'
+require 'opal/browser'
 
 require 'lissio/server'
+require 'lissio/builder'
 
 Opal.append_path File.expand_path('../../opal', __FILE__)

data/lib/lissio/builder.rb

@@ -0,0 +1,54 @@
+require 'opal/sprockets/environment'
+require 'uglifier'
+require 'forwardable'
+
+module Lissio
+
+class Builder
+	extend Forwardable
+
+	attr_accessor :debug, :index, :main, :static, :source_maps, :sprockets
+	def_delegators :@sprockets, :append_path, :use_gem
+
+	def initialize(&block)
+		@sprockets = Sprockets::Environment.new
+		@main      = 'app'
+
+		Opal.paths.each {|path|
+			@sprockets.append_path path
+		}
+
+		block.call(self) if block
+	end
+
+	def build
+		source = if @path
+			unless File.exist?(@path)
+				raise "index does not exist: #{@path}"
+			end
+
+			File.read @path
+		elsif File.exist? 'index.html.erb'
+			File.read 'index.html.erb'
+		else
+			<<-HTML
+				<!DOCTYPE html>
+				<html>
+				<head>
+					<%= lissio %>
+				</head>
+				<body>
+				</body>
+				</html>
+			HTML
+		end
+
+		::ERB.new(source).result binding
+	end
+
+	def lissio(source = main)
+		"<script>#{Uglifier.compile(@sprockets[source].to_s)}</script>"
+	end
+end
+
+end

data/lib/lissio/server.rb

@@ -61,8 +61,6 @@ class Server
 				end
 
 				File.read @path
-			elsif File.exist? 'index.html'
-				File.read 'index.html'
 			elsif File.exist? 'index.html.erb'
 				File.read 'index.html.erb'
 			else
@@ -88,9 +86,10 @@ class Server
 				end
 
 				assets.map {|a|
-					%Q{<script src="/assets/#{a.logical_path}?body=1"></script>}
+					%{<script src="/assets/#{a.logical_path}?body=1"></script>}
 				}.join ?\n
 			else
+				@server.sprockets.js_compressor = :uglify
 				"<script src=\"/assets/#{source}.js\"></script>"
 			end
 		end
@@ -101,8 +100,13 @@ class Server
 	attr_accessor :debug, :index, :main, :static, :source_maps, :sprockets
 	def_delegators :@sprockets, :append_path, :use_gem
 
-	def initialize(options = {}, &block)
-		@sprockets = Opal::Environment.new
+	def initialize(&block)
+		@sprockets = Sprockets::Environment.new
+		@main      = 'app'
+
+		Opal.paths.each {|path|
+			@sprockets.append_path path
+		}
 
 		block.call(self) if block
 	end
@@ -131,6 +135,7 @@ class Server
 
 		@app ||= Rack::Builder.app do
 			use Rack::ShowExceptions
+			use Rack::Deflater
 
 			map '/assets' do
 				run this.sprockets

data/lissio.gemspec

@@ -16,12 +16,9 @@ Gem::Specification.new do |s|
 	s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
 	s.require_paths  = ['lib']
 
-  s.add_dependency 'opal', '>= 0.5.5'
-	s.add_dependency 'opal-browser'
+  s.add_dependency 'opal', '>= 0.7.0'
+	s.add_dependency 'opal-browser', '>= 0.2.0.beta1'
 	s.add_dependency 'rack'
-
-	s.add_development_dependency 'opal-spec'
-	s.add_development_dependency 'rake'
-
 	s.add_dependency 'thor'
+	s.add_dependency 'uglifier'
 end

data/opal/lissio/adapter/rest.rb

@@ -18,8 +18,11 @@ class REST < Adapter
 	def initialize(value, options = {}, &block)
 		super(value)
 
-		domain options[:domain] || $document.location.host
+		domain   options[:domain]
+		base     options[:base]
 		endpoint options[:endpoint] || endpoint_for(value)
+		parse    &options[:parse]
+		error    &options[:error]
 
 		if block.arity == 0
 			instance_exec(&block)
@@ -28,28 +31,50 @@ class REST < Adapter
 		end if block
 	end
 
+	def parse(&block)
+		block ? @parse = block : @parse
+	end
+
+	def error(&block)
+		block ? @error = block : @error
+	end
+
+	def http(&block)
+		block ? @http = block : @http
+	end
+
 	def domain(value = nil)
 		value ? @domain = value : @domain
 	end
 
+	def base(value = nil)
+		value ? @base = value : @base
+	end
+
 	def endpoint(value = nil, &block)
 		if value
-			if Proc === value
+			if Proc === value || Hash === value
 				@endpoint = value
 			elsif model?
-				@endpoint = proc {|method, instance, id|
+				@endpoint = proc {|method, *args|
+					next value if args.empty?
+
 					case method
 					when :fetch
-						"#{value}/#{id}"
+						"#{value}/#{args.first}"
 
 					when :save, :create, :destroy
-						"#{value}/#{instance.id!}"
+						"#{value}/#{args.first.id!}"
 					end
 				}
 			else
-				@endpoint = proc {|method, instance, desc|
+				@endpoint = proc {|method, *args|
 					if method == :fetch
-						"#{value}?#{desc.encode_uri}"
+						if desc = args.first
+							"#{value}?#{desc.encode_uri}"
+						else
+							value
+						end
 					end
 				}
 			end
@@ -60,43 +85,62 @@ class REST < Adapter
 		end
 	end
 
-	def http(&block)
-		block ? @http = block : @http
-	end
-
-	def with(method, model, *args)
-		point = @endpoint.call(method, model, *args)
-
-		if Hash === point
-			point.first[0].to_s.downcase
+	def to(method, *args)
+		result = if Proc === @endpoint
+			@endpoint.call(method, *args)
+		else
+			@endpoint[method].call(*args)
 		end
-	end
 
-	def url(method, model, *args)
-		point = @endpoint.call(method, model, *args)
+		if Hash === result
+			with, point = result.first
+		else
+			point = result
+		end
 
-		if Hash === point
-			point = point.first[1]
+		url = if @base
+			"#@base#{point}"
+		elsif @domain
+			"//#@domain#{point}"
+		else
+			"//#{$document.location.host}#{point}"
 		end
 
-		"//#{domain}#{point}"
+		if with
+			[url, with]
+		else
+			url
+		end
 	end
 
 	def install
 		if model?
 			@for.instance_eval {
 				def self.fetch(*args)
-					promise = Promise.new
-					with    = adapter.with(:fetch, nil, *args) || :get
-					url     = adapter.url(:fetch, nil, *args)
+					promise   = Promise.new
+					url, with = adapter.to(:fetch, *args)
 
-					Browser::HTTP.send(with, url) do |req|
+					Browser::HTTP.send(with || :get, url) do |req|
 						req.on :success do |res|
-							promise.resolve(new(res.json, *args))
+							if block = adapter.parse
+								value = block.call(res.json, *args)
+
+								if self === value
+									promise.resolve(value)
+								else
+									promise.resolve(new(value, *args))
+								end
+							else
+								promise.resolve(new(res.json, *args))
+							end
 						end
 
 						req.on :failure do |res|
-							promise.reject(res.status)
+							if block = adapter.error
+								promise.reject(block.call(res))
+							else
+								promise.reject(res.status)
+							end
 						end
 
 						adapter.http.call(req) if adapter.http
@@ -106,17 +150,20 @@ class REST < Adapter
 				end
 
 				def save
-					promise = Promise.new
-					with    = adapter.with(:save, self) || :put
-					url     = adapter.url(:save, self)
+					promise   = Promise.new
+					url, with = adapter.to(:save, self)
 
-					Browser::HTTP.send(with, url, to_json) do |req|
+					Browser::HTTP.send(with || :put, url, to_json) do |req|
 						req.on :success do |res|
 							promise.resolve(res.status)
 						end
 
 						req.on :failure do |res|
-							promise.reject(res.status)
+							if block = adapter.error
+								promise.reject(block.call(res))
+							else
+								promise.reject(res.status)
+							end
 						end
 
 						adapter.http.call(req) if adapter.http
@@ -126,17 +173,20 @@ class REST < Adapter
 				end
 
 				def create
-					promise = Promise.new
-					with    = adapter.with(:create, self) || :post
-					url     = adapter.url(:create, self)
+					promise   = Promise.new
+					url, with = adapter.to(:create, self)
 
-					Browser::HTTP.send(with, url, to_json) do |req|
+					Browser::HTTP.send(with || :post, url, to_json) do |req|
 						req.on :success do |res|
 							promise.resolve(res.status)
 						end
 
 						req.on :failure do |res|
-							promise.reject(res.status)
+							if block = adapter.error
+								promise.reject(block.call(res))
+							else
+								promise.reject(res.status)
+							end
 						end
 
 						adapter.http.call(req) if adapter.http
@@ -146,17 +196,20 @@ class REST < Adapter
 				end
 
 				def destroy
-					promise = Promise.new
-					with    = adapter.with(:destroy, self) || :delete
-					url     = adapter.url(:destroy, self)
+					promise   = Promise.new
+					url, with = adapter.to(:destroy, self)
 
-					Browser::HTTP.send(with, url) do |req|
+					Browser::HTTP.send(with || :delete, url) do |req|
 						req.on :success do |res|
 							promise.resolve(res.status)
 						end
 
 						req.on :failure do |res|
-							promise.reject(res.status)
+							if block = adapter.error
+								promise.reject(block.call(res))
+							else
+								promise.reject(res.status)
+							end
 						end
 
 						adapter.http.call(req) if adapter.http
@@ -166,12 +219,11 @@ class REST < Adapter
 				end
 
 				def reload
-					promise = Promise.new
-					fetched = fetched_with.empty? ? [id!] : fetched_with
-					with    = adapter.with(:fetch, self, *fetched) || :get
-					url     = adapter.url(:fetch, self, *fetched)
+					promise   = Promise.new
+					fetched   = fetched_with.empty? ? [id!] : fetched_with
+					url, with = adapter.to(:fetch, self, *fetched)
 
-					Browser::HTTP.send(with, url) do |req|
+					Browser::HTTP.send(with || :get, url) do |req|
 						req.on :success do |res|
 							initialize(res.json, *fetched_with)
 
@@ -179,7 +231,11 @@ class REST < Adapter
 						end
 
 						req.on :failure do |res|
-							promise.reject(res.status)
+							if block = adapter.error
+								promise.reject(block.call(res))
+							else
+								promise.reject(res.status)
+							end
 						end
 
 						adapter.http.call(req) if adapter.http
@@ -191,17 +247,30 @@ class REST < Adapter
 		else
 			@for.instance_eval {
 				def self.fetch(*args, &block)
-					promise = Promise.new
-					with    = adapter.with(:fetch, nil, *args)
-					url     = adapter.url(:fetch, nil, *args)
+					promise   = Promise.new
+					url, with = adapter.to(:fetch, *args)
 
-					Browser::HTTP.send(with, url) do |req|
+					Browser::HTTP.send(with || :get, url) do |req|
 						req.on :success do |res|
-							promise.resolve(new(res.json, *args))
+							if block = adapter.parse
+								value = block.call(res.json, *args)
+
+								if self === value
+									promise.resolve(value)
+								else
+									promise.resolve(new(value, *args))
+								end
+							else
+								promise.resolve(new(res.json, *args))
+							end
 						end
 
 						req.on :failure do |res|
-							promise.reject(res.status)
+							if block = adapter.error
+								promise.reject(block.call(res))
+							else
+								promise.reject(res.status)
+							end
 						end
 
 						adapter.http.call(req) if adapter.http
@@ -211,18 +280,21 @@ class REST < Adapter
 				end
 
 				def reload(&block)
-					promise = Promise.new
-					with    = adapter.with(:fetch, self, *fetched_with) || :get
-					url     = adapter.url(:fetch, self, *fetched_with)
+					promise   = Promise.new
+					url, with = adapter.to(:fetch, self, *fetched_with)
 
-					Browser::HTTP.send(with, url)  do |req|
+					Browser::HTTP.send(with || :get, url)  do |req|
 						req.on :success do |res|
 							initialize(res.json, *fetched_with)
 							promise.resolve(self)
 						end
 
 						req.on :failure do |res|
-							promise.reject(res.status)
+							if block = adapter.error
+								promise.reject(block.call(res))
+							else
+								promise.reject(res.status)
+							end
 						end
 
 						adapter.http.call(req) if adapter.http