RubyGems - hocus_pocus - Versions diffs - 0.0.1 → 0.1.0 - Mend

hocus_pocus 0.0.1 → 0.1.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 (23) hide show

data/.gitignore +4 -0
data/CHANGELOG +7 -0
data/Gemfile +2 -11
data/Rakefile +1 -52
data/app/controllers/hocus_pocus/spec_controller.rb +8 -0
data/app/views/hocus_pocus/editor/_editor.html.erb +4 -1
data/app/views/hocus_pocus/generator/index.html.erb +2 -2
data/app/views/hocus_pocus/spec/destroy.js.erb +1 -0
data/config/routes.rb +14 -5
data/hocus_pocus.gemspec +19 -76
data/lib/generators/hocus_pocus/config_generator.rb +16 -0
data/lib/generators/hocus_pocus/templates/hocus_pocus_config.rb +6 -0
data/lib/hocus_pocus.rb +1 -43
data/lib/hocus_pocus/config.rb +30 -0
data/lib/hocus_pocus/content_appender.rb +76 -0
data/lib/hocus_pocus/filter.rb +32 -14
data/lib/hocus_pocus/railtie.rb +53 -0
data/lib/hocus_pocus/version.rb +3 -0
data/vendor/assets/javascripts/jquery_ujs.js +289 -0
metadata +23 -77
data/Gemfile.lock +0 -20
data/VERSION +0 -1
data/public/javascripts/rails.js +0 -160

data/.gitignore ADDED Viewed

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/CHANGELOG ADDED Viewed

@@ -0,0 +1,7 @@
+== 0.1.0
+* Works with Rails 3.1.0.beta1
+== 0.0.1
+* First release

data/Gemfile CHANGED Viewed

@@ -1,13 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
+# Specify your gem's dependencies in hocus_pocus.gemspec
+gemspec

data/Rakefile CHANGED Viewed

