makers 0.1.3 → 0.2.0

data/lib/makers/extensions/active_support/test_case.rb

@@ -0,0 +1,15 @@
+module Makers
+  module Extensions
+    module ActiveSupport
+      module TestCase
+
+        %w(build create).each do |method|
+          define_method method do |name, *args|
+            Makers.definitions.find(name).send method, *args
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/makers/maker.rb

@@ -1,112 +1,63 @@
 module Makers
   class Maker
 
-    attr_reader :options, :proxy
+    attr_reader :options, :assignments, :object
 
-    def initialize(name, options={}, &block)
-      @name = name
+    def initialize(options, assignments)
       @options = options
-      @block = block
-      @loaded = false
-      Fetcher.new(name, options, &block)
-    end
-
-    def parent
-      @parent ||= begin
-        if @options[:parent]
-          Makers.definitions.find(@options[:parent])
-        end
-      end
-    end
-
-    def attributes_for(options={})
-      {}.tap do |hash|
-        iterate_attributes(options, proxy) do |name, value|
-          hash[name] = value
-        end
-      end
+      @assignments = assignments
+      @object = build_object
     end
 
     %w(build create).each do |name|
       define_method name do |*args|
         options = args.extract_options!
-        single_name = :"#{name}_one"
+        action = :"#{name}_one"
         if args.any?
-          [].tap do |list|
-            args.first.times do
-              list << send(single_name, options)
-            end
+          collection = []
+          args.first.times do
+            collection << send(action, options)
           end
+          collection
         else
-          send(single_name, options)
+          send action, options
         end
       end
     end
 
-    %w(options attributes_for build create).each do |name|
-      define_method :"#{name}_with_load" do |*args|
-        load
-        send :"#{name}_without_load", *args
+    def attributes
+      hash = {}
+      if options.has_key?(:parent)
+        hash.merge! Makers.definitions.find(options[:parent]).attributes
       end
-      alias_method_chain name, :load
-    end
-
-    protected
-
-    def load
-      unless @loaded
-        if parent
-          @options = parent.options.merge(@options)
-        end
-        unless @options[:class] ||= @name.to_s.classify.constantize
-          raise "Class not found for maker #{@name}"
-        end
-        @proxy = Proxy.new(self, &@block)
-        @loaded = true
+      assignments.keys.each do |name|
+        hash[name] = object.send(name)
       end
+      hash
     end
 
-    def build_one(options={})
-      @options[:class].new.tap do |instance|
-        trigger :before_build, instance
-        iterate_attributes(options, instance) do |name, value|
-          instance.send :"#{name}=", value
-        end
-        trigger :after_build, instance
-      end
-    end
+    private
 
-    def create_one(options={})
-      build_one(options).tap do |instance|
-        trigger :before_create, instance
-        if instance.save
-          Makers.records << instance
-        end
-        trigger :after_create, instance
+    def build_one(overrides={})
+      instance = options[:class_name].constantize.new
+      attributes.merge(overrides).each do |name, value|
+        instance.send "#{name}=", value
       end
+      instance
     end
 
-    def trigger(name, instance)
-      globals = (Makers.configuration.callbacks[name] || [])
-      locals = (proxy.callbacks[name] || [])
-      (globals + locals).each do |callback|
-        callback.call instance
-      end
+    def create_one(overrides={})
+      instance = build_one(overrides)
+      instance.save
+      instance
     end
 
-    def iterate_attributes(options={}, context)
-      proxy.attributes.merge(options).each do |name, value|
-        case value
-        when Proc
-          context.instance_eval &value
-        when Sequence
-          value.generate context
-        else
-          value
-        end.tap do |value|
-          yield name, value
-        end
+    def build_object
+      klass = Class.new
+      assignments.each do |name, logic|
+        klass.send :define_method, name, &logic
       end
+      klass.new
     end
 
   end

data/lib/makers/proxy.rb

@@ -1,51 +1,12 @@
 module Makers
   class Proxy
-    include Callbacks
 
-    def initialize(maker, &block)
-      @maker = maker
-      @attributes = []
-      @sequences = {}
+    def initialize(&block)
       instance_eval &block
     end
 
-    def attributes
-      {}.tap do |hash|
-        if @maker.parent
-          hash.merge! @maker.parent.proxy.attributes
-        end
-        @attributes.each do |name|
-          hash[name] = send(name)
-        end
-      end
-    end
-
-    def sequence(name, &block)
-      @attributes << name
-      @sequences[name] = Sequence.new(&block)
-      class_eval do
-        define_method(name) { @sequences[name] }
-      end
-    end
-
-    def method_missing(name, *args, &block)
-      unless name == :maker
-        options = args.extract_options!
-        strategy = options.delete(:strategy) || :build
-        if block_given?
-          logic = block
-        elsif maker = Makers.definitions.find(name) rescue nil
-          logic = -> { maker.send(strategy, options) }
-        elsif maker = Makers.definitions.find(name.to_s.singularize.to_sym) rescue nil
-          logic = -> { maker.send(strategy, (args.first || 1), options) }
-        elsif args.any?
-          logic = -> { args.first }
-        end
-        if defined? logic
-          @attributes.send (block_given? ? :push : :unshift), name
-          class_eval { define_method(name, logic) }
-        end
-      end
+    def maker(*args, &block)
+      DSL::Maker.new *args, &block
     end
 
   end

data/lib/makers/railtie.rb

@@ -1,32 +1,21 @@
 module Makers
   class Railtie < Rails::Railtie
 
-    initializer 'makers' do
+    initializer :makers do
       config.app_generators.test_framework(
         config.app_generators.options[:rails][:test_framework],
-        fixture: false,
-        fixture_replacement: :makers
+        fixture: false
       )
-      if defined? RSpec
-        require 'rspec/rails'
-        RSpec.configure do |config|
-          config.include Makers::Methods
-          config.after(:each) do
-            Makers.clean
-          end
-        end
+      if Dir.exist?(Rails.root.join('spec'))
+        directory = 'spec'
       else
-        class ActiveSupport::TestCase
-          include Makers::Methods
-          teardown do
-            Makers.clean
-          end
-        end
+        directory = 'test'
       end
-    end
-
-    config.after_initialize do
-      Makers.load
+      path = Rails.root.join("#{directory}/makers.rb")
+      if File.exist?(path)
+        load path
+      end
+      ActiveSupport::TestCase.include Makers::Extensions::ActiveSupport::TestCase
     end
 
   end

data/lib/makers/version.rb

@@ -1,5 +1,5 @@
 module Makers
 
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 
 end

data/test/dummy/Rakefile

@@ -2,5 +2,4 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-
 Rails.application.load_tasks

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,12 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+  <head>
+    <title>Dummy</title>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/test/dummy/bin/bundle

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/bin/rake

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/test/dummy/bin/setup

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system 'gem install bundler --conservative'
+  system 'bundle check || bundle install'
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   system 'cp config/database.yml.sample config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system 'bin/rake db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system 'rm -f log/*'
+  system 'rm -rf tmp/cache'
+
+  puts "\n== Restarting application server =="
+  system 'touch tmp/restart.txt'
+end

data/test/dummy/config/application.rb

@@ -18,5 +18,8 @@ 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
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end

data/test/dummy/config/database.yml

@@ -1,25 +1,7 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
-default: &default
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
-
 development:
-  <<: *default
-  database: db/development.sqlite3
+  adapter: postgresql
+  database: makers_development
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  <<: *default
-  database: ":memory:"
-
-production:
-  <<: *default
-  database: db/production.sqlite3
+  adapter: postgresql
+  database: makers_test

data/test/dummy/config/database.yml.travis

@@ -0,0 +1,3 @@
+test:
+  adapter: <%= 'jdbc' if RUBY_ENGINE == 'jruby' %>postgresql
+  database: travis

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

@@ -1,4 +1,4 @@
-Dummy::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
@@ -10,7 +10,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # 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
 
   # Don't care if the mailer can't send.
@@ -27,6 +27,10 @@ Dummy::Application.configure do
   # number of complex assets.
   config.assets.debug = true
 
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.

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

@@ -1,4 +1,4 @@
-Dummy::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
@@ -11,20 +11,18 @@ Dummy::Application.configure do
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local = false
   config.action_controller.perform_caching = true
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
-    config.serve_static_files = false
-  else
-    config.serve_static_assets = false
-  end
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -33,21 +31,22 @@ Dummy::Application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs.
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
@@ -59,11 +58,7 @@ Dummy::Application.configure do
   # config.cache_store = :mem_cache_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -76,9 +71,6 @@ Dummy::Application.configure do
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new