danwrong-evil 0.1.1 → 0.1.2

data/assets/evil.js

@@ -15,6 +15,27 @@ jQuery(function($) {
     }
   });
   
+  var TemplateReorder = $.klass({
+    initialize: function() {
+      this.element.tableDnD({
+        onDrop: $.bind(this._onDrop, this),
+        onDragClass: 'dragging'
+      });
+    },
+    _onDrop: function() {
+      var data = $.tableDnD.serialize();
+      
+      $.post('/admin/templates/reorder', data);
+      
+      this._restripe();
+    },
+    _restripe: function() {
+      this.element.find('tbody tr:odd').addClass('alt');
+      this.element.find('tbody tr:even').removeClass('alt');
+    }
+  })
+  
   
-  $(window).attach(Sizer, 1000, 'wide')
+  $(window).attach(Sizer, 1000, 'wide');
+  $('#templates').attach(TemplateReorder);
 });

data/evil.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{evil}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Webb"]
-  s.date = %q{2009-04-17}
+  s.date = %q{2009-04-22}
   s.default_executable = %q{evil}
   s.description = %q{A simple framework for creating sites from 3rd party data and services}
   s.email = %q{dan@danwebb.net}
   s.executables = ["evil"]
-  s.extra_rdoc_files = ["bin/evil", "CHANGELOG", "lib/evil/application.rb", "lib/evil/extensions.rb", "lib/evil/helpers.rb", "lib/evil/models/config_pair.rb", "lib/evil/models/template.rb", "lib/evil/models/whitelist.rb", "lib/evil/models.rb", "lib/evil/open_id.rb", "lib/evil/plugin/base.rb", "lib/evil/plugin/configuration.rb", "lib/evil/plugin/environment.rb", "lib/evil/plugin/filesystem.rb", "lib/evil/plugin/tag.rb", "lib/evil/plugin.rb", "lib/evil/setup/db_tool.rb", "lib/evil/setup/generator.rb", "lib/evil/setup/migration.rb", "lib/evil.rb", "LICENSE", "README.textile"]
-  s.files = ["assets/config.ru", "assets/evil-lib.js", "assets/evil.css", "assets/evil.js", "assets/logo.png", "bin/evil", "CHANGELOG", "evil.gemspec", "lib/evil/application.rb", "lib/evil/extensions.rb", "lib/evil/helpers.rb", "lib/evil/models/config_pair.rb", "lib/evil/models/template.rb", "lib/evil/models/whitelist.rb", "lib/evil/models.rb", "lib/evil/open_id.rb", "lib/evil/plugin/base.rb", "lib/evil/plugin/configuration.rb", "lib/evil/plugin/environment.rb", "lib/evil/plugin/filesystem.rb", "lib/evil/plugin/tag.rb", "lib/evil/plugin.rb", "lib/evil/setup/db_tool.rb", "lib/evil/setup/generator.rb", "lib/evil/setup/migration.rb", "lib/evil.rb", "LICENSE", "Manifest", "Rakefile", "README.textile", "test/app/evil_test.rb", "test/dev_env.rb", "test/test_helper.rb", "test/units/plugin/base_test.rb", "test/units/plugin/tag_test.rb", "views/_banner.haml", "views/_errors.haml", "views/index.haml", "views/layout.haml", "views/login.haml", "views/plugins/_fields.haml", "views/plugins/edit.haml", "views/plugins/fields/_password.haml", "views/plugins/fields/_text.haml", "views/plugins/new.haml", "views/templates/_fields.haml", "views/templates/edit.haml", "views/templates/new.haml"]
+  s.extra_rdoc_files = ["bin/evil", "CHANGELOG", "lib/evil/application.rb", "lib/evil/extensions.rb", "lib/evil/helpers.rb", "lib/evil/models/config_pair.rb", "lib/evil/models/template.rb", "lib/evil/models/whitelist.rb", "lib/evil/models.rb", "lib/evil/open_id.rb", "lib/evil/plugin/base.rb", "lib/evil/plugin/block_tag.rb", "lib/evil/plugin/configuration.rb", "lib/evil/plugin/environment.rb", "lib/evil/plugin/filesystem.rb", "lib/evil/plugin/singleton_tag.rb", "lib/evil/plugin/tag.rb", "lib/evil/plugin.rb", "lib/evil/setup/db_tool.rb", "lib/evil/setup/generator.rb", "lib/evil/setup/migration.rb", "lib/evil.rb", "LICENSE", "README.textile"]
+  s.files = ["assets/config.ru", "assets/evil-lib.js", "assets/evil.css", "assets/evil.js", "assets/logo.png", "bin/evil", "CHANGELOG", "evil.gemspec", "lib/evil/application.rb", "lib/evil/extensions.rb", "lib/evil/helpers.rb", "lib/evil/models/config_pair.rb", "lib/evil/models/template.rb", "lib/evil/models/whitelist.rb", "lib/evil/models.rb", "lib/evil/open_id.rb", "lib/evil/plugin/base.rb", "lib/evil/plugin/block_tag.rb", "lib/evil/plugin/configuration.rb", "lib/evil/plugin/environment.rb", "lib/evil/plugin/filesystem.rb", "lib/evil/plugin/singleton_tag.rb", "lib/evil/plugin/tag.rb", "lib/evil/plugin.rb", "lib/evil/setup/db_tool.rb", "lib/evil/setup/generator.rb", "lib/evil/setup/migration.rb", "lib/evil.rb", "LICENSE", "Manifest", "Rakefile", "README.textile", "test/application/frontend_test.rb", "test/application/openid_test.rb", "test/application/plugin_config_test.rb", "test/application/template_test.rb", "test/dev_env.rb", "test/test_helper.rb", "test/units/models/template_test.rb", "test/units/models/whitelist_test.rb", "test/units/plugin/base_test.rb", "test/units/plugin/configuration_test.rb", "test/units/plugin/environment_test.rb", "test/units/plugin/filesystem_test.rb", "test/units/plugin/tag_test.rb", "views/_banner.haml", "views/_errors.haml", "views/index.haml", "views/layout.haml", "views/login.haml", "views/plugins/_fields.haml", "views/plugins/edit.haml", "views/plugins/fields/_password.haml", "views/plugins/fields/_text.haml", "views/plugins/new.haml", "views/templates/_fields.haml", "views/templates/edit.haml", "views/templates/new.haml"]
   s.has_rdoc = true
   s.homepage = %q{http://www.evilmashups.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Evil", "--main", "README.textile"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{evil}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{A simple framework for creating sites from 3rd party data and services}
-  s.test_files = ["test/app/evil_test.rb", "test/test_helper.rb", "test/units/plugin/base_test.rb", "test/units/plugin/tag_test.rb"]
+  s.test_files = ["test/application/frontend_test.rb", "test/application/openid_test.rb", "test/application/plugin_config_test.rb", "test/application/template_test.rb", "test/test_helper.rb", "test/units/models/template_test.rb", "test/units/models/whitelist_test.rb", "test/units/plugin/base_test.rb", "test/units/plugin/configuration_test.rb", "test/units/plugin/environment_test.rb", "test/units/plugin/filesystem_test.rb", "test/units/plugin/tag_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/evil/application.rb

@@ -10,7 +10,6 @@ module Evil
     end
 
     require_whitelisted_openid(/^\/admin/)
-    load_template_routes
 
     get '/admin/openid/login' do
       attempt_openid_authentication do |identity_url|
@@ -47,6 +46,21 @@ module Evil
         haml :"templates/new"
       end
     end
+    
+    post '/admin/templates/reorder' do
+      order = params[:templates].collect do |id|
+        if id =~ /(\d)+t/
+          $1.to_i
+        end
+      end.compact
+      
+      
+      order.each_with_index do |id, i|
+        Evil::Models::Template.find(id).update_attribute :position, i
+      end
+      
+      order.join(',')
+    end
 
     get '/admin/templates/:id' do
       @template = Evil::Models::Template.find(params[:id]) rescue not_found
@@ -84,6 +98,8 @@ module Evil
       
       redirect '/admin'
     end
+    
+    load_template_routes
   end
 end
       

data/lib/evil/helpers.rb

@@ -50,7 +50,7 @@ module Evil
     protected
     
     def initialize_plugins
-      Plugin::Environment.plugins.each { |p| p.init }
+      Plugin::Environment.plugins.each { |p| p.init } rescue nil
     end
     
     def partial_name(template_path)

data/lib/evil/models/template.rb

@@ -6,7 +6,7 @@ module Evil
       set_table_name :evil_templates
       
       validates_presence_of   :title, :source
-      validates_uniqueness_of :route, :if => lambda { |template| !(template.route.empty? || template.route.nil?) }
+      validates_uniqueness_of :route, :if => lambda { |template| !(template.route.nil? || template.route.empty?) }
       validates_format_of     :route, :with => /^((\/)|(((\/|\.):?[a-z0-9\_]+)+))$/, 
                                       :allow_blank => true, :allow_nil => true
       validate :liquid_syntax

data/lib/evil/plugin.rb

@@ -2,12 +2,16 @@ module Evil
   module Plugin
     autoload :Base, 'evil/plugin/base'
     autoload :Tag, 'evil/plugin/tag'
+    autoload :BlockTag, 'evil/plugin/block_tag'
+    autoload :SingletonTag, 'evil/plugin/singleton_tag'
     autoload :Environment, 'evil/plugin/environment'
     autoload :Filesystem, 'evil/plugin/filesystem'
     autoload :Configuration, 'evil/plugin/configuration'
     
     def self.evaluate(plugin_source)
       Environment.module_eval plugin_source
+    rescue
+      nil
     end
     
     def self.from_file(file)

data/lib/evil/plugin/base.rb

@@ -22,8 +22,8 @@ module Evil
         @setup_proc = block
       end
                   
-      def tag(name, &block)
-        tag = Tag.from(&block)
+      def tag(name, options={}, &block)
+        tag = options[:block] ? BlockTag.from(&block) : SingletonTag.from(&block)
         Liquid::Template.register_tag(name, tag)
       end
       

data/lib/evil/plugin/block_tag.rb

@@ -0,0 +1,48 @@
+module Evil
+  module Plugin
+    
+    class TagExecution
+      
+      def initialize(tag, options, context, &block)
+        @options = Tag.evaluate(options, context)
+        @context = context
+        @tag = tag
+        @proc = block
+      end
+      
+      def body(locals={})
+        @context.stack do
+          locals.each { |k, v| @context[k.to_s] = v }
+          return @tag.render_body(@context).to_s
+        end
+      end
+      
+      def execute
+        self.instance_exec(@options, &@proc)
+      end
+      
+      def to_s
+        execute.to_s
+      end
+    end
+    
+    class BlockTag < Liquid::Block
+      include Tag
+      
+      def initialize(tag_name, markup, tokens)
+        super
+        
+        set_options(markup)
+      end
+      
+      def render(context)
+        TagExecution.new(self, @options, context, &self.class.tag_proc).to_s
+      end
+      
+      def render_body(context)
+        render_all(@nodelist, context)
+      end
+    end
+    
+  end
+end

data/lib/evil/plugin/configuration.rb

@@ -49,8 +49,8 @@ module Evil
         
         def set(values)
           values.each do |k, v|
-            c = ConfigPair.find_or_create_by_plugin_and_key(@plugin.name, k)
-            c.update_attribute :value, v
+            c = ConfigPair.find_or_create_by_plugin_and_key(@plugin.name, k.to_s)
+            c.update_attribute :value, v.to_s
           end if values
           
           load_config!
@@ -61,12 +61,8 @@ module Evil
         def load_config!
           pairs = Evil::Models::ConfigPair.find_all_by_plugin(@plugin.name)
           
-          if pairs
-            @values = pairs.inject(Hash.new('')) do |m, pair|
-              m[pair.key.to_sym] = pair.value; m
-            end
-          else
-            @values = Hash.new('')
+          @values = pairs.inject(Hash.new('')) do |m, pair|
+            m[pair.key.to_sym] = pair.value; m
           end
         end
       

data/lib/evil/plugin/filesystem.rb

@@ -7,7 +7,7 @@ module Evil
         if template = Evil::Models::Template.find_by_title(title)
           template.source
         else
-          raise FileSystemError, "No such template '#{title}'"
+          raise Liquid::FileSystemError, "No such template '#{title}'"
         end
       end
       

data/lib/evil/plugin/singleton_tag.rb

@@ -0,0 +1,18 @@
+module Evil
+  module Plugin
+    class SingletonTag < Liquid::Tag
+      include Tag
+      
+      def initialize(tag_name, markup, tokens)
+        super
+        
+        set_options(markup)
+      end
+      
+      def render(context)
+        self.class.tag_proc.call(Tag.evaluate(@options, context))
+      end
+      
+    end
+  end
+end

data/lib/evil/plugin/tag.rb

@@ -1,56 +1,32 @@
 module Evil
   module Plugin
-    
-    class TagExecution
-      
-      def initialize(tag, options, context, &block)
-        @options = evaluate(options, context)
-        @context = context
-        @tag = tag
-        @proc = block
-      end
+    module Tag
+      Syntax = /((#{Liquid::TagAttributes}\s?,?\s?)*)/
       
-      def body(locals={})
-        @context.stack do
-          locals.each { |k, v| @context[k.to_s] = v }
-          return @tag.render_body(@context).to_s
+      def self.included(base)
+        base.instance_eval do
+          def from(&block)
+            tag = Class.new(self)
+            
+            class << tag
+              attr_accessor :tag_proc
+            end
+            
+            tag.tag_proc = block; tag
+          end
         end
       end
       
-      def execute
-        self.instance_exec(@options, &@proc)
-      end
-      
-      def to_s
-        execute.to_s
-      end
-      
-      private
-      
-      def evaluate(options, context)
+      def self.evaluate(options, context)
         options.inject({}) do |evaluated, pair| 
           opt, value = pair
           evaluated[opt] = context[value]; evaluated
         end
       end
-    end
-    
-    class Tag < Liquid::Block
-      Syntax = /((#{Liquid::TagAttributes}\s?,?\s?)*)/
       
-      class << self
-        attr_accessor :tag_proc
-        attr_accessor :plugin
-        
-        def from(&block)
-          tag = Class.new(self)
-          tag.tag_proc = block; tag
-        end
-      end
-
-      def initialize(tag_name, markup, tokens)
-        super
-        
+      protected
+      
+      def set_options(markup)
         if markup =~ Syntax
           @options = parse_options($1)
         else
@@ -58,16 +34,6 @@ module Evil
         end
       end
       
-      def render(context)
-        TagExecution.new(self, @options, context, &self.class.tag_proc).to_s
-      end
-      
-      def render_body(context)
-        render_all(@nodelist, context)
-      end
-
-      private
-
       def parse_options(opt_string)
         pairs = opt_string.split(',')
         pairs.inject({}) do |opts, pair|
@@ -75,7 +41,7 @@ module Evil
           opts[opt.strip.to_sym] = value.strip; opts
         end
       end
+      
     end
-    
   end
 end

data/test/application/frontend_test.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), '../test_helper')
+require 'evil/application'
+
+class FrontendTest < Test::Unit::TestCase
+  include Sinatra::Test
+  
+  context 'running the evil application' do
+    setup do
+      @app = Evil::Application
+    end
+  
+        
+    context 'GET a template page' do
+      setup do
+        @template = Factory.create(:template)
+        @app.reload!
+        get @template.route
+      end
+    
+      should 'be successful' do
+        assert_equal 200, response.status
+      end
+    
+      should 'render with text/html as default content_type' do
+        assert_match /text\/html/, response.headers['Content-Type']
+        assert_match /utf-8/, response.headers['Content-Type']
+      end
+    
+      should 'set a Cache-Control header from the template\'s ttl' do
+        assert_match /max-age=#{@template.ttl}/, response.headers['Cache-Control']
+      end
+    end
+  
+    context 'GET a template page with another content type set' do
+      setup do
+        @template = Factory.create(:template, :content_type => 'application/xml')
+        @app.reload!
+        get @template.route
+      end
+    
+      should 'be successful' do
+        assert_equal 200, response.status
+      end
+    
+      should 'render with text/html as default content_type' do
+        assert_match /application\/xml/, response.headers['Content-Type']
+        assert_match /utf-8/, response.headers['Content-Type']
+      end
+    end
+  end
+  
+end

data/test/{app/evil_test.rb → application/openid_test.rb}

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 require 'evil/application'
 
-class EvilTest < Test::Unit::TestCase
+class OpenidTest < Test::Unit::TestCase
   include Sinatra::Test
   
   context 'running the evil application' do
@@ -21,12 +21,14 @@ class EvilTest < Test::Unit::TestCase
             assert_match /openid_url/, response.body
           end
         end
-      
+        
       end
+        
     
       context 'while logged in' do 
         setup do
-          @env = { 'rack.session' => { :identity_url => 'www.danwebb.net' } }
+          Factory.create(:whitelist)
+          @env = { 'rack.session' => { :identity_url => 'www.example.com' } }
         end
              
         context 'GET /admin' do
@@ -38,26 +40,6 @@ class EvilTest < Test::Unit::TestCase
             assert response.ok?
           end
         end
-        
-        context 'GET /admin/templates/1 with existing template' do
-          setup do
-            get '/admin/templates/1', {}, @env
-          end
-          
-          should 'be successful' do
-            assert response.ok?
-          end
-        end
-        
-        context 'GET /admin/templates/nothinghere with non-existing template' do
-          setup do
-            get '/admin/templates/nothinghere', {}, @env
-          end
-          
-          should 'be not found' do
-            assert_equal 404, response.status
-          end
-        end
       end
     end