static-bartender 0.0.1 → 0.0.2

data/lib/bartender/asset.rb

@@ -8,10 +8,10 @@ module Bartender
       if @sprockets_object
         @found = true
         split_file_name = file.split("/")
-        @file = split_file_name[-1]                                         # asset
-        @site_path = @sprockets_object.digest_path                          # folder/asset-digest.ext
-        @src_file = @sprockets_object.pathname                              # site/asset-folder/asset.ext
-        @dest_path = File.join(Bartender::DEFAULTS["output"], site_path)    # output/folder/asset-digest.ext
+        @file = split_file_name[-1]                                                             # asset
+        @site_path = "#{@sprockets_object.logical_path}?#{@sprockets_object.digest}"            # folder/asset.ext?digest
+        @src_file = @sprockets_object.pathname                                                  # asset-folder/asset.ext
+        @dest_path = File.join(Bartender::DEFAULTS["output"], @sprockets_object.logical_path)   # output/folder/asset.ext
       else
         @found = false #asset doesn't exist, return nothing
       end

data/lib/bartender/partial.rb

@@ -0,0 +1,35 @@
+module Bartender
+      
+  class Partial
+    include ViewHelpers
+
+    def initialize(partial, sprockets_env, variables={})
+      @tempalte = ""
+      @sprockets_env = sprockets_env
+      variables.each {|k,v| instance_variable_set "@#{k}", v}
+      search_string = File.join(Bartender::DEFAULTS['pages'], '_' + partial + "*")
+      file = Dir.glob(search_string)[0]
+      if file && File.exists?(file)
+        @template = Tilt.new(file).render(self)
+      else
+        $stderr.puts "ERROR: Could not find partial file '#{partial}' in #{Bartender::DEFAULTS['pages']} for page #{self.page}"
+        exit 0
+      end
+    end #Function init
+
+    def to_s
+      @template.to_s
+    end #Function to_s
+
+
+    def method_missing(m, *args)
+      if m =~ /^(\w+)=$/
+        instance_variable_set "@#{$1}", args[0]
+      else
+        instance_variable_get "@#{m}"
+      end
+    end #Funciton method_missing
+
+  end #Class partial
+
+end #Module Bartender

data/lib/bartender/site.rb

@@ -13,24 +13,34 @@ module Bartender
       compile_assets
 
       Dir.glob(File.join(Bartender::DEFAULTS["pages"], '/**/*')).each do |page|
-        Page.new(page, @sprockets_env).compile unless page.split('/')[-1].match /^_/
+         compile_page(page) unless page.split('/')[-1].match /^_/ #compile the page unless it is a partial
       end
     end #Function initialize
 
+    #compile the page
+    #expects to be passed a path to a tilt template
+    def compile_page(page)
+      Page.new(page, @sprockets_env).compile
+    end #Function compile_page
 
     #compile the css and js assets for use in the page
     #uses sprokets set an environment, compile them, then get accessed
     def compile_assets
+      Dir.glob(File.join(Bartender::DEFAULTS["output"], '/**/*')).each {|asset| File.delete(asset) unless File.directory?(asset)}#delete the old files
       Dir.glob(File.join(Bartender::DEFAULTS["assets"], '/**/*')).each do |asset|
-        asset = Bartender::Asset.new(asset.gsub(File.join(Bartender::DEFAULTS["assets"], '/'), ''), @sprockets_env)
-
-        if asset.found #make sure sprockets can find the asset
-          asset.sprockets_object.write_to(asset.dest_path)
-        end
+        compile_asset(asset)
       end
     end #Function compile_assets
 
+    #compile each asset
+    #expects a file name to be passed to it
+    def compile_asset(asset)
+      asset = Bartender::Asset.new(asset.gsub(File.join(Bartender::DEFAULTS["assets"], '/'), ''), @sprockets_env)
 
+      if asset.found #make sure sprockets can find the asset
+        asset.sprockets_object.write_to(asset.dest_path)
+      end
+    end #Function compile_asset
 
     def self.create(name)
       name = File.join(Bartender::DEFAULTS["root"], name)

data/lib/bartender/version.rb

@@ -1,3 +1,3 @@
 module Bartender
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
 end

data/lib/bartender/view_helpers.rb

@@ -5,14 +5,7 @@ module Bartender
       #render a simple partial, use Tilt to render it
       #display an error if the partial isn't found
       def partial(filename, variables={})
-        search_string = File.join(Bartender::DEFAULTS['pages'], '_' + filename + "*")
-        file = Dir.glob(search_string)[0]
-        if file && File.exists?(file)
-          Tilt.new(file).render(variables, variables)
-        else
-          $stderr.puts "ERROR: Could not find partial file '#{filename}' in #{Bartender::DEFAULTS['pages']} for page #{self.page}"
-          exit 0
-        end
+        Bartender::Partial.new(filename, self.sprockets_env, variables).to_s
       end
 
       #link the appropriate stylesheet
@@ -23,7 +16,7 @@ module Bartender
         asset = Bartender::Asset.new(file_path, self.sprockets_env)
 
         if asset
-          return "<link #{opts.to_a.collect{|opt_a| "#{opt_a[0]}=\"#{opt_a[1]}\""}.join(' ')} src=\"#{asset.site_path}\"/>"
+          return "<link #{opts.to_a.collect{|opt_a| "#{opt_a[0]}=\"#{opt_a[1]}\""}.join(' ')} href=\"#{asset.site_path}\"/>"
         else
           $stderr.puts "WARNING: Could not find stylesheet '#{filename}' in #{Bartender::DEFAULTS['assets']} for page #{self.page}"
           return "<!-- WARNING: Could not link stylesheet #{filename} -->"
@@ -59,6 +52,19 @@ module Bartender
           return "<!-- WARNING: Could not link img #{filename} -->"
         end
       end #Function link_image
+
+      #provide the path to the asset
+      def asset_url(filename)
+
+        asset = Bartender::Asset.new(filename, self.sprockets_env)
+
+        if asset
+          return asset.site_path
+        else
+          $stderr.puts "WARNING: Could not find asset '#{filename}' in #{Bartender::DEFAULTS['assets']} for page #{self.page}"
+          return "<!-- WARNING: Could not find asset #{filename} -->"
+        end
+      end #Function link_image
         
     end #Module ViewHelpers
 

data/lib/bartender.rb

@@ -8,6 +8,7 @@ require 'deep_merge'
 
 require 'bartender/view_helpers'
 require 'bartender/asset'
+require 'bartender/partial'
 require 'bartender/site'
 require 'bartender/page'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: static-bartender
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70102636979800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70102636979800
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70102636979380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70102636979380
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70102636978960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70102636978960
 description: Build static websites smartly
 email:
 - daniel@prowestech.com
@@ -77,6 +62,7 @@ files:
 - lib/bartender.rb
 - lib/bartender/asset.rb
 - lib/bartender/page.rb
+- lib/bartender/partial.rb
 - lib/bartender/site.rb
 - lib/bartender/version.rb
 - lib/bartender/view_helpers.rb
@@ -104,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Use layouts, link helpers, and the asset pipeline to create static websites