unschema 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ed70f4c6013133bd2b75219bad66d570bc5d78
-  data.tar.gz: 0ada28339c5538bccde776ddf5c7017db209f65e
+  metadata.gz: 4243d394a3ed056790202261451bc521418c20aa
+  data.tar.gz: ad8f5409d7b724f00c0d9aead913859260cbdc10
 SHA512:
-  metadata.gz: 6245c40160baf94f84f8736e4aceb0a1d27b5beed15aaa356efdf58cd4acbb38a5c224b0e2097e321b93e41eb341883b6ee72058a51c6943ebcbb0621c37923c
-  data.tar.gz: 888c0f5114435aec00325a6beac2227ed198fdf9433bc73c6d2a81f994409aaa48bfdf04eeecf0a19f29172530557c55bec81db01134ca41e628c0f37b0a459f
+  metadata.gz: 7e27fa30ad4f8a21f290ff0214b50dccb8c6cdb6751db48317a6e7410016365fcf27fee5110eda9c448af5ec2217b2eaec8a3c6b2c83aacf73cab37fcf28531b
+  data.tar.gz: 657a908a1433219e1e1b30f4cdd73be2f90c7780e897234d0a723922dc7851dbb5dff5bac5ebc39507b12369b7774c8c1760439b49cab77c59f5bfb9865d91a3

data/.travis.yml

@@ -1,6 +1,12 @@
 language: ruby
 rvm:
   - "1.9.3"
-  - "2.0.0"
+  - "2.0"
+  - "2.1"
   - jruby-19mode
-  - rbx-19mode
+matrix:
+  fast_finish: true
+  allow_failures:
+    - jruby-head
+    - ruby-head
+    - rbx-head

data/README.md

@@ -1,6 +1,6 @@
 # Unschema - rebase your schema.rb
 
