tb_banners 1.2.0.beta1 → 1.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (55) hide show
  1. checksums.yaml +5 -5
  2. data/README.markdown +9 -14
  3. data/Rakefile +2 -5
  4. data/app/assets/javascripts/admin/banners/banner_sets.js +4 -1
  5. data/app/assets/javascripts/admin/banners/banners.js +49 -56
  6. data/app/assets/stylesheets/admin/banners/banners.css.scss +6 -1
  7. data/app/controllers/admin/banner_sets_controller.rb +15 -23
  8. data/app/controllers/admin/banners_controller.rb +32 -61
  9. data/app/helpers/spud_banners_helper.rb +24 -19
  10. data/app/models/spud_banner.rb +33 -20
  11. data/app/models/spud_banner_set.rb +16 -19
  12. data/app/views/admin/banner_sets/index.html.erb +1 -1
  13. data/app/views/admin/banner_sets/show.html.erb +2 -1
  14. data/app/views/admin/banners/_banner.html.erb +4 -1
  15. data/app/views/admin/banners/_form.html.erb +3 -5
  16. data/db/migrate/20121116195139_create_spud_banners.rb +1 -1
  17. data/db/migrate/20121116195312_create_spud_banner_sets.rb +1 -1
  18. data/db/migrate/20130614132846_add_rich_text_to_spud_banners.rb +1 -1
  19. data/db/migrate/20140721142719_add_start_and_end_dates_to_spud_banners.rb +1 -1
  20. data/lib/spud_banners/configuration.rb +6 -5
  21. data/lib/spud_banners/engine.rb +13 -11
  22. data/lib/spud_banners/version.rb +1 -1
  23. data/lib/tb_banners.rb +1 -2
  24. data/spec/controllers/admin/banner_sets_controller_spec.rb +57 -58
  25. data/spec/dummy/config.ru +1 -1
  26. data/spec/dummy/config/application.rb +2 -3
  27. data/spec/dummy/config/boot.rb +1 -1
  28. data/spec/dummy/config/environments/production.rb +1 -1
  29. data/spec/dummy/config/environments/test.rb +3 -4
  30. data/spec/dummy/config/initializers/secret_token.rb +0 -1
  31. data/spec/dummy/db/migrate/20121127192246_create_spud_admin_permissions.spud_core.rb +1 -1
  32. data/spec/dummy/db/migrate/20121127192247_create_spud_users.spud_core.rb +13 -13
  33. data/spec/dummy/db/migrate/20121127192248_add_time_zone_to_spud_user.spud_core.rb +1 -2
  34. data/spec/dummy/db/migrate/20121127192249_add_scope_to_spud_admin_permissions.spud_core.rb +1 -2
  35. data/spec/dummy/db/migrate/20121127192250_create_spud_user_settings.spud_core.rb +1 -1
  36. data/spec/dummy/db/migrate/20130920154442_create_spud_roles.tb_core.rb +1 -1
  37. data/spec/dummy/db/migrate/20130920154443_create_spud_permissions.tb_core.rb +4 -4
  38. data/spec/dummy/db/migrate/20130920154444_create_spud_role_permissions.tb_core.rb +3 -3
  39. data/spec/dummy/db/migrate/20130920154445_drop_spud_admin_permissions.tb_core.rb +1 -1
  40. data/spec/dummy/db/migrate/20160310164644_add_requires_password_change_to_spud_users.tb_core.rb +6 -0
  41. data/spec/dummy/db/schema.rb +70 -84
  42. data/spec/dummy/script/rails +2 -2
  43. data/spec/factories/spud_banner_sets.rb +9 -0
  44. data/spec/factories/spud_banners.rb +7 -0
  45. data/spec/models/spud_banner_spec.rb +27 -0
  46. data/spec/rails_helper.rb +81 -0
  47. data/spec/spec_helper.rb +77 -34
  48. metadata +79 -109
  49. data/app/views/admin/banners/legacy.js.erb +0 -5
  50. data/lib/spud_banners/liquid_tags.rb +0 -31
  51. data/spec/dummy/db/migrate/20130920154446_create_spud_banners.tb_banners.rb +0 -16
  52. data/spec/dummy/db/migrate/20130920154447_create_spud_banner_sets.tb_banners.rb +0 -13
  53. data/spec/dummy/db/migrate/20130920154448_add_rich_text_to_spud_banners.tb_banners.rb +0 -7
  54. data/spec/dummy/db/migrate/20140120174546_create_tb_liquid_spud_liquid_tags.tb_liquid.rb +0 -13
  55. data/spec/support/authlogic_helper.rb +0 -2
@@ -1,5 +0,0 @@
1
- <% if @banner.errors.any? %>
2
- spud.admin.banners.onLegacyUploadError("<%= escape_javascript(render :partial => 'form', :locals => {:path => admin_banner_set_banners_path(@banner_set)}) %>");
3
- <% else %>
4
- spud.admin.banners.onLegacyUploadComplete("<%= escape_javascript(render :partial => 'banner', :locals => {:banner => @banner}) %>");
5
- <% end %>
@@ -1,31 +0,0 @@
1
- require 'liquid'
2
- require_relative '../../app/helpers/spud_banners_helper'
3
-
4
- module Spud
5
- module Banners
6
- class BannerSetTag < Liquid::Tag
7
-
8
- include Sprockets::Rails::Helper
9
- include ActionView::Helpers
10
- include ActionView::Context
11
- include SpudBannersHelper
12
-
13
- def initialize(tag_name, set_identifer, tokens)
14
- @banner_set = SpudBannerSet.find_by_identifier(set_identifer)
15
- end
16
-
17
- def tag_name
18
- return 'spud_banner_set'
19
- end
20
-
21
- def tag_value
22
- return @banner_set.name
23
- end
24
-
25
- def render(context)
26
- return spud_banners_set_tag(@banner_set)
27
- end
28
-
29
- end
30
- end
31
- end
@@ -1,16 +0,0 @@
1
- # This migration comes from tb_banners (originally 20121116195139)
2
- class CreateSpudBanners < ActiveRecord::Migration
3
- def change
4
- create_table :spud_banners do |t|
5
- t.integer :spud_banner_set_id, :null => false
6
- t.string :link_to
7
- t.string :link_target, :default => '_self'
8
- t.string :title
9
- t.string :alt
10
- t.integer :sort_order, :default => 0
11
- t.attachment :banner
12
- t.timestamps
13
- end
14
- add_index :spud_banners, :spud_banner_set_id, :unique => false
15
- end
16
- end
@@ -1,13 +0,0 @@
1
- # This migration comes from tb_banners (originally 20121116195312)
2
- class CreateSpudBannerSets < ActiveRecord::Migration
3
- def change
4
- create_table :spud_banner_sets do |t|
5
- t.string :name, :null => false
6
- t.integer :width, :null => false
7
- t.integer :height, :null => false
8
- t.boolean :cropped, :default => true
9
- t.timestamps
10
- end
11
- add_index :spud_banner_sets, :name, :unique => true
12
- end
13
- end
@@ -1,7 +0,0 @@
1
- # This migration comes from tb_banners (originally 20130614132846)
2
- class AddRichTextToSpudBanners < ActiveRecord::Migration
3
- def change
4
- add_column :spud_banner_sets, :has_rich_text, :boolean, :default => false
5
- add_column :spud_banners, :rich_text, :text
6
- end
7
- end
@@ -1,13 +0,0 @@
1
- # This migration comes from tb_liquid (originally 20140110142037)
2
- class CreateTbLiquidSpudLiquidTags < ActiveRecord::Migration
3
- def change
4
- create_table :spud_liquid_tags do |t|
5
- t.integer :attachment_id
6
- t.string :attachment_type
7
- t.string :tag_name
8
- t.string :value
9
- t.timestamps
10
- end
11
- add_index :spud_liquid_tags, [:tag_name, :value]
12
- end
13
- end
@@ -1,2 +0,0 @@
1
- require 'authlogic/test_case'
2
- include Authlogic::TestCase