gumdrop 1.0.2 → 1.0.3

data/ChangeLog.md

@@ -1,3 +1,10 @@
+# v1.0.3
+- Fixed markdown and textile view_helpers.
+- `Dir.chdir` to `site.root`. (should be able to run gumdrop in any folder of a Gumdrop project)
+- Added support for launching the browser when starting the dev server.
+- You may now override the dev server port on the cli as well.
+- Disabled automatic `bundle install` when a new project is created. It's annoying.
+
 # v1.0.2
 - `gumdrop new` will automatically run `bundle install` so the project site is ready to go.
 - Using kramdown in default template.
@@ -105,7 +112,7 @@
 - You can install the current site as a local template using `gumdrop -t new_template_name` in a site folder.
 - Data folder path is now configurable: `Gumdrop.config.data_dir` or `set :data_dir, "PATH"`
 - Added `data.site` and `data.site_all` to `DefferedLoader`. Useful for listing all non-grey-listed files or all files.
-- Data will now load from data/COLLECTION_NAME/*.(json | yaml | yml). Loads as an array array of all entries, adds a key '_id' that's the base filename.
+- Data will now load from data/COLLECTION_NAME/*.json or .yaml or .yml. Loads as an array array of all entries, adds a key '_id' that's the base filename.
 - Initial `redirect` options for use in generate blocks.
 - Extra stitch generator options:
     - `compress` takes `:jsmin`, `:yuic`, or `:uglify` now. (`true` defaults to `:jsmin`)
@@ -171,7 +178,7 @@
 
 # v0.2.14
 - Added new template type: twitter
-- Added cli option -t / --template to specify default|twitter template when creating a new project
+- Added cli option -t / --template to specify default or twitter template when creating a new project
 
 # v0.2.13
 - Adding content_filters for altering rendered output -- BUILD ONLY!

data/bin/gumdrop

@@ -10,7 +10,8 @@ Bundler.require if File.exists?('Gemfile')
 begin
   if Gumdrop.in_site_folder?
     # Pre-Fetch Site and load Gumdrop file
-    Gumdrop.site()
+    Gumdrop.site
+    Dir.chdir Gumdrop.site.root
     Gumdrop::CLI::Internal.start
   else
     Gumdrop::CLI::External.start

data/gumdrop.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
    s.add_dependency 'onfire'
    s.add_dependency 'sinatra'
    s.add_dependency 'i18n'
+   s.add_dependency 'launchy'
    s.add_dependency 'bundle'
 
    s.add_development_dependency 'minitest'

data/lib/gumdrop.rb

@@ -38,7 +38,7 @@ module Gumdrop
   end
 
   # Returns 'ReadMe.md' from gem package.
-  def self.change_log
+  def self.read_me
     here= File.dirname(__FILE__)
     File.read here / ".." / "ReadMe.md"
   end

data/lib/gumdrop/cli/external.rb

@@ -28,8 +28,8 @@ module Gumdrop::CLI
         self.templates
         return
       end
-      path= File.expand_path(name)
-      puts `cd #{path} && bundle install`
+      # path= File.expand_path(name)
+      # puts `cd #{path} && bundle install`
     end
 
     desc 'templates', 'List templates'

data/lib/gumdrop/cli/internal.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'thor'
+require 'launchy'
 
 module Gumdrop::CLI
   class Internal < Thor
@@ -25,8 +26,15 @@ module Gumdrop::CLI
     end
 
     desc 'server', 'Run development server'
+    method_option :browser, aliases:'-b', default:false, desc:"Launch a browser to the site address."
+    method_option :port, aliases:'-p', default:4567, desc:"Port to run the server on."
     def server
+      Gumdrop.configure do |c|
+        c.server_port= options[:port]
+      end
       Gumdrop.site.options = options.merge(mode:'server')
+      Launchy.open "http://127.0.0.1:#{ options[:port] }" if options[:browser]
+      Gumdrop.log.warn "Launching dev server at http://127.0.0.1:#{ options[:port] }"
       Gumdrop::Server
     end
 

data/lib/gumdrop/util/core_ex.rb

@@ -9,7 +9,7 @@ class Hash
   end
 
   def to_hash_object
-    Gumdrop::Util::HashObject.from self
+    Gumdrop::Util::HashObject.from self, true
   end
 
   def ends_with?(string)

data/lib/gumdrop/util/hash_object.rb

@@ -7,6 +7,9 @@ module Gumdrop::Util
       super(key.to_sym)
     end
     def []=(key, value)
+      if value.is_a? Hash
+        value= HashObject.from value, true
+      end
       super(key.to_sym, value)
     end
   
@@ -59,8 +62,15 @@ module Gumdrop::Util
       end
     end
 
-    def self.from(hash={})
+    def self.from(hash={}, recurse=true)
       h= new
+      if recurse
+        hash.each do |key, value|
+          if value.is_a? Hash
+            hash[key]= HashObject.from value
+          end
+        end
+      end
       h.merge!(hash)
       h
     end

data/lib/gumdrop/util/view_helpers.rb

@@ -8,18 +8,20 @@ module Gumdrop
       end
       
       def markdown(source)
-        eng= Gumdrop::Renderer.for 'markdown'
-        unless eng.nil?
-          eng.new(source).render
+        eng_class= Gumdrop::Renderer.for 'markdown'
+        unless eng_class.nil?
+          eng= eng_class.new { source }
+          eng.render
         else
           raise StandardError, "Markdown is not available: Include a Markdown engine in your Gemfile!"
         end
       end
       
       def textile(source)
-        eng= Gumdrop::Renderer.for 'textile'
-        unless eng.nil?
-          eng.new(source).render
+        eng_class= Gumdrop::Renderer.for 'textile'
+        unless eng_class.nil?
+          eng= eng_class.new { source }
+          eng.render
         else
           raise StandardError, "Textile is not available: Include a Textile engine in your Gemfile!"
         end

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION= "1.0.2"
+  VERSION= "1.0.3"
 
 end

data/specs/hash_object_spec.rb

@@ -73,4 +73,11 @@ describe Gumdrop::Util::HashObject do
     ho.fifth.must_equal 5
   end
 
+  it "should make nested hashes act like objects too" do
+    @ho.sub= { :name=>'Matt', 'age'=>'OLDish', 'sub'=>{ 'stuff'=>'STUFF' } }
+    @ho.sub.name.must_equal "Matt"
+    @ho.sub.age.must_equal 'OLDish'
+    @ho.sub.sub.stuff.must_equal 'STUFF'
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Matt McCray
@@ -96,7 +96,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bundle
+  name: launchy
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -109,7 +109,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: bundle
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -119,10 +119,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: minitest
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -135,7 +135,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: sqlite3
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -148,7 +148,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: stitch
+  name: sprockets
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -161,7 +161,7 @@ dependencies:
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: jsmin
+  name: stitch
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -173,6 +173,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: jsmin
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
 description: The sweet 'n simple cms and prototyping tool for creating static html websites and webapps.
 email: matt@elucidata.net
 executables: