RubyGems - tb_core - Versions diffs - 1.3.0.beta2 → 1.3.0 - Mend

tb_core 1.3.0.beta2 → 1.3.0

Files changed (72) hide show

data/spec/dummy/app/assets/javascripts/application.js CHANGED Viewed

@@ -1,15 +1,18 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
 //= require jquery
 //= require jquery_ujs
-//= require_tree .
+//= require tb_core
+//= require bootstrap-sprockets
+//= require_self
+//= require_directory .
+(function(){
+window.app = {
+  init: function(){
+    // global initializer
+  }
+};
+$(document).ready(app.init);
+})();

data/spec/dummy/app/assets/stylesheets/admin/application.css.scss ADDED Viewed

@@ -0,0 +1,3 @@
+//= require_self
+//= require_tree

data/spec/dummy/app/assets/stylesheets/application.css.scss ADDED Viewed

@@ -0,0 +1,5 @@
+//= require_self
+//= require_directory .
+@import "bootstrap-sprockets";
+@import "bootstrap";

data/spec/dummy/app/controllers/application_controller.rb CHANGED Viewed

@@ -1,3 +1,3 @@
-class ApplicationController < ActionController::Base
+class ApplicationController < Spud::ApplicationController
   protect_from_forgery
 end

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

@@ -1,14 +1,33 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="viewport" content="width=device-width"/>
+  <%= tb_page_title() %>
+  <%= stylesheet_link_tag "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
+  <%= yield :head %>
 </head>
 <body>
+  <div class="container">
-<%= yield %>
+    <% if flash[:notice] %>
+      <div class="alert alert-info alert-dismissible">
+        <%= flash[:notice] %> <a href="#" class="flash-remove">X</a>
+        <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+      </div>
+    <% elsif flash[:error] %>
+      <div class="alert alert-danger alert-dismissible">
+        <%= flash[:error] %> <a href="#" class="flash-remove">X</a>
+        <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+      </div>
+    <% end %>
+    <%= content_for?(:body) ? yield(:body) : yield %>
+  </div>
 </body>
 </html>

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

@@ -7,6 +7,11 @@ require "tb_core"
 module Dummy
   class Application < Rails::Application
+    Spud::Core.configure do |config|
+      config.site_name = "Dummy"
+      config.from_address = "no-reply@dummy.com"
+    end
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

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

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
   # Compress JavaScripts and CSS
   config.assets.compress = true

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

@@ -8,7 +8,7 @@ Dummy::Application.configure do
   config.cache_classes = true
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
   # Deprecated

data/spec/dummy/db/migrate/20141214200804_create_spud_admin_permissions.tb_core.rb ADDED Viewed

@@ -0,0 +1,12 @@
+# This migration comes from tb_core (originally 20111214161011)
+class CreateSpudAdminPermissions < ActiveRecord::Migration
+  def change
+    create_table :spud_admin_permissions do |t|
+      t.integer :user_id
+      t.string :name
+      t.boolean :access
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20141214200805_create_spud_users.tb_core.rb ADDED Viewed

@@ -0,0 +1,30 @@
+# This migration comes from tb_core (originally 20111214161146)
+class CreateSpudUsers < ActiveRecord::Migration
+  def change
+    create_table :spud_users do |t|
+      t.string :first_name
+      t.string :last_name
+      t.boolean :super_admin
+      t.string    :login,               :null => false                # optional, you can use email instead, or both
+      t.string    :email,               :null => false                # optional, you can use login instead, or both
+      t.string    :crypted_password,    :null => false                # optional, see below
+      t.string    :password_salt,       :null => false                # optional, but highly recommended
+      t.string    :persistence_token,   :null => false                # required
+      t.string    :single_access_token, :null => false                # optional, see Authlogic::Session::Params
+      t.string    :perishable_token,    :null => false                # optional, see Authlogic::Session::Perishability
+      # Magic columns, just like ActiveRecord's created_at and updated_at. These are automatically maintained by Authlogic if they are present.
+      t.integer   :login_count,         :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns
+      t.integer   :failed_login_count,  :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns
+      t.datetime  :last_request_at                                    # optional, see Authlogic::Session::MagicColumns
+      t.datetime  :current_login_at                                   # optional, see Authlogic::Session::MagicColumns
+      t.datetime  :last_login_at                                      # optional, see Authlogic::Session::MagicColumns
+      t.string    :current_login_ip                                   # optional, see Authlogic::Session::MagicColumns
+      t.string    :last_login_ip                                      # optional, see Authlogic::Session::MagicColumns
+      t.timestamps
+    end
+    add_index :spud_users,:login
+    add_index :spud_users,:email
+  end
+end

