tb_banners 1.2.0.beta1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d69497d933e4e7d8b92513aef1b785d67fdee0
-  data.tar.gz: 379864ece8c927552575a6bda6b161172492a805
+  metadata.gz: 0c852929b1637e62064e63bdd120059fa48c39c4
+  data.tar.gz: 460c049bdd6d53166a067a4a2c47a39a0b9e6109
 SHA512:
-  metadata.gz: d4c75394cc35e6c9e43816f31fe477a9ed2047cc20f77193d47fbf8ed7cf0189939e72199cc6a09f35a79221ee6929f155d04d8beb8b3eee0adc5ff112d273cc
-  data.tar.gz: 123e7574293cf224312fa1b5e080b73a0f18fe1914ad1991e1b57c3556f9e5509d9c78b4901df271278fc81111b4a73f0324b496031dd94db216cd9f5cd31b4d
+  metadata.gz: f28f0749dde9be8adee20c9341507185cfa080ccfe79f77b3c4957cce9575555801ca8137833113034376a47dfe4fd209add17468de336350555ff63ef71158c
+  data.tar.gz: 6f2ac71955140b0ed8e4576d7879690ebb1bc5969c0942fdb1c0152c7b27a5ef60fd6903c5db24ddb8a0d29c88aec18cc1a85455a2677c38f78310d1bdfd8ec4

data/README.markdown

@@ -24,6 +24,7 @@ TB Banners accepts the following configuration options:
 Spud::Banners.configure do |config|
 	config.paperclip_storage = :filesystem #use :s3 to use s3 storage (aws gem required)
 	config.s3_credentials = "#{Rails.root}/config/s3.yml"
+	config.s3_protocol = 'https'
 	config.storage_path = ":rails_root/public/system/spud_banners/:id/:style/:basename.:extension"
 	config.storage_url = "/system/spud_banners/:id/:style/:basename.:extension"
 end
@@ -48,7 +49,12 @@ A number of view helpers are provided for displaying banners in your templates.
 
 `spud_banners_for_set(set_or_identifier, options)`
 
-Accepts the banner set name as a String or Symbol and returns an html template. Options hash accepts a `:limit` parameter for limiting the number of banners returned. This helper also accepts a block argument for rendering custom html.
+Accepts the banner set name as a String or Symbol and returns an html template. This helper also accepts a block argument for rendering custom html.
+
+**Options:**
+
+- `limit`: Limit how many banners you wish to render
+- `background_image`: Pass `true` in order to render the banners as divs with css background images instead of image tags. Defaults to `false`. **This is required when rendering banners with rich text.**
 
 ```ruby
 spud_banner_tag(banner)

data/app/models/spud_banner.rb

@@ -13,6 +13,7 @@ class SpudBanner < ActiveRecord::Base
     },
     :storage => Spud::Banners.paperclip_storage,
     :s3_credentials => Spud::Banners.s3_credentials,
+    :s3_protocol => Spud::Banners.s3_protocol,
     :url => Spud::Banners.storage_url,
     :path => Spud::Banners.storage_path
 

data/app/models/spud_banner_set.rb

@@ -5,7 +5,7 @@ class SpudBannerSet < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_numericality_of :width, :height
 
-  acts_as_spud_liquid_tag :spud_banner_set, :name
+  acts_as_tb_liquid_tag :spud_banner_set, :name
 
   after_update :check_for_dimension_change
 

data/lib/spud_banners/configuration.rb

@@ -1,10 +1,11 @@
 module Spud
   module Banners
     include ActiveSupport::Configurable
-    config_accessor :paperclip_storage, :s3_credentials, :storage_path, :storage_url
+    config_accessor :paperclip_storage, :s3_credentials, :storage_path, :storage_url, :s3_protocol
     self.paperclip_storage = :filesystem
     self.s3_credentials = "#{Rails.root}/config/s3.yml"
+    self.s3_protocol = 'https'
     self.storage_path = ":rails_root/public/system/spud_banners/:id/:style/:basename.:extension"
     self.storage_url = "/system/spud_banners/:id/:style/:basename.:extension"
   end
-end
+end

data/lib/spud_banners/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Banners
-    VERSION = "1.2.0.beta1"
+    VERSION = "1.2.0"
   end
 end

data/spec/controllers/admin/banner_sets_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Admin::BannerSetsController do
+describe Admin::BannerSetsController, :type => 'controller' do
 
   before(:each) do
     activate_authlogic
@@ -10,90 +10,89 @@ describe Admin::BannerSetsController do
     @user = SpudUserSession.create(u)
   end
 
-  describe :index do
+  describe 'index' do
     it "should return an array of banner sets" do
       5.times do |x| 
         banner_set = FactoryGirl.create(:spud_banner_set)
       end
       get :index
-      assigns(:banner_sets).count.should be > 1
+      expect(assigns(:banner_sets).count).to be > 1
     end
   end
 
-  describe :show do
+  describe 'show' do
     it "should respond with a banner set" do
       banner_set = FactoryGirl.create(:spud_banner_set)
       get :show, :id => banner_set.id
-      assigns(:banner_set).should == banner_set
-      response.should be_success
+      expect(assigns(:banner_set)).to eq(banner_set)
+      expect(response).to be_success
     end
 
     it "should redirect if banner set is not found" do
       get :show, :id => -1
-      assigns(:banner_set).should be_blank
-      response.should redirect_to admin_banner_sets_path
+      expect(assigns(:banner_set)).to be_blank
+      expect(response).to redirect_to admin_banner_sets_path
     end
   end
 
-  describe :new do
+  describe 'new' do
     it "should respond with a banner set" do
       get :new
-      assigns(:banner_set).should_not be_blank
-      response.should be_success
+      expect(response).to be_success
     end
   end
 
-  describe :create do
+  describe 'create' do
     it "should respond with a banner set" do
-      lambda {
+      expect {
         post :create, :spud_banner_set => FactoryGirl.attributes_for(:spud_banner_set)
-      }.should change(SpudBannerSet, :count).by(1)
-      response.should be_success
+      }.to change(SpudBannerSet, :count).by(1)
+      expect(response).to be_success
     end
 
     it "should respond unsuccessfully if the banner set is invalid" do
-      lambda {
+      expect {
         post :create, :spud_banner_set => {:name => '', :width => 'lorem', :height => 'ipsum'}
-      }.should_not change(SpudBannerSet, :count)
+      }.to_not change(SpudBannerSet, :count)
       assert_response 422
     end
   end
 
-  describe :edit do
+  describe 'edit' do
     it "should respond with a banner set" do
       banner_set = FactoryGirl.create(:spud_banner_set)
       get :edit, :id => banner_set.id
-      assigns(:banner_set).should == banner_set
-      response.should be_success
+      expect(assigns(:banner_set)).to eq(banner_set)
+      expect(response).to be_success
     end
   end
 
-  describe :update do
+  describe 'update' do
     it "should update the banner set" do
       banner_set = FactoryGirl.create(:spud_banner_set)
       new_name = "Updated Set Name"
-      lambda {
+      expect {
         put :update, :id => banner_set.id, :spud_banner_set => {:name => new_name}
         banner_set.reload
-      }.should change(banner_set, :name).to(new_name)
+      }.to change(banner_set, :name).to(new_name)
     end
 
     it "should respond unsuccessfully if the updated banner set is invalid" do
       banner_set = FactoryGirl.create(:spud_banner_set)
-      lambda {
+      expect {
         put :update, :id => banner_set.id, :spud_banner_set => {:name => '', :width => 'lorem', :height => 'ipsum'}
-      }.should_not change(SpudBannerSet, :count)
+      }.to_not change(SpudBannerSet, :count)
       assert_response 422
     end
   end
 
-  describe :destroy do
+  describe 'destroy' do
     it "should destroy the banner set and respond successfully" do
       banner_set = FactoryGirl.create(:spud_banner_set)
-      lambda {
+      expect {
         delete :destroy, :id => banner_set.id
-      }.should change(SpudBannerSet, :count).by(-1)
-      response.should be_success
+      }.to change(SpudBannerSet, :count).by(-1)
+      expect(response).to be_success
     end
   end
 

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

@@ -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

@@ -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
@@ -42,4 +42,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.active_record.raise_in_transactional_callbacks = true
 end

data/spec/rails_helper.rb

@@ -0,0 +1,71 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'spec_helper'
+require 'authlogic_helper'
+require 'rspec/rails'
+require 'database_cleaner'
+require 'simplecov'
+require 'factory_girl_rails'
+
+SimpleCov.start 'rails'
+
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+#ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
+  config.infer_base_class_for_anonymous_controllers = false
+  
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  # config.infer_spec_type_from_file_location!
+
+  # Clean the database as needed
+  # https://github.com/DatabaseCleaner/database_cleaner#rspec-example
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,40 +1,85 @@
-# Track code coverage
-require 'simplecov'
- SimpleCov.start 'rails' do
-  # root "dummy/"
-  add_filter "/factories/"
-end
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] = 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
-require 'database_cleaner'
-require 'shoulda'
-require 'factory_girl'
-require 'mocha/setup'
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
-Dir[File.join(ENGINE_RAILS_ROOT,"spec/support/**/*.rb"), File.join(ENGINE_RAILS_ROOT,"factories/*")].each {|f| require f}
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
 
-RSpec.configure do |config|
-  config.mock_with :mocha
-  config.use_transactional_fixtures = true
-  config.infer_base_class_for_anonymous_controllers = false
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
 
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
   end
 
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
 
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tb_banners
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta1
+  version: 1.2.0
 platform: ruby
 authors:
 - Westlake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: tb_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -80,104 +66,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0.RC1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0.RC1
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
 description: Banner Management engine for Twice Baked
 email:
 - greg@westlakedesign.com
@@ -226,6 +170,7 @@ files:
 - lib/spud_banners/version.rb
 - lib/tasks/spud_banners_tasks.rake
 - lib/tb_banners.rb
+- spec/authlogic_helper.rb
 - spec/controllers/admin/banner_sets_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -269,8 +214,8 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/support/authlogic_helper.rb
 homepage: http://bitbucket.org/westlakedesign/tb_banners
 licenses: []
 metadata: {}
@@ -285,16 +230,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Twice Baked Banners
 test_files:
+- spec/authlogic_helper.rb
 - spec/controllers/admin/banner_sets_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -338,5 +284,5 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
+- spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/support/authlogic_helper.rb