RubyGems - txtblx - Versions diffs - 0.0.4 → 0.0.5 - Mend

txtblx 0.0.4 → 0.0.5

Files changed (31) hide show

checksums.yaml +4 -4
data/app/controllers/txtblx/textblocks_controller.rb +13 -0
data/app/helpers/txtblx/textblocks_helper.rb +1 -1
data/config/routes.rb +1 -0
data/lib/tasks/txtblx_tasks.rake +8 -0
data/lib/txtblx/version.rb +1 -1
data/spec/controllers/txtblx/textblocks_controller_spec.rb +30 -0
data/spec/dummy/app/models/ability.rb +16 -0
data/spec/dummy/app/models/user.rb +6 -0
data/spec/dummy/app/views/layouts/application.html.erb +3 -0
data/spec/dummy/config/environments/development.rb +1 -0
data/spec/dummy/config/initializers/devise.rb +259 -0
data/spec/dummy/config/locales/devise.en.yml +60 -0
data/spec/dummy/config/routes.rb +1 -0
data/spec/dummy/db/development.sqlite3 +0 -0
data/spec/dummy/db/migrate/20150419175857_devise_create_users.rb +42 -0
data/spec/dummy/db/migrate/20150419222125_add_role_to_user.rb +5 -0
data/spec/dummy/db/schema.rb +20 -1
data/spec/dummy/db/test.sqlite3 +0 -0
data/spec/dummy/log/development.log +24 -14
data/spec/dummy/log/test.log +2954 -77
data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
data/spec/factories/users.rb +6 -0
data/spec/spec_helper.rb +3 -0
metadata +90 -61
data/spec/dummy/config/initializers/txtblx.rb +0 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875453f25d4ee37a2e911b8645c2b01e4f217b6e
-  data.tar.gz: 8a65c28bd93a5ec1606b2cb713273ae2b7f27c34
+  metadata.gz: dfa7c331db610c440ff85b697cedeb05b04a74a3
+  data.tar.gz: 46c1352db58924fccc5047006cdf137afc4bef54
 SHA512:
-  metadata.gz: 0541bb623490b597e5f05d3c477dc51adfa3fea55ff0cabf0e3e3c4fe239560d66f3c68dd82fac98eb96f859129f27c34a4bb2dc9bff72e083b74bcb5e0a99a6
-  data.tar.gz: 995403047749f836f44bd85f957ef0f1e6d5dbb4d9eb3c876d3920019b8f00a853b78551b3640a36d27e10d78294f16badffd927f2ce7fc1f5ba638089423435
+  metadata.gz: 4216335e0fcde868f5c0bd629ccf0b0d44f600251379a67252816b1d57411a903649373e578a22a241910b72acb56c45e27a4a33d57b6fb703d664a91014dffa
+  data.tar.gz: eb112ac0d3c05bd1091a9951dc5cf33b6e9aad9b2d74196e2aeb4e6e05f794044643536d84c6f0c79377499a17d000a518c8c2fc6005385fd01663590d7773c1

data/app/controllers/txtblx/textblocks_controller.rb ADDED Viewed

@@ -0,0 +1,13 @@
+module Txtblx
+  class TextblocksController < Txtblx::ApplicationController
+     def update
+       @textblock = Textblock.drafts.where(perma_id: params[:id]).first!
+       authorize!(:update, @textblock)
+       @textblock.text = params[:textblock][:text]
+       @textblock.save
+       @textblock.publish
+       render json: @textblock
+     end
+  end
+end

data/app/helpers/txtblx/textblocks_helper.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module Txtblx
          text =  I18n.t('txtblx.missing_key', key: key)
       end
-      content_tag(:div, text)
+      content_tag(:div, raw(text))
     end
   end
 end

data/config/routes.rb CHANGED Viewed

@@ -1,2 +1,3 @@
 Txtblx::Engine.routes.draw do
+  resources :textblocks, only: [:update]
 end

data/lib/tasks/txtblx_tasks.rake CHANGED Viewed

@@ -32,4 +32,12 @@ namespace :txtblx do
       end
     end
   end
+  desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
+  task routes: :environment do
+    all_routes = Txtblx::Engine.routes.routes
+    require 'action_dispatch/routing/inspector'
+    inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
+    puts inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, ENV['CONTROLLER'])
+  end
 end

data/lib/txtblx/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Txtblx
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/controllers/txtblx/textblocks_controller_spec.rb ADDED Viewed

@@ -0,0 +1,30 @@
+require 'spec_helper'
+module Txtblx
+  RSpec.describe TextblocksController, type: :controller do
+    before :each do
+      @textblock = Textblock.create(key: 'test')
+      @textblock.publish
+    end
+    describe '#update' do
+      it 'updates text and text_html' do
+        sign_in(create(:user, role: 'editor'))
+        put(:update, id: @textblock, use_route: 'textblock', textblock: { text: 'Some Text' })
+        txt = Textblock.published.find_by_perma_id(@textblock.perma_id)
+        expect(txt.text).to eq('Some Text')
+        expect(txt.text_html).to include('Some Text')
+      end
+      it 'raises error if user is not authenticated' do
+        sign_in(create(:user))
+        expect {
+          put(:update, id: @textblock, use_route: 'textblock', textblock: { text: 'Some Text' })
+        }.to raise_error(CanCan::AccessDenied)
+      end
+    end
+  end
+end

data/spec/dummy/app/models/ability.rb ADDED Viewed

@@ -0,0 +1,16 @@
+class Ability
+  include CanCan::Ability
+  include Txtblx::AbilityMixin
+  def initialize(user)
+    return if user.nil?
+    if user.role == 'editor'
+      txtblx_editor_abilities(user)
+    end
+    if user.role == 'admin'
+      txtblx_full_abilities(user)
+    end
+  end
+end

data/spec/dummy/app/models/user.rb ADDED Viewed

@@ -0,0 +1,6 @@
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+end

data/spec/dummy/app/views/layouts/application.html.erb CHANGED Viewed

@@ -8,6 +8,9 @@
 </head>
 <body>
+  <p class="notice"><%= notice %></p>
+  <p class="alert"><%= alert %></p>
 <%= yield %>
 </body>

data/spec/dummy/config/environments/development.rb CHANGED Viewed

@@ -15,6 +15,7 @@ Rails.application.configure do
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log

data/spec/dummy/config/initializers/devise.rb ADDED Viewed

@@ -0,0 +1,259 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # config.secret_key = 'ceeede74ce0dc4737ac7d01fa808d757050c969a929af9b953e3301e23c1aac834b4e16f0a0cf612fca6bfc949b2f34f13d7cac8295896a31d12bd45e4ee5d8b'
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class
+  # with default "from" parameter.
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [ :email ]
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [ :email ]
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+  # If 401 status code should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+  # using other encryptors, it sets how many times you want the password re-encrypted.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # encryptor), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+  config.stretches = Rails.env.test? ? 1 : 10
+  # Setup a pepper to generate the encrypted password.
+  # config.pepper = 'bfaf3c1eafdb08229d9e6d2a060c609a1c981cfe858e51e90f0e1a1778a4a220a759e5d163ce3898ac5fd9ec2f783f97c2b271399a3cb9ffd233b4529c10feb7'
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming their account.
+  # config.allow_unconfirmed_access_for = 2.days
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+  # Options to be passed to the created cookie. For instance, you can set
+  # secure: true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+  # ==> Configuration for :validatable
+  # Range for password length.
+  config.password_length = 8..128
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+  # If true, expires auth token on session timeout.
+  # config.expire_auth_token_on_timeout = false
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = true
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html]
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+  # end
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+end

data/spec/dummy/config/locales/devise.en.yml ADDED Viewed

@@ -0,0 +1,60 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

data/spec/dummy/config/routes.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
+  devise_for :users
   mount Txtblx::Engine => "/txtblx"
   root to: 'dummies#index'

data/spec/dummy/db/development.sqlite3 CHANGED Viewed

Binary file

data/spec/dummy/db/migrate/20150419175857_devise_create_users.rb ADDED Viewed

@@ -0,0 +1,42 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+      ## Rememberable
+      t.datetime :remember_created_at
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+      t.timestamps
+    end
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    # add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,         unique: true
+  end
+end

data/spec/dummy/db/migrate/20150419222125_add_role_to_user.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class AddRoleToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :role, :string
+  end
+end

data/spec/dummy/db/schema.rb CHANGED Viewed

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150405222157) do
+ActiveRecord::Schema.define(version: 20150419222125) do
   create_table "snaps_tags", force: :cascade do |t|
     t.integer  "record_id"
@@ -33,4 +33,23 @@ ActiveRecord::Schema.define(version: 20150405222157) do
     t.datetime "updated_at",  null: false
   end
+  create_table "users", force: :cascade do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0,  null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "role"
+  end
+  add_index "users", ["email"], name: "index_users_on_email", unique: true
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
 end

data/spec/dummy/db/test.sqlite3 CHANGED Viewed

Binary file

data/spec/dummy/log/development.log CHANGED Viewed

@@ -1,15 +1,25 @@
-  [1m[36m (24.5ms)[0m  [1mCREATE TABLE "snaps_tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "record_id" integer, "record_type" varchar, "tag" varchar, "superseded_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) [0m
-  [1m[35m (25.9ms)[0m  CREATE TABLE "txtblx_textblocks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "perma_id" integer, "key" varchar, "description" varchar, "text" text, "text_html" text, "path" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-  [1m[36m (36.4ms)[0m  [1mCREATE TABLE "schema_migrations" ("version" varchar NOT NULL) [0m
-  [1m[35m (0.1ms)[0m  select sqlite_version(*)
-  [1m[36m (22.8ms)[0m  [1mCREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")[0m
-  [1m[35m (0.1ms)[0m  SELECT version FROM "schema_migrations"
-  [1m[36m (18.5ms)[0m  [1mINSERT INTO "schema_migrations" (version) VALUES ('20150405222157')[0m
-  [1m[35m (23.6ms)[0m  CREATE TABLE "snaps_tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "record_id" integer, "record_type" varchar, "tag" varchar, "superseded_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-  [1m[36m (16.9ms)[0m  [1mCREATE TABLE "txtblx_textblocks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "perma_id" integer, "key" varchar, "description" varchar, "text" text, "text_html" text, "path" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) [0m
-  [1m[35m (32.9ms)[0m  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL)
-  [1m[36m (0.1ms)[0m  [1mselect sqlite_version(*)[0m
-  [1m[35m (28.6ms)[0m  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  [1m[36m (0.1ms)[0m  [1mSELECT version FROM "schema_migrations"[0m
-  [1m[35m (29.7ms)[0m  INSERT INTO "schema_migrations" (version) VALUES ('20150405222157')
+  [1m[36m (25.8ms)[0m  [1mCREATE TABLE "schema_migrations" ("version" varchar NOT NULL) [0m
+  [1m[35m (0.2ms)[0m  select sqlite_version(*)
+  [1m[36m (32.5ms)[0m  [1mCREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")[0m
+  [1m[35mActiveRecord::SchemaMigration Load (0.1ms)[0m  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateSnapsTags (20150321131740)
+  [1m[36m (0.1ms)[0m  [1mbegin transaction[0m
+  [1m[35m (0.4ms)[0m  CREATE TABLE "snaps_tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "record_id" integer, "record_type" varchar, "tag" varchar, "superseded_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  [1m[36mSQL (0.1ms)[0m  [1mINSERT INTO "schema_migrations" ("version") VALUES (?)[0m  [["version", "20150321131740"]]
+  [1m[35m (38.4ms)[0m  commit transaction
   [1m[36mActiveRecord::SchemaMigration Load (0.1ms)[0m  [1mSELECT "schema_migrations".* FROM "schema_migrations"[0m
+  [1m[36mActiveRecord::SchemaMigration Load (0.1ms)[0m  [1mSELECT "schema_migrations".* FROM "schema_migrations"[0m
+Migrating to CreateTxtblxTextblocks (20150405222157)
+  [1m[35m (0.1ms)[0m  begin transaction
+  [1m[36m (0.3ms)[0m  [1mCREATE TABLE "txtblx_textblocks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "perma_id" integer, "key" varchar, "description" varchar, "text" text, "text_html" text, "path" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) [0m
+  [1m[35mSQL (0.1ms)[0m  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150405222157"]]
+  [1m[36m (31.2ms)[0m  [1mcommit transaction[0m
+  [1m[35mActiveRecord::SchemaMigration Load (0.1ms)[0m  SELECT "schema_migrations".* FROM "schema_migrations"
+  [1m[36mActiveRecord::SchemaMigration Load (0.1ms)[0m  [1mSELECT "schema_migrations".* FROM "schema_migrations"[0m
+  [1m[35mActiveRecord::SchemaMigration Load (0.1ms)[0m  SELECT "schema_migrations".* FROM "schema_migrations"
+  [1m[36mActiveRecord::SchemaMigration Load (0.1ms)[0m  [1mSELECT "schema_migrations".* FROM "schema_migrations"[0m
+Migrating to CreateSnapsTags (20150406173449)
+  [1m[35m (0.1ms)[0m  begin transaction
+  [1m[36m (0.1ms)[0m  [1mCREATE TABLE "snaps_tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "record_id" integer, "record_type" varchar, "tag" varchar, "superseded_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) [0m
+SQLite3::SQLException: table "snaps_tags" already exists: CREATE TABLE "snaps_tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "record_id" integer, "record_type" varchar, "tag" varchar, "superseded_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  [1m[35m (0.0ms)[0m  rollback transaction