sql_migrations 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc164b4988352478c077939a9ed77564a15d52eb
-  data.tar.gz: 7c8dd94fd00064b7888154aa374568131813d3e9
+  metadata.gz: d7eefab432a38d45308f4a3e59cc8516151a6ff7
+  data.tar.gz: acb7edb97f69f2b6d7447306bb024cacb024765f
 SHA512:
-  metadata.gz: 43bfdee3da5cdd107dd72cd2eef9ef57a65a87abcb76c04b4735915b3ade80dae99e92880294eed5ac6c20a6abddab8c195085b0a44e03763ffed3517b8063e0
-  data.tar.gz: 55bf6583e6875822d9bec006c6027001f111d235621210715a837607e515db9cea4de462828f918231c312f16412cfc021c346a518b2b5c877d56a1549d01604
+  metadata.gz: 0c83d6b1ee4783fd09d935be49c812323d331b0023a148a42eda184b9d85afc714aee7f047075c70a51c806e4c1af202df393addf96c7a5da7c4b269ab69b826
+  data.tar.gz: c134ae9d84e65f66d8bbe07273a63531bb2c94c3a8bab4def1ca678325a4461e28a77e4d6d2df8afe24c0fd1f37c9ef9b2b2a4241a3c71f204afcd9c491e7841

data/lib/sql_migrations/fixture.rb

@@ -2,12 +2,12 @@ module SqlMigrations
   # Fixture class
   #
   class Fixture < SqlScript
-    def self.find(db_name)
-      super(db_name, :fixture)
+    def self.find(database_name)
+      super(database_name, :fixture)
     end
 
     def to_s
-      "Fixture #{@name} for `#{@db_name}` database, datetime: #{@date + @time}"
+      "Fixture #{@name} for `#{@database_name}` database, datetime: #{@date + @time}"
     end
   end
 end

data/lib/sql_migrations/migration.rb

@@ -2,12 +2,12 @@ module SqlMigrations
   # Migration class
   #
   class Migration < SqlScript
-    def self.find(db_name)
-      super(db_name, :migration)
+    def self.find(database_name)
+      super(database_name, :migration)
     end
 
     def to_s
-      "Migration #{@name} for `#{@db_name}` database, datetime: #{@date + @time}"
+      "Migration #{@name} for `#{@database_name}` database, datetime: #{@date + @time}"
     end
   end
 end

data/lib/sql_migrations/script_file.rb

@@ -0,0 +1,59 @@
+module SqlMigrations
+  # Class representing script file
+  #
+  class ScriptFile
+    attr_reader :name, :time, :date, :database_name, :path
+
+    def initialize(path, database_name, type)
+      @filename,
+      @base_directory,
+      @parent_directory   = path_elements(path)
+      @path               = path
+      @type               = type.to_s
+      @database_name      = database_name
+      @date, @time, @name = match_regexp(@filename) if @filename
+    end
+
+    def content
+      File.read(@path)
+    end
+
+    def valid?
+      (@name && @time && @date && @database_name && matches_directories?) ? true : false
+    end
+
+    private
+
+    def path_elements(path)
+      _filename, _base_directory, _parent_directory =
+        path.split(File::SEPARATOR).last(3).reverse
+    end
+
+    def match_regexp(filename)
+      _, date, time, name =
+        filename.match(/(\d{8})_(\d{6})_(.*)?\.sql/).to_a
+      [date, time, name]
+    end
+
+    def matches_directories?
+      if @database_name == :default
+        file_in_type_base_directory? || file_in_database_directory?
+      else
+        file_in_database_directory?
+      end
+    end
+
+    def file_in_type_base_directory?
+      @base_directory == "#{@type}s"
+    end
+
+    def file_in_type_parent_directory?
+      @parent_directory == "#{@type}s"
+    end
+
+    def file_in_database_directory?
+      file_in_type_parent_directory? &&
+        (@base_directory == @database_name.to_s)
+    end
+  end
+end

data/lib/sql_migrations/seed.rb

@@ -2,12 +2,12 @@ module SqlMigrations
   # Seed class
   #
   class Seed < SqlScript
-    def self.find(db_name)
-      super(db_name, :seed)
+    def self.find(database_name)
+      super(database_name, :seed)
     end
 
     def to_s
-      "Seed data #{@name} for `#{@db_name}` database, datetime: #{@date + @time}"
+      "Seed data #{@name} for `#{@database_name}` database, datetime: #{@date + @time}"
     end
   end
 end

data/lib/sql_migrations/sql_script.rb

@@ -1,17 +1,10 @@
 module SqlMigrations
   # SqlScript class
   #
