haml_tumblr 1.0.0 → 2.0.0

data/lib/haml_tumblr.rb

@@ -1,38 +1,11 @@
-def render( partial )
-  haml_concat Haml::Engine.new(File.read "partials/_#{partial.to_s}.haml" ).render(self)
-end
-  
-def tab
-  tab_up
-    yield
-  tab_down
-end
+$LOAD_PATH << File.dirname(__FILE__)
 
-def coffee_tag( coffee_file )
-  require 'coffee-script'
-  haml_tag :script, :type => 'text/javascript' do
-    haml_concat CoffeeScript.compile File.read "#{coffee_file.to_s}.coffee"
-  end
-end
+require 'haml_tumblr/defaults'
+require 'haml_tumblr/helpers'
+require 'haml_tumblr/importers'
 
-def jquery_tag( version = "1.7.2" )
-  haml_tag :script,
-    :type => 'text/javascript',
-    :src => 'http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js'
-end
-
-def sass_tag( sass_file )
-  require 'sass'
-  haml_tag :style, :type => 'text/css' do
-    haml_concat Sass::Engine.new(File.read "#{sass_file.to_s}.sass").render
-  end
-end
-
-def scss_tag( scss_file )
-  require 'sass'
-  haml_tag :style, :type => 'text/css' do
-    haml_concat Sass::Engine.new(File.read "#{scss_file.to_s}.scss").render
-  end
+def render( partial )
+  Haml::Engine.new(File.read "partials/_#{partial.to_s}.haml" ).render(self)
 end
 
 def tumblr_tag( tag )
@@ -47,18 +20,24 @@ def tumblr_tag( tag )
   end
 end
 
-def tumblr_link_tag( tag )
-  "{#{process tag}}"
-end
-
-def link_to( text, address )
-  haml_tag :a, :href => address do
-    haml_concat text
+def tumblr( tag )
+  if block_given?
+    haml_concat "{block:#{process tag}}"
+    tab do
+      yield
+    end
+    haml_concat "{/block:#{process tag}}"
+    nil
+  else
+    "{#{process tag}}"
   end
 end
 
-private
-
-def process( tag )
-  tag.to_s.split("_").map(&:capitalize).join
+module Tumblr
+  @@sass_variables = {:color => {}, :font => {} }
+  
+  def self.variables
+    @@sass_variables
+  end
+  
 end

data/lib/haml_tumblr/defaults.rb

@@ -0,0 +1,24 @@
+def render_defaults( format = :sass )
+  Tumblr.variables ||= {:color => {}, :font => {}}
+  [:font, :color].map { |type|
+    Tumblr.variables[type].each_pair.map { |key, value|
+      "$#{key}: unquote( \"{#{type}:#{process key}}\" )"
+    }
+  }.flatten.map { |string|
+    format == :scss ? string + ";" : string
+    }.join("\n") + "\n"
+end
+
+def default_colors( hash )
+  hash.each_pair.map { |key, val|
+    Tumblr.variables[:color][key.to_s] = val
+    capture_haml { haml_tag :meta, :name => "color:#{process key}", :content => val }
+  }.join
+end
+
+def default_fonts( hash )
+  hash.each_pair.map { |key, val|
+    Tumblr.variables[:font][key.to_s] = val
+    capture_haml { haml_tag :meta, :name => "font:#{process key}", :content => val }
+  }.join
+end

data/lib/haml_tumblr/helpers.rb

@@ -0,0 +1,22 @@
+def process( tag )
+  tag.to_s.split("_").map(&:capitalize).join
+end
+
+def link_to( *args )
+  if block_given?
+    haml_tag :a, :href => args.first do
+      yield
+    end
+  else
+    haml_tag :a, :href => args.last do
+      haml_concat args.first
+    end
+  end
+  nil
+end
+  
+def tab
+  tab_up
+    yield
+  tab_down
+end

data/lib/haml_tumblr/importers.rb

@@ -0,0 +1,34 @@
+def coffee_tag( coffee_file )
+  require 'coffee-script'
+  capture_haml do
+    haml_tag :script, :type => 'text/javascript' do
+      haml_concat CoffeeScript.compile File.read "#{coffee_file.to_s}.coffee"
+    end
+  end
+end
+
+def jquery_tag( version = "1.7.2" )
+  capture_haml { haml_tag :script,
+    :type => 'text/javascript',
+    :src => 'http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js' }
+end
+
+def sass_tag( sass_file )
+  require 'sass'
+  full_sass = render_defaults(:sass) + (File.read "#{sass_file.to_s}.sass")
+  capture_haml {
+    haml_tag :style, :type => 'text/css' do
+      haml_concat Sass::Engine.new(full_sass).render
+    end
+  }
+end
+
+def scss_tag( scss_file )
+  require 'sass'
+  full_sass = render_defaults(:scss) + (File.read "#{scss_file.to_s}.sass")
+  capture_haml {
+    haml_tag :style, :type => 'text/css' do
+      haml_concat Sass::Engine.new(full_sass).render
+    end
+  }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_tumblr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: fraser.m.murray@gmail.com
@@ -17,6 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/haml_tumblr/helpers.rb
+- lib/haml_tumblr/defaults.rb
+- lib/haml_tumblr/importers.rb
 - lib/haml_tumblr.rb
 homepage: http://github.com/intolerable/haml_tumblr
 licenses: []
@@ -38,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: library for making Tumblr themes nicer to write in Haml