tarpaulin 0.2.3 → 0.3.0

data/Gemfile

@@ -12,6 +12,7 @@ source "http://rubygems.org"
 
 gem 'tilt', '~> 1.3.1' # https://github.com/rtomayko/tilt
 gem 'lazy', '~> 0.9.6' # http://moonbase.rydia.net/software/lazy.rb/
+gem 'rack-flash' # https://github.com/nakajima/rack-flash
 # gem 'erubis', '~> 2.7.0' # http://www.kuwata-lab.com/erubis/
 
 # Add dependencies to develop your gem here.

data/README.rdoc

@@ -1,8 +1,8 @@
-= kommons
+= Tarpaulin
 
-Description goes here.
+My small attempt to make the world a better place to live in.
 
-== Contributing to kommons
+== Contributing to Tarpaulin
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/tarpaulin.rb

@@ -16,17 +16,17 @@ require "bundler/setup"
 # it's got a long name, nothing will conflict
 # http://grosser.it/2009/07/01/getting-the-caller-method-in-ruby/
 # this is like parse_caller() in ActionMailer apparently
-module Kernel
+module Context
   
   # return [n, dirname, filename or context, line num, self, function]
-  def determine_context (skip=1, &block)
+  def self.determine(skip=1, &block)
     begin
       # cheat, just in case it is nil, rather than handling that special case for now
       # cuz it's always possible to call a func that takes a block without an actual block :(
       # i suppose i could raise an ExpectingBlock Error
       b = block.send(:binding)
       snarf = caller(0)[skip] # defaults to 1
-      # [0] is us --- ["../y_ruby/c.rb:9:in `determine_context'",
+      # [0] is us --- ["../y_ruby/c.rb:9:in `determine'",
       #err "caller(): #{snarf.inspect}"
       matched = /^(.+?)[:](\d+)(.*)$/.match(snarf) # +? non-greedy
       #err "matched /^(.+?)[:](\d+)(.*)$/: #{matched}"
@@ -62,7 +62,7 @@ module Kernel
           #raise NameError.new("odd name found in backtrace -- " + context)
       end # case
     end # begin
-  end # determine_context()
+  end # determine()
   
 end # module Kernel
 
@@ -82,7 +82,7 @@ end # module Kernel
 class File
   
   def File.here (string)
-    return determine_context(2){}[:path] + '/' + string
+    return Context::determine(2){}[:path] + '/' + string
   end
 
 end
@@ -106,4 +106,6 @@ end
 require File.here "tarpaulin/logger"
 require File.here "tarpaulin/endless"
 require File.here "tarpaulin/camping"
+require File.here "tarpaulin/camping/flash"
+require File.here "tarpaulin/camping/filter"
 require File.here "tarpaulin/tilt/clearsilver_template"

data/lib/tarpaulin/camping.rb

@@ -16,10 +16,11 @@ module Tarpaulin
     @@link
   end
   
+  # check for Context, only show a.inspect in dev mode
   def r403(f=nil, &block)
     #$stderr.puts "in 403"
     h = {'Content-Type' => 'text/html; charset=utf-8'}
-    a = eval("determine_context{}", block)
+    a = eval("Context::determine{}", block)
     if f.nil?
       f = block.call
     end
@@ -32,7 +33,7 @@ module Tarpaulin
   def r404(f=nil, &block) # compat with Camping
     #$stderr.puts "in 404"
     h = {'Content-Type' => 'text/html; charset=utf-8'}
-    a = eval("determine_context{}", block)
+    a = eval("Context::determine{}", block)
     if f.nil?
       f = block.call
     end
@@ -76,8 +77,31 @@ module Tarpaulin
     end
     
     def stylesheet_link_tag(stylish)