data/spec/dummy/db/migrate/20141214200806_add_time_zone_to_spud_user.tb_core.rb ADDED Viewed

@@ -0,0 +1,7 @@
+# This migration comes from tb_core (originally 20120327124229)
+class AddTimeZoneToSpudUser < ActiveRecord::Migration
+  def change
+    add_column :spud_users, :time_zone, :string
+  end
+end

data/spec/dummy/db/migrate/20141214200807_add_scope_to_spud_admin_permissions.tb_core.rb ADDED Viewed

@@ -0,0 +1,7 @@
+# This migration comes from tb_core (originally 20120328235431)
+class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
+  def change
+    add_column :spud_admin_permissions, :scope, :string
+  end
+end

data/spec/dummy/db/migrate/20141214200808_create_spud_user_settings.tb_core.rb ADDED Viewed

@@ -0,0 +1,12 @@
+# This migration comes from tb_core (originally 20120329174000)
+class CreateSpudUserSettings < ActiveRecord::Migration
+  def change
+    create_table :spud_user_settings do |t|
+      t.integer :spud_user_id
+      t.string :key
+      t.string :value
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20141214200809_create_spud_roles.tb_core.rb ADDED Viewed

@@ -0,0 +1,11 @@
+# This migration comes from tb_core (originally 20130620143010)
+class CreateSpudRoles < ActiveRecord::Migration
+  def change
+    create_table :spud_roles do |t|
+      t.string :name
+      t.timestamps
+    end
+    add_column :spud_users, :spud_role_id, :integer
+    add_index :spud_users, :spud_role_id
+  end
+end

data/spec/dummy/db/migrate/20141214200810_create_spud_permissions.tb_core.rb ADDED Viewed

@@ -0,0 +1,11 @@
+# This migration comes from tb_core (originally 20130620143941)
+class CreateSpudPermissions < ActiveRecord::Migration
+  def change
+    create_table :spud_permissions do |t|
+      t.string :name, :null => false
+      t.string :tag, :null => false
+      t.timestamps
+    end
+    add_index :spud_permissions, :tag, :unique => true
+  end
+end

data/spec/dummy/db/migrate/20141214200811_create_spud_role_permissions.tb_core.rb ADDED Viewed

@@ -0,0 +1,12 @@
+# This migration comes from tb_core (originally 20130620151132)
+class CreateSpudRolePermissions < ActiveRecord::Migration
+  def change
+    create_table :spud_role_permissions do |t|
+      t.integer :spud_role_id, :null => false
+      t.string :spud_permission_tag, :null => false
+      t.timestamps
+    end
+    add_index :spud_role_permissions, :spud_role_id
+    add_index :spud_role_permissions, :spud_permission_tag
+  end
+end

data/spec/dummy/db/migrate/20141214200812_drop_spud_admin_permissions.tb_core.rb ADDED Viewed

@@ -0,0 +1,16 @@
+# This migration comes from tb_core (originally 20130620163144)
+class DropSpudAdminPermissions < ActiveRecord::Migration
+  def up
+    drop_table :spud_admin_permissions
+  end
+  def down
+    create_table :spud_admin_permissions do |t|
+      t.integer :user_id
+      t.string :name
+      t.boolean :access
+      t.string :scope
+      t.timestamps
+    end
+  end
+end

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

@@ -9,69 +9,69 @@
 # 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).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130620163144) do
