RubyGems - sinatra-rider - Versions diffs - 0.2.1 → 0.2.6 - Mend

sinatra-rider 0.2.1 → 0.2.6

Files changed (31) hide show

checksums.yaml +5 -5
data/.gitignore +1 -0
data/README.md +20 -0
data/db/migrate/1_create_users.rb +1 -1
data/db/schema.rb +12 -14
data/db/seeds.rb +3 -0
data/example/myapp/Gemfile +1 -1
data/example/myapp/Gemfile.lock +85 -74
data/example/myapp/db/migrate/1_create_users.rb +1 -1
data/example/myapp/db/schema.rb +12 -14
data/lib/sinatra/rider/assets.rb +14 -8
data/lib/sinatra/rider/command.rb +13 -5
data/lib/sinatra/rider/pathing.rb +1 -1
data/lib/sinatra/rider/quiet_assets.rb +1 -1
data/lib/sinatra/rider/templates/console.tt +16 -0
data/lib/sinatra/rider/templates/gemfile.tt +1 -1
data/lib/sinatra/rider/version.rb +1 -1
data/lib/sinatra/{views → rider/views}/login.erb +0 -0
data/lib/sinatra/{views → rider/views}/signup.erb +0 -0
data/lib/sinatra/rider/views/vendor/bootstrap-3.3.7.min.css +6 -0
data/lib/sinatra/rider/views/vendor/bootstrap.css +1 -0
data/lib/sinatra/rider/views/vendor/font-awesome-4.7.0.min.css +4 -0
data/lib/sinatra/rider/views/vendor/font-awesome.css +1 -0
data/lib/sinatra/rider/views/vendor/fonts/FontAwesome.otf +0 -0
data/lib/sinatra/rider/views/vendor/fonts/fontawesome-webfont.eot +0 -0
data/lib/sinatra/rider/views/vendor/fonts/fontawesome-webfont.svg +2671 -0
data/lib/sinatra/rider/views/vendor/fonts/fontawesome-webfont.ttf +0 -0
data/lib/sinatra/rider/views/vendor/fonts/fontawesome-webfont.woff +0 -0
data/lib/sinatra/rider/views/vendor/fonts/fontawesome-webfont.woff2 +0 -0
data/sinatra-rider.gemspec +8 -7
metadata +53 -28

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 25bd32f4686dc1ef70a3bad62a0eb866d97cce03
-  data.tar.gz: 4a6f26f9354502348088c9079cb1ddea97b82125
+SHA256:
+  metadata.gz: bc0800113023930bf9ccb731c659877326256e045d0f7d6a5934f4028dab4510
+  data.tar.gz: 223529596bbc50851e6c9ba1ecffb26c09133bed7b9f94050b32af6a2eceaf4c
 SHA512:
-  metadata.gz: 2f695ea42619ee6731f07a221aa2f9af9f91953920bc30f94c9a8c16f5df104ec687e18f5a3f13500e13e1579586cef77fff8df4d4c646edeb4f2def20c3909c
-  data.tar.gz: bb662ac4fa4874749df9b70f529ab00ab6ba389a00ec93db46cf326f099414049766c59f5bdd93980d0114ffeff4182ba6028bb65f6d96136a4e6640ece2cd7b
+  metadata.gz: 6bd856e793ef72cb156ac5d281d0f0cb0329d89ad91d04e30654158a56793b5f1c2bd68e323b29801e2cf808943e7e7a51f2387cf18fd4890e8cccff12ebe93b
+  data.tar.gz: 1e543b708ccbeaee373a9876348149408bbc60bb69a0f84fee1d1911777456faa771783a8fc0e810f5946a651f9a375608abe23a2e4266cb6dc499e4ff8ac540

data/.gitignore CHANGED

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.cache

data/README.md CHANGED

@@ -9,6 +9,7 @@ All the nice extras Sinatra likes to have when he's on the road.
 - Sass
 - Dotenv
 - Better Errors
+- Local copy of bootstrap and font-awesome
 - Autoloading `app` and `lib` directories
 - ~~One dozen blue M&Ms~~
@@ -98,6 +99,25 @@ Better Errors are included in the Sinatra configuration when `RACK_ENV` is in de
 [More Information](https://github.com/charliesome/better_errors)
+### Locally available copies of bootstrap and font-awesome
+`Sinatra::Rider` provides a copy of the latest Bootstrap and Font-Awesome libraries for your usage. Just add the `link` tag to your layout and you're styling!
+```html
+<head>
+  <title>My Sinatra::Rider App</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+  <link rel="stylesheet" type="text/css" href="/assets/bootstrap.css">
+  <link rel="stylesheet" type="text/css" href="/assets/font-awesome.css">
+</head>
+```
+Current Versions:
+- Bootstrap: 3.3.7
+- Font-Awesome: 4.7.0
+More Information: [Bootstrap](https://getbootstrap.com/) & [Font-Awesome](http://fontawesome.io/)
 ### Autoloading `app` and `lib`
 Any ruby files present in `app` or `lib` as siblings in the root directory of your `config.ru` will be automatically required.

data/db/migrate/1_create_users.rb CHANGED

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :name

data/db/schema.rb CHANGED

@@ -1,13 +1,12 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
@@ -16,14 +15,13 @@ ActiveRecord::Schema.define(version: 1) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
-  create_table "users", force: :cascade do |t|
-    t.string   "name"
-    t.string   "username",           null: false
-    t.string   "encrypted_password", null: false
-    t.datetime "created_at",         null: false
-    t.datetime "updated_at",         null: false
+  create_table "users", id: :serial, force: :cascade do |t|
+    t.string "name"
+    t.string "username", null: false
+    t.string "encrypted_password", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["username"], name: "index_users_on_username"
   end
-  add_index "users", ["username"], name: "index_users_on_username", using: :btree
 end

data/db/seeds.rb ADDED

@@ -0,0 +1,3 @@
+require_relative '../lib/sinatra/rider/user'
+Sinatra::Rider::User.signup(name: 'Matt', username: 'admin', password: 'hunter1')

data/example/myapp/Gemfile CHANGED

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gem 'rake'
-gem 'sinatra-rider'
+gem 'sinatra-rider', '0.2.6', path: '/Users/matthew/src/sinatra-rider'

data/example/myapp/Gemfile.lock CHANGED

@@ -1,101 +1,112 @@
+PATH
+  remote: /Users/matthew/src/sinatra-rider
+  specs:
+    sinatra-rider (0.2.6)
+      activerecord
+      better_errors
+      binding_of_caller
+      dotenv
+      pg
+      sass (~> 3.4)
+      sinatra (~> 2.1)
+      sinatra-activerecord
+      sinatra-contrib
+      sinatra_warden
+      sprockets (~> 3.7)
+      thin
+      thor
+      uglifier
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
-      builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
-      arel (~> 6.0)
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.4)
-    backports (3.6.8)
-    better_errors (2.1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    better_errors (2.8.3)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    builder (3.2.3)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.4)
-    daemons (1.2.4)
-    debug_inspector (0.0.2)
-    dotenv (2.2.0)
-    erubis (2.7.0)
-    eventmachine (1.2.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    daemons (1.3.1)
+    debug_inspector (0.0.3)
+    dotenv (2.7.6)
+    erubi (1.9.0)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    i18n (0.8.0)
-    json (1.8.6)
-    minitest (5.10.1)
-    multi_json (1.12.1)
-    pg (0.19.0)
-    rack (1.6.5)
-    rack-protection (1.5.3)
+    ffi (1.13.1)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.2)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    pg (1.2.3)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (12.0.0)
-    sass (3.4.23)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-activerecord (2.0.12)
-      activerecord (>= 3.2)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    ruby2_keywords (0.0.2)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra-activerecord (2.0.19)
+      activerecord (>= 4.1)
       sinatra (>= 1.0)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+    sinatra-contrib (2.1.0)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    sinatra-rider (0.1.0)
-      activerecord (= 4.2.5)
-      better_errors
-      binding_of_caller
-      dotenv
-      pg
-      sass
-      sinatra
-      sinatra-activerecord
-      sinatra-contrib
-      sinatra_warden
-      sprockets
-      thin
-      uglifier
-    sinatra_warden (1.0.0)
-      sinatra (~> 1.4.6)
-      warden (~> 1.2.3)
-    sprockets (3.7.1)
+      mustermann (~> 1.0)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra_warden (0.3.2)
+      sinatra (>= 1.0.0)
+      warden (~> 1.0)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    thin (1.7.0)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thread_safe (0.3.5)
-    tilt (2.0.6)
-    tzinfo (1.2.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    uglifier (3.0.4)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    warden (1.2.7)
-      rack (>= 1.0)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    zeitwerk (2.4.0)
 PLATFORMS
   ruby
 DEPENDENCIES
   rake
-  sinatra-rider
+  sinatra-rider (= 0.2.6)!
 BUNDLED WITH
-   1.13.7
+   2.1.4

data/example/myapp/db/migrate/1_create_users.rb CHANGED

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :name

data/example/myapp/db/schema.rb CHANGED

@@ -1,13 +1,12 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
@@ -16,14 +15,13 @@ ActiveRecord::Schema.define(version: 1) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
-  create_table "users", force: :cascade do |t|
-    t.string   "name"
-    t.string   "username",           null: false
-    t.string   "encrypted_password", null: false
-    t.datetime "created_at",         null: false
-    t.datetime "updated_at",         null: false
+  create_table "users", id: :serial, force: :cascade do |t|
+    t.string "name"
+    t.string "username", null: false
+    t.string "encrypted_password", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["username"], name: "index_users_on_username"
   end
-  add_index "users", ["username"], name: "index_users_on_username", using: :btree
 end

data/lib/sinatra/rider/assets.rb CHANGED

@@ -7,16 +7,22 @@ module Sinatra
   module Rider
     module Assets
       def self.registered(app)
-        app.set :pipeline, Sprockets::Environment.new
+        app.set :pipeline, pipeline = Sprockets::Environment.new
-        app.pipeline.append_path "assets/stylesheets"
-        app.pipeline.append_path "assets/javascripts"
-        app.pipeline.js_compressor  = :uglify
-        app.pipeline.css_compressor = :scss
+        pipeline.append_path "assets/stylesheets"
+        pipeline.append_path "assets/javascripts"
+        pipeline.append_path File.join(__dir__, "views/vendor")
-        app.get "/assets/*" do
-          env["PATH_INFO"].sub!("/assets", "")
-          settings.pipeline.call(env)
+        pipeline.js_compressor  = :uglify
+        pipeline.css_compressor = :scss
+        app.get '/assets/*' do
+          env['PATH_INFO'].sub!(%r{^/assets}, '')
+          pipeline.call(env)
+        end
+        app.configure :development do
+          pipeline.cache = Sprockets::Cache::FileStore.new(File.join(app.root, 'tmp'))
         end
       end
     end

data/lib/sinatra/rider/command.rb CHANGED

@@ -16,12 +16,12 @@ module Sinatra
       end
       def prepare_ruby_version
-        create_file("#{path}/.ruby-version") { "2.1.9\n" }
+        create_file("#{path}/.ruby-version") { "#{RUBY_VERSION}\n" }
       end
       def prepare_dotenv
         create_file("#{path}/.env") { "SESSION_SECRET=super secret shh\n" }
-        create_file("#{path}/.gitignore") { ".env\n" }
+        create_file("#{path}/.gitignore") { ".env\ntmp/\n" }
       end
       def prepare_database
@@ -38,10 +38,14 @@ module Sinatra
       end
       def prepare_app
+        template('templates/console.tt', "#{path}/bin/console")
+        system('chmod', '+x', "#{path}/bin/console")
         template('templates/user.tt', "#{path}/app/user.rb")
         template('templates/layout.erb', "#{path}/views/layout.erb")
         template('templates/navigation.erb', "#{path}/views/_navigation.erb")
         template('templates/index.erb', "#{path}/views/index.erb")
+        create_file("#{path}/README.md") { "# #{path.capitalize}\n" }
       end
       def prepare_assets
@@ -57,10 +61,14 @@ module Sinatra
           run('bundle install')
           run('bundle exec rake db:create db:migrate')
           run('git init')
-          puts "You're all set up! Start your server like this:"
-          puts "  bundle exec rackup config.ru"
-          puts "\nYou can get setup with a user at http://localhost:9292/signup"
+          run('git add .')
+          run('git commit -m "Initial Commit"')
         end
+        run("cd #{path}")
+        puts "You're all set up! Start your server like this:"
+        puts "  bundle exec rackup config.ru"
+        puts "\nYou can get setup with a user at http://localhost:9292/signup"
       end
       def self.source_root

data/lib/sinatra/rider/pathing.rb CHANGED

@@ -2,7 +2,7 @@ module Sinatra
   module Rider
     module Pathing
       def self.registered(app)
-        app.set :views, [app.settings.views, File.join(File.dirname(__dir__), 'views')]
+        app.set :views, [app.settings.views, File.join(__dir__, 'views')].flatten
         app.helpers do
           def find_template(views, name, engine, &block)

data/lib/sinatra/rider/quiet_assets.rb CHANGED

@@ -14,7 +14,7 @@ module Sinatra
           def call(env)
             ext = env['REQUEST_PATH'].split('.').last
-            if #{extensions.inspect}.include? ext
+            if #{extensions.inspect}.include?(ext)
               @app.call env
             else
               call_with_logging env

data/lib/sinatra/rider/templates/console.tt ADDED

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'bundler/setup'
+require 'dotenv'
+Dotenv.load
+require 'sinatra/rider'
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+require 'irb'
+IRB.start