test/assigns.rb @@ -3,6 +3,7 @@ lib/cassandra.rb lib/properties.rb lib/tags.rb Manifest +misc/dan.cssy misc/dan.rb misc/meyer_reset.css README.rdoc @@ -12,8 +13,8 @@ site/cssy_title.jpg site/flower.png site/index.mab site/ruby.cssy +test/assigns.rb +test/basics.css +test/basics.cssy test/basics.rb -test/dan.cssy -test/fiddle.css -test/fiddle.cssy test/helper.rb Manifest @@ -54,6 +54,7 @@ end # List all the desired pages as dependencies on :compile +desc "compile templates to html and css" task :compile => %w{ site/index.html site/basic.css site/ruby.css } task :clean do @@ -65,7 +66,7 @@ rule '.html' => [ '.mab' ] do |t| mab(t.source, t.name) end -file 'site/index.mab' => [ 'site/basic.rb' ] +file 'site/index.html' => [ 'site/basic.css', 'site/index.mab' ] rule '.css' => [ '.cssy' ] do |t| cssify(t.source, t.name) @@ -84,7 +85,8 @@ def mab(source, target) end def cssify(source, target) - c = Cssy.new.process(File.read(source)) + cssy = File.read(source) + c = Cssy.new.process(cssy, { :default => "#212F54" }) File.open(target, 'w') do |f| f.puts c.to_s end Rakefile @@ -8,11 +8,11 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Matthew King"] - s.date = %q{2008-09-08} + s.date = %q{2008-09-30} s.description = %q{Generates CSS using Ruby, like Markaby} s.email = %q{automatthew@gmail.com} s.extra_rdoc_files = ["lib/cassandra.rb", "lib/properties.rb", "lib/tags.rb", "README.rdoc"] - s.files = ["cassandra.gemspec", "lib/cassandra.rb", "lib/properties.rb", "lib/tags.rb", "Manifest", "misc/dan.rb", "misc/meyer_reset.css", "README.rdoc", "site/basic.cssy", "site/basic.rb", "site/cssy_title.jpg", "site/flower.png", "site/index.mab", "site/ruby.cssy", "test/basics.rb", "test/dan.cssy", "test/fiddle.css", "test/fiddle.cssy", "test/helper.rb"] + s.files = ["cassandra.gemspec", "lib/cassandra.rb", "lib/properties.rb", "lib/tags.rb", "Manifest", "misc/dan.cssy", "misc/dan.rb", "misc/meyer_reset.css", "README.rdoc", "site/basic.cssy", "site/basic.rb", "site/cssy_title.jpg", "site/flower.png", "site/index.mab", "site/ruby.cssy", "test/assigns.rb", "test/basics.css", "test/basics.cssy", "test/basics.rb", "test/helper.rb"] s.has_rdoc = true s.homepage = %q{} s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"] @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.rubyforge_project = %q{cassandra} s.rubygems_version = %q{1.2.0} s.summary = %q{Generates CSS using Ruby, like Markaby} - s.test_files = ["test/basics.rb", "test/helper.rb"] + s.test_files = ["test/assigns.rb", "test/basics.rb", "test/helper.rb"] if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION @@ -92,6 +92,7 @@ end # # # # List all the desired pages as dependencies on :compile +# desc "compile templates to html and css" # task :compile => %w{ site/index.html site/basic.css site/ruby.css } # # task :clean do @@ -103,7 +104,7 @@ end # mab(t.source, t.name) # end # -# file 'site/index.mab' => [ 'site/basic.rb' ] +# file 'site/index.html' => [ 'site/basic.css', 'site/index.mab' ] # # rule '.css' => [ '.cssy' ] do |t| # cssify(t.source, t.name) @@ -122,7 +123,8 @@ end # end # # def cssify(source, target) -# c = Cssy.new.process(File.read(source)) +# cssy = File.read(source) +# c = Cssy.new.process(cssy, { :default => "#212F54" }) # File.open(target, 'w') do |f| # f.puts c.to_s # end cassandra.gemspec @@ -43,7 +43,7 @@ require 'tags' class Cassandra # Clear out unneeded methods - METHODS = %w( class instance_eval send __send__ __id__ ) + METHODS = %w( class instance_eval send __send__ __id__ instance_variable_set ) instance_methods.each { |m| undef_method( m ) unless METHODS.include? m } attr_reader :data @@ -63,6 +63,12 @@ class Cassandra @state = :closed_block end + def instance_variables(hashlike) + hashlike.each do |key,val| + instance_variable_set("@#{key}",val) + end + end + # Create a new instance and process the supplied block, returning the instance. # # css = Cssy.process do @@ -70,8 +76,8 @@ class Cassandra # li { list_style :none } # end # end - def self.process(*args,&block) - self.new.process(*args,&block) + def self.process(*args, &block) + self.new.process(*args, &block) end # Process the supplied block (storing the result internally as an array in @data). @@ -79,10 +85,13 @@ class Cassandra # # If no block is given, join all arguments with "\n" and eval the result. Dubious utility. def process(*args, &block) + assigns = args[0] if args[0].is_a? Hash + string, assigns = args if args[0].is_a? String + instance_variables(assigns) if assigns if block instance_eval(&block) - else - instance_eval(args.join("\n")) + elsif string + instance_eval(string) end self end lib/cassandra.rb @@ -1,8 +1,8 @@ -@default = "#212F54" +@full = "700px" body { background_color "#F8F7F1"} div.content! { - width "700px"; margin "25px auto" + width @full; margin "25px auto" h1 { color @default } site/basic.cssy @@ -1,4 +1,4 @@ -x = Cssy.new.process do +css = Cssy.new.process do @default = "#212F54" @@ -19,4 +19,4 @@ x = Cssy.new.process do end -puts x.data.inspect \ No newline at end of file +css.to_s \ No newline at end of file site/basic.rb @@ -1,5 +1,4 @@ require 'syntax/convertors/html' -convertor = Syntax::Convertors::HTML.for_syntax "ruby" html do head do @@ -11,7 +10,17 @@ html do div.content! do img.logo! :src => "cssy_title.jpg" div.ruby.example! do - convertor.convert( File.read( "site/basic.rb" ) ).to_s + example = <<TEXT +css = Cssy.new +css.process(:default => "#212F54") do + + #{File.readlines( "site/basic.cssy").join(" ") } + +end + +css.to_s +TEXT + Syntax::Convertors::HTML.for_syntax("ruby").convert( example ).to_s end ul.links! do li { a "GitHub", :href => "http://github.com/automatthew/cassandra" } site/index.mab a2e4395e5fd9804c52444086fdb0ddb5df17f12e Matthew King automatthew@gmail.com http://github.com/automatthew/cassandra/commit/436559718c6151fb1b175dfa269ca26821812fdd 436559718c6151fb1b175dfa269ca26821812fdd 2008-09-30T10:17:47-07:00 2008-09-30T10:15:28-07:00 process now takes an assigns hash 7cdf286ac41d66484735f1e370c8c8dd47a28abc Matthew King automatthew@gmail.com