-      type = "text/css"
-      href = stylish.start_with?("http") ? "#{stylish}" : R(Tarpaulin.link_controller, @root, Tarpaulin::Helpers::CSS, "#{stylish}.css")
+
+      href = if stylish.start_with?("http")
+        "#{stylish}"
+      else
+        type = "text/css"
+        # $stderr.puts @root.inspect
+        if @root.length > 0 and @root[0] == '/'
+          root = @root.reverse.chop!.reverse
+        else
+          root = @root
+        end
+        # $stderr.puts root
+        if root and root.length > 0
+          r = R(Tarpaulin.link_controller, root, Tarpaulin::Helpers::CSS, "#{stylish}.css")
+          r2 = R(Tarpaulin.link_controller, Tarpaulin::Helpers::CSS, "#{stylish}.css")
+        else
+          r = R(Tarpaulin.link_controller, Tarpaulin::Helpers::CSS, "#{stylish}.css")
+          r2 = nil
+        end
+        # $stderr.puts r.inspect
+        # $stderr.puts r2.inspect
+        r
+      end
+      # $stderr.puts href
+      
       Markaby::Builder.new.capture {
         link :rel => "stylesheet",
              :type => type,
@@ -87,8 +111,31 @@ module Tarpaulin
     end
     
     def javascript_link_tag(scriptish)
-      type = "text/javascript"
-      src = scriptish.start_with?("http") ? "#{scriptish}" : R(Tarpaulin.link_controller, @root, Tarpaulin::Helpers::JS, "#{scriptish}.js")
+
+      src = if scriptish.start_with?("http")
+        "#{scriptish}"
+      else
+        type = "text/javascript"
+        # $stderr.puts @root.inspect
+        if @root.length > 0 and @root[0] == '/'
+          root = @root.reverse.chop!.reverse
+        else
+          root = @root
+        end
+        # $stderr.puts root
+        if root and root.length > 0
+          r = R(Tarpaulin.link_controller, root, Tarpaulin::Helpers::JS, "#{scriptish}.js")
+          r2 = R(Tarpaulin.link_controller, Tarpaulin::Helpers::JS, "#{scriptish}.js")
+        else
+          r = R(Tarpaulin.link_controller, Tarpaulin::Helpers::JS, "#{scriptish}.js")
+          r2 = nil
+        end
+        # $stderr.puts r.inspect
+        # $stderr.puts r2.inspect
+        r
+      end
+      # $stderr.puts src
+
       Markaby::Builder.new.capture {
         script(:type => type, :src => src) {}
       }

data/lib/tarpaulin/camping/filter.rb

@@ -0,0 +1,49 @@
+#
+# include the CampingFilters module in TheApp
+#
+module CampingFilters
+  module ClassMethods
+    def filters
+      @filters ||= {:before => [], :after => []}
+    end
+    
+    def before(actions, &blk)
+      actions = [actions] unless actions.is_a?(Array)
+      actions.each do |action|
+        filters[:before] << [action, blk]
+      end
+    end
+    
+    def after(actions, &blk)
+      actions = [actions] unless actions.is_a?(Array)
+      actions.each do |action|
+        filters[:after] << [action, blk]
+      end
+    end
+  end # ClassMethods
+  
+  def self.included(mod)
+    mod.extend(ClassMethods)
+  end
+  
+  def run_filters(type)
+    o = self.class.to_s.split("::")
+    filters = Object.const_get(o.first).filters
+    filters[type].each do |filter|
+      if (filter[0].is_a?(Symbol) && (filter[0] == o.last.to_sym || filter[0] == :all)) ||
+         (filter[0].is_a?(String) && /^#{filter[0]}\/?$/ =~ @env.REQUEST_URI)
+         self.instance_eval(&filter[1])
+      end
+    end
+  end
+  
+  def service(*a) # params to controllers, ids n stuff
+    override_self = catch(:halt) do
+      run_filters(:before)
+      override_self = super(*a)
+      run_filters(:after)
+      override_self
+    end
+    override_self
+  end
+end

data/lib/tarpaulin/camping/flash.rb

@@ -0,0 +1,54 @@
+#
+# monkey patch Camping to work with rack-flash
+#
+# include the CampingFlash module in TheApp
+#
+# => Use ClassName.instance_eval to define class methods.
+# => Use ClassName.class_eval to define instance methods.
+#
+module CampingFlash
+  
+  def self.included(base)
+    Camping::H.class_eval do
+      def diff(other)
+        self.keys.inject({}) do |memo, key|
+          unless self[key] == other[key]
+            memo[key] = [self[key], other[key]] 
+          end
+          memo
+        end
+      end
+    end
+  end
+
+  def to_a #:nodoc:
+    if @state.respond_to? :diff
+      diff = @_state.diff(@state)
+      diff.each {|k,v| @env['rack.session'].delete(k) }
+    end
+    super
+  end
+
+  def to_a #:nodoc:
+    # overwrite the session with how @state is now
+    # depeding on whether diff is defined for H or not
+    if @state.respond_to? :diff
+      @env['rack.session'].merge! Hash[@state]
+    else
+      @env['rack.session'] = Hash[@state]
+    end
+    r = Rack::Response.new(@body, @status, @headers)
+    @cookies._n.each do |k, v|
+      r.set_cookie(k, v)
+    end
+    r.to_a
+  end
+
+  def initialize(env, m) #:nodoc:
+    super(env,m)
+    @_state = @state.clone
+  end
+    
+end
+
+#Camping::Cookies[r.cookies], SimpleDelegator.new(Camping::H)[r.session.to_hash],

data/lib/tarpaulin/logger.rb

@@ -1,10 +1,15 @@
 require 'logger'
+require 'singleton'
 
-class Logger
+require 'pry'
+
+class ContextLogger < Logger
+  
+  include Singleton
   
   def self.format_block # implicit
     the_proc = Proc.new # capture it
-    context = eval("determine_context{}", the_proc) # eval can take a Proc obj or a Binding
+    context = eval("Context::determine{}", the_proc) # eval can take a Proc obj or a Binding
     result = the_proc.call # invoke it
     klass = 'nil' # can it be??
     # puts context[:self].inspect
@@ -30,20 +35,27 @@ class Logger
   end
 
   %w(debug info warn error fatal).each do |sev|
-    orig_method = ('orig_'+sev).to_sym
     method = sev.to_sym
-    alias_method( orig_method, method)
-    class_eval <<-"END"
-      def #{method}
-        output = Logger.format_block(&Proc.new)
-        #{orig_method}(output)
+    class_eval <<-EOT, __FILE__, __LINE__
+      def #{method}(msg=nil, &block)
+        if block
+          output = ContextLogger.format_block(&block)
+          super(@progname){output}
+        else
+          super(msg)
+        end
+      rescue
+        $stderr.puts "Oh deary me. Error in ContextLogger: "+$!.inspect
       end
-    END
+    EOT
+  end
+  
+  def initialize(stream=STDOUT)
+    # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+    level=Logger::DEBUG
+    super(stream)
   end
 
 end
 
-$logger = Logger.new(STDOUT)
-$logger.level = Logger::DEBUG
-# DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
-
+$L = ContextLogger.instance

data/lib/tarpaulin/tilt/clearsilver_template.rb

@@ -8,6 +8,7 @@ require 'tilt/template'
 # Tilt.register :rhtml, Tilt[:erubis]
 
 require 'neo'
+require 'pry'
 
 module Tilt
   # ClearSilver implementation. See:
@@ -15,7 +16,8 @@ module Tilt
   class ClearSilverTemplate < Tilt::Template
     
     def self.engine_initialized?
-      defined? ::ClearSilver
+      # defined? ::ClearSilver
+      defined? ::Neo::Cs
     end
 
     def initialize_engine
@@ -34,8 +36,8 @@ module Tilt
     def additive_parsing? ; additive_parsing end
     
     def debug # implicit
-      if $logger
-        #$logger.debug(&Proc.new) # pass it along
+      if $L
+        #$L.debug(&Proc.new) # pass it along
       end
     end
     
@@ -51,7 +53,7 @@ module Tilt
         @additive_parsing = false
       end
     end
-
+    
     def evaluate(scope, locals, &block)
 
       debug { scope }
@@ -59,8 +61,20 @@ module Tilt
       debug { block }
       if block
         hd = block.call
+        #obj = scope
+        #method = :fooish
+        debug { scope.methods.sort }
+        e = scope.instance_variable_get(:@env)
+        debug {e}
+        m = scope.instance_variable_get(:@method)
+        debug {m}
+        pack = [e, m]
+        obj = scope.class.parent
+        debug {obj}
+        method = :dispatch
       else
         hd = scope
+        obj = nil
       end
       if ClearSilverTemplate.old_api
       debug { "#2" }
@@ -76,7 +90,12 @@ module Tilt
       debug { "#3" }
         @engine = Neo::Cs.new # CS Ruby API, revamped
         @engine.use hd # CS Ruby/C API
+        if obj
+          @engine.register_fileload(obj, method, pack)
+          # @engine.register_fileload(obj, method, locals) # call before parse_x, should use splat
+        end
         @engine.parse_string @data # CS C API
+        #binding.pry
       end
       @output = @engine.render # it's actually called render in CS C API
     end

data/tarpaulin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tarpaulin"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Durity"]
-  s.date = "2011-10-13"
+  s.date = "2011-10-29"
   s.description = "So I don't have to copy and paste a million times."
   s.email = "github@jollyrotten.org"
   s.extra_rdoc_files = [
@@ -25,12 +25,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/tarpaulin.rb",
     "lib/tarpaulin/camping.rb",
+    "lib/tarpaulin/camping/filter.rb",
+    "lib/tarpaulin/camping/flash.rb",
     "lib/tarpaulin/endless.rb",
     "lib/tarpaulin/logger.rb",
     "lib/tarpaulin/tilt/clearsilver_template.rb",
     "tarpaulin.gemspec",
     "test/helper.rb",
-    "test/test_kommons.rb"
+    "test/test_tarpaulin.rb"
   ]
   s.homepage = "http://github.com/igravious/tarpaulin"
   s.licenses = ["GPLv3"]
@@ -44,6 +46,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<tilt>, ["~> 1.3.1"])
       s.add_runtime_dependency(%q<lazy>, ["~> 0.9.6"])
+      s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, ["~> 2.11.1"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.1"])
@@ -52,6 +55,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<tilt>, ["~> 1.3.1"])
       s.add_dependency(%q<lazy>, ["~> 0.9.6"])
+      s.add_dependency(%q<rack-flash>, [">= 0"])
       s.add_dependency(%q<shoulda>, ["~> 2.11.1"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.1"])
@@ -61,6 +65,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<tilt>, ["~> 1.3.1"])
     s.add_dependency(%q<lazy>, ["~> 0.9.6"])
+    s.add_dependency(%q<rack-flash>, [">= 0"])
     s.add_dependency(%q<shoulda>, ["~> 2.11.1"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.1"])

data/test/{test_kommons.rb → test_tarpaulin.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestKommons < Test::Unit::TestCase
+class TestTarpaulin < Test::Unit::TestCase
   should "probably rename this file and start testing for real" do
     flunk "hey buddy, you should probably rename this file and start testing for real"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tarpaulin
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Anthony Durity
@@ -15,12 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2011-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: tilt
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +29,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: tilt
   prerelease: false
-  name: lazy
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,12 +45,26 @@ dependencies:
         - 9
         - 6
         version: 0.9.6
+  name: lazy
+  prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: shoulda
-  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rack-flash
+  prerelease: false
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +75,12 @@ dependencies:
         - 11
         - 1
         version: 2.11.1
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  name: shoulda
   prerelease: false
-  name: bundler
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +91,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  name: jeweler
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,12 +107,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
-  name: rcov
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,12 +123,12 @@ dependencies:
         - 9
         - 7
         version: 0.9.7
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
-  name: rdoc
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,7 +139,10 @@ dependencies:
         - 9
         - 1
         version: 3.9.1
-  requirement: *id007
+  name: rdoc
+  prerelease: false
+  type: :development
+  requirement: *id008
 description: So I don't have to copy and paste a million times.
 email: github@jollyrotten.org
 executables: []
@@ -147,12 +161,14 @@ files:
 - VERSION
 - lib/tarpaulin.rb
 - lib/tarpaulin/camping.rb
+- lib/tarpaulin/camping/filter.rb
+- lib/tarpaulin/camping/flash.rb
 - lib/tarpaulin/endless.rb
 - lib/tarpaulin/logger.rb
 - lib/tarpaulin/tilt/clearsilver_template.rb
 - tarpaulin.gemspec
 - test/helper.rb
-- test/test_kommons.rb
+- test/test_tarpaulin.rb
 homepage: http://github.com/igravious/tarpaulin
 licenses: 
 - GPLv3