madride 1.0.0 → 1.0.1

data/README.md

@@ -1,34 +1,37 @@
-MADRIDe
+Madride
 =======
 
-Zero-configuration command-line HTTP server with cow super-powers... Basically
-it allows you to serve files from the directory where you call it. But in
-comparison to other solutions `madride` allows you to write htmls in slim, js in
-coffescript and so on... Consider you have following files:
+Zero-configuration command-line HTTP server with cow super-powers...
 
-    .
-    |- pages/
-    |   `- index.html.slim
-    |
-    `- assets/
-        |- app.js.coffee
-        `- app.css.sass
+It's main purpose is to provide environment for quick prototyping of
+pages with *slim* (or any other template engine - feel free to open
+feature request issue) without need to run full stack of big boys like
+*sinatra* or *rails*. All you need is to simply execute `madride` with
+paths to your assets and pages.
 
-You can run `madride pages assets` to start serving these files as:
+The most simple example is:
 
-    /index.html
-    /app.js
-    /app.css
+    madride .
 
-Similar to the Rails assets pipeline but for html too :))
+This will start a server on `0.0.0.0:3000` serving files from `.`
+directory. You can provide a dummy data (that will be available in your
+templates) with `--data path/to/data.yml` argument. See `example` dir.
 
 
-Future plans
+Installation
 ------------
 
-- Attachable plugins via `--with <plugin-name>` option, e.g. `--with bootstrap`
-  to allow you easily "attach" bootstrap assets.
-- Support for data sources. Prototyping is nice, but it's kinda hard without at
-  least mocked data sources. So I plan to add `--data <path_to_yaml_file>`
-  option that will allow to specify a file with data available within html
-  templates.
+    gem install madride
+
+
+Usage
+-----
+
+See `example` for details.
+
+
+License & Copyrights
+--------------------
+
+* Copyright (c) 2012 [Aleksey "ixti" Zapparov](https://github.com/ixti)
+* Released under the MIT license. See LICENSE for details.

data/bin/madride

@@ -12,7 +12,7 @@ require 'rack'
 # Options container. Filled in with default values.
 #
 
-options = { :host => '0.0.0.0', :port => 3000, :data => {} }
+options = { :host => '0.0.0.0', :port => 3000, :data => {}, :paths => [] }
 
 #
 # Parse options
@@ -35,22 +35,44 @@ OptionParser.new("", 24, '  ') do |opts|
   opts.on("-w", "--with PLUGIN", "include PLUGIN") do |plugin|
     begin
       require "madride-with-#{plugin}"
-    rescue LoadError
-      require plugin
     rescue LoadError
       puts "Plugin #{plugin} not found"
     end
   end
 
   opts.on("-d", "--data FILE", "read data from yaml FILE") do |file|
-    options[:data].update! YAML.load_file file
+    options[:data].merge! YAML.load_file file
   end
 
+  #
+  # No arguments given - show usage help
+  #
+
   if ARGV.empty?
     puts opts.help
     exit 1
   end
-end.parse!
+
+  #
+  # Parse options
+  #
+
+  begin
+    opts.order(ARGV){ |path| options[:paths] << path }
+  rescue OptionParser::ParseError => e
+    opts.warn e.message
+    exit 1
+  end
+
+  #
+  # We need at least one path
+  #
+
+  if options[:paths].empty?
+    opts.warn "No paths given. See `madride --help` for usage info."
+    exit 1
+  end
+end
 
 #
 # Create new madride environment
@@ -62,11 +84,7 @@ environment = Madride::Environment.new Dir.pwd
 # Fill in paths
 #
 
-if ARGV.empty?
-  environment.append_path "."
-else
-  ARGV.each{ |path| environment.append_path path }
-end
+options[:paths].each{ |path| environment.append_path path }
 
 #
 # Start server

data/example/README.md

@@ -1,4 +1,8 @@
 ## How To Start
 
+Install dependencies and start server:
+
     bundle install
-    bundle exec madride --with bootstrap -- assets pages
+    bundle exec madride --with bootstrap --data data.yml -- assets pages
+
+Now you can open http://0.0.0.0:3000/index.html in your browser

data/example/data.yml

@@ -0,0 +1 @@
+bootstrap_demo_url: "http://twitter.github.com/bootstrap/examples/hero.html"

data/example/pages/index.html.slim

@@ -52,7 +52,6 @@ html[lang="en"]
       hr
       footer
         p
-          - url = "http://twitter.github.com/bootstrap/examples/hero.html"
           ' This is a demo of madride.
-          ' Based on a <a href="#{url}">Basic marketing site</a>
+          ' Based on a <a href="#{bootstrap_demo_url}">Basic marketing site</a>
           ' example of Bootstrap from Twitter.

data/lib/madride/version.rb

@@ -1,3 +1,3 @@
 module Madride
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madride
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -142,6 +142,7 @@ files:
 - example/Gemfile
 - example/README.md
 - example/assets/app.css
+- example/data.yml
 - example/pages/index.html.slim
 - lib/madride.rb
 - lib/madride/context_patch.rb
@@ -171,24 +172,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 828496883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 828496883
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: madride-1.0.0
+summary: madride-1.0.1
 test_files:
 - spec/.gitkeep
 - spec/environment_spec.rb