@@ -1,53 +1,2 @@
-require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "hocus_pocus"
-  gem.homepage = "http://github.com/amatsuda/hocus_pocus"
-  gem.license = "MIT"
-  gem.summary = 'An Isolated Engine that casts a spell on your Rails 3.1 app'
-  gem.description =  'An Isolated Engine that casts a spell on your Rails 3.1 app'
-  gem.email = "ronnie@dio.jp"
-  gem.authors = ["Akira Matsuda"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'nested_scaffold', '>= 0.1.0'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-task :default => :test
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "hocus_pocus #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks

data/app/controllers/hocus_pocus/spec_controller.rb ADDED Viewed

@@ -0,0 +1,8 @@
+module HocusPocus
+  class SpecController < ActionController::Base
+    # XHR
+    def destroy
+      flash.discard HocusPocus::SPEC
+    end
+  end
+end

data/app/views/hocus_pocus/editor/_editor.html.erb CHANGED Viewed

@@ -4,7 +4,10 @@
   <%= form_tag save_editor_path, :remote => true, :id => HocusPocus::EDITOR do %>
     <%= hidden_field_tag :path, @path %>
     <%= text_area_tag :file, @file, :size => '100x30' %>
-    <%= submit_tag 'save' %>
+    <div align="right">
+      <%= button_to_function 'Hide', "$('#__editor__').hide()" %>&nbsp;
+      <%= submit_tag 'Save!' %>
+    </div>
   <% end %>
   <hr>

data/app/views/hocus_pocus/generator/index.html.erb CHANGED Viewed

@@ -1,8 +1,8 @@
 <html>
   <head>
     <title>generator</title>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
-    <script src="/hocus_pocus/javascripts/rails.js" type="text/javascript"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js"></script>
+    <script src="/assets/jquery_ujs.js" type="text/javascript"></script>
     <script type="text/javascript">
       $('#add_attr_type').live('click', function() {
           var i = $('#attr_type input').length;

data/app/views/hocus_pocus/spec/destroy.js.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ $('#<%= HocusPocus::CONTAINER %> div.spec pre').html('Cleared.');

data/config/routes.rb CHANGED Viewed

@@ -1,7 +1,16 @@
 HocusPocus::Engine.routes.draw do
-  post '/generator/scaffold', :to => 'generator#scaffold', :as => 'scaffold_generator'
-  post '/generator/execute', :to => 'generator#execute', :as => 'execute_generator'
-  get '/editor', :to => 'editor#index'
-  post '/editor/save', :to => 'editor#save', :as => 'save_editor'
-  get '/:anything', :to => 'generator#index', :constraints => {:anything => /.*/}
+  if HocusPocus.config.enable_generator
+    post '/generator/scaffold', :to => 'generator#scaffold', :as => 'scaffold_generator'
+    post '/generator/execute', :to => 'generator#execute', :as => 'execute_generator'
+  end
+  if HocusPocus.config.enable_editor
+    get '/editor', :to => 'editor#index'
+    post '/editor/save', :to => 'editor#save', :as => 'save_editor'
+  end
+  if HocusPocus.config.enable_scenario_recorder
+    delete '/spec', :to => 'spec#destroy'
+  end
+  if HocusPocus.config.enable_generator
+    get '/:anything', :to => 'generator#index', :constraints => {:anything => /.*/}
+  end
 end

data/hocus_pocus.gemspec CHANGED Viewed

@@ -1,83 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'hocus_pocus/version'
 Gem::Specification.new do |s|
-  s.name = %q{hocus_pocus}
-  s.version = "0.0.1"
+  s.name        = 'hocus_pocus'
+  s.version     = HocusPocus::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Akira Matsuda']
+  s.email       = ['ronnie@dio.jp']
+  s.homepage    = 'http://github.com/amatsuda/hocus_pocus'
+  s.summary     = 'An Isolated Engine that casts a spell on your Rails 3.1 app'
+  s.description = 'An Isolated Engine that casts a spell on your Rails 3.1 app'
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Akira Matsuda"]
-  s.date = %q{2010-12-23}
-  s.description = %q{An Isolated Engine that casts a spell on your Rails 3.1 app}
-  s.email = %q{ronnie@dio.jp}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "app/controllers/hocus_pocus/application_controller.rb",
-    "app/controllers/hocus_pocus/editor_controller.rb",
-    "app/controllers/hocus_pocus/generator_controller.rb",
-    "app/helpers/hocus_pocus/application_helper.rb",
-    "app/helpers/hocus_pocus/generator_helper.rb",
-    "app/views/hocus_pocus/editor/_editor.html.erb",
-    "app/views/hocus_pocus/editor/index.js.erb",
-    "app/views/hocus_pocus/editor/save.js.erb",
-    "app/views/hocus_pocus/generator/execute.js.erb",
-    "app/views/hocus_pocus/generator/index.html.erb",
-    "app/views/hocus_pocus/generator/scaffold.js.erb",
-    "config/routes.rb",
-    "hocus_pocus.gemspec",
-    "lib/hocus_pocus.rb",
-    "lib/hocus_pocus/engine.rb",
-    "lib/hocus_pocus/filter.rb",
-    "lib/tasks/hocus_pocus_tasks.rake",
-    "public/javascripts/rails.js",
-    "test/helper.rb",
-    "test/test_hocus_pocus.rb"
-  ]
-  s.homepage = %q{http://github.com/amatsuda/hocus_pocus}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{An Isolated Engine that casts a spell on your Rails 3.1 app}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_hocus_pocus.rb"
-  ]
+  s.rubyforge_project = 'hocus_pocus'
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<nested_scaffold>, [">= 0.1.0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<nested_scaffold>, [">= 0.1.0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<nested_scaffold>, [">= 0.1.0"])
-  end
-end
+  s.extra_rdoc_files = ['README.rdoc']
+  s.licenses = ['MIT']
+  s.add_runtime_dependency 'nested_scaffold', ['>= 0.1.0']
+end

data/lib/generators/hocus_pocus/config_generator.rb ADDED Viewed

@@ -0,0 +1,16 @@
+module HocusPocus
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      desc <<DESC
+Description:
+    Copies hobus_pocus configuration file to your application's initializer directory.
+DESC
+      def copy_config_file
+        template 'hocus_pocus_config.rb', 'config/initializers/hocus_pocus_config.rb'
+      end
+    end
+  end
+end

data/lib/generators/hocus_pocus/templates/hocus_pocus_config.rb ADDED Viewed

@@ -0,0 +1,6 @@
+HocusPocus.configure do |config|
+  # config.enable_generator = true
+  # config.enable_editor = true
+  # config.enable_scenario_recorder = true
+  # config.enable_command_line = false
+end if defined? HocusPocus

data/lib/hocus_pocus.rb CHANGED Viewed

@@ -1,43 +1 @@
-require 'hocus_pocus/engine'
-require 'hocus_pocus/filter'
-module HocusPocus
-  VIEW_FILENAMES = :__hocus_pocus_view_filenames__
-  EDITOR = :__hocus_pocus_editor__
-  GENERATOR = :__hocus_pocus_generator__
-  SPEC = :__hocus_pocus_spec__
-end
-if Rails.env.development?
-  ActiveSupport.on_load(:after_initialize) do
-    Rails.application.routes.append do
-      mount HocusPocus::Engine, :at => '/'
-    end
-  end
-  class ::ActionController::Base
-    before_filter HocusPocus::Filter
-    after_filter HocusPocus::Filter
-  end
-  class ::ActionView::Base
-    def method_missing(method, args = {}, &blk)
-      if method.to_s =~ /(new_|edit_)?(.*)(_path|_url)\z/
-        # to avoid DoubleRenderError
-        controller.instance_variable_set :@_response_body, nil
-        #FIXME preserve args
-        controller.redirect_to "/#{$2.pluralize}?return_path=#{method}(#{args})"
-      else
-        super
-      end
-    end
-  end
-  class ::ActionView::PartialRenderer
-    def render_partial_with_filename_caching
-      (Thread.current[HocusPocus::VIEW_FILENAMES] ||= []) << @template unless @view.controller.is_a?(HocusPocus::EditorController)
-      render_partial_without_filename_caching
-    end
-    alias_method_chain :render_partial, :filename_caching
-  end
-end
+require File.join(File.dirname(__FILE__), 'hocus_pocus/railtie')

data/lib/hocus_pocus/config.rb ADDED Viewed

@@ -0,0 +1,30 @@
+require 'active_support/configurable'
+module HocusPocus
+  # Configures global settings for HocusPocus
+  #   HocusPocus.configure do |config|
+  #     config.enable_generator = false
+  #   end
+  def self.configure(&block)
+    yield @config ||= HocusPocus::Configuration.new
+  end
+  # Global settings for HocusPocus
+  def self.config
+    @config
+  end
+  # need a Class for 3.0
+  class Configuration #:nodoc:
+    include ActiveSupport::Configurable
+    config_accessor :enable_generator, :enable_editor, :enable_scenario_recorder, :enable_command_line
+  end
+  # this is ugly. why can't we pass the default value to config_accessor...?
+  configure do |config|
+    config.enable_generator = true
+    config.enable_editor = true
+    config.enable_scenario_recorder = true
+    config.enable_command_line = false
+  end
+end

data/lib/hocus_pocus/content_appender.rb ADDED Viewed

@@ -0,0 +1,76 @@
+module HocusPocus
+  class ContentAppender
+    def initialize(app)
+      @app = app
+    end
+    def call(env)
+#       controller.flash[HocusPocus::SPEC] = controller.params[HocusPocus::SPEC] if controller.params[HocusPocus::SPEC]
+#       controller.flash.keep(HocusPocus::SPEC)
+    @app.call(env).tap do |status, headers, body|
+      if body.respond_to? :body
+        @body = body.body
+        @controller_name = env['action_dispatch.request.path_parameters'][:controller]
+        @action_name = env['action_dispatch.request.path_parameters'][:action]
+        unless headers['Content-Type'].starts_with?('text/html')
+          #FIXME avoid loading jquery twice
+  #         add_jquery
+          add_steak_recorder
+  #         add_js
+          unless controller.start_with? 'hocus_pocus/'
+            add_buttons
+          end
+  #         add_command_line
+          body.body = @body
+        end
+      end
+    end
+    private
+    def add_steak_recorder
+      #TODO exclude EDITOR and GENERATOR
+      insert_text :before, /<\/body>/i, <<-TEPPAN
+<script type="text/javascript">
+  $('form').live('submit', function() {
+  var scenario = ["  scenario '#{@action_name.humanize} #{@controller_name.humanize}' do"];
+  scenario.push("    visit '" + window.location.href + "'");
+  $(this).find('input[type=text]').each(function() {
+    scenario.push("    fill_in '" + $(this).attr('id') + "', :with => '" + $(this).val() + "'");
+  });
+  scenario.push("    click_button '" + $(this).find('input[type=submit]').val() + "'");
+  $(this).append('<textarea id="#{HocusPocus::SPEC}" name="#{HocusPocus::SPEC}" style="height: 0px; width: 0px;" />');
+  $('##{HocusPocus::SPEC}').val(scenario.join('\\n'));
+})
+</script>
+TEPPAN
+    end
+    def add_buttons
+      #FIXME path
+      #FIXME use @template somehow?
+      edit_link = %Q[<a href="/editor?template=#{@controller.controller_name}/#{@controller.action_name}" data-remote="true" onclick="$(this).closest('div').find('div.partials').toggle()">edit</a>]
+      spec_link = %Q[<a href="#" onclick="$(this).closest('div').find('div.spec').toggle();">spec</a>]
+      partials = %Q[<div class="partials" style="display:none">#{(Thread.current[HocusPocus::VIEW_FILENAMES] || []).map(&:virtual_path).map {|v| '<a href="/editor?template=' + v + '" data-remote="true">' + v + '</a>'}.join('<br>')}</div>]
+      #FIXME more assertions
+      spec = %Q[<div class="spec" style="display:none"><pre>#{CGI.unescape(@controller.flash[HocusPocus::SPEC]) + "\n  end" if @controller.flash[HocusPocus::SPEC]}</pre></div>]
+      insert_text :before, /<\/body>/i, %Q[<div style="position:absolute; top:0; right: 0;">#{edit_link} | #{spec_link}<br>#{partials}<br>#{spec}</div>]
+      Thread.current[HocusPocus::VIEW_FILENAMES] = nil
+    end
+    def insert_text(position, pattern, new_text)
+      index = case pattern
+        when Regexp
+          if match = @body.match(pattern)
+            match.offset(0)[position == :before ? 0 : 1]
+          else
+            @body.size
+          end
+        else
+          pattern
+        end
+      @body.insert index, new_text
+    end
+  end
+end

data/lib/hocus_pocus/filter.rb CHANGED Viewed

@@ -12,12 +12,12 @@ module HocusPocus
         filter = self.new(controller)
         #FIXME avoid loading jquery twice
 #         filter.add_jquery
-        filter.add_steak_recorder
+        filter.add_steak_recorder if HocusPocus.config.enable_scenario_recorder
 #         filter.add_js
         unless controller.is_a?(HocusPocus::EditorController) || controller.is_a?(HocusPocus::GeneratorController)
           filter.add_buttons
         end
-#         filter.add_command_line
+        filter.add_command_line if HocusPocus.config.enable_command_line
         controller.response.body = filter.body
       end
     end
@@ -30,7 +30,7 @@ module HocusPocus
     def add_jquery
 #       insert_text :before, /<\/head>/i, '<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script><script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script><link rel="stylesheet" href="/hocus_pocus/stylesheets/jquery.ui.dialog.css" type="text/css">'
-      insert_text :before, /<\/head>/i, '<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>'
+      insert_text :before, /<\/head>/i, '<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>'
     end
     def add_steak_recorder
@@ -40,9 +40,12 @@ module HocusPocus
   $('form').live('submit', function() {
   var scenario = ["  scenario '#{@controller.action_name.humanize} #{@controller.controller_name.humanize}' do"];
   scenario.push("    visit '" + window.location.href + "'");
-  $(this).find('input[type=text]').each(function() {
+  $(this).find('input[type=text],textarea').each(function() {
     scenario.push("    fill_in '" + $(this).attr('id') + "', :with => '" + $(this).val() + "'");
   });
+  $(this).find('select').each(function() {
+    scenario.push("    select '" + $(this).val() + "', :from => '" + $(this).attr('id') + "'");
+  });
   scenario.push("    click_button '" + $(this).find('input[type=submit]').val() + "'");
   $(this).append('<textarea id="#{HocusPocus::SPEC}" name="#{HocusPocus::SPEC}" style="height: 0px; width: 0px;" />');
   $('##{HocusPocus::SPEC}').val(scenario.join('\\n'));
@@ -57,20 +60,12 @@ TEPPAN
     end
     def add_buttons
-      #FIXME path
-      #FIXME use @template somehow?
-      edit_link = %Q[<a href="/editor?template=#{@controller.controller_name}/#{@controller.action_name}" data-remote="true" onclick="$(this).closest('div').find('div.partials').toggle()">edit</a>]
-      spec_link = %Q[<a href="#" onclick="$(this).closest('div').find('div.spec').toggle();">spec</a>]
-      partials = %Q[<div class="partials" style="display:none">#{(Thread.current[HocusPocus::VIEW_FILENAMES] || []).map(&:virtual_path).map {|v| '<a href="/editor?template=' + v + '" data-remote="true">' + v + '</a>'}.join('<br>')}</div>]
-      #FIXME more assertions
-      spec = %Q[<div class="spec" style="display:none"><pre>#{CGI.unescape(@controller.flash[HocusPocus::SPEC]) + "\n  end" if @controller.flash[HocusPocus::SPEC]}</pre></div>]
-      insert_text :before, /<\/body>/i, %Q[<div style="position:absolute; top:0; right: 0;">#{edit_link} | #{spec_link}<br>#{partials}<br>#{spec}</div>]
+      insert_text :before, /<\/body>/i, %Q[<div id="#{HocusPocus::CONTAINER}" style="position:absolute; top:0; right: 0; font-size: small;">#{[edit_link, spec_link].compact.join(' | ')}<br>#{partials}<br>#{spec}</div>]
       Thread.current[HocusPocus::VIEW_FILENAMES] = nil
     end
     def add_command_line
-      insert_text :before, /<\/body>/i, %Q[<div style="position:absolute; bottom:0;"><form method="post" action="/generator/execute" data-remote="true"><input type="text" name="command" placeholder="どうする？コマンド" style="width: 512px;" /><input type="submit" name="run" /></form></div>]
+      insert_text :before, /<\/body>/i, %Q[<div style="position:absolute; bottom:0;"><form method="post" action="/generator/execute" data-remote="true"><input type="text" name="command" placeholder="Command?" style="width: 512px;" /><input type="submit" name="run" /></form></div>]
     end
     private
@@ -87,5 +82,28 @@ TEPPAN
         end
       @body.insert index, new_text
     end
+    def edit_link
+      return nil unless HocusPocus.config.enable_editor
+      #FIXME path
+      #FIXME use @template somehow?
+      %Q[<a href="/editor?template=#{@controller.controller_name}/#{@controller.action_name}" data-remote="true" onclick="$(this).closest('div').find('div.partials').toggle()">edit</a>]
+    end
+    def spec_link
+      return nil unless HocusPocus.config.enable_scenario_recorder
+      %Q[<a href="#" onclick="$(this).closest('div').find('div.spec').toggle();">spec</a>]
+    end
+    def partials
+      return nil unless HocusPocus.config.enable_editor
+      %Q[<div class="partials" style="display:none">#{(Thread.current[HocusPocus::VIEW_FILENAMES] || []).map(&:virtual_path).map {|v| '<a href="/editor?template=' + v + '" data-remote="true">' + v + '</a>'}.join('<br>')}</div>]
+    end
+    def spec
+      return nil unless HocusPocus.config.enable_scenario_recorder
+      #FIXME more assertions
+      %Q[<div class="spec" style="display:none"><pre>#{CGI.unescape(@controller.flash[HocusPocus::SPEC]) + "\n  end" if @controller.flash[HocusPocus::SPEC]}</pre><div align="right"><a href="/spec" data-remote="true" data-method="delete">Clear</a></div></div>]
+    end
   end
 end

data/lib/hocus_pocus/railtie.rb ADDED Viewed

@@ -0,0 +1,53 @@
+require 'rails'
+require File.join(File.dirname(__FILE__), 'config')
+if Rails.env.development?
+  require 'hocus_pocus/engine'
+  require 'hocus_pocus/filter'
+  module HocusPocus
+    VIEW_FILENAMES = :__hocus_pocus_view_filenames__
+    CONTAINER = :__hocus_pocus_container__
+    EDITOR = :__hocus_pocus_editor__
+    GENERATOR = :__hocus_pocus_generator__
+    SPEC = :__hocus_pocus_spec__
+    class Railtie < ::Rails::Railtie #:nodoc:
+      initializer 'hocus_pocus' do |app|
+        ActiveSupport.on_load(:after_initialize) do
+          Rails.application.routes.append do
+            mount HocusPocus::Engine, :at => '/'
+          end
+        end
+        ActiveSupport.on_load(:action_controller) do
+          class ::ActionController::Base
+            before_filter HocusPocus::Filter
+            after_filter HocusPocus::Filter
+          end
+        end
+        ActiveSupport.on_load(:action_view) do
+          class ::ActionView::Base
+            def method_missing(method, args = {}, &blk)
+              if method.to_s =~ /(new_|edit_)?(.*)(_path|_url)\z/
+                # to avoid DoubleRenderError
+                controller.instance_variable_set :@_response_body, nil
+                #FIXME preserve args
+                controller.redirect_to "/#{$2.pluralize}?return_path=#{method}(#{args})"
+              else
+                super
+              end
+            end
+          end
+          class ::ActionView::PartialRenderer
+            def render_partial_with_filename_caching
+              (Thread.current[HocusPocus::VIEW_FILENAMES] ||= []) << @template unless @view.controller.is_a?(HocusPocus::EditorController)
+              render_partial_without_filename_caching
+            end
+            alias_method_chain :render_partial, :filename_caching
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hocus_pocus/version.rb ADDED Viewed

@@ -0,0 +1,3 @@
+module HocusPocus
+  VERSION = '0.1.0'
+end

data/vendor/assets/javascripts/jquery_ujs.js ADDED Viewed

@@ -0,0 +1,289 @@
+/**
+ * Unobtrusive scripting adapter for jQuery
+ *
+ * Requires jQuery 1.4.4 or later.
+ * https://github.com/rails/jquery-ujs
+ * Uploading file using rails.js
+ * =============================
+ *
+ * By default, browsers do not allow files to be uploaded via AJAX. As a result, if there are any non-blank file fields
+ * in the remote form, this adapter aborts the AJAX submission and allows the form to submit through standard means.
+ *
+ * The `ajax:aborted:file` event allows you to bind your own handler to process the form submission however you wish.
+ *
+ * Ex:
+ *     $('form').live('ajax:aborted:file', function(event, elements){
+ *       // Implement own remote file-transfer handler here for non-blank file inputs passed in `elements`.
+ *       // Returning false in this handler tells rails.js to disallow standard form submission
+ *       return false;
+ *     });
+ *
+ * The `ajax:aborted:file` event is fired when a file-type input is detected with a non-blank value.
+ *
+ * Third-party tools can use this hook to detect when an AJAX file upload is attempted, and then use
+ * techniques like the iframe method to upload the file instead.
+ *
+ * Required fields in rails.js
+ * ===========================
+ *
+ * If any blank required inputs (required="required") are detected in the remote form, the whole form submission
+ * is canceled. Note that this is unlike file inputs, which still allow standard (non-AJAX) form submission.
+ *
+ * The `ajax:aborted:required` event allows you to bind your own handler to inform the user of blank required inputs.
+ *
+ * !! Note that Opera does not fire the form's submit event if there are blank required inputs, so this event may never
+ *    get fired in Opera. This event is what causes other browsers to exhibit the same submit-aborting behavior.
+ *
+ * Ex:
+ *     $('form').live('ajax:aborted:required', function(event, elements){
+ *       // Returning false in this handler tells rails.js to submit the form anyway.
+ *       // The blank required inputs are passed to this function in `elements`.
+ *       return ! confirm("Would you like to submit the form with missing info?");
+ *     });
+ */
+(function($) {
+  // Shorthand to make it a little easier to call public rails functions from within rails.js
+  var rails;
+  $.rails = rails = {
+    // Link elements bound by jquery-ujs
+    linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote]',
+    // Form elements bound by jquery-ujs
+    formSubmitSelector: 'form',
+    // Form input elements bound by jquery-ujs
+    formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])',
+    // Form input elements disabled during form submission
+    disableSelector: 'input[data-disable-with], button[data-disable-with], textarea[data-disable-with]',
+    // Form input elements re-enabled after form submission
+    enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled',
+    // Form required input elements
+    requiredInputSelector: 'input[name][required],textarea[name][required]',
+    // Form file input elements
+    fileInputSelector: 'input:file',
+    // Make sure that every Ajax request sends the CSRF token
+    CSRFProtection: function(xhr) {
+      var token = $('meta[name="csrf-token"]').attr('content');
+      if (token) xhr.setRequestHeader('X-CSRF-Token', token);
+    },
+    // Triggers an event on an element and returns false if the event result is false
+    fire: function(obj, name, data) {
+      var event = $.Event(name);
+      obj.trigger(event, data);
+      return event.result !== false;
+    },
+    // Submits "remote" forms and links with ajax
+    handleRemote: function(element) {
+      var method, url, data,
+        dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+      if (rails.fire(element, 'ajax:before')) {
+        if (element.is('form')) {
+          method = element.attr('method');
+          url = element.attr('action');
+          data = element.serializeArray();
+          // memoized value from clicked submit button
+          var button = element.data('ujs:submit-button');
+          if (button) {
+            data.push(button);
+            element.data('ujs:submit-button', null);
+          }
+        } else {
+          method = element.data('method');
+          url = element.attr('href');
+          data = null;
+        }
+        $.ajax({
+          url: url, type: method || 'GET', data: data, dataType: dataType,
+          // stopping the "ajax:beforeSend" event will cancel the ajax request
+          beforeSend: function(xhr, settings) {
+            if (settings.dataType === undefined) {
+              xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+            }
+            return rails.fire(element, 'ajax:beforeSend', [xhr, settings]);
+          },
+          success: function(data, status, xhr) {
+            element.trigger('ajax:success', [data, status, xhr]);
+          },
+          complete: function(xhr, status) {
+            element.trigger('ajax:complete', [xhr, status]);
+          },
+          error: function(xhr, status, error) {
+            element.trigger('ajax:error', [xhr, status, error]);
+          }
+        });
+      }
+    },
+    // Handles "data-method" on links such as:
+    // <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
+    handleMethod: function(link) {
+      var href = link.attr('href'),
+        method = link.data('method'),
+        csrf_token = $('meta[name=csrf-token]').attr('content'),
+        csrf_param = $('meta[name=csrf-param]').attr('content'),
+        form = $('<form method="post" action="' + href + '"></form>'),
+        metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
+      if (csrf_param !== undefined && csrf_token !== undefined) {
+        metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
+      }
+      form.hide().append(metadata_input).appendTo('body');
+      form.submit();
+    },
+    /* Disables form elements:
+      - Caches element value in 'ujs:enable-with' data store
+      - Replaces element text with value of 'data-disable-with' attribute
+      - Adds disabled=disabled attribute
+    */
+    disableFormElements: function(form) {
+      form.find(rails.disableSelector).each(function() {
+        var element = $(this), method = element.is('button') ? 'html' : 'val';
+        element.data('ujs:enable-with', element[method]());
+        element[method](element.data('disable-with'));
+        element.attr('disabled', 'disabled');
+      });
+    },
+    /* Re-enables disabled form elements:
+      - Replaces element text with cached value from 'ujs:enable-with' data store (created in `disableFormElements`)
+      - Removes disabled attribute
+    */
+    enableFormElements: function(form) {
+      form.find(rails.enableSelector).each(function() {
+        var element = $(this), method = element.is('button') ? 'html' : 'val';
+        if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with'));
+        element.removeAttr('disabled');
+      });
+    },
+    // If message provided in 'data-confirm' attribute, fires `confirm` event and returns result of confirm dialog.
+    // Attaching a handler to the element's `confirm` event that returns false cancels the confirm dialog.
+    allowAction: function(element) {
+      var message = element.data('confirm');
+      return !message || (rails.fire(element, 'confirm') && confirm(message));
+    },
+    // Helper function which checks for blank inputs in a form that match the specified CSS selector
+    blankInputs: function(form, specifiedSelector, nonBlank) {
+      var inputs = $(), input,
+        selector = specifiedSelector || 'input,textarea';
+      form.find(selector).each(function() {
+        input = $(this);
+        // Collect non-blank inputs if nonBlank option is true, otherwise, collect blank inputs
+        if (nonBlank ? input.val() : !input.val()) {
+          inputs = inputs.add(input);
+        }
+      });
+      return inputs.length ? inputs : false;
+    },
+    // Helper function which checks for non-blank inputs in a form that match the specified CSS selector
+    nonBlankInputs: function(form, specifiedSelector) {
+      return rails.blankInputs(form, specifiedSelector, true); // true specifies nonBlank
+    },
+    // Helper function, needed to provide consistent behavior in IE
+    stopEverything: function(e) {
+      e.stopImmediatePropagation();
+      return false;
+    },
+    // find all the submit events directly bound to the form and
+    // manually invoke them. If anyone returns false then stop the loop
+    callFormSubmitBindings: function(form) {
+      var events = form.data('events'), continuePropagation = true;
+      if (events !== undefined && events['submit'] !== undefined) {
+        $.each(events['submit'], function(i, obj){
+          if (typeof obj.handler === 'function') return continuePropagation = obj.handler(obj.data);
+        });
+      }
+      return continuePropagation;
+    }
+  };
+  // ajaxPrefilter is a jQuery 1.5 feature
+  if ('ajaxPrefilter' in $) {
+    $.ajaxPrefilter(function(options, originalOptions, xhr){ rails.CSRFProtection(xhr); });
+  } else {
+    $(document).ajaxSend(function(e, xhr){ rails.CSRFProtection(xhr); });
+  }
+  $(rails.linkClickSelector).live('click.rails', function(e) {
+    var link = $(this);
+    if (!rails.allowAction(link)) return rails.stopEverything(e);
+    if (link.data('remote') !== undefined) {
+      rails.handleRemote(link);
+      return false;
+    } else if (link.data('method')) {
+      rails.handleMethod(link);
+      return false;
+    }
+  });
+  $(rails.formSubmitSelector).live('submit.rails', function(e) {
+    var form = $(this),
+      remote = form.data('remote') !== undefined,
+      blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector),
+      nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector);
+    if (!rails.allowAction(form)) return rails.stopEverything(e);
+    // skip other logic when required values are missing or file upload is present
+    if (blankRequiredInputs && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
+      return !remote;
+    }
+    if (remote) {
+      if (nonBlankFileInputs) {
+        return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+      }
+      // If browser does not support submit bubbling, then this live-binding will be called before direct
+      // bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
+      if (!$.support.submitBubbles && rails.callFormSubmitBindings(form) === false) return rails.stopEverything(e);
+      rails.handleRemote(form);
+      return false;
+    } else {
+      // slight timeout so that the submit button gets properly serialized
+      setTimeout(function(){ rails.disableFormElements(form); }, 13);
+    }
+  });
+  $(rails.formInputClickSelector).live('click.rails', function(event) {
+    var button = $(this);
+    if (!rails.allowAction(button)) return rails.stopEverything(event);
+    // register the pressed submit button
+    var name = button.attr('name'),
+      data = name ? {name:name, value:button.val()} : null;
+    button.closest('form').data('ujs:submit-button', data);
+  });
+  $(rails.formSubmitSelector).live('ajax:beforeSend.rails', function(event) {
+    if (this == event.target) rails.disableFormElements($(this));
+  });
+  $(rails.formSubmitSelector).live('ajax:complete.rails', function(event) {
+    if (this == event.target) rails.enableFormElements($(this));
+  });
+})( jQuery );

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hocus_pocus
 version: !ruby/object:Gem::Version
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease:
   segments:
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors:
 - Akira Matsuda
@@ -15,72 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-12-23 00:00:00 +09:00
-default_executable:
+date: 2011-05-06 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: nested_scaffold
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
-  name: shoulda
-  requirement: *id001
-  type: :development
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        hash: 23
-        segments:
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: bundler
-  requirement: *id002
-  type: :development
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        hash: 7
-        segments:
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  name: jeweler
-  requirement: *id003
-  type: :development
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
-  name: rcov
-  requirement: *id004
-  type: :development
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -91,29 +31,29 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  name: nested_scaffold
-  requirement: *id005
   type: :runtime
+  version_requirements: *id001
 description: An Isolated Engine that casts a spell on your Rails 3.1 app
-email: ronnie@dio.jp
+email:
+- ronnie@dio.jp
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - README.rdoc
 files:
 - .document
+- .gitignore
+- CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - app/controllers/hocus_pocus/application_controller.rb
 - app/controllers/hocus_pocus/editor_controller.rb
 - app/controllers/hocus_pocus/generator_controller.rb
+- app/controllers/hocus_pocus/spec_controller.rb
 - app/helpers/hocus_pocus/application_helper.rb
 - app/helpers/hocus_pocus/generator_helper.rb
 - app/views/hocus_pocus/editor/_editor.html.erb
@@ -122,16 +62,22 @@ files:
 - app/views/hocus_pocus/generator/execute.js.erb
 - app/views/hocus_pocus/generator/index.html.erb
 - app/views/hocus_pocus/generator/scaffold.js.erb
+- app/views/hocus_pocus/spec/destroy.js.erb
 - config/routes.rb
 - hocus_pocus.gemspec
+- lib/generators/hocus_pocus/config_generator.rb
+- lib/generators/hocus_pocus/templates/hocus_pocus_config.rb
 - lib/hocus_pocus.rb
+- lib/hocus_pocus/config.rb
+- lib/hocus_pocus/content_appender.rb
 - lib/hocus_pocus/engine.rb
 - lib/hocus_pocus/filter.rb
+- lib/hocus_pocus/railtie.rb
+- lib/hocus_pocus/version.rb
 - lib/tasks/hocus_pocus_tasks.rake
-- public/javascripts/rails.js
 - test/helper.rb
 - test/test_hocus_pocus.rb
-has_rdoc: true
+- vendor/assets/javascripts/jquery_ujs.js
 homepage: http://github.com/amatsuda/hocus_pocus
 licenses:
 - MIT
@@ -160,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
-rubyforge_project:
-rubygems_version: 1.3.7
+rubyforge_project: hocus_pocus
+rubygems_version: 1.8.0
 signing_key:
 specification_version: 3
 summary: An Isolated Engine that casts a spell on your Rails 3.1 app

data/Gemfile.lock DELETED Viewed

@@ -1,20 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-PLATFORMS
-  ruby
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
-  shoulda

data/VERSION DELETED Viewed

	@@ -1 +0,0 @@
1	- 0.0.1

data/public/javascripts/rails.js DELETED Viewed

@@ -1,160 +0,0 @@
-/*
- * jquery-ujs
- *
- * http://github.com/rails/jquery-ujs/blob/master/src/rails.js
- *
- * This rails.js file supports jQuery 1.4.3 and 1.4.4 .
- *
- */
-jQuery(function ($) {
-    var csrf_token = $('meta[name=csrf-token]').attr('content'),
-        csrf_param = $('meta[name=csrf-param]').attr('content');
-    $.fn.extend({
-        /**
-         * Triggers a custom event on an element and returns the event result
-         * this is used to get around not being able to ensure callbacks are placed
-         * at the end of the chain.
-         *
-         * TODO: deprecate with jQuery 1.4.2 release, in favor of subscribing to our
-         *       own events and placing ourselves at the end of the chain.
-         */
-        triggerAndReturn: function (name, data) {
-            var event = new $.Event(name);
-            this.trigger(event, data);
-            return event.result !== false;
-        },
-        /**
-         * Handles execution of remote calls. Provides following callbacks:
-         *
-         * - ajax:beforeSend  - is executed before firing ajax call
-         * - ajax:success  - is executed when status is success
-         * - ajax:complete - is executed when the request finishes, whether in failure or success.
-         * - ajax:error    - is execute in case of error
-         */
-        callRemote: function () {
-            var el      = this,
-                method  = el.attr('method') || el.attr('data-method') || 'GET',
-                url     = el.attr('action') || el.attr('href'),
-                dataType  = el.attr('data-type')  || ($.ajaxSettings && $.ajaxSettings.dataType);
-            if (url === undefined) {
-                throw "No URL specified for remote call (action or href must be present).";
-            } else {
-                    var $this = $(this), data = el.is('form') ? el.serializeArray() : [];
-                    $.ajax({
-                        url: url,
-                        data: data,
-                        dataType: dataType,
-                        type: method.toUpperCase(),
-                        beforeSend: function (xhr) {
-                            xhr.setRequestHeader("Accept", "text/javascript");
-                            if ($this.triggerHandler('ajax:beforeSend') === false) {
-                              return false;
-                            }
-                        },
-                        success: function (data, status, xhr) {
-                            el.trigger('ajax:success', [data, status, xhr]);
-                        },
-                        complete: function (xhr) {
-                            el.trigger('ajax:complete', xhr);
-                        },
-                        error: function (xhr, status, error) {
-                            el.trigger('ajax:error', [xhr, status, error]);
-                        }
-                    });
-            }
-        }
-    });
-    /**
-     *  confirmation handler
-     */
-    $('body').delegate('a[data-confirm], button[data-confirm], input[data-confirm]', 'click.rails', function () {
-        var el = $(this);
-        if (el.triggerAndReturn('confirm')) {
-            if (!confirm(el.attr('data-confirm'))) {
-                return false;
-            }
-        }
-    });
-    /**
-     * remote handlers
-     */
-    $('form[data-remote]').live('submit.rails', function (e) {
-        $(this).callRemote();
-        e.preventDefault();
-    });
-    $('a[data-remote],input[data-remote]').live('click.rails', function (e) {
-        $(this).callRemote();
-        e.preventDefault();
-    });
-    /**
-     * <%= link_to "Delete", user_path(@user), :method => :delete, :confirm => "Are you sure?" %>
-     *
-     * <a href="/users/5" data-confirm="Are you sure?" data-method="delete" rel="nofollow">Delete</a>
-     */
-    $('a[data-method]:not([data-remote])').live('click.rails', function (e){
-        var link = $(this),
-            href = link.attr('href'),
-            method = link.attr('data-method'),
-            form = $('<form method="post" action="'+href+'"></form>'),
-            metadata_input = '<input name="_method" value="'+method+'" type="hidden" />';
-        if (csrf_param !== undefined && csrf_token !== undefined) {
-            metadata_input += '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />';
-        }
-        form.hide()
-            .append(metadata_input)
-            .appendTo('body');
-        e.preventDefault();
-        form.submit();
-    });
-    /**
-     * disable-with handlers
-     */
-    var disable_with_input_selector           = 'input[data-disable-with]',
-        disable_with_form_remote_selector     = 'form[data-remote]:has('       + disable_with_input_selector + ')',
-        disable_with_form_not_remote_selector = 'form:not([data-remote]):has(' + disable_with_input_selector + ')';
-    var disable_with_input_function = function () {
-        $(this).find(disable_with_input_selector).each(function () {
-            var input = $(this);
-            input.data('enable-with', input.val())
-                .attr('value', input.attr('data-disable-with'))
-                .attr('disabled', 'disabled');
-        });
-    };
-    $(disable_with_form_remote_selector).live('ajax:before.rails', disable_with_input_function);
-    $(disable_with_form_not_remote_selector).live('submit.rails', disable_with_input_function);
-    $(disable_with_form_remote_selector).live('ajax:complete.rails', function () {
-        $(this).find(disable_with_input_selector).each(function () {
-            var input = $(this);
-            input.removeAttr('disabled')
-                 .val(input.data('enable-with'));
-        });
-    });
-    var jqueryVersion = $().jquery;
-	if (!( (jqueryVersion === '1.4.3') || (jqueryVersion === '1.4.4'))){
-		alert('This rails.js does not support the jQuery version you are using. Please read documentation.');
-	}
-});