fredit 0.1.9 → 0.2.0

data/README.md

@@ -22,10 +22,6 @@ edit page.
 
 You can also create and delete front-end files on the fredit edit page.
 
-**NOTE: Currently only the ERB Rails template handler is supported.**
-You are welcome to fork and add support for Haml and other template
-handlers. 
-
 
 ## fredit lowers the barriers to collaboration
 
@@ -50,7 +46,7 @@ templates and stylesheets. This is madness. And if you want to add
 additional non-Rails people as front-end collaborators, [the King of
 Sparta kicks you into a pit][sparta]. Have fun.
 
-[sparta]:http://www.youtube.com/watch?v=-qR0Uke2XNI
+[sparta]:http://www.youtube.com/watch?v=wDiUG52ZyHQ&t=38s
 
 Another option is to integrate a CMS into your Rails app. But in
 addition to adding a mass of dependencies and code bloat, this approach
@@ -94,7 +90,8 @@ lower the "collaboration barrier" to reap further gains in productivity.
 
 ## Install and setup
 
-fredit requires Rails 3.
+fredit requires Rails 3. fredit should work with all Rails-compatible
+templating engines as of version 0.2.0.
 
 fredit works best as a gem you include in a specific Rails
 environment. Put something like this in the `Gemfile` of your Rails app:

data/lib/fredit.rb

@@ -1,7 +1,7 @@
 if Rails.version < '3.1.0'
-  require 'fredit/erb'
+  require 'fredit/template30'
 else
-  require 'fredit/erb31'
+  require 'fredit/template31'
 end
 require 'uri'
 
@@ -35,12 +35,27 @@ module Fredit
     {:css => css, :views => views, :javascript => js}
   end
 
+  def add_fredit_link(template, s)
+    return s unless template_editable?(template)
+    if s =~ /^\s*<!DOCTYPE/ && s =~ /<body[^>]*>/
+      s.sub(/<body[^>]*>/, '\&' + fredit_link(template))
+    else
+      fredit_link(template) + s
+    end
+  end
+
+  def fredit_link(template)
+    source_file = Fredit.rel_path template.identifier
+    edit_link = "<div style='color:red'>#{Fredit.link(source_file)}</div>".html_safe
+  end
+
   def template_editable?(template)
     template.identifier.index(Rails.root.to_s) == 0 &&
       template.formats && 
       template.formats.include?(:html)
   end
 
+
 end
 
 require 'fredit/engine'

data/lib/fredit/template30.rb

@@ -0,0 +1,28 @@
+module ActionView
+  class Template
+
+    def render(view, locals, &block)
+      # Notice that we use a bang in this instrumentation because you don't want to
+      # consume this in production. This is only slow if it's being listened to.
+      ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do
+        if view.is_a?(ActionView::CompiledTemplates)
+          mod = ActionView::CompiledTemplates
+        else
+          mod = view.singleton_class
+        end
+        method_name = compile(locals, view, mod)
+        r = view.send(method_name, locals, &block)
+        Fredit.add_fredit_link(self, r)
+      end
+    rescue Exception => e
+      if e.is_a?(Template::Error)
+        e.sub_template_of(self)
+        raise e
+      else
+        raise Template::Error.new(self, view.respond_to?(:assigns) ? view.assigns : {}, e)
+      end
+    end
+
+  end
+end
+

data/lib/fredit/template31.rb

@@ -0,0 +1,16 @@
+module ActionView
+  class Template
+    def render(view, locals, buffer=nil, &block)
+      ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do
+        compile!(view)
+        r = view.send(method_name, locals, buffer, &block)
+        Fredit.add_fredit_link(self, r)
+      end
+    rescue Exception => e
+      handle_render_error(view, e)
+    end
+  end
+end
+
+__END__
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fredit
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70199512506440 !ruby/object:Gem::Requirement
+  requirement: &72582790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70199512506440
+  version_requirements: *72582790
 description: Edit the front end of Rails apps through the browser.
 email:
 - dhchoi@gmail.com
