gris 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1536bc795f9bd4f13e27e042a5e09cc0bbcbd886
-  data.tar.gz: 631eefd6d5a719e2026406a479569777083e4613
+  metadata.gz: b1844ff0da2b765f419c75ba83eaa1c09e2997af
+  data.tar.gz: 64953a88f2539ad4226939bd17a57ff630c48462
 SHA512:
-  metadata.gz: df23e82e5c53dc17b63104cf728095ccf0392cebe20280eda6b81c605e3202a0b3a6db9dbd41237438ed25a3b5b0891a69417bd3025e82c6c66f698f3206d9c2
-  data.tar.gz: a56b4323b731c0f477b45e652bff91849725913acc171d6269541fb720e2686267995d321d6ab689f554155971156a0fc0f6434d5308fd36e45b6d8c0f83eeea
+  metadata.gz: 8711f2778844cd3f8625e03ba8b9f22e82c20f675688afc5434244df6f2f7a6902084d65a909d119992fe3ca96a89109c8896d5c936c9ebbe0148d88541161d0
+  data.tar.gz: 37b472636c273327b7ea5454ec4dd64a191ed29704a40f39af786e81bc8129edc693729c609c90ed9e72baab6d31a96cb7eb0375ef20122307706ef41583677b

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    gris (0.5.7)
+    gris (0.5.8)
+      active_record_migrations
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)
@@ -20,6 +21,23 @@ 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)
@@ -52,11 +70,12 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colorize (0.7.7)
-    dalli (2.7.4)
+    dalli (2.7.5)
     descendants_tracker (0.0.4)
       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)
@@ -73,7 +92,7 @@ GEM
     ffi (1.9.10)
     futuroscope (0.1.11)
     git (1.2.9.1)
-    grape (0.13.0)
+    grape (0.14.0)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -89,10 +108,10 @@ GEM
     grape-roar (0.3.0)
       grape
       roar (>= 1.0)
-    grape-swagger (0.10.2)
+    grape-swagger (0.10.4)
       grape (>= 0.8.0)
-      grape-entity
-    hashie (3.4.2)
+      grape-entity (< 0.5.0)
+    hashie (3.4.3)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
     hyperclient (0.7.2)
@@ -112,11 +131,16 @@ 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)
@@ -130,12 +154,25 @@ 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)
       uber (~> 0.0.7)
-    roar (1.0.3)
-      representable (>= 2.0.1, <= 3.0.0)
+    roar (1.0.4)
+      representable (>= 2.0.1, < 2.4.0)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)

data/gris.gemspec

@@ -32,6 +32,7 @@ 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/setup.rb

@@ -24,14 +24,6 @@ module Gris
       end
     end
 
-    def db_connection_details
-      if ENV['DATABASE_URL']
-        ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(ENV['DATABASE_URL']).to_hash
-      else
-        YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
-      end
-    end
-
     def cache
       @_cache ||= ActiveSupport::Cache.lookup_store(:memory_store)
     end

data/lib/gris/version.rb

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

data/lib/tasks/db.rake

@@ -1,75 +1,9 @@
-unless defined?(Rails)
-  task :environment do
-    require './config/application.rb'
-    fail 'ActiveRecord Not Found' unless Module.const_defined?(:ActiveRecord)
-  end
-
-  namespace :db do
-    desc 'Migrate the database through scripts in db/migrate. Target specific version with VERSION=x'
-    task migrate: :environment do
-      ActiveRecord::Migrator.migrate('db/migrate', ENV['VERSION'] ? ENV['VERSION'].to_i : nil)
-      Rake::Task['db:schema:dump'].invoke unless Gris.env.production?
-    end
-
-    desc 'Rollback to a previous migration. Go back multiple steps with STEP=x'
-    task rollback: :environment do
-      ActiveRecord::Migration.verbose = true
-      step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-      ActiveRecord::Migrator.rollback('db/migrate', step)
-    end
-
-    desc 'Create the database'
-    task create: :environment do
-      db = Gris.db_connection_details
-      admin_connection = db.merge(database: 'postgres',
-                                  schema_search_path: 'public')
-      ActiveRecord::Base.establish_connection(admin_connection)
-      begin
-        ActiveRecord::Base.connection.create_database(db['database'])
-      rescue ActiveRecord::StatementInvalid => e
-        if e.message =~ /DuplicateDatabase/
-          $stderr.puts "#{admin_connection['database']} already exists"
-        else
-          raise
-        end
-      end
-    end
+if File.file? 'config/database.yml'
+  require 'active_record_migrations'
 
-    desc 'Delete the database'
-    task drop: :environment do
-      db = Gris.db_connection_details
-      admin_connection = db.merge(database: 'postgres',
-                                  schema_search_path: 'public')
-      ActiveRecord::Base.establish_connection(admin_connection)
-      ActiveRecord::Base.connection.drop_database(db['database'])
-    end
-
-    desc 'Recreate the database, load the schema, and initialize with the seed data'
-    task reset: :environment do
-      Rake::Task['db:drop'].invoke
-      Rake::Task['db:create'].invoke
-      Rake::Task['db:schema:load'].invoke
-    end
-
-    namespace :schema do
-      desc 'Create a db/schema.rb file that can be portably used against any DB supported by AR'
-      task dump: :environment do
-        require 'active_record/schema_dumper'
-        File.open(ENV['SCHEMA'] || 'db/schema.rb', 'w') do |file|
-          ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-        end
-      end
-
-      desc 'Load a schema.rb file into the database'
-      task load: :environment do
-        file = ENV['SCHEMA'] || 'db/schema.rb'
-        db = Gris.db_connection_details
-        admin_connection = db.merge(database: 'postgres',
-                                    schema_search_path: 'public')
-        ActiveRecord::Base.establish_connection(admin_connection)
-        ActiveRecord::Schema.verbose = true
-        load(file)
-      end
-    end
+  ActiveRecordMigrations.configure do |c|
+    c.yaml_config = 'config/database.yml'
   end
+
+  ActiveRecordMigrations.load_tasks
 end

data/lib/tasks/routes.rake

@@ -1,6 +1,7 @@
 unless defined?(Rails)
   desc 'display all routes for Grape'
   task routes: :environment do
+    require './config/application.rb'
     ApplicationEndpoint.routes.each do |api|
       method = api.route_method.ljust(10)
       path = api.route_path.ljust(40)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -236,6 +236,20 @@ 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
@@ -423,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple api microservice generator framework.