masamune 0.17.12 → 0.17.13

data/lib/masamune/schema/fact.rb

@@ -22,7 +22,7 @@
 
 module Masamune::Schema
   class Fact < Table
-    SUPPORTED_GRAINS = [:transaction, :hourly, :daily, :monthly]
+    SUPPORTED_GRAINS = [:transaction, :hourly, :daily, :monthly].freeze
 
     attr_accessor :grain
     attr_accessor :partition
@@ -96,7 +96,7 @@ module Masamune::Schema
     def partition_tables(start_date = nil, stop_date = nil)
       return unless partition
       return unless start_date && stop_date
-      (start_date .. stop_date).each do |date|
+      (start_date..stop_date).each do |date|
         next unless date.day == 1
         yield partition_table(date)
       end

data/lib/masamune/schema/map.rb

@@ -72,7 +72,7 @@ module Masamune::Schema
 
       def quote(buffer)
         return buffer if buffer =~ /\A".*"\z/
-        %Q{"#{buffer.gsub('"', '""')}"}
+        %("#{buffer.gsub('"', '""')}")
       end
 
       def separator
@@ -101,10 +101,10 @@ module Masamune::Schema
         @csv = nil
       end
 
-      def each(&block)
+      def each
         raise 'must call Buffer#bind first' unless @io
         CSV.parse(JSONEncoder.new(@io, @store), options.merge(headers: @store.headers || @table.columns.keys)) do |data|
-          next if data.to_s =~ /\A#/
+          next if data.to_s.start_with?('#')
           row = safe_row(data)
           yield row.to_hash if row
           @line += 1
@@ -142,14 +142,12 @@ module Masamune::Schema
         end
       end
 
-      def line
-        @line
-      end
+      attr_reader :line
 
       private
 
       def options
-        {skip_blanks: true}.tap do | opts|
+        { skip_blanks: true }.tap do |opts|
           opts[:col_sep] = "\t" if @store.format == :tsv
         end
       end
@@ -178,7 +176,7 @@ module Masamune::Schema
       distinct:  false,
       fail_fast: false,
       debug:     false
-    }
+    }.freeze
 
     DEFAULT_ATTRIBUTES.keys.each do |attr|
       attr_accessor attr
@@ -194,9 +192,7 @@ module Masamune::Schema
       @skipped = 0
     end
 
-    def source=(source)
-      @source = source
-    end
+    attr_writer :source
 
     # FIXME: avoid implict conversions
     def target=(target)
@@ -229,7 +225,7 @@ module Masamune::Schema
       intermediate
     end
 
-    def open_stream(file, mode, &block)
+    def open_stream(file, mode)
       case file
       when IO, StringIO
         file.flush
@@ -295,7 +291,7 @@ module Masamune::Schema
       output_buffer.flush
     end
 
-    def safe_apply_function(input_buffer, input, &block)
+    def safe_apply_function(input_buffer, input)
       return unless input
       Array.wrap(function.call(input, input_buffer.line)).each do |output|
         yield output

data/lib/masamune/schema/row.rb

@@ -30,7 +30,7 @@ module Masamune::Schema
       strict:   true,
       parent:   nil,
       debug:    false
-    }
+    }.freeze
 
     DEFAULT_ATTRIBUTES.keys.each do |attr|
       attr_accessor attr
@@ -128,7 +128,8 @@ module Masamune::Schema
       @columns = {}
       values.each do |key, value|
         next unless key
-        if column = parent.dereference_column_name(key)
+        column = parent.dereference_column_name(key)
+        if column
           @columns[column.compact_name] = column
           result[column.compact_name] = column.ruby_value(value)
         elsif strict

data/lib/masamune/schema/store.rb

@@ -28,7 +28,7 @@ module Masamune::Schema
   class Store
     include Masamune::HasEnvironment
 
-    SUPPORTED_ATTRIBUTES = %(table dimension fact file)
+    SUPPORTED_ATTRIBUTES = %(table dimension fact file).freeze
 
     DEFAULT_ATTRIBUTES =
     {
@@ -37,7 +37,7 @@ module Masamune::Schema
       json_encoding:   ->(store) { default_json_encoding(store) },
       headers:         ->(store) { default_headers(store) },
       debug:           false
-    }
+    }.freeze
 
     DEFAULT_ATTRIBUTES.keys.each do |attr|
       attr_accessor attr
@@ -72,26 +72,25 @@ module Masamune::Schema
       @extra      = []
     end
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, *_args)
       if type == :files
         files[method]
       else
         *attribute_name, attribute_type = method.to_s.split('_')
         raise ArgumentError, "unknown attribute type '#{attribute_type}'" unless SUPPORTED_ATTRIBUTES.include?(attribute_type)
-        self.send(attribute_type.pluralize)[attribute_name.join('_')]
+        send(attribute_type.pluralize)[attribute_name.join('_')]
       end
     end
 
     def dereference_column(id, options = {})
       column_id, reference_id = id.to_s.split(/\./).reverse
       column_options = options.dup
-      column_options.merge!(id: column_id)
+      column_options[:id] = column_id
 
-      if reference = references[reference_id]
-        column_options.merge!(reference: reference)
-      else
-        raise ArgumentError, "dimension #{reference_id} not defined"
-      end if reference_id
+      if reference_id
+        raise ArgumentError, "dimension #{reference_id} not defined" unless references[reference_id]
+        column_options[:reference] = references[reference_id]
+      end
 
       Masamune::Schema::Column.new(column_options)
     end
@@ -105,16 +104,16 @@ module Masamune::Schema
           number = filename.split('_').first.to_i
           result << file if number <= 0 && order == :pre
           result << file if number > 0 && order == :post
-        else
-          result << file if order == :pre
+        elsif order == :pre
+          result << file
         end
       end
       result.to_a
     end
 
-    private
-
     class << self
+      private
+
       def default_format(store)
         case store.type
         when :postgres then :csv

data/lib/masamune/schema/table.rb

@@ -43,7 +43,7 @@ module Masamune::Schema
       inherit:         false,
       debug:           false,
       properties:      {}
-    }
+    }.freeze
 
     DEFAULT_ATTRIBUTES.keys.each do |attr|
       attr_accessor attr
@@ -76,8 +76,8 @@ module Masamune::Schema
       columns = (instance.is_a?(Hash) ? instance.values : instance).compact
       raise ArgumentError, "table #{name} contains reserved columns" if columns.any? { |column| reserved_column_ids.include?(column.id) }
 
-      initialize_surrogate_key_column! unless columns.any? { |column| column.surrogate_key }
-      initialize_reference_columns! unless columns.any? { |column| column.reference }
+      initialize_surrogate_key_column! unless columns.any?(&:surrogate_key)
+      initialize_reference_columns! unless columns.any?(&:reference)
       columns.each do |column|
         initialize_column!(column)
       end
@@ -104,7 +104,7 @@ module Masamune::Schema
     end
 
     def surrogate_key
-      columns.values.detect { |column| column.surrogate_key }
+      columns.values.detect(&:surrogate_key)
     end
 
     def primary_keys
@@ -112,11 +112,11 @@ module Masamune::Schema
     end
 
     def natural_keys
-      columns.values.select { |column| column.natural_key }
+      columns.values.select(&:natural_key)
     end
 
     def defined_columns
-      columns.values.reject { |column| column.partition }
+      columns.values.reject(&:partition)
     end
     method_with_last_element :defined_columns
 
@@ -150,11 +150,11 @@ module Masamune::Schema
     end
 
     def reference_columns
-      columns.values.select { | column| column.reference }
+      columns.values.select(&:reference)
     end
 
     def foreign_key_columns
-      columns.values.select { | column| !column.degenerate? && column.reference && column.reference.foreign_key }
+      columns.values.select { |column| !column.degenerate? && column.reference && column.reference.foreign_key }
     end
 
     def partitions
@@ -166,7 +166,7 @@ module Masamune::Schema
     end
 
     def aliased_rows
-      rows.select { |row| row.name }
+      rows.select(&:name)
     end
 
     def insert_references
@@ -225,7 +225,7 @@ module Masamune::Schema
     end
 
     def shared_columns(other)
-      Hash.new { |h,k| h[k] = [] }.tap do |shared|
+      Hash.new { |h, k| h[k] = [] }.tap do |shared|
         columns.each do |_, column|
           other.columns.each do |_, other_column|
             shared[column] << other_column if column.references?(other_column)
