machined 0.4.0 → 0.5.0

data/lib/machined.rb

@@ -4,6 +4,7 @@ module Machined
   autoload :CLI,                    "machined/cli"
   autoload :Context,                "machined/context"
   autoload :Environment,            "machined/environment"
+  autoload :Index,                  "machined/index"
   autoload :Initializable,          "machined/initializable"
   autoload :Server,                 "machined/server"
   autoload :Sprocket,               "machined/sprocket"

data/lib/machined/helpers/page_helpers.rb

@@ -3,22 +3,6 @@ require "active_support/core_ext/string/inflections"
 module Machined
   module Helpers
     module PageHelpers
-      # Returns the context of the given path. This is useful
-      # if you want to get the information from the front matter
-      # of a specific page.
-      def context_for(path, environment = self.environment)
-        pathname = environment.resolve path, :base_path => self.pathname.dirname
-        
-        contexts_cache[pathname] ||= begin
-          if pathname == self.pathname
-            self
-          else
-            depend_on_asset pathname
-            environment.find_asset(pathname).send :dependency_context
-          end
-        end
-      end
-      
       # Returns the default layout, unless overridden by
       # the YAML front matter.
       def layout

data/lib/machined/index.rb

@@ -0,0 +1,23 @@
+require "sprockets"
+
+module Machined
+  # We need to add accessors for the Machined
+  # environment and the Sprocket's config to the
+  # index, so the Context has access.
+  class Index < Sprockets::Index
+    # A reference to the Machined environment which
+    # created this instance.
+    attr_reader :machined
+  
+    # A reference to the configuration.
+    attr_reader :config
+    
+    #
+    def initialize(environment)
+      @machined = environment.machined
+      @config   = environment.config
+      
+      super
+    end
+  end
+end

data/lib/machined/sprocket.rb

@@ -29,7 +29,6 @@ module Machined
       super config.root
       
       @context_class = Class.new Context
-      use_all_templates unless config.assets
     end
     
     # Returns true, if this sprocket should be
@@ -41,6 +40,11 @@ module Machined
       config.compile && config.url
     end
     
+    # Override to use Machined's Index
+    def index
+      Index.new(self)
+    end
+    
     # Loops through the available Tilt templates
     # and registers them as processor engines for
     # Sprockets. By default, Sprockets cherry picks

data/lib/machined/static_compiler.rb

@@ -23,7 +23,7 @@ module Machined
           next unless compiled_assets[url].nil? && compile?(url)
           
           if asset = sprocket.find_asset(logical_path)
-            compiled_assets[url] = write_asset(asset)
+            compiled_assets[url] = write_asset(sprocket, asset)
           end
         end
       end
@@ -39,8 +39,8 @@ module Machined
     
     # Writes the asset to its destination, also
     # writing a gzipped version if necessary.
-    def write_asset(asset)
-      filename = path_for(asset)
+    def write_asset(environment, asset)
+      filename = path_for(environment, asset)
       FileUtils.mkdir_p File.dirname(filename)
       asset.write_to filename
       asset.write_to "#{filename}.gz" if gzip?(filename)
@@ -52,15 +52,15 @@ module Machined
     # Gets the full output path for the given asset.
     # If it's supposed to include a digest, it will return the
     # digest_path.
-    def path_for(asset) # :nodoc:
-      path = digest?(asset) ? asset.digest_path : asset.logical_path
-      File.join(machined.output_path, asset.environment.config.url, path)
+    def path_for(environment, asset) # :nodoc:
+      path = digest?(environment, asset) ? asset.digest_path : asset.logical_path
+      File.join(machined.output_path, environment.config.url, path)
     end
     
     # Determines if we should use the digest_path for the given
     # asset.
-    def digest?(asset) # :nodoc:
-      machined.config.digest_assets && asset.environment.config.assets
+    def digest?(environment, asset) # :nodoc:
+      machined.config.digest_assets && environment.config.assets
     end
     
     # Determines if we should gzip the asset.

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/machined.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency             "sprockets",         "~> 2.0.3"
+  s.add_dependency             "sprockets",         "~> 2.0.0"
   s.add_dependency             "sprockets-helpers", "~> 0.2.1"
-  s.add_dependency             "sprockets-sass",    "~> 0.4.1"
+  s.add_dependency             "sprockets-sass",    "~> 0.5.0"
   s.add_dependency             "padrino-helpers",   "~> 0.10.5"
-  s.add_dependency             "activesupport",     "~> 3.1.1"
+  s.add_dependency             "activesupport",     "~> 3.1.3"
   s.add_dependency             "i18n",              "~> 0.6.0"
   s.add_dependency             "thor",              "~> 0.14.6"
   s.add_dependency             "crush",             "~> 0.3.3"
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rack-test",         "~> 0.6.1"
   s.add_development_dependency "test-construct",    "~> 1.2.0"
   s.add_development_dependency "unindent",          "~> 1.0"
-  s.add_development_dependency "railties",          "~> 3.1.1"
+  s.add_development_dependency "railties",          "~> 3.1.3"
   s.add_development_dependency "haml"
   s.add_development_dependency "sass"
   s.add_development_dependency "slim"

data/spec/machined/helpers/page_helpers_spec.rb

@@ -1,41 +1,6 @@
 require "spec_helper"
 
 describe Machined::Helpers::PageHelpers do
-  describe "#context_for" do
-    it "returns the context for the given path" do
-      within_construct do |c|
-        c.file "pages/index.html.erb", "<%= context_for('about').title %>"
-        c.file "pages/about.html", "---\ntitle: Hello World\n---\n"
-        
-        machined.pages["index.html"].to_s.should == "Hello World"
-      end
-    end
-    
-    it "returns a self reference to avoid circular dependencies" do
-      within_construct do |c|
-        c.file "pages/index.html.erb", "<%= context_for('index') == self %>"
-        
-        machined.pages["index.html"].to_s.should == "true"
-      end
-    end
-    
-    it "adds the found context as a dependency" do
-      within_construct do |c|
-        c.file "pages/index.html.erb", "<%= context_for('about').title %>"
-        dep = c.file "pages/about.html", "---\ntitle: Hello World\n---\n"
-        
-        asset = machined.pages["index.html"]
-        asset.should be_fresh
-        
-        dep.open("w") { |f| f.write("---\ntitle: This Changed!\n---\n") }
-        mtime = Time.now + 600
-        dep.utime mtime, mtime
-        
-        asset.should be_stale
-      end
-    end
-  end
-  
   describe "#layout" do
     it "defaults to the default layout" do
       within_construct do |c|

data/spec/machined/helpers/render_helpers_spec.rb

@@ -86,13 +86,13 @@ describe Machined::Helpers::RenderHelpers do
         dep = c.file "views/partial.haml", "Hello World"
         
         asset = machined.pages["index.html"]
-        asset.should be_fresh
+        asset.should be_fresh(machined.pages)
           
         dep.open("w") { |f| f.write("%h1 Hello World") }
         mtime = Time.now + 600
         dep.utime mtime, mtime
         
-        asset.should be_stale
+        asset.should_not be_fresh(machined.pages)
       end
     end
     

data/spec/machined/processors/layout_processor_spec.rb

@@ -36,13 +36,13 @@ describe Machined::Processors::LayoutProcessor do
       dep = c.file "views/layouts/main.html.haml", "= yield"
       
       asset = machined.pages["index.html"]
-      asset.should be_fresh
-        
+      asset.should be_fresh(machined.pages)
+      
       dep.open("w") { |f| f.write("#layout= yield") }
       mtime = Time.now + 600
       dep.utime mtime, mtime
       
-      asset.should be_stale
+      asset.should_not be_fresh(machined.pages)
     end
   end
 end

data/spec/support/be_fresh_matcher.rb

@@ -0,0 +1,17 @@
+RSpec::Matchers.define :be_fresh do |env|
+  match do |actual|
+    if actual.method(:fresh?).arity == 1
+      actual.fresh?(env)
+    else
+      actual.fresh?
+    end
+  end
+  
+  failure_message_for_should do |env|
+    "expected asset to be fresh"
+  end
+  
+  failure_message_for_should_not do |env|
+    "expected asset to be stale"
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: machined
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,327 +10,239 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: sprockets
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 0
-        - 3
-        version: 2.0.3
-  name: sprockets
+        version: 2.0.0
+  type: :runtime
   prerelease: false
   version_requirements: *id001
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: sprockets-helpers
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
         version: 0.2.1
-  name: sprockets-helpers
+  type: :runtime
   prerelease: false
   version_requirements: *id002
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: sprockets-sass
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
-        version: 0.4.1
-  name: sprockets-sass
+        version: 0.5.0
+  type: :runtime
   prerelease: false
   version_requirements: *id003
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: padrino-helpers
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 10
-        - 5
         version: 0.10.5
-  name: padrino-helpers
+  type: :runtime
   prerelease: false
   version_requirements: *id004
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: activesupport
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
-        version: 3.1.1
-  name: activesupport
+        version: 3.1.3
+  type: :runtime
   prerelease: false
   version_requirements: *id005
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: i18n
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
-  name: i18n
+  type: :runtime
   prerelease: false
   version_requirements: *id006
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: thor
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
         version: 0.14.6
-  name: thor
+  type: :runtime
   prerelease: false
   version_requirements: *id007
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: crush
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 3
-        - 3
         version: 0.3.3
-  name: crush
+  type: :runtime
   prerelease: false
   version_requirements: *id008
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: rspec
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
         version: 2.7.0
-  name: rspec
+  type: :development
   prerelease: false
   version_requirements: *id009
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: rack-test
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
         version: 0.6.1
-  name: rack-test
+  type: :development
   prerelease: false
   version_requirements: *id010
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: test-construct
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
         version: 1.2.0
-  name: test-construct
+  type: :development
   prerelease: false
   version_requirements: *id011
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: unindent
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
-  name: unindent
+  type: :development
   prerelease: false
   version_requirements: *id012
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: railties
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
-        version: 3.1.1
-  name: railties
+        version: 3.1.3
+  type: :development
   prerelease: false
   version_requirements: *id013
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: haml
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: haml
+  type: :development
   prerelease: false
   version_requirements: *id014
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: sass
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: sass
+  type: :development
   prerelease: false
   version_requirements: *id015
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: slim
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: slim
+  type: :development
   prerelease: false
   version_requirements: *id016
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: erubis
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: erubis
+  type: :development
   prerelease: false
   version_requirements: *id017
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: rdiscount
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rdiscount
+  type: :development
   prerelease: false
   version_requirements: *id018
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: uglifier
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: uglifier
+  type: :development
   prerelease: false
   version_requirements: *id019
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: jquery-rails
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: jquery-rails
+  type: :development
   prerelease: false
   version_requirements: *id020
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: rake
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rake
+  type: :development
   prerelease: false
   version_requirements: *id021
-  type: :development
 description: Why another static site generator? Machined is for the developers who know and love the asset pipeline of Rails 3.1 and want to develop blazingly fast static websites. It's built from the ground up using Sprockets 2.0.
 email: 
 - me@petebrowne.com
@@ -361,6 +268,7 @@ files:
 - lib/machined/helpers/output_helpers.rb
 - lib/machined/helpers/page_helpers.rb
 - lib/machined/helpers/render_helpers.rb
+- lib/machined/index.rb
 - lib/machined/initializable.rb
 - lib/machined/processors/front_matter_processor.rb
 - lib/machined/processors/layout_processor.rb
@@ -395,6 +303,7 @@ files:
 - spec/machined/static_compiler_spec.rb
 - spec/machined/utils_spec.rb
 - spec/spec_helper.rb
+- spec/support/be_fresh_matcher.rb
 - spec/support/helpers.rb
 - spec/support/match_paths_matcher.rb
 homepage: https://github.com/petebrowne/machined
@@ -410,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2894475183900037284
       segments: 
       - 0
       version: "0"
@@ -419,14 +328,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2894475183900037284
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: machined
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A static site generator and Rack server built using Sprockets 2.0
@@ -447,5 +356,6 @@ test_files:
 - spec/machined/static_compiler_spec.rb
 - spec/machined/utils_spec.rb
 - spec/spec_helper.rb
+- spec/support/be_fresh_matcher.rb
 - spec/support/helpers.rb
 - spec/support/match_paths_matcher.rb