seedbank 0.4.0 → 0.5.0.pre

data/lib/seedbank/railtie.rb

@@ -1,13 +1,8 @@
-require 'seedbank'
-require 'rails'
-
+# frozen_string_literal: true
 module Seedbank
   class Railtie < Rails::Railtie
-
     rake_tasks do
-      Seedbank.seeds_root = File.expand_path('db/seeds', Rails.root)
       Seedbank.load_tasks
     end
-
   end
-end
+end

data/lib/seedbank/runner.rb

@@ -1,33 +1,10 @@
+# frozen_string_literal: true
 module Seedbank
   class Runner
-
     def initialize
       @_memoized = {}
     end
 
-    def let(name, &block)
-      name = String(name)
-
-      raise ArgumentError.new("#{name} is already defined") if respond_to?(name, true)
-
-      __eigenclass.instance_exec(name) do |name|
-        define_method(name) do
-          @_memoized.fetch(name) { |key| @_memoized[key] = instance_eval(&block) }
-        end
-      end
-
-    end
-
-    def let!(name, &block)
-      let(name, &block)
-      send name
-    end
-
-    def evaluate(seed_task, seed_file)
-      @_seed_task = seed_task
-      instance_eval(File.read(seed_file), seed_file)
-    end
-
     # Run this seed after the specified dependencies have run
     # @param dependencies [Array] seeds to run before the block is executed
     #
@@ -42,26 +19,36 @@ module Seedbank
     #
     # Would look for a db/seeds/shared/users.seeds.rb seed and execute it.
     def after(*dependencies, &block)
-      dependencies.flatten!
-      dependencies.map! { |dep| "db:seed:#{dep}"}
-      dependent_task_name =  @_seed_task.name + ':body'
+      depends_on = dependencies.flat_map { |dep| "db:seed:#{dep}" }
+      dependent_task_name = @_seed_task.name + ':body'
 
       if Rake::Task.task_defined?(dependent_task_name)
         dependent_task = Rake::Task[dependent_task_name]
       else
-        dependent_task = Rake::Task.define_task(dependent_task_name => dependencies, &block)
+        dependent_task = Rake::Task.define_task(dependent_task_name => depends_on, &block)
       end
 
       dependent_task.invoke
     end
 
-    private
+    def let(name, &block)
+      name = String(name)
+
+      raise ArgumentError, "#{name} is already defined" if respond_to?(name, true)
 
-    def __eigenclass
-      class << self
-        self
+      define_singleton_method(name) do
+        @_memoized.fetch(name) { |key| @_memoized[key] = instance_exec(&block) }
       end
     end
 
+    def let!(name, &block)
+      let(name, &block)
+      public_send name
+    end
+
+    def evaluate(seed_task, seed_file)
+      @_seed_task = seed_task
+      instance_eval(File.read(seed_file), seed_file)
+    end
   end
 end

data/lib/seedbank/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Seedbank
-  VERSION = "0.4.0"
+  VERSION = '0.5.0.pre'
 end

data/lib/tasks/seed.rake

@@ -1,42 +1,38 @@
+# frozen_string_literal: true
 namespace :db do
-
-  include Seedbank::DSL
-
-  base_dependencies   = ['db:seed:original']
+  using Seedbank::DSL
   override_dependency = ['db:seed:common']
 
   namespace :seed do
     # Create seed tasks for all the seeds in seeds_path and add them to the dependency
     # list along with the original db/seeds.rb.
-    common_dependencies = glob_seed_files_matching('*.seeds.rb').sort.map { |seed_file| seed_task_from_file(seed_file) }
+    common_dependencies = seed_tasks_matching(Seedbank.matcher)
+
+    # Only add the original seeds if db/seeds.rb exists.
+    if original_seeds_file
+      define_seed_task original_seeds_file, :original
+      common_dependencies.unshift('db:seed:original')
+    end
 
-    desc "Load the seed data from db/seeds.rb and db/seeds/*.seeds.rb."
-    task 'common' => base_dependencies + common_dependencies
+    desc "Load the seed data from db/seeds.rb and db/seeds/#{Seedbank.matcher}."
+    task 'common' => common_dependencies
 
     # Glob through the directories under seeds_path and create a task for each adding it to the dependency list.
     # Then create a task for the environment
     glob_seed_files_matching('/*/').each do |directory|
       environment = File.basename(directory)
 
-      environment_dependencies = glob_seed_files_matching(environment, '*.seeds.rb').sort.map { |seed_file| seed_task_from_file(seed_file) }
+      environment_dependencies = seed_tasks_matching(environment, Seedbank.matcher)
 
-      desc "Load the seed data from db/seeds.rb, db/seeds/*.seeds.rb and db/seeds/#{environment}/*.seeds.rb."
+      desc "Load the seed data from db/seeds.rb, db/seeds/#{Seedbank.matcher} and db/seeds/#{environment}/#{Seedbank.matcher}."
       task environment => ['db:seed:common'] + environment_dependencies
 
       override_dependency << "db:seed:#{environment}" if defined?(Rails) && Rails.env == environment
     end
-
-    if Rails.version > '4'
-      original_seeds_file = Rails.application.paths["db/seeds.rb"].existent.first
-    elsif Rails.version > '3.1'
-      original_seeds_file = Rails.application.paths["db/seeds"].existent.first
-    else
-      original_seeds_file = Rails.root.join("db","seeds").children.first.to_s
-    end
-    define_seed_task original_seeds_file, :original if original_seeds_file
   end
 
   # Override db:seed to run all the common and environments seeds plus the original db:seed.
-  desc 'Load the seed data from db/seeds.rb, db/seeds/*.seeds.rb and db/seeds/ENVIRONMENT/*.seeds.rb. ENVIRONMENT is the current environment in Rails.env.'
-  override_seed_task :seed => override_dependency
+  desc %(Load the seed data from db/seeds.rb, db/seeds/#{Seedbank.matcher} and db/seeds/ENVIRONMENT/#{Seedbank.matcher}.
+  ENVIRONMENT is the current Rails.env.)
+  override_seed_task seed: override_dependency
 end

data/seedbank.gemspec

@@ -1,59 +1,38 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "seedbank/version"
-
-Gem::Specification.new do |s|
-  s.name = %q{seedbank}
-  s.version = Seedbank::VERSION
-  s.date = `git log -1 --format="%cd" --date=short lib/seedbank/version.rb`
-
-  s.required_rubygems_version = Gem::Requirement.new(">=1.2.0") if s.respond_to?(:required_rubygems_version=)
-  s.rubygems_version = %q{1.3.5}
-  s.license = "MIT"
-
-  s.authors = ["James McCarthy"]
-  s.email = %q{james2mccarthy@gmail.com}
-  s.homepage = %q{http://github.com/james2m/seedbank}
-  s.summary = %q{
-    Extends Rails seeds to split out complex seeds into their own file
-    and have different seeds for each environment.
+# coding: utf-8
+# frozen_string_literal: true
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'seedbank/version'
+require 'English'
+
+Gem::Specification.new do |spec|
+  spec.name        = 'seedbank'
+  spec.version     = Seedbank::VERSION
+  spec.authors     = ['James McCarthy']
+  spec.email       = ['[james2mccarthy@gmail.com']
+  spec.required_ruby_version = '>= 2.1'
+  spec.summary     = 'Generate seeds data for your Ruby application.'
+  spec.description = %{
+    Adds simple rake commands for seeding your database. Simple dependencies let you organise your seeds.
+    If you are using Rails, Seedbank extends Rails seeds and lets you add seeds for each environment.
   }
-  s.description = %q{
-    Extends Rails seeds to split out complex seeds into multiple
-    files and lets each environment have it's own seeds.
-  }
-  s.license = "MIT"
-
-  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"]
+  spec.date        = `git log -1 --format="%cd" --date=short lib/seedbank/version.rb`
+  spec.homepage    = 'http://github.com/james2m/seedbank'
+  spec.license     = 'MIT'
 
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = [
-    "MIT-LICENSE",
-    "README.md"
-  ]
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  s.add_development_dependency "minitest", "~> 5.0"
-  s.add_development_dependency "rails", "~> 3.2"
+  spec.rdoc_options     = ['--charset=UTF-8']
+  spec.extra_rdoc_files = ['MIT-LICENSE', 'README.md']
 
-  s.post_install_message = %q{
-  ================================================================================
+  spec.add_dependency 'rake', '>= 10.0'
 
-  Rails 2.x
-  ---------
-  If you are using Seedbank with Rails 2.x you will need to place the following at
-  the end of your Rakefile so Rubygems can load the seedbank tasks;
-
-    require 'seedbank'
-    Seedbank.load_tasks if defined?(Seedbank)
-
-  Rails 3.x and 4.x
-  ---------
-  Your work here is done!
-
-  ================================================================================
-  }
+  spec.add_development_dependency 'bundler',  '~> 1.11'
+  spec.add_development_dependency 'rails',    '~> 4.2'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'm',        '~> 1.5'
+  spec.add_development_dependency 'byebug',   '~> 9.0'
 end
-

data/test/dummy/Rakefile

@@ -1,4 +1,5 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ApplicationController < ActionController::Base
   protect_from_forgery
 end

data/test/dummy/config.ru

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application

data/test/dummy/config/application.rb

@@ -1,29 +1,9 @@
+# frozen_string_literal: true
 require File.expand_path('../boot', __FILE__)
 
-# Pick the frameworks you want:
-require "active_record/railtie"
-
-Bundler.require  if defined?(Bundler)
-require 'seedbank'
+Bundler.require(:default, Rails.env)
 
 module Dummy
   class Application < Rails::Application
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # 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
   end
 end
-

data/test/dummy/config/boot.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems'
 gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 
@@ -7,4 +8,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/environment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -5,12 +6,13 @@ 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
+  config.eager_load = false
 
   # 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.consider_all_requests_local = true
   config.action_controller.perform_caching = false
 
   # Print deprecation notices to the Rails logger
@@ -19,16 +21,10 @@ 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
-
-  # Expands the lines which load the assets
-  config.assets.debug = true
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -6,26 +7,20 @@ Dummy::Application.configure do
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
-
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.eager_load = false
 
   # 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.consider_all_requests_local = true
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.action_controller.allow_forgery_protection = false
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Your secret key for verifying the integrity of signed cookies.

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

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 #
 # This file contains settings for ActionController::ParamsWrapper which
@@ -5,7 +6,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json]
 end
 
 # Disable root element in JSON by default.

data/test/dummy/config/routes.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 Dummy::Application.routes.draw do
 end

data/test/dummy/db/seeds.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 FakeModel.seed('db/seeds.rb')

data/test/dummy/db/seeds/circular1.seeds.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 after :circular2 do
   FakeModel.seed('circular1')
-end
+end

data/test/dummy/db/seeds/circular2.seeds.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 after :circular1 do
   FakeModel.seed('circular2')
-end
+end