proton 0.3.0.rc1 → 0.3.2

data/HISTORY.md

@@ -1,14 +1,33 @@
+Proton v0.3.2 - Jun 22, 2011
+----------------------------
+
+Hotfixes.
+
+### Fixed:
+  * `Gemfile` and `Gemfile.lock` are now auto ignored when doing *proton build*.
+  * Fixed the `rel()` helper.
+
 Proton v0.3.0 - Jun 22, 2011
 ----------------------------
 
 **The project has been renamed to Proton** (previously called *Hyde*).
 
-### Changed:
-  * The main class is now called `Proton` instead of `Hyde`. However, `Hyde` 
+A manual is also in progress, currently hosted at 
+[sinefunc.com/hyde/manual](http://sinefunc.com/hyde/manual).
+
+### Renamed:
+  * * The main class is now called `Proton` instead of `Hyde`. However, *Hyde* 
   still works as an alias.
   * The main executable is now called `proton` (and not `hyde`).
-  * The configuration file is now called `Protonfile`. The legacy `hyde.conf` 
-  and `.hyderc` still works for backward-compatibility.
+  * The configuration file is now called `Protonfile`. The legacy *hyde.conf* 
+  and *.hyderc* still works for backward-compatibility.
+
+### Added:
+  * New `proton rack` command to Rackify a given project.
+
+### Changed:
+  * Creating a project with `proton create` will now not include any gem 
+  manifest or *config.ru* file.
 
 Hyde v0.2.3 - Jun 20, 2011
 --------------------------

data/README.md

@@ -41,7 +41,7 @@ It's like building a static site, but better! You can use Proton for:
 Installation
 ------------
 
-    gem install protonweb
+    gem install proton
 
 Usage
 -----

data/data/rack/Gemfile

@@ -1,2 +1,2 @@
-gem "proton", "0.3.0.rc1"
+gem "proton", "~> 0.3.2"
 gem "rack-cache", "~> 1.0.0"

data/data/rack/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     hashie (1.0.0)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    proton (0.3.0.rc1)
+    proton (0.3.2)
       RedCloth (~> 4.2.3)
       compass (~> 0.11.1)
       cuba (~> 2.0.0)
@@ -36,5 +36,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  proton (= 0.3.0.rc1)
+  proton (~> 0.3.2)
   rack-cache (~> 1.0.0)

data/data/rack/config.ru

@@ -8,14 +8,16 @@ begin
   require 'bundler'
   Bundler.setup
 rescue LoadError
-  gem 'proton', '0.3.0.rc1'
+  gem 'proton', '0.3.2'
 end
 
-# Add the 'rack-cache' gem if you want to enable caching.
-begin
-  require 'rack/cache'
-  use Rack::Cache
-rescue LoadError
+# Optional: use the 'rack-cache' gem for cacheing.
+if ENV['RACK_ENV'] == 'production'
+  begin
+    require 'rack/cache'
+    use Rack::Cache
+  rescue LoadError
+  end
 end
 
 # Load Proton.

data/lib/proton/config.rb

@@ -72,7 +72,7 @@ class Config
   end
 
   def requirement
-    # Backward compatibility: this config option used to be called
+    # Backward compatibility; this config option used to be called
     # `hyde_requirement` before the project was renamed to Proton.
     self[:requirement] || self[:hyde_requirement]
   end

data/lib/proton/helpers.rb

@@ -64,10 +64,16 @@ module Helpers
   #
   # ...where the `../../` depends on the current page's path.
   #
-  def rel(path)
-    depth = page.path.count('/')
-    dotdot = depth > 1 ? ('../' * (depth-1)) : './'
-    (dotdot[0...-1] + path)
+  def rel(path, from=page.path)
+    if path[0] == '/'
+      depth = from.count('/')
+      dotdot = depth > 1 ? ('../' * (depth-1)) : './'
+      str = (dotdot[0...-1] + path).squeeze('/')
+      str = str[2..-1]  if str[0..-1] == './'
+      str
+    else
+      path
+    end
   end
 
   # Method: content_for (Proton::Helpers)

data/lib/proton/project.rb

@@ -141,7 +141,7 @@ class Project
     end
 
     # Ignore dotfiles and hyde.conf files by default
-    specs += %w[.* _* *~ README* /config.ru]
+    specs += %w[.* _* *~ README* /config.ru Gemfile Gemfile.lock]
     specs += Proton::CONFIG_FILES.map { |s| "/#{s}" }
 
     specs.compact.map { |s| glob(s) }.flatten.uniq

data/lib/proton/version.rb

@@ -1,5 +1,5 @@
 class Proton
-  VERSION = "0.3.0.rc1"
+  VERSION = "0.3.2"
 
   # Attribute: version (Proton)
   # Returns the version.

data/test/unit/build_options_test.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path('../../helper', __FILE__)
 
 class BuildOptionsTest < TestCase

data/test/unit/helper_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path('../../helper', __FILE__)
+
+class HelperTest < TestCase
+  include Proton::Helpers
+
+  test "rel" do
+    assert_equal 'index.html', rel('index.html', '/about/index.html')
+    assert_equal '../index.html', rel('/index.html', '/about/index.html')
+    assert_equal '../foo/index.html', rel('/foo/index.html', '/about/index.html')
+    assert_equal '../about/us.html', rel('/about/us.html', '/about/index.html')
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: proton
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.3.0.rc1
+  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -254,6 +254,7 @@ files:
 - test/unit/build_options_test.rb
 - test/unit/extensions_test.rb
 - test/unit/fixture_test.rb
+- test/unit/helper_test.rb
 - test/unit/page_test.rb
 - test/unit/proton_test.rb
 - test/unit/set_test.rb
@@ -287,9 +288,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: