adva-core 0.0.9 → 0.0.13

data/app/models/section.rb

@@ -40,10 +40,4 @@ class Section < ActiveRecord::Base
     default << 'id' unless self.class.primary_key.eql? 'id'
     default
   end
-
-  protected
-
-    def _path
-      read_attribute(:path)
-    end
 end

data/app/views/admin/sites/index.html.rb

@@ -1,14 +1,14 @@
 class Admin::Sites::Index < Minimal::Template
   include do
     def to_html
-    	table_for collection do |t|
+    	table_for collection.all do |t|
     		t.column :site
     		t.column :actions, :class => :actions
 
     		t.row do |r, site|
     			r.cell link_to_site(site)
           r.cell links_to_actions([:view, :edit, :destroy], site)
-    		end unless collection.empty?
+    		end unless collection.count == 0
     	end
     end
 

data/config/redirects.rb

@@ -4,5 +4,6 @@ Adva::Registry.set :redirect, {
 
   'admin/sites#update'    => lambda { |c| c.edit_url        },
   'admin/pages#update'    => lambda { |c| c.show_url        },
-  'admin/pages#destroy'   => lambda { |c| c.index_url       }
+  'admin/pages#destroy'   => lambda { |c| c.index_url       },
+  'admin/sections#destroy' => lambda { |c| c.index_url      }
 }

data/lib/adva.rb

@@ -34,6 +34,47 @@ module Adva
       engine_names.include?(name)
     end
     alias :installed? :engine?
+
+    # Helps you slice and dice your addons to adva-cms
+    #
+    # load and slice (patch) the class +Existing::Stuff+
+    # in 'ur/engine/existing/stuff_slice.rb' 
+    # Adva.slice 'existing/stuff' do
+    #   include do
+    #     def fn0rd
+    #       23 + 42
+    #     end
+    #   end
+    #   attr_accessor :things
+    # end
+    def slice(path_with_namespace, &block)
+      raise ArgumentError, 'must give block to slice and dice' unless block_given?
+      if path_with_namespace =~ /^([^#]+)#([^#]+)$/
+        path, namespace = $1, $2
+      else
+        raise ArgumentError, "first argument must be class_to_slice#your_slice_identifier"
+      end
+      unless loaded_slices.include?(path_with_namespace)
+        class_name = path.sub(/\.\w+$/,'').pluralize.classify # cut out extension for minimal templates
+        begin
+          class_name.constantize.class_eval(&block)
+        rescue NameError => e
+          if e.message.include?(class_name)
+            require_dependency(path)
+          else
+            raise e
+          end
+        ensure
+          loaded_slices << path_with_namespace
+        end
+      else
+        Rails.logger.debug { "Adva.slice: already loaded #{path_with_namespace}, skipping" }
+      end
+    end
+
+    def loaded_slices
+      @loaded_slices ||= Set.new
+    end
   end
 end
 

data/lib/adva/controller/internal_redirect.rb

@@ -13,6 +13,7 @@ module Adva
         params = yield(params) if block_given?
 
         rack_endpoint = "#{controller}_controller".classify.constantize.action(action)
+        Rails.logger.debug { "redirecting internally to #{controller}##{action}" }
         env['action_dispatch.request.parameters'] = params
         response = rack_endpoint.call(env)
 
@@ -23,4 +24,4 @@ module Adva
       end
     end
   end
-end
+end

data/lib/adva/core.rb

@@ -90,5 +90,13 @@ module Adva
                         adva-core/admin/lists )
       )
     end
+
+    if Rails.env.development?
+      initializer 'adva-core.schedule_slice_clearing' do
+        config.to_prepare do
+          Adva.loaded_slices.clear
+        end
+      end
+    end
   end
 end

data/lib/adva/engine.rb

@@ -1,5 +1,6 @@
 # Common behaviour that we want included in all adva engines
 
+require 'active_support/concern'
 module Adva
   module Engine
     extend ActiveSupport::Concern

data/lib/adva/generators/app.rb

@@ -11,7 +11,7 @@ module Adva
   module Generators
     class App
       DEFAULT_OPTIONS = {
-        :source    => File.expand_path('../../../../..', __FILE__),
+        :core_dir  => File.expand_path('../../../..', __FILE__),
         :target    => File.expand_path('.'),
         :template  => File.expand_path('../templates/app/app_template.rb', __FILE__),
         :engines   => [:all],
@@ -21,13 +21,13 @@ module Adva
         :force     => false
       }
 
-      def initialize(name, options = {}, &block)
+      def initialize(name, options = {})
         @options = options.reverse_merge!(DEFAULT_OPTIONS)
-        @name    = name || File.basename(source)
-        raise ArgumentError, "#{source.inspect} is not a directory" unless File.directory?(source)
+        @name    = name || File.basename( File.expand_path('../', core_dir) )
+        raise ArgumentError, "#{core_dir.inspect} is not a directory" unless File.directory?(core_dir)
       end
 
-      def invoke
+      def invoke(&block)
         if force? || build?
           build
           generate_resources  if generate_resources?
@@ -44,7 +44,7 @@ module Adva
       protected
 
         attr_reader :name
-        option_reader :source, :target, :template, :engines, :resources, :migrate, :bundle, :force
+        option_reader :core_dir, :target, :template, :engines, :resources, :migrate, :bundle, :force
 
         def root
           "#{target}/#{name}"
@@ -57,8 +57,7 @@ module Adva
             options = force? || ENV.key?('REGENERATE_APP') ? ['-f'] : []
             generator = Rails::Generators::AppGenerator.new([root], options, :shell => shell)
             generator.invoke_all
-            generator.apply(template, :source => Pathname.new(source))
-            FileUtils.cp("#{source}/Thorfile", "#{root}/Thorfile")
+            generator.apply(template, :adva_core => Pathname.new(core_dir))
           end
         end
 

data/lib/adva/generators/templates/app/Gemfile

@@ -10,15 +10,15 @@ gem  'adva-markup'
 
 group :test do
   gem 'sqlite3-ruby', '1.2.5'
-  gem 'cucumber', '0.9.4'
-  gem 'cucumber-rails', '0.3.2'
-  gem 'webrat', '0.7.2'
+  gem "capybara", ">= 0.4.1.1"
+  gem 'cucumber', '~> 0.10.2'
+  gem 'cucumber-rails', '~> 0.4.1'
   gem 'thor'
   gem 'ruby-debug'
   gem 'mocha'
   gem 'fakefs', :require => 'fakefs/safe'
   gem 'test_declarative'
-  gem 'database_cleaner', '0.5.2'
+  gem 'database_cleaner', ' ~> 0.6.7'
   gem 'launchy'
   gem 'factory_girl', '1.3.2'
 end

data/lib/adva/generators/templates/app/Thorfile

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.setup
+Bundler.require(:default)
+
+$0 = 'thor'
+
+Adva.engines.each { |engine| engine.new.load_tasks }

data/lib/adva/generators/templates/app/app_template.rb

@@ -1,3 +1,5 @@
-copy_file config[:source].join('lib/bundler/repository.rb'), "#{app_path}/lib/bundler/repository.rb"
-copy_file config[:source].join('adva-core/lib/adva/generators/templates/app/Gemfile'), "#{app_path}/Gemfile"
+copy_file config[:adva_core].join('lib/bundler/repository.rb'), "#{app_path}/lib/bundler/repository.rb"
+copy_file config[:adva_core].join('lib/adva/generators/templates/app/Thorfile'), "#{app_path}/Thorfile"
+remove_file 'Gemfile' # we do not want to confirm overwriting the Gemfile
+copy_file config[:adva_core].join('lib/adva/generators/templates/app/Gemfile'), "#{app_path}/Gemfile"
 remove_file 'public/index.html'

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

@@ -1,3 +1,18 @@
 source :rubygems
 
 gemspec
+
+group :test do
+  gem 'sqlite3-ruby', '1.2.5'
+  gem "capybara", ">= 0.4.1.1"
+  gem 'cucumber', '~> 0.10.2'
+  gem 'cucumber-rails', '~> 0.4.1'
+  gem 'thor'
+  gem 'ruby-debug'
+  gem 'mocha'
+  gem 'fakefs', :require => 'fakefs/safe'
+  gem 'test_declarative'
+  gem 'database_cleaner', ' ~> 0.6.7'
+  gem 'launchy'
+  gem 'factory_girl', '1.3.2'
+end

data/lib/adva/testing.rb

@@ -6,6 +6,10 @@ module Adva
 
     class << self
       def setup(options = {})
+        options = {
+          :migrate => true
+        }.merge(options)
+
         Adva.out = StringIO.new('')
         setup_logging(options)
         setup_active_record
@@ -14,7 +18,10 @@ module Adva
         ActiveSupport::Slices.register
 
         each_engine { |e| e.new.require_patches }
-        each_engine { |e| e.migrate }
+
+        if options[:migrate]
+          each_engine { |e| e.migrate }
+        end
 
         load_assertions
         load_factories
@@ -43,7 +50,7 @@ module Adva
       def setup_logging(options)
         if log = options[:log]
           FileUtils.touch(log) unless File.exists?(log)
-          ActiveRecord::Base.logger = Logger.new(log)
+          Rails.logger = Logger.new(log)
           ActiveRecord::LogSubscriber.attach_to(:active_record)
         end
       end

data/lib/adva/testing/engine.rb

@@ -19,6 +19,7 @@ module Adva
       end
 
       def load_cucumber_support
+        load_all('lib/testing/support')
         load_all('lib/testing/step_definitions')
         load_all('lib/testing/paths')
       end

data/lib/adva/view/form.rb

@@ -37,7 +37,10 @@ module Adva
       end
 
       def pass_return_to
-        hidden_field_tag :return_to, params[:return_to]
+        hidden_field_tag :return_to, params[:return_to] if params[:return_to].present?
+      end
+
+      def fields
       end
     end
   end

data/lib/adva_core/version.rb

@@ -1,3 +1,3 @@
 module AdvaCore
-  VERSION = "0.0.9"
+  VERSION = "0.0.13"
 end

data/lib/bundler/repository.rb

@@ -0,0 +1,117 @@
+require 'pathname'
+
+# Bundler gemfile support for local/remote workspaces/repositories for work in
+# development teams.
+#
+# Usage:
+#
+#   # define paths to be searched for repositories:
+#   workspace '~/.projects ~/Development/{projects,work}'
+#
+#   # define developer preferences for using local or remote repositories (uses ENV['user']):
+#   developer :sven, :prefer => :local
+#
+#   # define repositories to be used for particular gems:
+#   adva_cms  = repository('adva-cms2', :git => 'git@github.com:svenfuchs/adva-cms2.git', :ref => 'c2af0de')
+#   adva_shop = repository('adva-shop', :source => :local)
+#
+#   # now use repositories to define gems:
+#   adva_cms.gem  'adva-core'
+#   adva_shop.gem 'adva-catalog'
+#
+#   # The gem definition will now be proxied to Bundler with arguments according
+#   # to the setup defined earlier. E.g. as:
+#
+#   gem 'adva-core', :path => 'Development/projects/adva-cms2'                           # for developer 'sven'
+#   gem 'adva-core', :git => 'git@github.com:svenfuchs/adva-cms2.git', :ref => 'c2af0de' # for other developers
+#   gem 'adva-catalog', :path => 'Development/projects/adva-shop'                        # for all developers
+#
+#  One can also set an environment variable FORCE_REMOTE which will force remote
+#  repositories to be used *except* when a repository was defined with :source => :local
+#  which always forces the local repository to be used.
+#
+class Repository
+  class << self
+    def paths
+      @paths ||= []
+    end
+
+    def path(*paths)
+      paths.join(' ').split(' ').each do |path|
+        self.paths.concat(Pathname.glob(File.expand_path(path)))
+      end
+    end
+
+    def developer(name, preferences)
+      developers[name] = preferences
+      workspaces(preferences[:workspace])
+    end
+
+    def current_developer
+      developers[ENV['USER'].to_sym] || {}
+    end
+
+    def developers(developers = nil)
+      @developers ||= {}
+    end
+  end
+
+  class Gem < Array
+    def initialize(name, repository)
+      if repository.local?
+        super([name, { :path => repository.path.to_s }])
+      else
+        super([name, repository.options.dup])
+      end
+    end
+  end
+
+  attr_reader :bundler, :name, :options, :source
+
+  def initialize(bundler, name, options)
+    @bundler = bundler
+    @name    = name
+    @source  = options.delete(:source)
+    @options = options
+  end
+
+  def gem(name)
+    bundler.gem(*Gem.new(name, self))
+  end
+
+  def local?
+    source == :local # && path
+  end
+
+  def source
+    @source ||= forced_source || preferred_source || :remote
+  end
+
+  def forced_source
+    :remote if ENV['FORCE_REMOTE']
+  end
+
+  def preferred_source
+    self.class.current_developer[:prefer] || self.class.current_developer[name.to_sym]
+  end
+
+  def path
+    @path ||= begin
+      path = self.class.paths.detect { |path| path.join(name).exist? }
+      path ? path.join(name) : Pathname.new('.')
+    end
+  end
+end
+
+def workspace(*paths)
+  Repository.path(*paths)
+end
+alias :workspaces :workspace
+
+def developer(name, preferences)
+  Repository.developer(name, preferences)
+end
+
+def repository(*args)
+  Repository.new(self, *args)
+end

data/lib/patches/inherited_resources.rb

@@ -1,7 +1,9 @@
 require 'gem-patching'
 require 'inherited_resources'
 
-Gem.patching('inherited_resources', '1.1.2') do
+# FIXME is any of this still neccessary?
+
+Gem.patching('inherited_resources', '1.2.2') do
   InheritedResources::Actions.module_eval do
     module Actions
       def index(options={}, &block)
@@ -15,14 +17,13 @@ Gem.patching('inherited_resources', '1.1.2') do
     def collection
       get_collection_ivar || begin
         collection = end_of_association_chain
-        collection = collection.find(:all) unless collection.respond_to?(:each)
         set_collection_ivar(collection)
       end
     end
 
     def build_resource
       get_resource_ivar || begin
-        resource = end_of_association_chain.send(method_for_build, params[resource_instance_name] || {})
+        resource = end_of_association_chain.send(method_for_build, resource_params)
         # check if resource is included to prevent deleting from a relation
         if method_for_build == :build && end_of_association_chain.include?(resource)
           end_of_association_chain.delete(resource)

data/lib/patches/rails/integretion_runner_respond_to.rb

@@ -4,7 +4,7 @@ require 'gem-patching'
 # respond_to? method. It thus doesn't respond_to? to named route url helpers even
 # though it actually responds to them. Happens with the PolymorphicRoutes patch
 # above, so this patch is here as well.
-Gem.patching('rails', '3.0.3') do
+Gem.patching('rails', '3.0.9') do
   ActionDispatch::Integration::Runner.module_eval do
     def respond_to?(method, include_private = false)
       @integration_session.respond_to?(method, include_private) || super

data/lib/patches/rails/polymorphic_url_for.rb

@@ -1,7 +1,9 @@
 # Walks up the inheritance chain for given records if the generated named route
 # helper does not exist. Caches resulting method names.
 # see https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2986-polymorphic_url-should-handle-sti-better
-Gem.patching('rails', '3.0.3') do
+#
+# FIXME: this should not blindly overwrite ActionDispatch::Routing::PolymorphicRoutes.build_named_route_call
+Gem.patching('rails', '3.0.9') do
   require 'action_dispatch/routing/polymorphic_routes'
 
   ActionDispatch::Routing::PolymorphicRoutes.module_eval do