gris 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1844ff0da2b765f419c75ba83eaa1c09e2997af
-  data.tar.gz: 64953a88f2539ad4226939bd17a57ff630c48462
+  metadata.gz: aa0597dd3271c7ee42e4a9687b4ef7c60cd87ed4
+  data.tar.gz: a6ec4d9e1d5a47e68ba1bb4f43d9bc8cfb08c026
 SHA512:
-  metadata.gz: 8711f2778844cd3f8625e03ba8b9f22e82c20f675688afc5434244df6f2f7a6902084d65a909d119992fe3ca96a89109c8896d5c936c9ebbe0148d88541161d0
-  data.tar.gz: 37b472636c273327b7ea5454ec4dd64a191ed29704a40f39af786e81bc8129edc693729c609c90ed9e72baab6d31a96cb7eb0375ef20122307706ef41583677b
+  metadata.gz: 22fbda40978f237d530280d94d79204fd5efcf0e37bca3eae9cddfe06a2fd528ba9dd1ce77f70724b78efd1499c05d38a89a28498130ab7cd84a42e207d847e2
+  data.tar.gz: 89e7dc1d05839a9e83ae05f8f405f73c0f0628b8682e287014c57fa93bd42ef4b9e02227d422acd2df431fad338074400547f75a758798e074edd56669a67d26

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-08-28 20:12:20 -0400 using RuboCop version 0.33.0.
+# on 2015-12-21 17:33:53 -0500 using RuboCop version 0.34.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
 Lint/EndAlignment:
@@ -30,12 +30,12 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 76
+# Offense count: 83
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 159
 
-# Offense count: 9
+# Offense count: 11
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 32
@@ -46,7 +46,8 @@ Metrics/MethodLength:
 Style/CaseIndentation:
   Enabled: false
 
-# Offense count: 25
+# Offense count: 22
+# Configuration parameters: Exclude.
 Style/Documentation:
   Enabled: false
 

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.5.8)
-      active_record_migrations
+    gris (0.5.9)
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)
@@ -21,23 +20,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_record_migrations (4.2.4.1)
-      activerecord (= 4.2.4)
-      railties (= 4.2.4)
-      rake
     activemodel (4.2.4)
       activesupport (= 4.2.4)
       builder (~> 3.1)
@@ -75,7 +57,6 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     equalizer (0.0.11)
-    erubis (2.7.0)
     fakefs (0.6.7)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -131,16 +112,11 @@ GEM
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mini_portile2 (2.0.0)
     minitest (5.8.1)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-http-digest_auth (1.4)
-    nokogiri (1.6.7.1)
-      mini_portile2 (~> 2.0.0.rc2)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
@@ -154,19 +130,6 @@ GEM
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.4.2)
     representable (2.3.0)

data/gris.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'chronic', '~> 0.10.0'
   s.add_runtime_dependency 'dalli', '~> 2.7'
   s.add_runtime_dependency 'indefinite_article', '~> 0.2'
-  s.add_runtime_dependency 'active_record_migrations'
 
   s.add_development_dependency 'bundler', '~> 1'
   s.add_development_dependency 'rspec', '~> 3.3'

data/lib/gris.rb

@@ -22,6 +22,7 @@ require 'gris/middleware/error_handlers'
 require 'gris/output_formatters/paginated_presenter'
 require 'gris/output_formatters/presenter'
 require 'gris/output_formatters/presenter_link_helpers'
+require 'gris/seed_loader'
 require 'gris/setup'
 require 'gris/version'
 

data/lib/gris/generators/templates/scaffold/config/initializers/active_record.rb

@@ -1,8 +1,10 @@
 if ENV['DATABASE_URL']
-  ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+  ActiveRecord::Base.establish_connection ENV['DATABASE_URL']
 else
-  db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
-  ActiveRecord::Base.establish_connection(db)
+  configurations = YAML.load ERB.new(File.read('./config/database.yml')).result
+  ActiveRecord::Base.establish_connection configurations[Gris.env]
+  ActiveRecord::Base.configurations = configurations
 end
+
 # prevent deprecation warning
 ActiveRecord::Base.raise_in_transactional_callbacks = true

data/lib/gris/generators/templates/scaffold/db/seeds.rb

@@ -0,0 +1,9 @@
+require './config/application' if File.file?('config/application.rb')
+
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed.
+#
+# Examples:
+#
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)

data/lib/gris/seed_loader.rb

@@ -0,0 +1,12 @@
+module Gris
+  class SeedLoader
+    def initialize(file_path)
+      @seed_file = file_path
+    end
+
+    def load_seed
+      fail("Seed file '#{@seed_file}' does not exist.") unless File.file?(@seed_file)
+      load @seed_file
+    end
+  end
+end

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 
   class Version
     class << self