-  class SqlScript
-    attr_reader :date, :time, :name
-
-    def initialize(content, opts)
-      @content   = content
-      @date      = opts[:date]
-      @time      = opts[:time]
-      @name      = opts[:name]
-      @db_name   = opts[:db_name]
-      @type      = self.class.name.downcase.split('::').last
-      @datetime  = (@date + @time).to_i
+  class SqlScript < ScriptFile
+    def initialize(path, database_name, type)
+      super
+      @datetime = (@date.to_s + @time.to_s).to_i
     end
 
     def execute(db)
@@ -35,22 +28,20 @@ module SqlMigrations
     def statements
       separator = Config.options[:separator]
       if separator
-        statements = @content.split(separator)
+        statements = content.split(separator)
         statements.collect!(&:strip)
         statements.reject(&:empty?)
       else
-        [@content]
+        [content]
       end
     end
 
-    def self.find(db_name, type)
-      files = FindScripts.find(db_name, type)
-      scripts = files.map do |parameters|
-        path = parameters.delete(:path)
-        content = File.read(path)
-        new(content, parameters)
+    def self.find(database_name, type)
+      scripts = []
+      Find.find(Dir.pwd) do |path|
+        candidate = new(path, database_name, type)
+        scripts << candidate if candidate.valid?
       end
-
       scripts.sort_by { |file| (file.date + file.time).to_i }
     end
 

data/lib/sql_migrations/version.rb

@@ -1,5 +1,5 @@
 # SqlMigrations
 #
 module SqlMigrations
-  VERSION = '2.1.1'
+  VERSION = '2.2.1'
 end

data/lib/sql_migrations.rb

@@ -8,7 +8,7 @@ require 'erb'
 require 'sql_migrations/version'
 require 'sql_migrations/database'
 require 'sql_migrations/config'
-require 'sql_migrations/find_scripts'
+require 'sql_migrations/script_file'
 require 'sql_migrations/sql_script'
 require 'sql_migrations/migration'
 require 'sql_migrations/seed'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_migrations
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -140,9 +140,9 @@ files:
 - lib/sql_migrations.rb
 - lib/sql_migrations/config.rb
 - lib/sql_migrations/database.rb
-- lib/sql_migrations/find_scripts.rb
 - lib/sql_migrations/fixture.rb
 - lib/sql_migrations/migration.rb
+- lib/sql_migrations/script_file.rb
 - lib/sql_migrations/seed.rb
 - lib/sql_migrations/sql_script.rb
 - lib/sql_migrations/tasks/list.rake

data/lib/sql_migrations/find_scripts.rb

@@ -1,66 +0,0 @@
-module SqlMigrations
-  # Class for finding sql scripts
-  #
-  class FindScripts
-    class << self
-      def find(db_name, type)
-        files = []
-        Find.find(Dir.pwd) do |path|
-          file_parameters = match_file(db_name, type, path)
-          next unless file_parameters
-          file_parameters.merge!(path: path)
-          files << file_parameters
-        end
-        files
-      end
-
-      private
-
-      def match_file(db_dir, type, path)
-        # parent_dir/base_dir/filename_that_matches_regexp.sql
-        _filename, base_dir, parent_dir  = path.split(File::SEPARATOR).last(3).reverse
-
-        # Only files that match agains regexp will do
-        file_parameters = file_match_regexp(File.basename(path))
-        return nil unless file_parameters
-
-        # Only files that lay in specific directory structure will do
-        file_database = file_match_directories(parent_dir, base_dir, db_dir, "#{type}s")
-        return nil unless file_database
-
-        { date: file_parameters[1], time: file_parameters[2],
-          name: file_parameters[3], db_name: file_database }
-      end
-
-      def file_match_regexp(file_name)
-        file_name.match(/(\d{8})_(\d{6})_(.*)?\.sql/)
-      end
-
-      def file_match_directories(parent_dir, base_dir, db_dir, type)
-        # example: migrations/migration_file.sql
-        file_in_type_base_dir   = (base_dir == type.to_s)
-        # example: migrations/some_database/migration_file.sql
-        file_in_type_parent_dir = (parent_dir == type.to_s)
-        # example migrations/some_database/migration_file.sql
-        file_in_db_dir          = (base_dir == db_dir.to_s)
-
-        file_in_valid_db_dir    = (file_in_type_parent_dir && file_in_db_dir)
-
-        # If we are matching script assigned to :default database
-        #   scripts can be placed in base_dir or in parent dir indicating type
-        #   and in :default base_dir
-        if db_dir == :default
-          matches =  file_in_type_base_dir || file_in_valid_db_dir
-          file_database = :default
-        else
-          # Otherwise only files for specific type dir (migration/fixture/seed)
-          #   and specific database dir apply
-          matches = file_in_valid_db_dir
-          file_database = base_dir.to_sym
-        end
-
-        matches ? file_database : nil
-      end
-    end
-  end
-end