+ActiveRecord::Schema.define(version: 20141214200812) do
-  create_table "spud_permissions", :force => true do |t|
-    t.string   "name",       :null => false
-    t.string   "tag",        :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "spud_permissions", force: true do |t|
+    t.string   "name",       limit: 255, null: false
+    t.string   "tag",        limit: 255, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
-  add_index "spud_permissions", ["tag"], :name => "index_spud_permissions_on_tag", :unique => true
+  add_index "spud_permissions", ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
-  create_table "spud_role_permissions", :force => true do |t|
-    t.integer  "spud_role_id",        :null => false
-    t.string   "spud_permission_tag", :null => false
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
+  create_table "spud_role_permissions", force: true do |t|
+    t.integer  "spud_role_id",        limit: 4,   null: false
+    t.string   "spud_permission_tag", limit: 255, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
-  add_index "spud_role_permissions", ["spud_permission_tag"], :name => "index_spud_role_permissions_on_spud_permission_tag"
-  add_index "spud_role_permissions", ["spud_role_id"], :name => "index_spud_role_permissions_on_spud_role_id"
+  add_index "spud_role_permissions", ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag", using: :btree
+  add_index "spud_role_permissions", ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id", using: :btree
-  create_table "spud_roles", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "spud_roles", force: true do |t|
+    t.string   "name",       limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
-  create_table "spud_user_settings", :force => true do |t|
-    t.integer  "spud_user_id"
-    t.string   "key"
-    t.string   "value"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+  create_table "spud_user_settings", force: true do |t|
+    t.integer  "spud_user_id", limit: 4
+    t.string   "key",          limit: 255
+    t.string   "value",        limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
-  create_table "spud_users", :force => true do |t|
-    t.string   "first_name"
-    t.string   "last_name"
-    t.boolean  "super_admin"
-    t.string   "login",                              :null => false
-    t.string   "email",                              :null => false
-    t.string   "crypted_password",                   :null => false
-    t.string   "password_salt",                      :null => false
-    t.string   "persistence_token",                  :null => false
-    t.string   "single_access_token",                :null => false
-    t.string   "perishable_token",                   :null => false
-    t.integer  "login_count",         :default => 0, :null => false
-    t.integer  "failed_login_count",  :default => 0, :null => false
+  create_table "spud_users", force: true do |t|
+    t.string   "first_name",          limit: 255
+    t.string   "last_name",           limit: 255
+    t.boolean  "super_admin",         limit: 1
+    t.string   "login",               limit: 255,             null: false
+    t.string   "email",               limit: 255,             null: false
+    t.string   "crypted_password",    limit: 255,             null: false
+    t.string   "password_salt",       limit: 255,             null: false
+    t.string   "persistence_token",   limit: 255,             null: false
+    t.string   "single_access_token", limit: 255,             null: false
+    t.string   "perishable_token",    limit: 255,             null: false
+    t.integer  "login_count",         limit: 4,   default: 0, null: false
+    t.integer  "failed_login_count",  limit: 4,   default: 0, null: false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "time_zone"
-    t.integer  "spud_role_id"
+    t.string   "current_login_ip",    limit: 255
+    t.string   "last_login_ip",       limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "time_zone",           limit: 255
+    t.integer  "spud_role_id",        limit: 4
   end
-  add_index "spud_users", ["email"], :name => "index_spud_users_on_email"
-  add_index "spud_users", ["login"], :name => "index_spud_users_on_login"
-  add_index "spud_users", ["spud_role_id"], :name => "index_spud_users_on_spud_role_id"
+  add_index "spud_users", ["email"], name: "index_spud_users_on_email", using: :btree
+  add_index "spud_users", ["login"], name: "index_spud_users_on_login", using: :btree
+  add_index "spud_users", ["spud_role_id"], name: "index_spud_users_on_spud_role_id", using: :btree
 end

data/spec/factories/spud_admin_permission_factories.rb ADDED Viewed

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  sequence :permission_name do |n|
+    "app#{n}"
+  end
+  factory :spud_admin_permission do
+    name { FactoryGirl.generate(:permission_name) }
+    access true
+  end
+end

data/spec/factories/spud_role_factories.rb ADDED Viewed

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  sequence :name do |n|
+    "SomeRole#{n}"
+  end
+  factory :spud_role do
+    name { FactoryGirl.generate(:name) }
+  end
+end

data/spec/factories/spud_user_factories.rb ADDED Viewed

@@ -0,0 +1,31 @@
+FactoryGirl.define do
+  sequence :first_name do |n|
+    "John#{n}"
+  end
+  sequence :last_name do |n|
+    "Doe#{n}"
+  end
+  sequence :login do |n|
+    "john#{n}doe#{n}"
+  end
+  sequence :email do |n|
+    "john#{n}doe#{n}@email.com"
+  end
+  sequence :single_access_token do |n|
+    "k3cF#{n}"
+  end
+  factory :spud_user do
+    first_name { FactoryGirl.generate(:first_name) }
+    last_name { FactoryGirl.generate(:last_name) }
+    login { FactoryGirl.generate(:login) }
+    email { FactoryGirl.generate(:email) }
+    password "password"
+    password_confirmation "password"
+    single_access_token { FactoryGirl.generate(:single_access_token) }
+  end
+end

data/spec/helpers/spud/admin/application_helper_spec.rb CHANGED Viewed

@@ -1,150 +1,42 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Admin::ApplicationHelper do
-  describe :timestamp do
+describe Admin::ApplicationHelper, :type => :helper do
+  describe '#timestamp' do
     it "should return 'Never' if a timedate is not given" do
-      timestamp.should == 'Never'
+      expect(timestamp).to eq('Never')
     end
     it "should reutrn 'x ago' when the supplied timestamp is less than a week ago" do
-      timestamp(6.days.ago).should match('.*? ago')
+      expect(timestamp(6.days.ago)).to match('.*? ago')
     end
     it "should not return 'x at x' when the timestamp is less than a week ago" do
-      timestamp(5.minutes.ago).should_not match(/.*? at .*/)
+      expect(timestamp(5.minutes.ago)).to_not match(/.*? at .*/)
     end
     it "should return 'x at x' when the timestamp is more than a week ago" do
-      timestamp(7.days.ago).should match(/.*? at .*/)
+      expect(timestamp(7.days.ago)).to match(/.*? at .*/)
     end
     it "should not reutrn 'x ago' when the supplied timestamp is more than a week ago" do
-      timestamp(8.days.ago).should_not match('.*? ago')
+      expect(timestamp(8.days.ago)).to_not match('.*? ago')
     end
   end
-  describe :current_admin_site_name do
-    let(:core_site_name) { "Spud" }
-    let(:multi_site_name) { "Spud2" }
-    before(:each) do
-      Spud::Core.stubs(:site_name).returns(core_site_name)
-    end
-    context "with multisite mode enabled" do
-      before(:each) do
-        Spud::Core.stubs(:multisite_mode_enabled).returns(true)
-      end
-      context "with a site selected" do
-        before(:each) do
-          controller.stubs(:session).returns({:admin_site => 1})
-        end
-        it "should return the spud core site name if the selected site's name is not configured" do
-          Spud::Core.stubs(:multisite_config).returns([{:site_id => 2, :site_name => multi_site_name}])
-          helper.current_admin_site_name.should == core_site_name
-        end
-        it "should return the selected site name if the select site's name is configured" do
-          Spud::Core.stubs(:multisite_config).returns([{:site_id => 1, :site_name => multi_site_name}])
-          helper.current_admin_site_name.should == multi_site_name
-        end
-      end
-      context "without a site selected" do
-        before(:each) do
-          controller.stubs(:session).returns({:admin_site => nil})
-        end
-        it "should return the core's site name" do
-          helper.current_admin_site_name.should == core_site_name
-        end
-      end
-    end
-    context "with multisite mode disabled" do
-      before(:each) do
-        Spud::Core.stubs(:multisite_mode_enabled).returns(false)
-      end
-      it "should return the core's site name" do
-        helper.current_admin_site_name.should == core_site_name
-      end
-    end
-  end
-  describe :header_style do
-    let(:style_string) { 'Big' }
-    context "with multisite mode enabled" do
-      before(:each) do
-        Spud::Core.stubs(:multisite_mode_enabled).returns(true)
-      end
-      context "and an admin site is selected" do
-        before(:each) do
-          controller.stubs(:session).returns({:admin_site => 1})
-        end
-        it "should return a style string if the site is configured" do
-          Spud::Core.stubs(:multisite_config).returns([{:site_id => 1, :header_style => style_string}])
-          helper.header_style.should == style_string
-        end
-        it "should return an empty string if the site is not configured" do
-           Spud::Core.stubs(:multisite_config).returns([])
-           helper.header_style.should == ''
-        end
-      end
-      context "and an admin site is not selected" do
-        before(:each) do
-          controller.stubs(:session).returns({:admin_site => nil})
-        end
-        it "should return an empty string" do
-          helper.header_style.should == ''
-        end
-      end
-    end
-    context "with multisite mode disabled" do
-      before(:each) do
-        Spud::Core.stubs(:multisite_mode_enabled).returns(false)
-      end
-      it "should return an empty string" do
-        helper.header_style.should == ''
-      end
-    end
-  end
-  describe :tb_form_errors do
+  describe '#tb_form_errors' do
     before(:each) do
       @user = FactoryGirl.create(:spud_user)
     end
     it "should return blank when no errors exist" do
