RubyGems - ahoward-tagz - Versions diffs - 5.1.0 → 6.0.0 - Mend

ahoward-tagz 5.1.0 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/README CHANGED

@@ -58,17 +58,15 @@ RAILS
   in a view
-    <%=
-      table_{
-        rows.each do |row|
-          tr_{
-            row.each do |cell|
-              td_{ cell }
-            end
-          }
-        end
-      }
-    %>
+    table_{
+      rows.each do |row|
+        tr_{
+          row.each do |cell|
+            td_{ cell }
+          end
+        }
+      end
+    }
   in a controller
@@ -99,6 +97,12 @@ URIS
   http://rubyforge.org/projects/codeforpeople
 HISTORY
+  6.0.0
+    - reorganize lib to avoid dumping a few constants into the includee - aka
+    don't absolutely minimize namespace pollution. there is now reason to
+    thing this version shouldn't be backwards compat - i bumped the version
+    just in case
   5.1.0
     - attribute/content auto-escaping can be turned off with
@@ -147,241 +151,4 @@ HISTORY
 SAMPLES
-  <========< samples/a.rb >========>
-  ~ > cat samples/a.rb
-    #
-    # in the simplest case tagz generates html using a syntax which safely mixes
-    # in to any object
-    #
-    require 'tagz'
-    include Tagz.globally
-    class GiraffeModel
-      def link
-        a_(:href => "/giraffe/neck/42"){ "whack!" }
-      end
-    end
-    puts GiraffeModel.new.link
-  ~ > ruby samples/a.rb
-    <a href="/giraffe/neck/42">whack!</a>
-  <========< samples/b.rb >========>
-  ~ > cat samples/b.rb
-    #
-    # tagz.rb mixes quite easily with your favourite templating engine, avoiding
-    # the need for '<% rows.each do |row| %> ... <% row.each do |cell| %> '
-    # madness and other types of logic to be coded in the templating language,
-    # leaving templating to template engines and logic and looping to ruby -
-    # unencumbered by extra funky syntax.  in rails tagz will automatically be
-    # available in your erb templates.
-    #
-    require 'tagz'
-    include Tagz.globally
-    require 'erb'
-    rows = %w( a b c ), %w( 1 2 3 )
-    template = ERB.new <<-ERB
-      <html>
-        <body>
-          <%=
-            table_{
-              rows.each do |row|
-                tr_{
-                  row.each do |cell|
-                    td_{ cell }
-                  end
-                }
-              end
-            }
-          %>
-        </body>
-      </html>
-    ERB
-    puts template.result(binding)
-  ~ > ruby samples/b.rb
-      <html>
-        <body>
-          <table><tr><td>a</td><td>b</td><td>c</td></tr><tr><td>1</td><td>2</td><td>3</td></tr></table>
-        </body>
-      </html>
-  <========< samples/c.rb >========>
-  ~ > cat samples/c.rb
-    #
-    # once you've learned to generate html using tagz you're primed to generate
-    # xml too
-    #
-    require 'tagz'
-    include Tagz.globally
-    doc =
-      xml_{
-        giraffe_{ 'large' }
-        ninja_{ 'small' }
-      }
-    puts doc
-  ~ > ruby samples/c.rb
-    <xml><giraffe>large</giraffe><ninja>small</ninja></xml>
-  <========< samples/d.rb >========>
-  ~ > cat samples/d.rb
-    #
-    # tagz.rb doesn't cramp your style, allowing even invalid html to be
-    # generated.  note the use of the 'tagz' method, which can be used both to
-    # capture output and to append content to the top of the stack.
-    #
-    require 'tagz'
-    include Tagz.globally
-    def header
-      tagz{
-        html_
-          body_(:class => 'ninja-like', :id => 'giraffe-slayer')
-          __ "<!-- this is the header -->"
-      }
-    end
-    def footer
-      tagz{
-        __ "<!-- this is the footer -->"
-          _body
-        _html
-      }
-    end
-    puts header, footer
-  ~ > ruby samples/d.rb
-    <html><body class="ninja-like" id="giraffe-slayer">
-    <!-- this is the header -->
-    <!-- this is the footer -->
-    </body></html>
-  <========< samples/e.rb >========>
-  ~ > cat samples/e.rb
-    #
-    # tagz.rb allows a safer method of mixin which requires any tagz methods to be
-    # insider a tagz block - tagz generating methods outside a tagz block with
-    # raise an error if tagz is included this way.  also notice that the error is
-    # reported from where it was raised - not from the bowels of the the tagz.rb
-    # lib.
-    #
-    require 'tagz'
-    include Tagz
-    puts tagz{
-     html_{ 'works only in here' }
-    }
-    begin
-      html_{ 'not out here' }
-    rescue Object => e
-      p :backtrace => e.backtrace
-    end
-  ~ > ruby samples/e.rb
-    <html>works only in here</html>
-    {:backtrace=>["samples/e.rb:17"]}
-  <========< samples/f.rb >========>
-  ~ > cat samples/f.rb
-    #
-    # tagz.rb can generate really compact html.  this is great to save bandwidth
-    # but can sometimes make reading the generated html a bit rough.  of course
-    # using tidy or the dom inspector in firebug obviates the issue; nevertheless
-    # it's sometime nice to break things up a little.  you can use 'tagz << "\n"'
-    # or the special shorthand '__' or '___' to accomplish this
-    #
-    require 'tagz'
-    include Tagz.globally
-    html =
-      div_{
-        span_{ true }
-        __
-        span_{ false }  # hey ryan, i fixed this ;-)
-        ___
-        ___ 'foo & escaped bar'
-      }
-    puts html
-  ~ > ruby samples/f.rb
-    <div><span>true</span>
-    <span>false</span>
-    foo & escaped bar
-    </div>
-  <========< samples/g.rb >========>
-  ~ > cat samples/g.rb
-    # tagz gives you low-level control of the output and makes even dashersized
-    # xml tagz easy enough to work with
-    #
-    require 'tagz'
-    include Tagz.globally
-    xml =
-      root_{
-        tagz__('foo-bar', :key => 'foo&bar'){ 'content' }
-        tagz__('bar-foo')
-        tagz.concat 'content'
-        tagz.concat tagz.escape('foo&bar')
-        __tagz('bar-foo')
-      }
-    puts xml
-  ~ > ruby samples/g.rb
-    <root><foo-bar key="foo&amp;bar">content</foo-bar><bar-foo>contentfoo&amp;amp;bar</bar-foo></root>

data/Rakefile ADDED

@@ -0,0 +1,228 @@
+This.rubyforge_project = 'codeforpeople'
+This.author = "Ara T. Howard"
+This.email = "ara.t.howard@gmail.com"
+This.homepage = "http://github.com/ahoward/#{ This.lib }/tree/master"
+task :default do
+  puts(Rake::Task.tasks.map{|task| task.name} - ['default'])
+end
+task :gemspec do
+  ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem'
+  ignore_directories = 'pkg'
+  ignore_files = 'test/log'
+  shiteless =
+    lambda do |list|
+      list.delete_if do |entry|
+        next unless test(?e, entry)
+        extension = File.basename(entry).split(%r/[.]/).last
+        ignore_extensions.any?{|ext| ext === extension}
+      end
+      list.delete_if do |entry|
+        next unless test(?d, entry)
+        dirname = File.expand_path(entry)
+        ignore_directories.any?{|dir| File.expand_path(dir) == dirname}
+      end
+      list.delete_if do |entry|
+        next unless test(?f, entry)
+        filename = File.expand_path(entry)
+        ignore_files.any?{|file| File.expand_path(file) == filename}
+      end
+    end
+  lib         = This.lib
+  version     = This.version
+  files       = shiteless[Dir::glob("**/**")]
+  executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
+  has_rdoc    = true #File.exist?('doc')
+  test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
+  extensions = This.extensions
+  if extensions.nil?
+    %w( Makefile configure extconf.rb ).each do |ext|
+      extensions << ext if File.exists?(ext)
+    end
+  end
+  extensions = [extensions].flatten.compact
+  template =
+    if test(?e, 'gemspec.erb')
+      Template{ IO.read('gemspec.erb') }
+    else
+      Template {
+        <<-__
+          ## #{ lib }.gemspec
+          #
+          Gem::Specification::new do |spec|
+            spec.name = #{ lib.inspect }
+            spec.version = #{ version.inspect }
+            spec.platform = Gem::Platform::RUBY
+            spec.summary = #{ lib.inspect }
+            spec.files = #{ files.inspect }
+            spec.executables = #{ executables.inspect }
+            spec.require_path = "lib"
+            spec.has_rdoc = #{ has_rdoc.inspect }
+            spec.test_files = #{ test_files.inspect }
+            #spec.add_dependency 'lib', '>= version'
+            #spec.add_dependency 'fattr'
+            spec.extensions.push(*#{ extensions.inspect })
+            spec.rubyforge_project = #{ This.rubyforge_project.inspect }
+            spec.author = #{ This.author.inspect }
+            spec.email = #{ This.email.inspect }
+            spec.homepage = #{ This.homepage.inspect }
+          end
+        __
+      }
+    end
+  open("#{ lib }.gemspec", "w"){|fd| fd.puts template}
+  This.gemspec = "#{ lib }.gemspec"
+end
+task :gem => [:clean, :gemspec] do
+  Fu.mkdir_p This.pkgdir
+  before = Dir['*.gem']
+  cmd = "gem build #{ This.gemspec }"
+  `#{ cmd }`
+  after = Dir['*.gem']
+  gem = ((after - before).first || after.first) or abort('no gem!')
+  Fu.mv gem, This.pkgdir
+  This.gem = File.basename(gem)
+end
+task :readme do
+  samples = ''
+  prompt = '~ > '
+  lib = This.lib
+  version = This.version
+  Dir['sample*/*'].sort.each do |sample|
+    samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
+    cmd = "cat #{ sample }"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
+    samples << Util.indent(`#{ cmd }`, 4) << "\n"
+    cmd = "ruby #{ sample }"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
+    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -I ./lib #{ sample })'"
+    samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n"
+  end
+  template =
+    if test(?e, 'readme.erb')
+      Template{ IO.read('readme.erb') }
+    else
+      Template {
+        <<-__
+          NAME
+            #{ lib }
+          DESCRIPTION
+          INSTALL
+            gem install #{ lib }
+          SAMPLES
+            #{ samples }
+        __
+      }
+    end
+  open("README", "w"){|fd| fd.puts template}
+end
+task :clean do
+  Dir[File.join(This.pkgdir, '**/**')].each{|entry| Fu.rm_rf(entry)}
+end
+task :release => [:clean, :gemspec, :gem] do
+  gems = Dir[File.join(This.pkgdir, '*.gem')].flatten
+  raise "which one? : #{ gems.inspect }" if gems.size > 1
+  raise "no gems?" if gems.size < 1
+  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.pkgdir }/#{ This.gem }"
+  puts cmd
+  system cmd
+end
+BEGIN {
+  $VERBOSE = nil
+  require 'ostruct'
+  require 'erb'
+  require 'fileutils'
+  Fu = FileUtils
+  This = OpenStruct.new
+  This.file = File.expand_path(__FILE__)
+  This.dir = File.dirname(This.file)
+  This.pkgdir = File.join(This.dir, 'pkg')
+  lib = ENV['LIB']
+  unless lib
+    lib = File.basename(Dir.pwd)
+  end
+  This.lib = lib
+  version = ENV['VERSION']
+  unless version
+    name = lib.capitalize
+    require "./lib/#{ lib }"
+    version = eval(name).send(:version)
+  end
+  This.version = version
+  abort('no lib') unless This.lib
+  abort('no version') unless This.version
+  module Util
+    def indent(s, n = 2)
+      s = unindent(s)
+      ws = ' ' * n
+      s.gsub(%r/^/, ws)
+    end
+    def unindent(s)
+      indent = nil
+      s.each do |line|
+      next if line =~ %r/^\s*$/
+      indent = line[%r/^\s*/] and break
+    end
+    indent ? s.gsub(%r/^#{ indent }/, "") : s
+  end
+    extend self
+  end
+  class Template
+    def initialize(&block)
+      @block = block
+      @template = block.call.to_s
+    end
+    def expand(b=nil)
+      ERB.new(Util.unindent(@template)).result(b||@block)
+    end
+    alias_method 'to_s', 'expand'
+  end
+  def Template(*args, &block) Template.new(*args, &block) end
+  Dir.chdir(This.dir)
+}

data/lib/tagz.rb CHANGED

@@ -1,14 +1,7 @@
 unless defined? Tagz
   module Tagz
-    unless defined?(Tagz::VERSION)
-      Tagz::VERSION = [
-        Tagz::VERSION_MAJOR = 5,
-        Tagz::VERSION_MINOR = 1,
-        Tagz::VERSION_TEENY = 0
-      ].join('.')
-      def Tagz.version() Tagz::VERSION end
-    end
+    def Tagz.version() '6.0.0' end
   private
@@ -141,176 +134,16 @@ unless defined? Tagz
       end
     end
-    class Document < ::String
-      def Document.for other
-        Document === other ? other : Document.new(other.to_s)
-      end
-      def element
-        Element.new(*a, &b)
-      end
-      alias_method 'e', 'element'
-      alias_method 'write', 'concat'
-      alias_method 'push', 'concat'
-      def << string
-        case string
-          when Document
-            super string.to_s
-          else
-            super Tagz.escape_content(string)
-        end
-        self
-      end
-      def concat string
-        self << string
-      end
-      #alias_method 'concat', '<<'
-      def escape(*strings)
-        XChar.escape(strings.join)
-      end
-      alias_method 'h', 'escape'
-      def puts string
-        write "#{ string }\n"
-      end
-      def document
-        self
-      end
-      alias_method 'doc', 'document'
-      def + other
-        self.dup << other
-      end
-      def to_s
-        self
-      end
-      def to_str
-        self
-      end
-    end
-    class Element < ::String
-      def Element.attributes options
-        unless options.empty?
-          ' ' <<
-            options.map do |key, value|
-              key = Tagz.escape_attribute(key)
-              value = Tagz.escape_attribute(value)
-              if value =~ %r/"/
-                raise ArgumentError, value if value =~ %r/'/
-                value = "'#{ value }'"
-              else
-                raise ArgumentError, value if value =~ %r/"/
-                value = "\"#{ value }\""
-              end
-              [key, value].join('=')
-            end.join(' ')
-        else
-          ''
-        end
-      end
-      attr 'name'
-      def initialize name, *argv, &block
-        options = {}
-        content = []
-        argv.each do |arg|
-          case arg
-            when Hash
-              options.update arg
-            else
-              content.push arg
-          end
-        end
-        content.push block.call if block
-        content.compact!
-        @name = name.to_s
-        if content.empty?
-          replace "<#{ @name }#{ Element.attributes options }>"
-        else
-          replace "<#{ @name }#{ Element.attributes options }>#{ content.join }</#{ name }>"
-        end
-      end
-    end
-    module XChar
-    # http://intertwingly.net/stories/2004/04/14/i18n.html#CleaningWindows
-    #
-      CP1252 = {
-        128 => 8364, # euro sign
-        130 => 8218, # single low-9 quotation mark
-        131 =>  402, # latin small letter f with hook
-        132 => 8222, # double low-9 quotation mark
-        133 => 8230, # horizontal ellipsis
-        134 => 8224, # dagger
-        135 => 8225, # double dagger
-        136 =>  710, # modifier letter circumflex accent
-        137 => 8240, # per mille sign
-        138 =>  352, # latin capital letter s with caron
-        139 => 8249, # single left-pointing angle quotation mark
-        140 =>  338, # latin capital ligature oe
-        142 =>  381, # latin capital letter z with caron
-        145 => 8216, # left single quotation mark
-        146 => 8217, # right single quotation mark
-        147 => 8220, # left double quotation mark
-        148 => 8221, # right double quotation mark
-        149 => 8226, # bullet
-        150 => 8211, # en dash
-        151 => 8212, # em dash
-        152 =>  732, # small tilde
-        153 => 8482, # trade mark sign
-        154 =>  353, # latin small letter s with caron
-        155 => 8250, # single right-pointing angle quotation mark
-        156 =>  339, # latin small ligature oe
-        158 =>  382, # latin small letter z with caron
-        159 =>  376} # latin capital letter y with diaeresis
-    # http://www.w3.org/TR/REC-xml/#dt-chardata
-    #
-      PREDEFINED = {
-        38 => '&amp;', # ampersand
-        60 => '&lt;',  # left angle bracket
-        62 => '&gt;'}  # right angle bracket
-    # http://www.w3.org/TR/REC-xml/#charsets
-    #
-      VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF), (0xE000..0xFFFD), (0x10000..0x10FFFF)]
-      def XChar.escape(string)
-        string.unpack('U*').map{|n| xchr(n)}.join # ASCII, UTF-8
-      rescue
-        string.unpack('C*').map{|n| xchr(n)}.join # ISO-8859-1, WIN-1252
-      end
-      def XChar.xchr(n)
-        (@xchr ||= {})[n] ||= ((
-          n = XChar::CP1252[n] || n
-          n = 42 unless XChar::VALID.find{|range| range.include? n}
-          XChar::PREDEFINED[n] or (n<128 ? n.chr : "&##{n};")
-        ))
-      end
-    end
+  # escape support
+  #
     def Tagz.escapeHTML(*strings)
       XChar.escape(strings.join)
     end
     def Tagz.escape(*strings)
       XChar.escape(strings.join)
     end
-    NoEscape = lambda{|v|v}
   # support for configuring attribute escaping
   #
     def Tagz.escape_attribute!(*args, &block)
@@ -373,16 +206,191 @@ unless defined? Tagz
       escape_content!{|value| XChar.escape(value)}
     end
-    module Globally; include Tagz; end
     def Tagz.globally
       Globally
     end
-    module Privately; include Tagz; end
     def Tagz.privately
       Privately
     end
+  # hide away our own shit to minimize pollution
+  #
+    module TagzConstants
+      class Document < ::String
+        def Document.for other
+          Document === other ? other : Document.new(other.to_s)
+        end
+        def element
+          Element.new(*a, &b)
+        end
+        alias_method 'e', 'element'
+        alias_method 'write', 'concat'
+        alias_method 'push', 'concat'
+        def << string
+          case string
+            when Document
+              super string.to_s
+            else
+              super Tagz.escape_content(string)
+          end
+          self
+        end
+        def concat string
+          self << string
+        end
+        #alias_method 'concat', '<<'
+        def escape(*strings)
+          XChar.escape(strings.join)
+        end
+        alias_method 'h', 'escape'
+        def puts string
+          write "#{ string }\n"
+        end
+        def document
+          self
+        end
+        alias_method 'doc', 'document'
+        def + other
+          self.dup << other
+        end
+        def to_s
+          self
+        end
+        def to_str
+          self
+        end
+      end
+      class Element < ::String
+        def Element.attributes options
+          unless options.empty?
+            ' ' <<
+              options.map do |key, value|
+                key = Tagz.escape_attribute(key)
+                value = Tagz.escape_attribute(value)
+                if value =~ %r/"/
+                  raise ArgumentError, value if value =~ %r/'/
+                  value = "'#{ value }'"
+                else
+                  raise ArgumentError, value if value =~ %r/"/
+                  value = "\"#{ value }\""
+                end
+                [key, value].join('=')
+              end.join(' ')
+          else
+            ''
+          end
+        end
+        attr 'name'
+        def initialize name, *argv, &block
+          options = {}
+          content = []
+          argv.each do |arg|
+            case arg
+              when Hash
+                options.update arg
+              else
+                content.push arg
+            end
+          end
+          content.push block.call if block
+          content.compact!
+          @name = name.to_s
+          if content.empty?
+            replace "<#{ @name }#{ Element.attributes options }>"
+          else
+            replace "<#{ @name }#{ Element.attributes options }>#{ content.join }</#{ name }>"
+          end
+        end
+      end
+      module XChar
+      # http://intertwingly.net/stories/2004/04/14/i18n.html#CleaningWindows
+      #
+        CP1252 = {
+          128 => 8364, # euro sign
+          130 => 8218, # single low-9 quotation mark
+          131 =>  402, # latin small letter f with hook
+          132 => 8222, # double low-9 quotation mark
+          133 => 8230, # horizontal ellipsis
+          134 => 8224, # dagger
+          135 => 8225, # double dagger
+          136 =>  710, # modifier letter circumflex accent
+          137 => 8240, # per mille sign
+          138 =>  352, # latin capital letter s with caron
+          139 => 8249, # single left-pointing angle quotation mark
+          140 =>  338, # latin capital ligature oe
+          142 =>  381, # latin capital letter z with caron
+          145 => 8216, # left single quotation mark
+          146 => 8217, # right single quotation mark
+          147 => 8220, # left double quotation mark
+          148 => 8221, # right double quotation mark
+          149 => 8226, # bullet
+          150 => 8211, # en dash
+          151 => 8212, # em dash
+          152 =>  732, # small tilde
+          153 => 8482, # trade mark sign
+          154 =>  353, # latin small letter s with caron
+          155 => 8250, # single right-pointing angle quotation mark
+          156 =>  339, # latin small ligature oe
+          158 =>  382, # latin small letter z with caron
+          159 =>  376} # latin capital letter y with diaeresis
+      # http://www.w3.org/TR/REC-xml/#dt-chardata
+      #
+        PREDEFINED = {
+          38 => '&amp;', # ampersand
+          60 => '&lt;',  # left angle bracket
+          62 => '&gt;'}  # right angle bracket
+      # http://www.w3.org/TR/REC-xml/#charsets
+      #
+        VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF), (0xE000..0xFFFD), (0x10000..0x10FFFF)]
+        def XChar.escape(string)
+          string.unpack('U*').map{|n| xchr(n)}.join # ASCII, UTF-8
+        rescue
+          string.unpack('C*').map{|n| xchr(n)}.join # ISO-8859-1, WIN-1252
+        end
+        def XChar.xchr(n)
+          (@xchr ||= {})[n] ||= ((
+            n = XChar::CP1252[n] || n
+            n = 42 unless XChar::VALID.find{|range| range.include? n}
+            XChar::PREDEFINED[n] or (n<128 ? n.chr : "&##{n};")
+          ))
+        end
+      end
+      NoEscape = lambda{|v|v}
+      module Globally; include ::Tagz; end
+      module Privately; include ::Tagz; end
+    end
+  # const_missing support
+  #
+    def Tagz.const_missing(const)
+      super unless TagzConstants.const_defined?(const)
+      TagzConstants.const_get(const)
+    end
     %w( tagz tagz__ __tagz method_missing ).each{|m| module_function(m)}
   end

