adva-core 0.0.6 → 0.0.7

data/app/controllers/base_controller.rb

@@ -8,11 +8,57 @@ class BaseController < InheritedResources::Base
   layout 'default'
   helper_method :site
 
-  def self.responder
-    Adva::Responder
+  mattr_accessor :sortable
+  self.sortable = []
+
+  class << self
+    def responder
+      Adva::Responder
+    end
+
+    def sortable?(order)
+      !!sortable_direction(order)
+    end
+
+    def sortable_direction(order)
+      self.sortable.assoc(order.to_sym).last rescue nil
+    end
   end
 
   def site
     @site ||= Site.by_host(request.host_with_port)
   end
+
+  def collection
+    params[:order].present? ? sort(super, params[:order]) : super
+  end
+
+  protected
+
+    def sort(collection, order)
+      if !self.class.sortable?(order)
+        collection
+      elsif collection.respond_to?(order)
+        collection.send(order)
+      elsif collection.arel_table[order]
+        collection.order(collection.arel_table[order].send(self.class.sortable_direction(order)))
+      else
+        collection
+      end
+    end
 end
+
+# ActiveRecord::Base.class_eval do
+#   mattr_reader :sortable
+#   self.sortable = []
+#
+#   class << self
+#     def sortable_by?(name)
+#       sortable.include?(name)
+#     end
+#
+#     def sort_by(name)
+#       sortable_by?(name) && respond_to?(name) : send(name) : self
+#     end
+#   end
+# end

data/app/views/layouts/admin.rb

@@ -1,11 +1,6 @@
 module Layouts
   class Admin < Layouts::Base
     include do
-      def head
-        csrf_meta_tag
-        super
-      end
-
       def body
         div do
           header

data/app/views/layouts/base.rb

@@ -18,6 +18,7 @@ class Layouts::Base < Minimal::Template
       title
       stylesheets
       javascripts
+      csrf_meta_tag
       block.call(:head)
     end
 

data/lib/adva/generators/engine.rb

@@ -4,14 +4,14 @@ module Adva
   module Generators
     class Engine < Rails::Generators::Base
       source_root File.expand_path('../templates/engine', __FILE__)
-      
+
       attr_reader :name
-      
+
       def initialize(name, options = {})
         @name = name
         super()
       end
-      
+
       def build
         empty_directory "adva-#{name}"
         template        "gemspec.erb", "adva-#{name}/adva-#{name}.gemspec"
@@ -31,15 +31,23 @@ module Adva
         empty_directory "adva-#{name}/db/migrate"
         template        'migration.rb.erb', "adva-#{name}/db/migrate/#{migration_timestamp}_adva_#{name}_create_tables.rb"
 
+        empty_directory "adva-#{name}/features"
+        template        'env.rb', "adva-#{name}/features/env.rb"
+        template        'feature.erb', "adva-#{name}/features/#{name}.feature"
+
         empty_directory "adva-#{name}/lib/adva"
         create_file     "adva-#{name}/lib/adva-#{name}.rb", "require 'adva/#{name}'"
         template        'engine.rb.erb', "adva-#{name}/lib/adva/#{name}.rb"
 
+        empty_directory "adva-#{name}/lib/testing"
+        create_file     "adva-#{name}/lib/paths.rb", "adva-#{name}/lib/step_definitions.rb"
+        template        'paths.rb.erb', "adva-#{name}/lib/testing/paths.rb"
+
         empty_directory "adva-#{name}/test"
         template        'all.rb', "adva-#{name}/test/all.rb"
         template        'test_helper.rb.erb', "adva-#{name}/test/test_helper.rb"
       end
-      
+
       protected
 
         def migration_timestamp
@@ -49,10 +57,10 @@ module Adva
         def table_name
           name.tableize
         end
-        
+
         def class_name
           name.camelize
         end
     end
   end
-end
+end

data/lib/adva/generators/templates/engine/env.rb

@@ -0,0 +1,3 @@
+require File.expand_path('../../../features/env', __FILE__)
+
+

data/lib/adva/generators/templates/engine/feature.erb

@@ -0,0 +1,3 @@
+Feature: <%= name.titleize %>
+
+  Scenario:

data/lib/adva/generators/templates/engine/paths.rb.erb