-      helper.tb_form_errors(@user).should == ''
-    end
-    it "should display 1 error when the subject has 2 errors" do
-      @user.errors[:base] << "error 1"
-      helper.tb_form_errors(@user).should include("1 error")
-    end
-    (1..3).each do |error_count|
-      it "should display #{error_count} errors when the subject has #{error_count} errors" do
-        error_count.times {|x| @user.errors[:base] << "error #{x}" }
-        helper.tb_form_errors(@user).should include("#{@user.errors[:base].size} error")
-      end
+      expect(helper.tb_form_errors(@user)).to be_blank
     end
     it "should display the error" do
       error = "You're invalid"
       @user.errors[:base] << error
-      helper.tb_form_errors(@user).should include(error)
+      expect(helper.tb_form_errors(@user)).to include(error)
     end
   end
 end

data/spec/helpers/spud/application_helper_spec.rb CHANGED Viewed

@@ -1,66 +1,11 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Spud::ApplicationHelper do
-    before :each do
+describe Spud::ApplicationHelper, :type => :helper do
+  before :each do
     activate_authlogic
     @user = FactoryGirl.create(:spud_user)
     @session = SpudUserSession.create(@user)
   end
-  describe :current_site_name do
-    it "should return config site name if multisite is disabled" do
-      Spud::Core.configure do |config|
-        config.multisite_mode_enabled = false
-        config.site_name = "Test Site"
-        config.multisite_config = []
-      end
-      helper.current_site_name.should == 'Test Site'
-    end
-    it "should return config site name if multisite is enabled but multisite name is blank" do
-      Spud::Core.configure do |config|
-        config.site_name = "Test Site"
-        config.multisite_mode_enabled = true
-        config.multisite_config = []
-      end
-      helper.current_site_name.should == 'Test Site'
-    end
-    it "should return multisite name if multisite is enabled" do
-      Spud::Core.configure do |config|
-        config.site_name = "Test Site"
-        config.multisite_mode_enabled = true
-        config.multisite_config += [{:hosts => ["test.host"], :site_name =>"Site B", :site_id => 1}]
-      end
-      helper.current_site_name.should == 'Site B'
-    end
-  end
-  describe :current_site_id do
-    it "should return the default site id if multisite is disabled" do
-      Spud::Core.configure do |config|
-        config.site_id = 0
-        config.multisite_mode_enabled = false
-        config.multisite_config = []
-      end
-      helper.current_site_id.should == 0
-    end
-    it "should return the current site id if multisite is enabled" do
-      Spud::Core.configure do |config|
-        config.multisite_mode_enabled = true
-        config.multisite_config = [{:hosts => ["test.host"], :site_name =>"Site B", :site_id => 1}]
-      end
-      # @controller.request = request
-      helper.current_site_id.should == 1
-    end
-  end
 end