@@ -29,14 +29,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/fredit_controller.rb
-- app/views/fredit/revision.html.erb
-- app/views/fredit/show.html.erb
 - app/views/layouts/fredit.html.erb
-- lib/fredit/engine.rb
-- lib/fredit/erb.rb
-- lib/fredit/erb31.rb
+- app/views/fredit/show.html.erb
+- app/views/fredit/revision.html.erb
+- app/controllers/fredit_controller.rb
 - lib/fredit.rb
+- lib/fredit/template31.rb
+- lib/fredit/template30.rb
+- lib/fredit/engine.rb
 - config/routes.rb
 - MIT-LICENSE
 - Rakefile
@@ -56,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1023881741045697263
+      hash: 421214845
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -65,10 +65,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1023881741045697263
+      hash: 421214845
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Edit the front end of Rails apps through the browser.

data/lib/fredit/erb.rb

@@ -1,50 +0,0 @@
-module ActionView
-  class Template
-    module Handlers
-      class ERB < Handler
-        def compile(template)
-
-          # copied from original
-
-          if template.source.encoding_aware?
-            # First, convert to BINARY, so in case the encoding is
-            # wrong, we can still find an encoding tag
-            # (<%# encoding %>) inside the String using a regular
-            # expression
-            template_source = template.source.dup.force_encoding("BINARY")
-
-            erb = template_source.gsub(ENCODING_TAG, '')
-            encoding = $2
-
-            erb.force_encoding valid_encoding(template.source.dup, encoding)
-
-            # Always make sure we return a String in the default_internal
-            erb.encode!
-          else
-            erb = template.source.dup
-          end
-
-          # begin Fredit patch
-
-          if Fredit.template_editable?(template)
-            source_file = Fredit.rel_path template.identifier
-            edit_link = "<div style='color:red'>#{Fredit.link(source_file)}</div> "
-            if erb =~ /^\s*<!DOCTYPE/ && erb =~ /<body[^>]*>/
-              erb = erb.sub(/<body[^>]*>/, '\&' + edit_link)
-            else
-              erb = edit_link + erb
-            end
-          end
-
-          # end Fredit patch
-
-          self.class.erb_implementation.new(
-            erb,
-            :trim => (self.class.erb_trim_mode == "-")
-          ).src
-        end
-
-      end
-    end
-  end
-end

data/lib/fredit/erb31.rb

@@ -1,50 +0,0 @@
-module ActionView
-  class Template
-    module Handlers
-      class ERB 
-        def call(template)
-          if template.source.encoding_aware?
-            # First, convert to BINARY, so in case the encoding is
-            # wrong, we can still find an encoding tag
-            # (<%# encoding %>) inside the String using a regular
-            # expression
-            template_source = template.source.dup.force_encoding("BINARY")
-
-            erb = template_source.gsub(ENCODING_TAG, '')
-            encoding = $2
-
-            erb.force_encoding valid_encoding(template.source.dup, encoding)
-
-            # Always make sure we return a String in the default_internal
-            erb.encode!
-          else
-            erb = template.source.dup
-          end
-
-          # begin Fredit patch
-
-          if Fredit.template_editable?(template)
-            source_file = Fredit.rel_path template.identifier
-            edit_link = "<div style='color:red'>#{Fredit.link(source_file)}</div> "
-            if erb =~ /^\s*<!DOCTYPE/ && erb =~ /<body[^>]*>/
-              erb = erb.sub(/<body[^>]*>/, '\&' + edit_link)
-            else
-              erb = edit_link + erb
-            end
-          end
-
-          # end Fredit patch
-
-
-          self.class.erb_implementation.new(
-            erb,
-            :trim => (self.class.erb_trim_mode == "-")
-          ).src
-
-        end
-
-      end
-    end
-  end
-end
-