@@ -0,0 +1,12 @@
+module Adva::<%= name.classify %>::Paths
+  def path_to(page)
+    case page
+    when 'path/to/<%= name %>'
+    else
+      super
+    end
+  end
+end
+World(Adva::<%= name.classify %>::Paths)
+
+

data/lib/adva/generators/templates/engine/routes.rb.erb

@@ -1,3 +1,3 @@
 # Rails.application.routes.draw do
-#   resource :<%= name %>
-# end
+#   resources :<%= name %>
+# end

data/lib/adva/generators/templates/engine/test_helper.rb.erb

@@ -1,3 +1,3 @@
-require File.expand_path('../../../adva-core/test/test_helper', __FILE__)
+require File.expand_path('../../../test/test_helper', __FILE__)
 
 require 'adva-<%= name %>'

data/lib/adva_core/version.rb

@@ -1,3 +1,3 @@
 module AdvaCore
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/patches/inherited_resources.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 require 'inherited_resources'
 
 Gem.patching('inherited_resources', '1.1.2') do

data/lib/patches/rails/integretion_runner_respond_to.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 
 # ActionDispatch::Integration::Runner defines method_missing but no accompaning
 # respond_to? method. It thus doesn't respond_to? to named route url helpers even

data/lib/patches/rails/route_set_trailing_segment.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 
 # remove trailing segments '.1' and  query params '?=1' from url
 Gem.patching('rails', '3.0.3') do

data/lib/patches/rails/sti_associations.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 
 # Make build associations have their given type
 # i.e.: site.sections.build(:type => 'Page').class == Page

data/lib/patches/simple_form.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 
 # add "blog edit_blog" as css classes. should propose a patch to simple_form
 

data/lib/patches/webrat/links-data-method.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 
 Gem.patching('webrat', '0.7.2') do
   Webrat::Link.class_eval do

data/lib/patches/webrat/logger.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 
 Gem.patching('webrat', '0.7.2') do
   Webrat::Logging.class_eval do

data/lib/patches/webrat/upload_file.rb

@@ -1,4 +1,4 @@
-require 'gem_patching'
+require 'gem-patching'
 
 Gem.patching('webrat', '0.7.2') do
   Webrat::FileField.class_eval do

data/lib/testing/assertions.rb

@@ -1,3 +1,7 @@
+def assert_html(html, *args, &block)
+  assert_select(HTML::Document.new(html).root, *args, &block)
+end
+
 def emails_for_assertion(attributes)
   ::ActionMailer::Base.deliveries.select do |email|
     attributes.all? do |name, value|

data/lib/testing/helpers/global_helpers.rb

@@ -3,7 +3,18 @@ module GlobalHelpers
     Site.first || raise("Could not find a site. Maybe you want to set one up in your story background?")
   end
 
+  def user
+    @user || raise("@current_user is not set. Maybe you want to sign in first?")
+  end
+
   def account
     Account.first || raise("Could not find a site. Maybe you want to set one up in your story background?")
   end
-end
+
+  def parsed_html
+    # memoizing this causes problems since it seems to be memoized across requests
+    # TODO: Figure out way to memoize within one request only
+    # @parsed_body ||= Nokogiri::HTML(response.body)
+    Nokogiri::HTML(response.body)
+  end
+end

data/lib/testing/paths.rb

@@ -18,6 +18,11 @@ module Adva::Core::Paths
       section = Section.where(:name => $1).first || raise("could not find section named #{$1}")
       polymorphic_path(section)
 
+    # the "Catalog" section page, ordered by "most viewed"
+    when /,? ordered by "([^\"]*)"$/
+      order = $1
+      path_to(page.gsub(/,? ordered by "[^\"]*"$/, '')) + "?order=#{order.gsub(' ', '_')}"
+
     when /^the admin sites page$/
       polymorphic_path([:admin, :sites])
 

data/lib/testing/step_definitions/common_steps.rb

@@ -78,16 +78,29 @@ When /^(.+) that link$/ do |step|
   When %(#{step} "#{@last_link}")
 end
 
-When /^I (press|click) "(.*)" in the row (of the ([a-z ]+) table )?where "(.*)" is "(.*)"$/ do |press_or_click, link_or_button, _, table_id, header, cell_content|
+When /^I (press|click|follow) "(.*)" in the row (of the ([a-z ]+) table )?where "(.*)" is "(.*)"$/ do |action, target, _, table_id, header, content|
   body = Nokogiri::HTML(response.body)
   table_xpath = table_id.nil? ? 'table' : "table[@id='#{table_id.gsub(/ /, '_')}']"
-  table_header_cells = body.xpath("//#{table_xpath}/descendant::th[normalize-space(text())='#{header}']/@id")
-  assert !table_header_cells.empty?, "could not find table header cell '#{header}'"
-  header_id = body.xpath("//#{table_xpath}/descendant::th[normalize-space(text())='#{header}']/@id").first.value
-  row_id = body.xpath("//#{table_xpath}/descendant::td[@headers='#{header_id}'][normalize-space(text())='#{cell_content}']/ancestor::tr/@id").first.value
-  within("##{row_id}") do
-    send({'press' => 'click_button', 'click' => 'click_link'}[press_or_click], link_or_button)
-  end
+  headers = body.xpath("//#{table_xpath}/descendant::th[normalize-space(text())='#{header}']/@id")
+  assert !headers.empty?, "could not find table header cell #{header.inspect}"
+
+  header_id = headers.first.value
+  cell_path = "//#{table_xpath}/descendant::td[@headers='#{header_id}']"
+  content   = "normalize-space(text())='#{content}'"
+  tag_path  = "#{cell_path}[#{content}]/ancestor::tr/@id"
+  nested_tag_path = "#{cell_path}/descendant::*[#{content}]/ancestor::tr/@id"
+
+  rows = body.xpath([tag_path, nested_tag_path].join('|'))
+  assert !rows.empty?, "could not find table row where a cell has the header id #{header_id.inspect} and the content #{content.inspect}"
+
+  map = { 'press' => 'click_button', 'click' => 'click_link' }
+  within("##{rows.first.value}") { map[action] ? send(map[action], target) : When(%(I #{action} "#{target}")) }
+end
+
+When /^I order the (.*)s list by "([^"]*)"$/ do |model, order|
+  When %(I select "#{order}" from "#{model}s_order")
+  select = Webrat::Locators::FieldLocator.new(webrat, webrat.dom, "#{model}s_order", Webrat::SelectField).locate!
+  select.send(:form).submit
 end
 
 When /^I visit the url from the email to (.*)$/ do |to|
@@ -97,6 +110,10 @@ When /^I visit the url from the email to (.*)$/ do |to|
   visit(url)
 end
 
+# Examples:
+# I should see a product row where "Name" is "Apple Powerbook"
+# I should not see a product row where "Name" is "Apple Powerbook"
+# I should see a row in the products table where "Name" is "Apple Powerbook"
 Then /^I should (not )?see a ([a-z ]+ )?row (?:of the ([a-z ]+) table )?where "(.*)" is "(.*)"$/ do |optional_not, row_classes, table_id, header, cell_content|
   body = Nokogiri::HTML(response.body)
   table_xpath = table_id.nil? ? 'table' : "table[@id='#{table_id.gsub(/ /, '_')}']"
@@ -111,7 +128,7 @@ Then /^I should (not )?see a ([a-z ]+ )?row (?:of the ([a-z ]+) table )?where "(
     "contains(concat(' ', normalize-space(@class), ' '), ' #{row_class} ')"
   end.join(' and ')
   tr_xpath = class_condition.empty? ? 'ancestor::tr' : "ancestor::tr[#{class_condition}]"
-  xpath_result = body.xpath("//#{table_xpath}/descendant::td[@headers='#{header_id}'][normalize-space(text())='#{cell_content}']/#{tr_xpath}/@id")
+  xpath_result = body.xpath("//#{table_xpath}/descendant::td[@headers='#{header_id}'][normalize-space(text())='#{cell_content}']/#{tr_xpath}")
 
   if optional_not.present?
     assert xpath_result.empty?, "Expected not find a row where #{header.inspect} is #{cell_content}."
@@ -158,6 +175,8 @@ Then /^the title should be "([^"]+)"$/ do |title|
   assert_select('title', title)
 end
 
+# TODO: This is an almost duplicate step
+# Use the one with un-quoted 'thing' expression
 Then /^I should see (an?|the) "([^"]+)"$/ do |kind, thing|
   kind = { 'a' => '.', 'the' => '#' }[kind]
   assert_select("#{kind}#{thing}")
@@ -168,14 +187,21 @@ Then /^I should see a link "([^"]+)"$/ do |link|
   assert_select('a', link)
 end
 
-Then /^I should not see any (\w+)$/ do |type|
-  assert_select(".#{type.singularize}", :count => 0) # .#{type},
+Then /^I should not see any ([a-z_ ]+)$/ do |type|
+  assert_select(".#{type.gsub(' ', '_').singularize}", :count => 0)
 end
 
 Then /^I should see an? (\w+)$/ do |type|
   assert_select(".#{type}")
 end
 
+Then /^I should see a "([^"]*)" select box with the following options:$/ do |name, options|
+  select = Webrat::Locators::FieldLocator.new(webrat, webrat.dom, 'products_order', Webrat::SelectField).locate!
+  actual = select.options.map(&:inner_text).uniq
+  expected = options.raw.flatten[1..-1] # ignores the first row
+  assert_equal expected, actual
+end
+
 Then /^I should see an? (\w+) (?:titled|named) "([^"]+)"$/ do |type, text|
   assert_select(".#{type} h2", text)
 end
@@ -184,6 +210,18 @@ Then /^I should see an? (\w+) containing "([^"]+)"$/ do |type, text|
   assert_select(".#{type}", /#{text}/)
 end
 
+# TODO: the sinature of this step should really be:
+# I should see 'foo' within 'bar'
+# However, the generic "within 'bar'" meta step uses 'within' which doesn't currently work with assertions
+# only with navigation ('click', 'press')
+Then /^the ([^"]+) should(?: (not))? contain "([^"]+)"$/ do |container_name, optional_negation, text|
+  container_id = container_name.gsub(' ', '_')
+  # 'within' doesn't currently work with assertions, so we need to resort to xpath
+  # within('#' + container_id) { assert_contain text }
+  assert(parsed_html.xpath("//*[@id=\"#{container_id}\"]").any?, "Could not find the #{container_name}")
+  assert(parsed_html.xpath("//*[@id=\"#{container_id}\"]/descendant::*[contains(normalize-space(text()), \"#{text}\")]").send(optional_negation ? :'none?' : :'any?'), "Could not see '#{text}' in the #{container_name}")
+end
+
 Then /^I should see an? (\w+) list$/ do |type|
   assert_select(".#{type}.list")
 end
@@ -192,6 +230,16 @@ Then /^I should see a list of (\w+)$/ do |type|
   assert_select(".#{type}.list")
 end
 
+Then /^the (.*) list should display (.*)s in the following order:$/ do |list, model, values|
+  expected = values.raw.flatten
+  name     = expected.shift
+  selector = "##{list}.list tr td.#{name}"
+  rows     = parsed_html.css(selector)
+
+  assert !rows.empty?, "could not find any elements matching #{selector.inspect}"
+  assert_equal expected, rows.map(&:content)
+end
+
 Then /^I should see an? ([a-z ]+) form$/ do |type|
   tokens = type.split(' ')
   types = [tokens.join('_'), tokens.reverse.join('_')]
@@ -219,13 +267,24 @@ Then /^I should see a "(.+)" table with the following entries:$/ do |table_id, e
     diff_table = expected_table.dup
     diff_table.diff!(actual_table.dup)
   rescue
-    puts "\nActual table:#{actual_table.to_s}\n"
-    puts "Expected table:#{expected_table.to_s}\n"
-    puts "Difference:#{diff_table.to_s}\n"
+    puts tables_differ_message(actual_table, expected_table, diff_table)
     raise
   end
 end
 
+Then /^I should see a "(.+)" table with the following entries in no particular order:$/ do |table_id, expected_table|
+  actual_table  = table(tableish("table##{table_id} tr", 'td,th'))
+  expected_rows = expected_table.raw
+  actual_rows   = actual_table.raw.transpose.select { |row| expected_rows.first.include?(row.first) }.transpose
+  assert_equal expected_rows.to_set, actual_rows.to_set, tables_differ_message(actual_table, expected_table)
+end
+
+def tables_differ_message(actual, expected, diff = nil)
+  msg = "\nActual table:#{actual.to_s}\nExpected table:#{expected.to_s}\n"
+  msg += "Difference:#{diff.to_s}\n" if diff
+  msg
+end
+
 Then /^I should see the "([^"]+)" page$/ do |name|
   assert_select('h2', name)
 end
@@ -289,7 +348,8 @@ Then /^I should see "([^"]*)" formatted as a "([^"]*)" tag$/ do |value, tag|
   assert_select(tag, value)
 end
 
-Then /^I should see (\d+|no|one|two|three) ([a-z ]+)$/ do |amount, item_class|
+Then(/^I should see (\d+|no|one|two|three) ([a-z ]+?)(?: in the ([a-z ]+))?$/) do |amount, item_class, container_id|
+  container_selector = container_id ? '#' + container_id.gsub(' ', '_') : nil
   amount = case amount
     when 'no' then 0
     when 'one' then 1
@@ -297,6 +357,14 @@ Then /^I should see (\d+|no|one|two|three) ([a-z ]+)$/ do |amount, item_class|
     when 'three' then 3
     else amount.to_i
   end
-  assert_select ".#{item_class.gsub(' ', '_').singularize}", :count => amount
+  item_selector = '.' + item_class.gsub(' ', '_').singularize
+  # assertions do not work with 'within' yet, so we need to resort to cancatenating selectors:
+  # container_selector ? within(container_selector) { assert_select(item_selector) } : assert_select(item_selector)
+  if container_selector
+    assert_select container_selector
+    assert_select [container_selector, item_selector].join(' '), amount
+  else
+    assert_select item_selector, amount
+  end
 end
 

data/lib/testing/step_definitions/transforms.rb

@@ -3,7 +3,7 @@
 # works for both normal tables and row_hash tables):
 timezonify = lambda do |table|
   dates = table.headers.select { |header| header =~ /(_at|_on)$/ }
-  dates.each { |date| table.map_column!(date) { |date| DateTime.parse(date).in_time_zone } }
+  dates.each { |date| table.map_column!(date) { |date| DateTime.parse(date).in_time_zone if date.present? && date != '-' } }
   table.transpose
 end
 

data/lib/webrat/integrations/rails.rb

@@ -1,7 +1,7 @@
 # webrat/integrations/rails.rb requires 'action_controller/integration' which
 # does not exist in rails 3 any more. so we gotta replace the whole file.
 
-require 'gem_patching'
+require 'gem-patching'
 
 Gem.patching('webrat', '0.7.2') do
   require "action_controller"

data/public/javascripts/adva-core/admin.js

@@ -19,4 +19,10 @@ $(document).ready(function() {
     $(selected).addClass('active');
   });
 
+  $('table.list .toggle').click(function(event) {
+    $(this).hasClass('open') ? $(this).removeClass('open').addClass('closed') : $(this).removeClass('closed').addClass('open');
+    $(this).closest('tr').next().toggle();
+    event.stopPropagation();
+    return false;
+  });
 });

data/public/stylesheets/adva-core/admin/lists.css

@@ -11,7 +11,7 @@ table.list thead tr:last-child th {
   border-bottom: 3px solid #ddd;
 }
 table.list tbody tr {
-  border-bottom: 1px solid #ddd;  
+  border-bottom: 1px solid #ddd;
 }
 table.list tbody td {
   position: relative;
@@ -36,19 +36,41 @@ table.list span.status {
   padding-left: 10px;
   display: inline-block;
   width: 16px;
-  height: 16px; 
+  height: 16px;
   margin-left: 4px;
   text-indent: 16px;
   overflow: hidden;
   vertical-align: middle;
+  background-repeat: no-repeat;
+}
+table.list td.status {
+  width: 24px;
+  background-position: 4px 8px;
+  background-repeat: no-repeat;
 }
 
+table.list tr.published td.status,
 table.list span.published {
-  background: url(/images/adva-core/icons/tick.png) no-repeat;
+  background-image: url(/images/adva-core/icons/tick.png);
 }
 table.list span.draft,
 table.list span.hold,
 table.list span.queued,
-table.list span.pending {
-  background: url(/images/adva-core/icons/hourglass.png) no-repeat;
+table.list span.pending,
+table.list span.unpublished,
+table.list tr.unpublished td.status {
+  background-image: url(/images/adva-core/icons/hourglass.png);
+}
+
+table.list .toggle {
+  padding-left: 18px;
+  background-position: 0 2px;
+  background-repeat: no-repeat;
+  background-image: url(/images/adva-core/admin/closed.png);
+}
+table.list .toggle.open {
+  background-image: url(/images/adva-core/admin/open.png);
+}
+table.list tr.details {
+  display: none;
 }

data/public/stylesheets/adva-core/admin/styles.css

@@ -89,6 +89,12 @@ ul.links li:before {
 .actions a.destroy {
   background: url(/images/adva-core/icons/bin_closed.png) no-repeat -5px top;
 }
+.actions a.publish {
+  background: url('/images/adva-core/icons/tick.png');
+}
+.actions a.unpublish {
+  background: url('/images/adva-core/icons/delete.png');
+}
 
 
 div.pagination {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adva-core
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Ingo Weiss
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +01:00
+date: 2011-01-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,28 +59,28 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: gem_patching
+  name: gem-patching
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 0
-        - 2
-        version: 0.0.2
+        - 3
+        version: 0.0.3
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -139,12 +139,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 45
         segments: 
         - 0
         - 0
-        - 24
-        version: 0.0.24
+        - 25
+        version: 0.0.25
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -187,12 +187,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
         - 0
-        - 14
-        version: 0.0.14
+        - 16
+        version: 0.0.16
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -203,12 +203,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 37
         segments: 
         - 0
         - 0
-        - 28
-        version: 0.0.28
+        - 29
+        version: 0.0.29
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -337,7 +337,6 @@ files:
 - lib/patches/inherited_resources.rb
 - lib/patches/responders/flash_responder.rb
 - lib/patches/simple_form.rb
-- lib/patches/arel_in_subquery.rb
 - lib/patches/thor/group/symbolized_options.rb
 - lib/patches/thor/core_ext/hash.rb
 - lib/adva-core.rb
@@ -354,7 +353,10 @@ files:
 - lib/adva/generators/install.rb
 - lib/adva/generators/gemfile.rb
 - lib/adva/generators/templates/engine/migration.rb.erb
+- lib/adva/generators/templates/engine/feature.erb
 - lib/adva/generators/templates/engine/test_helper.rb.erb
+- lib/adva/generators/templates/engine/paths.rb.erb
+- lib/adva/generators/templates/engine/env.rb
 - lib/adva/generators/templates/engine/engine.rb.erb
 - lib/adva/generators/templates/engine/routes.rb.erb
 - lib/adva/generators/templates/engine/en.yml.erb
@@ -548,9 +550,11 @@ files:
 - public/images/adva-core/admin/tab_action_active.png
 - public/images/adva-core/admin/tab_sidebar_active.png
 - public/images/adva-core/admin/tab_main_active.png
+- public/images/adva-core/admin/open.png
 - public/images/adva-core/admin/header_bg.png
 - public/images/adva-core/admin/tab_top_active.png
 - public/images/adva-core/admin/menu_checkmark.png
+- public/images/adva-core/admin/closed.png
 - public/images/adva-core/filter-bg.png
 - public/images/adva-core/grid.png
 - public/images/adva-core/theme_selected.png

data/lib/patches/arel_in_subquery.rb

@@ -1,44 +0,0 @@
-# https://gist.github.com/730257
-# bars.where(bars[:id].in(foos.project(:bar_id).where(...)))
-
-Gem.patching('arel', '2.0.6') do
-  Arel::Predications.module_eval do
-    def in_with_select_fix(other)
-      case other
-      when Arel::SelectManager
-        Arel::Nodes::In.new(self, other)
-      else
-        in_without_select_fix(other)
-      end
-    end
-    alias_method_chain :in, :select_fix
-
-    def not_in_with_select_fix(other)
-      case other
-      when Arel::SelectManager
-        Arel::Nodes::NotIn.new(self, other)
-      else
-        in_without_select_fix(other)
-      end
-    end
-    alias_method_chain :not_in, :select_fix
-  end
-
-  Arel::Visitors::ToSql.class_eval do
-    def visit_Arel_SelectManager o
-      o.to_sql
-    end
-
-    def visit_Arel_Nodes_In o
-      "#{visit o.left} IN (#{visit o.right})"
-    end
-
-    def visit_Arel_Nodes_NotIn o
-      "#{visit o.left} NOT IN (#{visit o.right})"
-    end
-
-    def visit_Array o
-      o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
-    end
-  end
-end