-[![Build Status](https://travis-ci.org/neopoly/unschema.png?branch=master)](https://travis-ci.org/neopoly/unschema) [![Gem Version](https://badge.fury.io/rb/unschema.png)](http://badge.fury.io/rb/unschema) [![Code Climate](https://codeclimate.com/github/neopoly/unschema.png)](https://codeclimate.com/github/neopoly/unschema)
+[![Build Status](http://img.shields.io/travis/neopoly/unschema.svg?branch=master)](https://travis-ci.org/neopoly/unschema) [![Gem Version](http://img.shields.io/gem/v/unschema.svg)](https://rubygems.org/gems/unschema) [![Code Climate](http://img.shields.io/codeclimate/github/neopoly/unschema.svg)](https://codeclimate.com/github/neopoly/unschema) [![Inline docs](http://inch-ci.org/github/neopoly/unschema.svg?branch=master)](http://inch-ci.org/github/neopoly/unschema)
 
 Splits your schema.rb into separate migrations per table.
 

data/lib/unschema.rb

@@ -1,4 +1,5 @@
 require "unschema/version"
 require "unschema/base"
+require "unschema/migration_dumper"
 require "unschema/schema_intermediator"
 require "unschema/fake_schema"

data/lib/unschema/base.rb

@@ -34,42 +34,14 @@ module Unschema
     private
 
     def dump_table_calls(table_name, calls)
-      File.open(File.join(migrations_path, "#{next_migration}_create_#{table_name}.rb"), "w") do |f|
-        f << "class Create#{table_name.gsub(/^(\w)/){|s| s.upcase }.gsub(/(_\w)/){|s| s[-1, 1].upcase} } < ActiveRecord::Migration\n"
-
-        f << "  def change\n"
-
-        calls.each do |call|
-          str = "    #{call.name} #{stringify_args call.args}"
-
-          if call.block
-            receiver = call.block.name
-            str += " do |#{receiver}|\n"
-
-            call.block.calls.each do |block_call|
-              str += "      #{receiver}.#{block_call.name} #{stringify_args block_call.args}\n"
-            end
-
-            str += "    end\n"
-          else
-            str += "\n"
-          end
-
-
-          f << str
-        end
-
-        f << "  end\nend"
+      file = File.join(migrations_path, "#{next_migration}_create_#{table_name}.rb")
+      File.open(file, "w") do |f|
+        MigrationDumper.new(table_name, calls).dump_to(f)
       end
     end
 
-    def stringify_args(args)
-      args.inspect.gsub(/^\[|\]$/,"")
-    end
-
     def next_migration
       @version += 1
     end
-
   end
 end

data/lib/unschema/migration_dumper.rb

@@ -0,0 +1,58 @@
+module Unschema
+  class MigrationDumper
+    def initialize(table_name, calls)
+      @table_name = table_name
+      @calls      = calls
+    end
+
+    def dump_to(f)
+      f << "class Create#{table_name_camelcased} < ActiveRecord::Migration\n"
+      f << "  def change\n"
+
+      @calls.each do |call|
+        f << dump_call(call)
+      end
+
+      f << "  end\n"
+      f << "end"
+    end
+
+    private
+
+    def dump_call(call)
+      str = "    #{call.name} #{stringify_call call}"
+
+      if call.block
+        receiver = call.block.name
+        str << " do |#{receiver}|\n"
+
+        call.block.calls.each do |block_call|
+          str << "      #{receiver}.#{block_call.name} #{stringify_call block_call}\n"
+        end
+
+        str << "    end"
+      end
+
+      str << "\n"
+      str
+    end
+
+    def table_name_camelcased
+      @table_name.gsub(/^(\w)/){|s| s.upcase }.gsub(/(_\w)/) { |s| s[-1, 1].upcase }
+    end
+
+    def stringify_call(call)
+      args    = stringify_args(call.args)
+      options = stringify_options(call.options) unless call.options.empty?
+      [ args, options ].compact.join(", ")
+    end
+
+    def stringify_args(args)
+      args.inspect.gsub(/^\[|\]$/,"")
+    end
+
+    def stringify_options(options)
+      options.map { |key, value| "#{key.inspect} => #{value.inspect}" }.join(", ")
+    end
+  end
+end

data/lib/unschema/schema_intermediator.rb

@@ -1,6 +1,6 @@
 module Unschema
   class SchemaIntermediator
-    attr_reader :root, :version
+    attr_reader :version
 
     def process(options, &block)
       @version = options[:version] || 0
@@ -9,15 +9,17 @@ module Unschema
     end
 
     def calls
-      root.calls
+      @root.calls
     end
 
     class Call
-      attr_reader :name, :args, :block, :calls
+      attr_reader :name, :args, :options, :block, :calls
+
       def initialize(name, *args, &block)
-        @name = name
-        @args = args
-        @calls = []
+        @name     = name
+        @args     = args
+        @options  = Hash === args.last ? args.pop : {}
+        @calls    = []
 
         process_block!(block) if block
       end
@@ -27,6 +29,7 @@ module Unschema
       end
 
       private
+
       def process_block!(block)
         @block = self.class.new("t")
         block.call(@block)

data/lib/unschema/version.rb

@@ -1,3 +1,3 @@
 module Unschema
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/helper.rb

@@ -2,13 +2,27 @@ require 'minitest/autorun'
 
 require 'unschema'
 
-class TestCase <  MiniTest::Unit::TestCase
+class TestCase <  Minitest::Test
+  def assert_string(actual, expect)
+    assert_equal expect.unindent.chomp, actual.unindent
+  end
 end
 
 class String
   def unindent
-    matched = %r{^\s*}.match self.split("\n").first
-    indent = matched.end(0)
-    self.gsub(%r{^\s{#{indent}}}, '')
+    gsub(%r{^\s{#{indentation}}}, '')
+  end
+
+  def indentation
+    first_line = split("\n").first
+    if match = %r{^\s*}.match(first_line)
+      match.end(0)
+    else
+      0
+    end
+  end
+
+  def indent(level)
+    gsub(%r{^}, " " * level)
   end
 end

data/test/integration/end_to_end_test.rb

@@ -25,14 +25,14 @@ class EndToEndTest < TestCase
     assert_migration "20130222131357_create_table1.rb", <<-MIGRATION
       class CreateTable1 < ActiveRecord::Migration
         def change
-          create_table "table1", {:force=>true} do |t|
+          create_table "table1", :force => true do |t|
             t.string "str"
             t.integer "int"
             t.datetime "created_at"
             t.datetime "updated_at"
           end
-          add_index "table1", ["id"], {:name=>"the_index_1", :unique=>true}
-          add_index "table1", ["doesnt_make_sende"], {:name=>"the_index_2", :unique=>true, :wrong_attr=>1}
+          add_index "table1", ["id"], :name => "the_index_1", :unique => true
+          add_index "table1", ["doesnt_make_sende"], :name => "the_index_2", :unique => true, :wrong_attr => 1
         end
       end
     MIGRATION
@@ -40,11 +40,11 @@ class EndToEndTest < TestCase
     assert_migration "20130222131358_create_the_table2.rb", <<-MIGRATION
       class CreateTheTable2 < ActiveRecord::Migration
         def change
-          create_table "the_table2", {:force=>true} do |t|
+          create_table "the_table2", :force => true do |t|
             t.date "date"
-            t.integer "max_online", {:default=>0}
+            t.integer "max_online", :default => 0
           end
-          add_index "the_table2", ["date"], {:name=>"index_statistics_on_date_and"}
+          add_index "the_table2", ["date"], :name => "index_statistics_on_date_and"
         end
       end
     MIGRATION
@@ -55,7 +55,7 @@ class EndToEndTest < TestCase
   def assert_migration(path, expect)
     actual = File.read(migrations_path.join path)
 
-    assert_equal expect.unindent.chomp, actual.unindent
+    assert_string actual, expect
   end
 
   def schema_file

data/test/unit/helper_test.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+class HelperTest < TestCase
+  def test_unindent
+    expect = <<-STR
+foo
+  bar
+    STR
+    actual = <<-STR
+  foo
+    bar
+    STR
+
+    assert_equal expect, actual.unindent
+  end
+
+  def test_identatition
+    assert_equal 0, "".indentation
+    assert_equal 1, " ".indentation
+    assert_equal 2, <<-STR.indentation
+  foo
+bar
+    STR
+  end
+
+  def test_indent
+    expect = <<-STR
+  foo
+  bar
+    STR
+    actual = <<-STR
+foo
+bar
+    STR
+
+    assert_equal expect, actual.indent(2)
+  end
+end

data/test/unit/migration_dumper_test.rb

@@ -0,0 +1,71 @@
+require 'stringio'
+require 'helper'
+
+class MigrationDumperTest < TestCase
+  def test_without_calls
+    create_dumper
+
+    assert_change <<-STR
+    STR
+  end
+
+  def test_create_table_call
+    create_dumper \
+      create_call(:create_table, "table", :force => true) { |t|
+        t.string  "uid", :limit => 32, :unique => true
+        t.integer "amount"
+      }
+
+    assert_change <<-STR
+      create_table "table", :force => true do |t|
+        t.string "uid", :limit => 32, :unique => true
+        t.integer "amount"
+      end
+    STR
+  end
+
+  def test_index_call
+    create_dumper \
+      create_call(:add_index, "table", "uid", :unique => true),
+      create_call(:add_index, "table", %w[composite index])
+
+    assert_change <<-STR
+      add_index "table", "uid", :unique => true
+      add_index "table", ["composite", "index"]
+    STR
+  end
+
+  private
+
+  def create_dumper(*calls)
+    @dumper = Unschema::MigrationDumper.new("foo_bar", calls)
+  end
+
+  def create_call(name, *args, &block)
+    Unschema::SchemaIntermediator::Call.new(name, *args, &block)
+  end
+
+  def assert_change(inner)
+    expect = <<-STR
+      class CreateFooBar < ActiveRecord::Migration
+        def change
+    STR
+
+    unless inner.empty?
+      expect << inner.unindent.indent(expect.indentation + 4)
+    end
+
+    expect << <<-STR
+        end
+      end
+    STR
+
+    assert_dump expect
+  end
+
+  def assert_dump(expect)
+    io = StringIO.new
+    @dumper.dump_to(io)
+    assert_string io.string, expect
+  end
+end

data/unschema.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency  'rake'
+  gem.add_development_dependency  'minitest', '~> 5.3.5'
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: unschema
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jakob Holderbaum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.3.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.3.5
 description: Splits your current schema.rb into per-table migrations. Think of it
   as >rebase< for your migrations.
 email:
@@ -33,8 +47,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -43,12 +57,15 @@ files:
 - lib/unschema.rb
 - lib/unschema/base.rb
 - lib/unschema/fake_schema.rb
+- lib/unschema/migration_dumper.rb
 - lib/unschema/schema_intermediator.rb
 - lib/unschema/version.rb
 - test/helper.rb
 - test/integration/end_to_end_test.rb
 - test/integration/fixtures/schema.rb
 - test/integration/target/.keep
+- test/unit/helper_test.rb
+- test/unit/migration_dumper_test.rb
 - unschema.gemspec
 homepage: https://github.com/neopoly/unschema
 licenses: []
@@ -59,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Splits your current schema.rb into per-table migrations
@@ -78,3 +95,5 @@ test_files:
 - test/integration/end_to_end_test.rb
 - test/integration/fixtures/schema.rb
 - test/integration/target/.keep
+- test/unit/helper_test.rb
+- test/unit/migration_dumper_test.rb