railsless-active_record 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f122a117e6b93dbe3c7349d10e6161421bbf8dd7
-  data.tar.gz: 2503c67f693b02ab67decdaff8aa982d4e02d9d9
+  metadata.gz: 440df35df9bfdf54c4f3ac5a448cb874c5718d7c
+  data.tar.gz: c5b1ca4083c3e97d41e58511fd8b6eb87a2eee00
 SHA512:
-  metadata.gz: bb0e33c4b0de00d44b34545acccb0b96628186f89b08cb0804ac998a0f502493b9d1046f8dc0211c61693f0c64121b475920434d10a782e5d66e9bcf93388cc2
-  data.tar.gz: 398ea7f655fa43bf16c90c857cd73b1ed4fa422110e0ae9f0085364fadc0b88ce43ffbcaec8cc26225767ba1086d221c33751e9067bc0b350b480165ab3bb819
+  metadata.gz: 6ae4b00085195b98cc491925c85d7f1b5cadeb4f001dd8119e465cabf63e306acec196ad250bc74e4c19ed5d34c1b448f47739b8b9c2e072ce6e0ad222869732
+  data.tar.gz: 9db05790b5d871eaf44becea098d2ab0117b8ba0d78987c2120688798e759d0e917803b64f06a527f5c0d8396bac298e3865fbcc69b0a4bb1e1b40eee9f881fc

data/lib/railsless/active_record/config.rb

@@ -6,7 +6,7 @@ require 'erb'
 module Railsless
   module ActiveRecord
     class Config
-      def self.attr_accessor_with_default(name, &block)
+      def self.accessor_with_default(name, &block)
         module_eval do
           attr_writer name
           define_method(name) do
@@ -28,11 +28,11 @@ module Railsless
       end
 
       # Fumble around picking the right running environment.
-      attr_accessor_with_default(:env) do
+      accessor_with_default(:env) do
         ENV['RACK_ENV'] || ENV['SINATRA_ENV'] || ENV['RAILS_ENV'] || ENV['ENV'] || 'development'
       end
 
-      attr_accessor_with_default(:db_config) do
+      accessor_with_default(:db_config) do
         case
         when File.exist?(db_config_path)
           YAML.load(read_config(db_config_path))
@@ -43,15 +43,15 @@ module Railsless
         end
       end
 
-      attr_accessor_with_default(:db_config_path) do
-        File.join(root, 'config', 'database.yml')
-      end
-      attr_accessor_with_default(:db_path)     { File.join(root, 'db') }
-      attr_accessor_with_default(:seeds_path)  { File.join(db_path, 'seeds.rb') }
-      attr_accessor_with_default(:schema_path) { File.join(db_path, 'schema.rb') }
-      attr_accessor_with_default(:migrations_path) { File.join(db_path, 'migrate') }
+      accessor_with_default(:config_path)     { File.join(root, 'config') }
+      accessor_with_default(:db_config_path)  { File.join(config_path, 'database.yml') }
+
+      accessor_with_default(:db_path)         { File.join(root, 'db') }
+      accessor_with_default(:seeds_path)      { File.join(db_path, 'seeds.rb') }
+      accessor_with_default(:schema_path)     { File.join(db_path, 'schema.rb') }
+      accessor_with_default(:migrations_path) { File.join(db_path, 'migrate') }
 
-      attr_accessor_with_default(:logger) { Logger.new(STDOUT) }
+      accessor_with_default(:logger) { Logger.new(STDOUT) }
 
       protected
 

data/lib/railsless/active_record/rake.rb

@@ -1,6 +1,8 @@
+require 'active_support/inflector' # Doesn't mix in; called for its class methods.
 require 'active_record'
-require 'rake'
 require 'fileutils'
+require 'rake'
+require 'erb'
 
 module Railsless
   module ActiveRecord
@@ -50,21 +52,33 @@ module Railsless
 
             desc "Generate and write a config/database.yml"
             task :config do
-              config_path = config.db_config_path
-              if File.exists?(config_path)
-                puts "Database config already exists at #{config_path}; skipping..."
+              db_config_path = config.db_config_path
+              if File.exists?(db_config_path)
+                puts "Database config already exists at #{db_config_path}; skipping..."
               else
-                FileUtils.cp(
-                  File.join(TEMPLATES_PATH, 'database.yml'),
-                  config_path
-                )
+                FileUtils.mkdir_p(config.config_path)
+                FileUtils.cp(File.join(TEMPLATES_PATH, 'database.yml'), db_config_path)
               end
             end
 
             desc "Generate a database migration, eg: rake db:generate:migration NAME=CreatePosts"
             task :migration do
