aladdin 0.0.6 → 0.0.7

data/lib/aladdin/app.rb

@@ -19,13 +19,7 @@ module Aladdin
     MARKDOWN_OPTIONS = {
       renderer:           Aladdin::Render::HTML,
       layout_engine:      :haml,
-      no_intra_emphasis:  true,
-      tables:             true,
-      fenced_code_blocks: true,
-      autolink:           true,
-      strikethrough:      true,
-      tables:             true,
-    }
+    }.merge MARKDOWN_EXTENSIONS
 
     class << self
       private
@@ -47,7 +41,7 @@ module Aladdin
       # @return [void]
       def configure_assets
         set :public_folder, Aladdin::PATHS.assets
-        set :static_paths, Proc.new { Aladdin.config['static_paths'] }
+        set :static_paths, Proc.new { Aladdin.config[:static_paths] }
       end
 
       # Configures ZURB's compass to compile aladdin's scss assets.

data/lib/aladdin/commands.rb

@@ -29,7 +29,7 @@ module Aladdin
       when '--version', '-v'
         puts "Aladdin #{Aladdin::VERSION}"
         exit 0
-      when '--help', '-h'
+      when nil, '--help', '-h'
         puts File.read USAGE
         exit 0
       else

data/lib/aladdin/config.rb

@@ -1,4 +1,8 @@
 # ~*~ encoding: utf-8 ~*~
+require 'active_support/core_ext/hash'
+require 'json'
+require 'aladdin/constants'
+
 module Aladdin
 
   # Raised when there is a configuration error.
@@ -14,14 +18,14 @@ module Aladdin
 
     # Default configuration options.
     DEFAULTS = {
-      'verify' => {
+      verify: {
         'bin' => 'make',
         'arg_prefix' => ''
        },
-      'title' => 'Lesson X',
-      'description' => 'This is a placeholder description. You should provide your own',
-      'categories' => [],
-      'static_paths' => %w(images)
+      title: 'Lesson X',
+      description: 'This is a placeholder description. You should provide your own',
+      categories: [],
+      static_paths: %w(images)
     }
 
     # Creates a new configuration from the file at the given path. Merges the
@@ -32,7 +36,8 @@ module Aladdin
       @path = File.expand_path FILE, root
       ensure_readable
       super nil
-      merge! DEFAULTS.deep_merge ::JSON.parse File.read @path
+      newsets = ::JSON.parse File.read @path
+      merge! DEFAULTS.deep_merge newsets.symbolize_keys
       ensure_valid
     rescue ::JSON::JSONError => e
       raise ConfigError.new e.message

data/lib/aladdin/constants.rb

@@ -26,4 +26,14 @@ module Aladdin
   # File extension for solution files.
   SOLUTION_EXT = '.sol'
 
+  # Markdown extensions for Redcarpet
+  MARKDOWN_EXTENSIONS = {
+    no_intra_emphasis:  true,
+    tables:             true,
+    fenced_code_blocks: true,
+    autolink:           true,
+    strikethrough:      true,
+    tables:             true,
+  }
+
 end

data/lib/aladdin/render.rb

@@ -5,4 +5,5 @@ require 'redcarpet'
 require 'htmlentities'
 require 'sanitize'
 
-require 'aladdin/render/markdown'
+require 'aladdin/support'
+require 'aladdin/render/html'

data/lib/aladdin/submission.rb

@@ -54,7 +54,7 @@ module Aladdin
         # FIXME: catch errors
         filename = SecureRandom.uuid
         IO.write(filename, @input)
-        bin = File.join '..', Aladdin.config['verify']['bin']
+        bin = File.join '..', Aladdin.config[:verify]['bin']
         `#{bin} --id=#{@id} --input=#{filename}`
         IO.read 'genie-results.json'
       end

data/lib/aladdin/version.rb

@@ -1,4 +1,4 @@
 module Aladdin
   # Version number.
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aladdin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.3
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -139,22 +123,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +237,7 @@ files:
 - lib/aladdin/config.rb
 - lib/aladdin/constants.rb
 - lib/aladdin/render/error.rb
-- lib/aladdin/render/markdown.rb
+- lib/aladdin/render/html.rb
 - lib/aladdin/render/sanitize.rb
 - lib/aladdin/render/templates/header.rb
 - lib/aladdin/render/templates/image.rb
@@ -361,6 +329,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3977803358167524809
 requirements:
 - pygments, python's syntax highlighter
 rubyforge_project: