wagons 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWNkNWI2OTJlMzhhZjNiZmE1ZDk5M2VhZGZkZjFjZGJkNDdhMTIzZA==
+  data.tar.gz: !binary |-
+    NDYwNWRlZDJmODk4NGY4NDFhNjkzN2ViYjM5NTM3YzA2NGYxNDBmYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjM0NzkxMWY3ODBkZDBhMDIxNGU0YjFhZWUyMDkzOWE2MzViZjA2ZDE4MDRh
+    YTU1NWVkNTBkOGZkMTQ2N2MxM2QzYjFkN2RhMTI2NDBkMWJhYWQ4MzMyNGEy
+    OGYwZGExNTRjMzVmNTBhYjk0ZGQwOGFiYzcyZWM4YTZlMDVjMmI=
+  data.tar.gz: !binary |-
+    ZmYxNzMwMWNkNGUwNmI4Mzk0NmM0NTZjYzFjOWYxYjEyZjk2ODc4MWVlYTM4
+    Njg3MDA2MTEwMGJlZDRhNzdmYWI4OTY1OGU2ZDEzODgyNmRkMDUyZDI1ODUx
+    NTI3NzYyZjRhMTY4ZGM2NjUzMjJlOWI1MDc1OTNlMzNjNTI2Njk=

data/Rakefile

@@ -4,6 +4,7 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
 begin
   require 'rdoc/task'
 rescue LoadError
@@ -33,6 +34,7 @@ end
 task :test do
   begin
     Bundler.with_clean_env { sh "cd test/dummy && rails g wagon test_wagon" }
+    Bundler.with_clean_env { sh "cd test/dummy && bundle exec rake wagon:bundle:update" }
     Bundler.with_clean_env { sh "cd test/dummy && bundle exec rake db:migrate test  #{'-t' if Rake.application.options.trace}" }
     Bundler.with_clean_env { sh "cd test/dummy && bundle exec rake wagon:test  #{'-t' if Rake.application.options.trace}" }
   ensure

data/lib/generators/wagon/templates/Gemfile.tt

@@ -1,4 +1,4 @@
-require File.expand_path('../app_root', __FILE__)
+load File.expand_path('../app_root.rb', __FILE__)
 
 source 'https://rubygems.org'
 

data/lib/generators/wagon/templates/Rakefile.tt

@@ -7,6 +7,6 @@ rescue LoadError
 end
 
 ENGINE_PATH = File.expand_path('..', __FILE__)
-require File.expand_path('../app_root', __FILE__)
+load File.expand_path('../app_root.rb', __FILE__)
 
 load 'wagons/wagon_tasks.rake'

data/lib/generators/wagon/templates/script/rails.tt

@@ -6,6 +6,6 @@ ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ENGINE_ROOT)
 ENGINE_PATH = File.expand_path('lib/<%= singular_name %>/engine', ENGINE_ROOT)
 
-require File.expand_path('../../app_root', __FILE__)
+load File.expand_path('../../app_root.rb', __FILE__)
 
 load File.expand_path('script/rails', ENV["APP_ROOT"])

data/lib/generators/wagon/templates/test/test_helper.rb.tt

@@ -1,5 +1,5 @@
 # Configure Rails Environment
-require File.expand_path('../../app_root', __FILE__)
+load File.expand_path('../../app_root.rb', __FILE__)
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require File.expand_path('test/test_helper.rb', ENV['APP_ROOT'])

data/lib/tasks/wagons.rake

@@ -179,8 +179,9 @@ namespace :db do
     Rake::Task[:'db:_dump'].clear_actions
 
     task :_dump do
-      migrator = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations_paths)
-      if migrator.migrated.size > migrator.migrations.size
+      migrations = ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)
+      migrated = Set.new(ActiveRecord::Migrator.get_all_versions)
+      if migrated.size > migrations.size
         puts "The database schema will not be dumped when there are loaded wagon migrations."
         puts "To dump the application schema, please 'rake wagon:remove WAGON=ALL' wagons beforehand or reset the database."
       else

data/lib/wagons/extensions/application.rb

@@ -1,14 +1,18 @@
 module Rails
-  class Application
+  class Application < Engine
+    
     protected
 
     # Append wagons at the end of all railties, even after the application.
-    def ordered_railties
-      @ordered_railties ||= super.tap do |ordered|
+    def ordered_railties_with_wagons
+      @ordered_railties ||= ordered_railties_without_wagons.tap do |ordered|
         Wagons.all.each do |w|
           ordered.push(ordered.delete(w))
         end
       end
     end
+    
+    alias_method_chain :ordered_railties, :wagons
+    
   end
 end

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/wagons/view_helper.rb

@@ -39,7 +39,7 @@ module Wagons
       handlers = glob_pattern(lookup_context.handlers)
       
       view_paths.collect do |path|
-        Dir.glob(File.join(path, folder_pattern, "_#{key}_*.#{formats}.#{handlers}"))
+        Dir.glob(File.join(path.to_s, folder_pattern, "_#{key}_*.#{formats}.#{handlers}"))
       end.flatten
     end
     

data/lib/wagons.rb

@@ -16,7 +16,9 @@ require 'wagons/extensions/test_case'
 module Wagons
   # All wagons installed in the current Rails application.
   def self.all
-    Rails.application.railties.all.select {|r| r.is_a?(Wagon) }
+    enumerable = Rails.application.railties
+    enumerable = enumerable.all if enumerable.respond_to?(:all)
+    enumerable.select {|r| r.is_a?(Wagon) }
   end
   
   # Find a wagon by its name.

data/test/ci/rails3.gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'rails', '~> 3.2'
+
+gem "seed-fu-ndo", ">= 0.0.2"
+
+group :test, :development do
+  gem 'sqlite3'
+  gem 'open4'
+  gem 'mocha', :require => false
+end

data/test/ci/rails3.gemfile.lock

@@ -0,0 +1,108 @@
+PATH
+  remote: /Users/pascal/Code/ruby/wagons
+  specs:
+    wagons (0.1.1)
+      bundler (>= 1.1)
+      rails (>= 3.2)
+      seed-fu-ndo (>= 0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
+      mail (~> 2.5.4)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
+      builder (~> 3.0.0)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    journey (1.0.4)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.25.1)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.8.2)
+    open4 (1.3.0)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.16)
+      actionmailer (= 3.2.16)
+      actionpack (= 3.2.16)
+      activerecord (= 3.2.16)
+      activeresource (= 3.2.16)
+      activesupport (= 3.2.16)
+      bundler (~> 1.0)
+      railties (= 3.2.16)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    seed-fu (2.3.0)
+      activerecord (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+    seed-fu-ndo (0.0.2)
+      seed-fu (>= 2.2.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  open4
+  rails (~> 3.2)
+  seed-fu-ndo (>= 0.0.2)
+  sqlite3
+  wagons!

data/test/dummy/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem 'wagons', :path => File.expand_path(__FILE__).split("test#{File::SEPARATOR}dummy").first
 
@@ -10,7 +10,7 @@ group :test do
   gem 'mocha', :require => false
 end
 
-# Include the wagons you want attached in Wagonfile. 
+# Include the wagons you want attached in Wagonfile.
 # Do not check Wagonfile into source control.
 #
 # To create a Wagonfile suitable for development, run 'rake wagon:file'

data/test/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /home/pzumkehr/src/ruby/wagons
+  remote: /Users/pascal/Code/ruby/wagons
   specs:
-    wagons (0.1.1)
+    wagons (0.2.0)
       bundler (>= 1.1)
       rails (>= 3.2)
       seed-fu-ndo (>= 0.0.2)
@@ -17,93 +17,88 @@ PATH
     dummy_test_wagon (0.0.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.1)
+    atomic (1.1.14)
+    builder (3.1.4)
     erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.8.0)
+    hike (1.2.3)
+    i18n (0.6.9)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.23)
+    mime-types (1.25.1)
+    minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.4)
+    multi_json (1.8.2)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    seed-fu (2.2.0)
-      activerecord (~> 3.1)
-      activesupport (~> 3.1)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    seed-fu (2.3.0)
+      activerecord (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
     seed-fu-ndo (0.0.2)
       seed-fu (>= 2.2.0)
-    sprockets (2.2.2)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby

data/test/dummy/app/models/person.rb

@@ -1,5 +1,3 @@
 class Person < ActiveRecord::Base
-  attr_accessible :birthday, :name
-  
   validates :name, :presence => true
 end

data/test/dummy/app/views/people/index.html.erb

@@ -4,5 +4,4 @@
 
 <%= render_extensions :list, :locals => {:test => 42} %>
 
-
 <%= render 'shared/sidebar' %>

data/test/dummy/config/application.rb

@@ -32,6 +32,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+    config.i18n.enforce_available_locales = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
@@ -44,11 +45,13 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    if Rails.version < '4.0'
+      # Enforce whitelist mode for mass assignment.
+      # This will create an empty whitelist of attributes available for mass-assignment for all models
+      # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+      # parameters by using an attr_accessible or attr_protected declaration.
+      config.active_record.whitelist_attributes = false
+    end
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/test/dummy/config/environments/development.rb

@@ -5,9 +5,8 @@ Dummy::Application.configure do
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -22,13 +21,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

data/test/dummy/config/environments/production.rb

@@ -4,6 +4,8 @@ Dummy::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
+  config.eager_load = true
+  
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

data/test/dummy/config/environments/test.rb

@@ -7,13 +7,12 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  config.eager_load = false
+  
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,9 +28,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,9 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'e85c1b61190124d7d5e2660879966e236e6de1db13dd618c12d55901a7b7611b522d5821657f62529a6a6448cbb5e217934734f2e334fde656438ce182213e98'
+
+if Rails.version < '4.0'
+  Dummy::Application.config.secret_token = 'e85c1b61190124d7d5e2660879966e236e6de1db13dd618c12d55901a7b7611b522d5821657f62529a6a6448cbb5e217934734f2e334fde656438ce182213e98'
+else
+  Dummy::Application.config.secret_key_base = 'e85c1b61190124d7d5e2660879966e236e6de1db13dd618c12d55901a7b7611b522d5821657f62529a6a6448cbb5e217934734f2e334fde656438ce182213e98'
+end