-              # TODO: NAME=...
-              raise "Not Implemented"
+              migrations_path = config.migrations_path
+              timestamp = Time.now.strftime("%Y%m%d%H%M%S")
+              name = ENV.fetch('NAME') do
+                fail "Usage: rake db:generate:migration NAME=CreatePosts"
+              end
+
+              # Normalise the name to a MigrationClass and a migration_filename
+              migration_class    = ActiveSupport::Inflector.camelize(name)
+              migration_filename = "#{timestamp}_#{ActiveSupport::Inflector.underscore(name)}.rb"
+              migration_path     = File.join(migrations_path, migration_filename)
+
+              template = File.read(File.join(TEMPLATES_PATH, 'migration.erb'))
+              FileUtils.mkdir_p(migrations_path)
+              File.write(migration_path, ERB.new(template).result(binding))
+
+              puts "Created migration: #{migration_path}"
             end
           end
         end

data/lib/railsless/active_record/version.rb

@@ -1,5 +1,5 @@
 module Railsless
   module ActiveRecord
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/integrations/sinatra_spec.rb

@@ -26,6 +26,9 @@ shared_examples "a Sinatra app" do
     end
   end
 
+  # TODO: This block is both testing integration AND the Rake tasks themselves.
+  #       Break this out so we have independent Rake integration tests and a
+  #       very set of tests, just to make sure it hooks up fine with Sinatra.
   context "generators" do
     describe "db:generate:config" do
       let(:config_path) do
@@ -42,7 +45,7 @@ shared_examples "a Sinatra app" do
       end
 
       it "generates a config file that doesn't yet exist" do
-        FileUtils.rm_f(config_path)
+        FileUtils.rm_f(config_path) # TODO: Avoid directly modifying a fixture app like this.
         out = run "bundle exec rake db:generate:config"
         expect(File.read(config_path)).to eq File.read(template_path)
       end
@@ -54,8 +57,36 @@ shared_examples "a Sinatra app" do
       end
     end
 
-    pending "'db:generate:migration NAME=NameHere' creates a migration" do
-      # TODO: 'NameHere' -> 'name_here' transform.
+    describe "db:generate:migration NAME=NameHere" do
+      let(:migrations_path) { File.join(app_path, 'db', 'migrate') }
+
+      it "explodes when no name given" do
+        out = run 'bundle exec rake db:generate:migration', should_succeed=false
+        expect(out).to match /Usage:/
+      end
+
+      it "normalises NAME=CamelCase" do
+        out = run 'bundle exec rake db:generate:migration NAME=CreateExamples'
+        expect_migration(out, 'CreateExamples', 'create_examples')
+      end
+
+      it "normalises NAME=snake_case" do
+        out = run 'bundle exec rake db:generate:migration NAME=drop_examples'
+        expect_migration(out, 'DropExamples', 'drop_examples')
+      end
+
+      def expect_migration(out, class_name, filename_suffix)
+        expect(out).to match /\ACreated migration: (.*)\Z/ do |m|
+          filename = m[1]
+          expect(filename).to match /\/[0-9]+_#{filename_suffix}.rb\Z/
+          expect(File.read(filename)).to match /\Aclass #{class_name} < ActiveRecord::Migration/
+        end
+      end
+
+      # Clean up examples after each run.
+      after do
+        Dir["#{migrations_path}/*_examples.rb"].each {|f| FileUtils.rm_f(f) }
+      end
     end
   end
 
@@ -87,11 +118,11 @@ shared_examples "a Sinatra app" do
 
   # Helpers
 
-  def run(command)
+  def run(command, should_succeed=true)
     output = ""
     Bundler.with_clean_env do
-      output, status = Open3.capture2(command, :chdir => app_path)
-      expect(status).to be_success
+      output, status = Open3.capture2e(command, :chdir => app_path)
+      expect(status.success?).to eq should_succeed
     end
     output
   end

data/templates/migration.erb

@@ -0,0 +1,5 @@
+class <%= migration_class %> < ActiveRecord::Migration
+  def change
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsless-active_record
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rob Howard
@@ -101,6 +101,7 @@ files:
 - spec/support/fs_fixture_helpers.rb
 - spec/support/inline_timeout_helpers.rb
 - templates/database.yml
+- templates/migration.erb
 homepage: https://github.com/damncabbage/railsless-active_record
 licenses:
 - Apache License, Version 2.0