@@ -235,13 +235,13 @@ module Masamune::Schema
     end
 
     def dereference_column_name(name)
-      reference_name, column_name = Column::dereference_column_name(name)
-      if reference = references[reference_name]
-        if column = reference.columns[column_name]
-          dereference_column(column.dup, reference)
-        end
-      elsif column = columns[column_name]
-        column
+      reference_name, column_name = Column.dereference_column_name(name)
+      reference = references[reference_name]
+      if reference
+        column = reference.columns[column_name]
+        dereference_column(column.dup, reference) if column
+      elsif columns[column_name]
+        columns[column_name]
       end
     end
 
@@ -287,17 +287,13 @@ module Masamune::Schema
           column = dereference_column_name(name)
           next unless column
           next if inherit && parent.reserved_column_ids.include?(column.id)
-          if column.parent == self
-            next if column.surrogate_key
-            result[name] = column
-          else
-            result[name] = column
-          end
+          next if column.parent == self && column.surrogate_key
+          result[name] = column
         end
       end
     end
 
-    def stage_table_references(parent, selected = [])
+    def stage_table_references(_parent, selected = [])
       selected = references.keys if selected.empty?
       {}.tap do |result|
         selected.each do |name|
@@ -325,7 +321,7 @@ module Masamune::Schema
             initialize_column! id: column.id, type: column.type, reference: reference, default: reference.default, null: reference.null, natural_key: reference.natural_key
           end
         elsif reference.foreign_key
-          # FIXME column.reference should point to reference.surrogate_key, only allow column references to Columns
+          # FIXME: column.reference should point to reference.surrogate_key, only allow column references to Columns
           initialize_column! id: reference.foreign_key_name, type: reference.foreign_key_type, reference: reference, default: reference.default, null: reference.null, natural_key: reference.natural_key
         end
       end
@@ -342,7 +338,7 @@ module Masamune::Schema
 
     def index_column_map
       @index_column_map ||= begin
-        map = Hash.new { |h,k| h[k] = [] }
+        map = Hash.new { |h, k| h[k] = [] }
         columns.each do |_, column|
           column.index.each do |index|
             map[index] << column.name
@@ -355,7 +351,7 @@ module Masamune::Schema
 
     def unique_constraints_map
       @unique_constraints_map ||= begin
-        map = Hash.new { |h,k| h[k] = [] }
+        map = Hash.new { |h, k| h[k] = [] }
         columns.each do |_, column|
           next if column.auto_reference
           column.unique.each do |unique|
@@ -369,7 +365,7 @@ module Masamune::Schema
     end
 
     def reverse_unique_constraints_map
-      @reverse_unique_constraints_map ||= Hash[unique_constraints_map.to_a.map { |k,v| [v.sort, k] }]
+      @reverse_unique_constraints_map ||= Hash[unique_constraints_map.to_a.map { |k, v| [v.sort, k] }]
     end
 
     def short_md5(*a)

data/lib/masamune/schema/table_reference.rb

@@ -34,7 +34,7 @@ module Masamune::Schema
       multiple:        false,
       through:         [],
       degenerate:      false
-    }
+    }.freeze
 
     DEFAULT_ATTRIBUTES.keys.each do |attr|
       attr_accessor attr
@@ -70,17 +70,17 @@ module Masamune::Schema
 
     def default(column = nil)
       return if @default == :null
-      if default_row = @table.rows.detect { |row| @default ? row.id == @default : row.default }
-        default_row.name(column)
-      end
+      default_row = @table.rows.detect { |row| @default ? row.id == @default : row.default }
+      return unless default_row
+      default_row.name(column)
     end
 
     def unknown(column = nil)
       return unless @unknown
       return if @unknown == :null
-      if unknown_row = @table.rows.detect { |row| row.id == @unknown }
-        unknown_row.name(column)
-      end
+      unknown_row = @table.rows.detect { |row| row.id == @unknown }
+      return unless unknown_row
+      unknown_row.name(column)
     end
 
     def through=(columns)

data/lib/masamune/spec_helper.rb

@@ -20,4 +20,4 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-Dir["#{File.dirname(__FILE__)}/../../spec/support/masamune/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/../../spec/support/masamune/**/*.rb"].each { |f| require f }

data/lib/masamune/string_format.rb

@@ -26,7 +26,7 @@ module Masamune
       out = sql.dup
       out.gsub!(/\A'|\A"|"\z|'\z/, '')
       out.gsub!(/\s\s+/, ' ')
-      out.gsub!(/\s*;+\s*$/,'')
+      out.gsub!(/\s*;+\s*$/, '')
       out.strip!
       out + ';'
     end

data/lib/masamune/tasks/aws_emr_thor.rb

@@ -28,36 +28,36 @@ module Masamune::Tasks
     include Masamune::Thor
     include Masamune::Actions::AwsEmr
 
-    # FIXME need to add an unnecessary namespace until this issue is fixed:
+    # FIXME: need to add an unnecessary namespace until this issue is fixed:
     # https://github.com/wycats/thor/pull/247
     namespace :aws_emr
     skip_lock!
 
-    REQUIRE_CLUSTER_ID_ACTIONS = 
+    REQUIRE_CLUSTER_ID_ACTIONS =
     {
       'describe-cluster'    => 'Describe an AWS EMR cluster',
       'list-instances'      => 'List instances for an AWS EMR cluster',
       'add-instance-groups' => 'Add instances to an AWS EMR cluster',
       'ssh'                 => 'Launch an AWS EMR ssh session',
       'wait'                => 'Wait for an AWS EMR cluster to start'
-    }
+    }.freeze
 
     REQUIRE_CLUSTER_ID_ACTIONS.each do |action, description|
       desc action, description
-      method_option :cluster_id, :desc => "AWS EMR cluster_id ID (Hint: `masamune-emr-aws list-clusters`)"
+      method_option :cluster_id, desc: 'AWS EMR cluster_id ID (Hint: `masamune-emr-aws list-clusters`)'
       define_method(action.underscore) do
         raise Thor::RequiredArgumentMissingError, "No value provided for required options '--cluster-id'" unless options[:cluster_id]
         aws_emr(aws_emr_options(action))
       end
     end
 
-    NO_REQUIRE_CLUSTER_ID_ACTIONS = 
+    NO_REQUIRE_CLUSTER_ID_ACTIONS =
     {
       'create-cluster'          => 'Create an AWS EMR cluster',
       'list-clusters'           => 'List existing AWS EMR clusters',
       'modify-instance-groups'  => 'Modify instance groups for an AWS EMR cluster',
       'terminate-clusters'      => 'Terminate one or more AWS EMR clusters'
-    }
+    }.freeze
 
     NO_REQUIRE_CLUSTER_ID_ACTIONS.each do |action, description|
       desc action, description
@@ -69,9 +69,9 @@ module Masamune::Tasks
     no_tasks do
       def aws_emr_options(action)
         options.dup.with_indifferent_access.tap do |opts|
-          opts.merge!(interactive: true)
-          opts.merge!(action: action)
-          opts.merge!(extra: self.extra)
+          opts[:interactive] = true
+          opts[:action] = action
+          opts.merge!(extra: extra)
         end
       end
     end

data/lib/masamune/tasks/dump_thor.rb

@@ -29,16 +29,16 @@ module Masamune::Tasks
     include Masamune::Actions::DateParse
     include Masamune::Transform::DefineSchema
 
-    # FIXME need to add an unnecessary namespace until this issue is fixed:
+    # FIXME: need to add an unnecessary namespace until this issue is fixed:
     # https://github.com/wycats/thor/pull/247
     namespace :dump
     skip_lock!
 
     desc 'dump', 'Dump schema'
-    method_option :type, :enum => ['psql', 'hql'], :desc => 'Schema type', :default => 'psql'
-    method_option :section, :enum => ['pre', 'post', 'all'], :desc => 'Schema section', :default => 'all'
-    method_option :exclude, :type => :array, :desc => 'Exclude tables matching globs', :default => []
-    method_option :skip_indexes, :type => :boolean, :desc => 'Disable indexes', :default => false
+    method_option :type, enum: %w(psql hql), desc: 'Schema type', default: 'psql'
+    method_option :section, enum: %w(pre post all), desc: 'Schema section', default: 'all'
+    method_option :exclude, type: :array, desc: 'Exclude tables matching globs', default: []
+    method_option :skip_indexes, type: :boolean, desc: 'Disable indexes', default: false
     def dump_exec
       print_catalog
       exit