data/{README.tmpl → readme.erb} RENAMED

@@ -58,17 +58,15 @@ RAILS
   in a view
-    <%=
-      table_{
-        rows.each do |row|
-          tr_{
-            row.each do |cell|
-              td_{ cell }
-            end
-          }
-        end
-      }
-    %>
+    table_{
+      rows.each do |row|
+        tr_{
+          row.each do |cell|
+            td_{ cell }
+          end
+        }
+      end
+    }
   in a controller
@@ -99,6 +97,12 @@ URIS
   http://rubyforge.org/projects/codeforpeople
 HISTORY
+  6.0.0
+    - reorganize lib to avoid dumping a few constants into the includee - aka
+    don't absolutely minimize namespace pollution. there is now reason to
+    thing this version shouldn't be backwards compat - i bumped the version
+    just in case
   5.1.0
     - attribute/content auto-escaping can be turned off with
@@ -147,4 +151,4 @@ HISTORY
 SAMPLES
-  @samples
+  <%= @samples %>

data/tagz.gemspec CHANGED

@@ -1,25 +1,26 @@
+## tagz.gemspec
+#
-  Gem::Specification::new do |spec|
-    spec.name = "tagz"
-    spec.version = "5.1.0"
-    spec.platform = Gem::Platform::RUBY
-    spec.summary = "tagz"
+Gem::Specification::new do |spec|
+  spec.name = "tagz"
+  spec.version = "6.0.0"
+  spec.platform = Gem::Platform::RUBY
+  spec.summary = "tagz"
-    spec.files = ["gen_readme.rb", "install.rb", "lib", "lib/tagz.rb", "README", "README.tmpl", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "tagz-5.1.0.gem", "tagz.gemspec", "test", "test/tagz.rb"]
-    spec.executables = []
-    spec.require_path = "lib"
+  spec.files = ["lib", "lib/tagz.rb", "Rakefile", "README", "readme.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "tagz.gemspec", "test", "test/tagz.rb"]
+  spec.executables = []
+  spec.require_path = "lib"
-    spec.has_rdoc = true
-    spec.test_files = "test/tagz.rb"
-    #spec.add_dependency 'lib', '>= version'
-    #spec.add_dependency 'fattr'
+  spec.has_rdoc = true
+  spec.test_files = "test/tagz.rb"
+  #spec.add_dependency 'lib', '>= version'
+  #spec.add_dependency 'fattr'
-    spec.extensions.push(*[])
-    spec.rubyforge_project = 'codeforpeople'
-    spec.author = "Ara T. Howard"
-    spec.email = "ara.t.howard@gmail.com"
-    spec.homepage = "http://github.com/ahoward/tagz/tree/master"
-  end
+  spec.extensions.push(*[])
+  spec.rubyforge_project = "codeforpeople"
+  spec.author = "Ara T. Howard"
+  spec.email = "ara.t.howard@gmail.com"
+  spec.homepage = "http://github.com/ahoward/tagz/tree/master"
+end

data/test/tagz.rb CHANGED

@@ -668,4 +668,40 @@ class TagzTest < Test::Unit::TestCase
     expected = "<div>\na&gt;b\nc>d\ne&gt;f\ng>h</div>"
     assert_equal expected, actual
   end
+  def test_500
+    expected = actual = nil
+    Module.new do
+      before = constants
+      include Tagz
+      after = constants
+      expected = %w[ TagzConstants ]
+      actual = after - before
+    end
+    assert_equal expected, actual
+  end
+  def test_510
+    expected = actual = nil
+    Module.new do
+      before = constants
+      include Tagz.globally
+      after = constants
+      expected = %w[ TagzConstants ]
+      actual = after - before
+    end
+    assert_equal expected, actual
+  end
+  def test_520
+    expected = actual = nil
+    Module.new do
+      before = constants
+      include Tagz.privately
+      after = constants
+      expected = %w[ TagzConstants ]
+      actual = after - before
+    end
+    assert_equal expected, actual
+  end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ahoward-tagz
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Ara T. Howard
@@ -22,12 +22,11 @@ extensions: []
 extra_rdoc_files: []
 files:
-- gen_readme.rb
-- install.rb
 - lib
 - lib/tagz.rb
+- Rakefile
 - README
-- README.tmpl
+- readme.erb
 - samples
 - samples/a.rb
 - samples/b.rb
@@ -36,7 +35,6 @@ files:
 - samples/e.rb
 - samples/f.rb
 - samples/g.rb
-- tagz-5.1.0.gem
 - tagz.gemspec
 - test
 - test/tagz.rb

data/gen_readme.rb DELETED

@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby
-require 'pathname'
-$VERBOSE=nil
-def indent s, n = 2
-  ws = ' ' * n
-  s.gsub %r/^/, ws
-end
-template = IO::read 'README.tmpl'
-samples = ''
-prompt = '~ > '
-Dir['sample*/*'].sort.each do |sample|
-  samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
-  cmd = "cat #{ sample }"
-  samples << indent(prompt + cmd, 2) << "\n\n"
-  samples << indent(`#{ cmd }`, 4) << "\n"
-  cmd = "ruby #{ sample }"
-  samples << indent(prompt + cmd, 2) << "\n\n"
-  cmd = "ruby -Ilib #{ sample }"
-  samples << indent(`#{ cmd } 2>&1`, 4) << "\n"
-end
-#samples.gsub! %r/^/, '  '
-readme  = template.gsub %r/^\s*@samples\s*$/, samples
-print readme

data/install.rb DELETED

@@ -1,214 +0,0 @@
-#!/usr/bin/env ruby
-require 'rbconfig'
-require 'find'
-require 'ftools'
-require 'tempfile'
-include Config
-LIBDIR      = "lib"
-LIBDIR_MODE = 0644
-BINDIR      = "bin"
-BINDIR_MODE = 0755
-$srcdir            = CONFIG["srcdir"]
-$version           = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
-$libdir            = File.join(CONFIG["libdir"], "ruby", $version)
-$archdir           = File.join($libdir, CONFIG["arch"])
-$site_libdir       = $:.find {|x| x =~ /site_ruby$/}
-$bindir            = CONFIG["bindir"] || CONFIG['BINDIR']
-$ruby_install_name = CONFIG['ruby_install_name'] || CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
-$ruby_ext          = CONFIG['EXEEXT'] || ''
-$ruby              = File.join($bindir, ($ruby_install_name + $ruby_ext))
-if !$site_libdir
-  $site_libdir = File.join($libdir, "site_ruby")
-elsif $site_libdir !~ %r/#{Regexp.quote($version)}/
-  $site_libdir = File.join($site_libdir, $version)
-end
-def install_rb(srcdir=nil, destdir=nil, mode=nil, bin=nil)
-#{{{
-  path   = []
-  dir    = []
-  Find.find(srcdir) do |f|
-    next unless FileTest.file?(f)
-    next if (f = f[srcdir.length+1..-1]) == nil
-    next if (/CVS$/ =~ File.dirname(f))
-    next if (/\.svn/ =~ File.dirname(f))
-    next if f =~ %r/\.lnk/
-    next if f =~ %r/\.svn/
-    next if f =~ %r/\.swp/
-    next if f =~ %r/\.svn/
-    path.push f
-    dir |= [File.dirname(f)]
-  end
-  for f in dir
-    next if f == "."
-    next if f == "CVS"
-    File::makedirs(File.join(destdir, f))
-  end
-  for f in path
-    next if (/\~$/ =~ f)
-    next if (/^\./ =~ File.basename(f))
-    unless bin
-      File::install(File.join(srcdir, f), File.join(destdir, f), mode, true)
-    else
-      from = File.join(srcdir, f)
-      to = File.join(destdir, f)
-      shebangify(from) do |sf|
-        $deferr.print from, " -> ", File::catname(from, to), "\n"
-        $deferr.printf "chmod %04o %s\n", mode, to
-        File::install(sf, to, mode, false)
-      end
-    end
-  end
-#}}}
-end
-def shebangify f
-#{{{
-  open(f) do |fd|
-    buf = fd.read 42
-    if buf =~ %r/^\s*#\s*!.*ruby/o
-      ftmp = Tempfile::new("#{ $$ }_#{ File::basename(f) }")
-      begin
-        fd.rewind
-        ftmp.puts "#!#{ $ruby  }"
-        while((buf = fd.read(8192)))
-          ftmp.write buf
-        end
-        ftmp.close
-        yield ftmp.path
-      ensure
-        ftmp.close!
-      end
-    else
-      yield f
-    end
-  end
-#}}}
-end
-def ARGV.switch
-#{{{
-  return nil if self.empty?
-  arg = self.shift
-  return nil if arg == '--'
-  if arg =~ /^-(.)(.*)/
-    return arg if $1 == '-'
-    raise 'unknown switch "-"' if $2.index('-')
-    self.unshift "-#{$2}" if $2.size > 0
-    "-#{$1}"
-  else
-    self.unshift arg
-    nil
-  end
-#}}}
-end
-def ARGV.req_arg
-#{{{
-  self.shift || raise('missing argument')
-#}}}
-end
-def linkify d, linked = []
-#--{{{
-  if test ?d, d
-    versioned = Dir[ File::join(d, "*-[0-9].[0-9].[0-9].rb") ]
-    versioned.each do |v|
-      src, dst = v, v.gsub(%r/\-[\d\.]+\.rb$/, '.rb')
-      lnk = nil
-      begin
-        if test ?l, dst
-          lnk = "#{ dst }.lnk"
-          puts "#{ dst } -> #{ lnk }"
-          File::rename dst, lnk
-        end
-        unless test ?e, dst
-          puts "#{ src } -> #{ dst }"
-          File::copy src, dst
-          linked << dst
-        end
-      ensure
-        if lnk
-          at_exit do
-            puts "#{ lnk } -> #{ dst }"
-            File::rename lnk, dst
-          end
-        end
-      end
-    end
-  end
-  linked
-#--}}}
-end
-#
-# main program
-#
-libdir = $site_libdir
-bindir = $bindir
-no_linkify = false
-linked = nil
-help = false
-usage = <<-usage
-  #{ File::basename $0 }
-    -d, --destdir    <destdir>
-    -l, --libdir     <libdir>
-    -b, --bindir     <bindir>
-    -r, --ruby       <ruby>
-    -n, --no_linkify
-    -s, --sudo
-    -h, --help
-usage
-begin
-  while switch = ARGV.switch
-    case switch
-    when '-d', '--destdir'
-      libdir = ARGV.req_arg
-    when '-l', '--libdir'
-      libdir = ARGV.req_arg
-    when '-b', '--bindir'
-      bindir = ARGV.req_arg
-    when '-r', '--ruby'
-      $ruby = ARGV.req_arg
-    when '-n', '--no_linkify'
-      no_linkify = true
-    when '-s', '--sudo'
-      sudo = 'sudo'
-    when '-h', '--help'
-      help = true
-    else
-      raise "unknown switch #{switch.dump}"
-    end
-  end
-rescue
-  STDERR.puts $!.to_s
-  STDERR.puts usage
-  exit 1
-end
-if help
-  STDOUT.puts usage
-  exit
-end
-system "#{ sudo } #{ $ruby } pre-install.rb" if test(?s, 'pre-install.rb')
-unless no_linkify
-  linked = linkify('lib') + linkify('bin')
-end
-system "#{ $ruby } extconf.rb && make && #{ sudo } make install" if test(?s, 'extconf.rb')
-install_rb(LIBDIR, libdir, LIBDIR_MODE)
-install_rb(BINDIR, bindir, BINDIR_MODE, bin=true)
-if linked
-  linked.each{|path| File::rm_f path}
-end
-system "#{ sudo } #{ $ruby } post-install.rb" if test(?s, 'post-install.rb')

data/tagz-5.1.0.gem DELETED

Binary file