hoshi 0.1.3 → 0.1.4

data/Rakefile

@@ -20,8 +20,8 @@ spec = Gem::Specification.new { |s|
 	s.rubyforge_project = 'hoshi-view'
 	s.summary = "Nice, object-oriented, first-class views."
 	s.homepage = "http://debu.gs/#{s.name}"
-	%w(facets metaid hpricot).each &s.method(:add_dependency)
-	s.version = '0.1.3'
+	%w(metaid hpricot).each &s.method(:add_dependency)
+	s.version = '0.1.4'
 }
 
 Rake::GemPackageTask.new(spec) { |pkg|
@@ -29,6 +29,6 @@ Rake::GemPackageTask.new(spec) { |pkg|
 }
 
 task(:install => :package) { 
-	g = Dir['pkg/*.gem'].sort.last
-	system "gem install -l #{g}"
+	g = "pkg/#{spec.name}-#{spec.version}.gem"
+	system "sudo gem install -l #{g}"
 }

data/doc/TODO

@@ -1,6 +1,7 @@
 TODO for 1.0:
 * Separate the tags by close type in the various View sub-classes.  (The most
   tedious thing on the list, but required for compliance.)
+* Still not too happy about the way RSS feeds are done, going to rework.
 
 TODO for later:
 * Have html2hoshi do a smarter job of deciding doctypes, not using permissive!

data/doc/examples/layouts.rb

@@ -1,4 +1,3 @@
-
 require 'hoshi'
 require 'cgi'
 

data/lib/hoshi/monkey_patches.rb

@@ -6,3 +6,13 @@ class Hash
 		map { |k,v| "#{k}=#{qchar}#{v}#{qchar}" }.join(' ')
 	end
 end
+
+# We've dropped facets, and are now shooting for compatibility across Ruby
+# versions, so we add Symbol#to_proc unless it exists.
+unless((Symbol.instance_method(:to_proc) rescue nil))
+	class Symbol
+		def to_proc
+			proc { |obj, *args| obj.send(self, *args) }
+		end
+	end
+end

data/lib/hoshi/view/html.rb

@@ -12,5 +12,12 @@ class Hoshi::View
 		def cdata str
 			append! "<![CDATA[\n" + str + "\n]]>"
 		end
+
+		# Includes the stylesheets from the list passed as arguments.
+		def css_includes *ss
+			ss.each { |s|
+				link :rel => 'stylesheet', :media => 'all', :href => s
+			}
+		end
 	end
 end

data/lib/hoshi/view/rss2.rb

@@ -22,7 +22,7 @@ class Hoshi::View
 			self.channel_block = b
 		end
 
-		def def_item &b
+		def each_item &b
 			self.item_block = b
 		end
 

data/lib/hoshi/view-tag-fallback.rb

@@ -0,0 +1,19 @@
+module Hoshi
+	class View
+		# This method is a fallback for pre-1.8.7 Ruby; if a syntax error is
+		# encountered when hoshi/view.rb tries to load hoshi/view-tag.rb, this
+		# file is loaded.  I have really been trying to avoid eval()ing strings
+		# (for religious reasons), but have to make this concession.
+		def self.tag(name, close_type = nil)
+			class_eval <<-EOHACK
+				def #{name}(*opts, &b)
+					if b
+						tag #{name.inspect}, #{close_type.inspect}, *opts, &b
+					else
+						tag #{name.inspect}, #{close_type.inspect}, *opts, &b
+					end
+				end
+			EOHACK
+		end
+	end
+end

data/lib/hoshi/view-tag.rb

@@ -0,0 +1,20 @@
+module Hoshi
+	class View
+		# This creates an instance method for this view which appends a tag.
+		# Most of these are handled for you.  The arguments to this method
+		# match those to Tag.new.  See also View#permissive!.
+		# 	tag('h1')
+		# 	def show_an_h1
+		# 		h1 "I have been shown"
+		# 	end
+		def self.tag(name, close_type = nil)
+			define_method(name) { |*opts,&b|
+				if b
+					tag name, close_type, *opts, &b
+				else
+					tag name, close_type, *opts
+				end
+			}
+		end
+	end
+end

data/lib/hoshi/view.rb

@@ -1,6 +1,12 @@
 require 'metaid'
 require 'cgi'
 
+begin
+	require 'hoshi/view-tag'
+rescue SyntaxError
+	require 'hoshi/view-tag-fallback'
+end
+
 module Hoshi
 	# The View class is the super-class for views you create with Hoshi.  More
 	# likely, though, you'll be using one of View's many sub-classes as the
@@ -15,23 +21,6 @@ module Hoshi
 	class View
 		class ValidationError < StandardError; end
 
-		# This creates an instance method for this view which appends a tag.
-		# Most of these are handled for you.  The arguments to this method
-		# match those to Tag.new.  See also View#permissive!.
-		# 	tag('h1')
-		# 	def show_an_h1
-		# 		h1 "I have been shown"
-		# 	end
-		def self.tag(name, close_type = nil)
-			define_method(name) { |*opts,&b|
-				if b
-					tag name, close_type, *opts, &b
-				else
-					tag name, close_type, *opts
-				end
-			}
-		end
-
 		# A short-hand for creating multiple tags via View.tag.  For tags that
 		# do not require closing, see View.open_tags.
 		def self.tags *names
@@ -52,7 +41,8 @@ module Hoshi
 			doctype = doctype.to_s.downcase.gsub('_', '')
 			const_get(constants.find { |c| 
 				cl = const_get c
-				cl.ancestors.include?(self) && c.downcase == doctype
+				(cl.ancestors.include?(self) && 
+				 c.to_s.downcase == doctype) rescue false
 			}) rescue nil
 		end
 

data/lib/hoshi.rb

@@ -1,4 +1,3 @@
-require 'facets/symbol'
 require 'hoshi/monkey_patches'
 
 require 'hoshi/tag'

metadata

@@ -1,63 +1,41 @@
 --- !ruby/object:Gem::Specification 
-name: hoshi
-version: !ruby/object:Gem::Version 
-  version: 0.1.3
-platform: ruby
-authors: 
-- Pete Elmore
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-11-11 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: facets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: metaid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: 
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 email: pete.elmore@gmail.com
-executables: 
-- html2hoshi
-extensions: []
+cert_chain: []
 
+summary: Nice, object-oriented, first-class views.
+post_install_message: 
 extra_rdoc_files: 
 - doc/README
 - doc/TODO
 - doc/LICENSE
+homepage: http://debu.gs/hoshi
+signing_key: 
+name: hoshi
+rdoc_options: []
+
+autorequire: 
+rubyforge_project: hoshi-view
+executables: 
+- html2hoshi
+description: 
+specification_version: 2
+default_executable: 
 files: 
 - lib/html2hoshi.rb
 - lib/hoshi.rb
 - lib/hoshi
 - lib/hoshi/monkey_patches.rb
 - lib/hoshi/view
+- lib/hoshi/view-tag.rb
+- lib/hoshi/tag.rb
+- lib/hoshi/view-tag-fallback.rb
+- lib/hoshi/view.rb
 - lib/hoshi/view/html.rb
 - lib/hoshi/view/xhtml1_strict.rb
 - lib/hoshi/view/xhtml1_frameset.rb
@@ -70,45 +48,59 @@ files:
 - lib/hoshi/view/xhtml2.rb
 - lib/hoshi/view/xhtml1_transitional.rb
 - lib/hoshi/view/rss2.rb
-- lib/hoshi/tag.rb
-- lib/hoshi/view.rb
 - doc/README
 - doc/examples
+- doc/TODO
+- doc/LICENSE
 - doc/examples/layouts.rb
 - doc/examples/trivial.rb
 - doc/examples/blocks.rb
 - doc/examples/env.cgi
 - doc/examples/feed.rb
 - doc/examples/rss2.rb
-- doc/TODO
-- doc/LICENSE
 - bin/html2hoshi
 - Rakefile
-has_rdoc: true
-homepage: http://debu.gs/hoshi
-post_install_message: 
-rdoc_options: []
-
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
+extensions: []
 
-rubyforge_project: hoshi-view
 rubygems_version: 1.3.1
-signing_key: 
-specification_version: 2
-summary: Nice, object-oriented, first-class views.
+requirements: []
+
+authors: 
+- Pete Elmore
+date: 2009-02-10 08:00:00 +00:00
+platform: ruby
 test_files: []
 
+version: !ruby/object:Gem::Version 
+  version: 0.1.4
+require_paths: 
+- lib
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+  type: :runtime
+  version_requirement: 
+  name: metaid
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+  type: :runtime
+  version_requirement: 
+  name: hpricot
+bindir: bin
+has_rdoc: true