data/lib/tasks/db.rake

@@ -1,9 +1,19 @@
-if File.file? 'config/database.yml'
-  require 'active_record_migrations'
+if Module.const_defined?(:ActiveRecord) &&
+   (File.file?('config/database.yml') || ENV['DATABASE_URL']) &&
+   File.file?('config/initializers/active_record.rb')
 
-  ActiveRecordMigrations.configure do |c|
-    c.yaml_config = 'config/database.yml'
+  require 'erb'
+  require './config/initializers/active_record'
+  include ActiveRecord::Tasks
+
+  DatabaseTasks.env = Gris.env
+  DatabaseTasks.db_dir = 'db'
+  DatabaseTasks.migrations_paths = "#{DatabaseTasks.db_dir}/migrate"
+  DatabaseTasks.seed_loader = Gris::SeedLoader.new "./#{DatabaseTasks.db_dir}/seeds.rb"
+  DatabaseTasks.database_configuration = ActiveRecord::Base.configurations
+
+  task :environment do
   end
 
-  ActiveRecordMigrations.load_tasks
+  load 'active_record/railties/databases.rake'
 end

data/lib/tasks/routes.rake

@@ -3,10 +3,11 @@ unless defined?(Rails)
   task routes: :environment do
     require './config/application.rb'
     ApplicationEndpoint.routes.each do |api|
+      version = api.route_version.ljust(20)
       method = api.route_method.ljust(10)
       path = api.route_path.ljust(40)
       description = api.route_description
-      puts "     #{method} #{path} # #{description}"
+      puts "#{version} #{method} #{path} # #{description}"
     end
   end
 end

data/spec/generators/scaffold_generator_spec.rb

@@ -44,6 +44,11 @@ describe Gris::Generators::ScaffoldGenerator do
       expect(database_config_file).to match(/adapter: postgresql/)
     end
 
+    it 'generates a db/seeds.rb file' do
+      seed_file = File.read("#{app_path}/db/seeds.rb")
+      expect(seed_file).to match(/all the record creation needed to seed the database/)
+    end
+
     it 'adds ruby 2.2.3 to Gemfile' do
       gemfile = File.read("#{app_path}/Gemfile")
       expect(gemfile).to match(/ruby '2.2.3'/)

data/spec/seed_loader_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Gris::SeedLoader do
+  context '#load_seed' do
+    context 'without an existing seed file' do
+      let(:loader) { Gris::SeedLoader.new('blah') }
+
+      it 'raises a RuntimeError' do
+        expect do
+          loader.load_seed
+        end.to raise_error(RuntimeError, "Seed file 'blah' does not exist.")
+      end
+    end
+
+    context 'with an existing seed file' do
+      include_context 'with a generated app'
+      let(:loader) { Gris::SeedLoader.new('my_test_app/db/seeds.rb') }
+
+      it 'does not raise an error' do
+        expect do
+          loader.load_seed
+        end.to_not raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -236,20 +236,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: active_record_migrations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +362,7 @@ files:
 - lib/gris/generators/templates/scaffold/config/puma.rb
 - lib/gris/generators/templates/scaffold/config/secrets.yml.tt
 - lib/gris/generators/templates/scaffold/db/schema.rb
+- lib/gris/generators/templates/scaffold/db/seeds.rb
 - lib/gris/generators/templates/scaffold/spec/endpoints/cors_spec.rb.tt
 - lib/gris/generators/templates/scaffold/spec/spec_helper.rb
 - lib/gris/generators/templates/scaffold/spec/support/app_helper.rb
@@ -390,6 +377,7 @@ files:
 - lib/gris/output_formatters/presenter_link_helpers.rb
 - lib/gris/rspec_extensions/active_record_shared_connection.rb
 - lib/gris/rspec_extensions/response_helpers.rb
+- lib/gris/seed_loader.rb
 - lib/gris/setup.rb
 - lib/gris/version.rb
 - lib/tasks/db.rake
@@ -409,6 +397,7 @@ files:
 - spec/middleware/error_handlers_spec.rb
 - spec/output_formatters/presenter_link_helpers_spec.rb
 - spec/secrets_spec.rb
+- spec/seed_loader_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb
@@ -457,6 +446,7 @@ test_files:
 - spec/middleware/error_handlers_spec.rb
 - spec/output_formatters/presenter_link_helpers_spec.rb
 - spec/secrets_spec.rb
+- spec/seed_loader_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb