active_record-annotate 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46ab2c978b90e86c92cc4c21cc11007100fe01b
-  data.tar.gz: 8a3fbf198e6ab48158313b1e270bc1ebc93489e8
+  metadata.gz: 7993b3163ca44d4a0bc01d33b6dec3c3e2771df5
+  data.tar.gz: b43985e86662c7249a38fea23221a9d74d9da98f
 SHA512:
-  metadata.gz: 62d1fb53fd8b99b1cea51746e716a3b46c6d1a96cc87c90f797884f79ef57d524a68bf14b67e2902dcce7ba0f1d9a1a97bab79f5a69f8ee817bf046f6b8900e1
-  data.tar.gz: 71f8c07dce06df0168053f02454fd45047870dde06fcf65a724042ee74bea4be4d7d0fa21a28d201281141825b9dd69f050540fd9ecc6b67db620cf92f642821
+  metadata.gz: 760912037953c8ade81346556ccf1aa02df22aa3944add396e821b6eb79db70701916301e47499219b66cfaffe3df23a02ee7c72ad47762ff34b9c9204ef0fb3
+  data.tar.gz: 1004587b536ed6580ca4fc090874c057e0f9e4735db8022ef748421b42dd1a0a8f0100745cc549c5b7964e92353cd072f16fb3ccd0161fcf6b488409828f2df9

data/Guardfile

@@ -1,7 +1,9 @@
-guard :rspec, all_on_start: true, all_after_pass: true do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { 'spec' }
-  
-  notification :terminal_notifier, activate: 'com.googlecode.iTerm2'
+guard :rspec, all_on_start: true, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  watch(dsl.rspec.spec_helper) { dsl.rspec.spec_dir }
+  watch(dsl.rspec.spec_files)
+
+  dsl.watch_spec_files_for(dsl.ruby.lib_files)
 end

data/README.md

@@ -66,6 +66,7 @@ It creates an initializer at `config/initializers/annotate.rb` which contains de
 * 0.4 Checking table existance before dumping
 * 0.4.1 Several models per table fix
 * 0.4.2 Initializer fix
+* 0.4.3 Support for `frozen_string_literal` & `warn_indent` magic comments
 
 ## Roadmap
 

data/active_record-annotate.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   
   spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'terminal-notifier'
   spec.add_development_dependency 'terminal-notifier-guard'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'awesome_print'

data/lib/active_record/annotate/file.rb

@@ -10,9 +10,14 @@ module ActiveRecord
       end
       
       def annotate_with(annotation, configurator)
-        if @lines.first =~ /^\s*#.*coding/
-          # encoding: utf-8 encountered on the first line
-          encoding_line = @lines.shift
+        magic_comments = []
+        while @lines.first =~ /^\s*#.*(coding|frozen_string_literal|warn_indent)/i
+          magic_comments.push(@lines.shift)
+        end
+
+        unless magic_comments.empty?
+          # separate magic comments from the annotation with an empty line
+          magic_comments << nil
         end
         
         while @lines.first.start_with?('#') || @lines.first.blank?
@@ -27,7 +32,7 @@ module ActiveRecord
         end
         
         @lines.unshift(*annotation, nil)
-        @lines.unshift(encoding_line) unless encoding_line.nil?
+        @lines.unshift(*magic_comments)
         @lines.push(nil) # newline at the end of file
       end
       

data/lib/active_record/annotate/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Annotate
-    VERSION = '0.4.2'
+    VERSION = '0.4.3'
   end
 end

data/spec/active_record/annotate/file_spec.rb

@@ -5,7 +5,10 @@ describe ActiveRecord::Annotate::File do
     file = Tempfile.new('test_annotation')
     File.open(file.path, 'w') do |tempfile|
       tempfile.write(<<-FILE)
-# encoding: utf-8
+# enCoding: utf-8
+# frozen_string_literal: true
+# warn_indent: true
+
 # create_table :users do |t|
 #   t.string :name
 #   t.integer :age
@@ -40,7 +43,10 @@ end
   
   let(:expected_result) do
     <<-FILE
-# encoding: utf-8
+# enCoding: utf-8
+# frozen_string_literal: true
+# warn_indent: true
+
 # create_table :users do |t|
 #   t.string :name
 #   t.integer :age, null: false, default: 0
@@ -54,7 +60,10 @@ end
   
   let(:expected_result_for_yard) do
     <<-FILE
-# encoding: utf-8
+# enCoding: utf-8
+# frozen_string_literal: true
+# warn_indent: true
+
 # ```
 # create_table :users do |t|
 #   t.string :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-annotate
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Vsevolod Romashov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  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: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ActiveRecord models annotator based on rails' schema dumper
@@ -167,4 +181,3 @@ test_files:
 - spec/active_record/annotate/file_spec.rb
 - spec/active_record/annotate_spec.rb
 - spec/spec_helper.rb
-has_rdoc: