tb_media 1.2.0.beta1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 113523e49c829fd56bda7df24ae33a556660fee5
-  data.tar.gz: f657496378550afd5bcb74b82fb774aee76277b8
+  metadata.gz: 2346e4b40486aa8457024ae860e82ddd2f967b23
+  data.tar.gz: e7520766aa0f18b3d68a28c7f7eba0f4234fc70c
 SHA512:
-  metadata.gz: f603cbb40c6ec92e57797ee3d3b095b3db21f37419e0564caa736dc410506ea60322d1517f147e76d7fc6649d93e563a4c1b50647659169707197bf2bc3a6349
-  data.tar.gz: 363afcc5f0f28cb0bfd3ec0605d202aad048570998ad48918e08cdb542527f925b20344e324210429c206c4089a3a05702b2e83dabf4caba8fc3ebb6fa1feff0
+  metadata.gz: 80ba5cd98b543017db866a4703ff66ec08833cb041f07e4712d71ba3c7940aaacc58b7140b84a74b1de74f6e81f764f0a5ab6337ce5404935829c95b55ec3dba
+  data.tar.gz: cc9edb5f94db9708bdb85c909b7966a8b0cda9895c6f1f51d0466490179b6214e161bdc71198cea71ef09f1a642e95808501395eb035f9e297aa3eadea173de2

data/lib/spud_media/version.rb

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

data/spec/controllers/{media_controller_spec.rb → admin/media_controller_spec.rb}

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Admin::MediaController do
+describe Admin::MediaController, :type => :controller do
 
   before :each do
     activate_authlogic
@@ -10,38 +10,33 @@ describe Admin::MediaController do
     @user = SpudUserSession.create(u)
   end
   
-  describe :index do
+  describe 'index' do
   	it "index page should return all media in descending order by create_at" do
   	  @media1 = FactoryGirl.create(:spud_media, created_at: 1.hour.ago)
   	  @media2 = FactoryGirl.create(:spud_media, created_at: 2.hours.ago)
   	  @media3 = FactoryGirl.create(:spud_media, created_at: 3.hours.ago)
   	  get :index
   	  @medias = assigns(:media)
-  	  @medias.count.should eq(3)
-  	  (@medias[0].id).should eq(@media1.id)
-  	  (@medias[1].id).should eq(@media2.id)
-  	  (@medias[2].id).should eq(@media3.id)
+  	  expect(@medias.count).to eq(3)
+  	  expect((@medias[0].id)).to eq(@media1.id)
+  	  expect((@medias[1].id)).to eq(@media2.id)
+  	  expect((@medias[2].id)).to eq(@media3.id)
     end
   end
 
-  describe :new do
+  describe 'new' do
   	it "should return a new media object" do
   	  get :new
   	  @media = assigns(:media)
-  	  @media.should_not be_blank
-  	  @media.id.should be_blank
-  	  @media.should be_a_kind_of(SpudMedia)
+  	  expect(@media).to_not be_blank
     end
   end
 
-  describe :create do
+  describe 'create' do
   	it "should create a new media and returned the saved object's edit page" do
-  	  post :create, spud_media: Factory.attributes_for(:spud_media)
-  	  @media = assigns(:media)
-  	  @media.should_not be_blank
-  	  response.should redirect_to(edit_admin_medium_path(@media.id))
+  	  post :create, spud_media: FactoryGirl.attributes_for(:spud_media)
   	  expect {
-  	  	post :create, spud_media: Factory.attributes_for(:spud_media)
+  	  	post :create, spud_media: FactoryGirl.attributes_for(:spud_media)
   	  }.to change(SpudMedia, :count).by(1)
   	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"
 
   # Do not eager load code on boot. This avoids loading your whole application
@@ -33,4 +33,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/models/spud_media_spec.rb

@@ -1,5 +1,13 @@
-require 'spec_helper'
+require 'rails_helper'
+
+describe SpudMedia, :type => :model do
+
+  describe 'attachment' do
+    it 'should require an attachment' do
+      media = FactoryGirl.build(:spud_media, :attachment => nil)
+      expect(media.valid?).to eq(false)
+      expect(media.errors[:attachment].length).to eq(1)
+    end
+  end
 
-describe SpudMedia do
-  it { should validate_presence_of(:attachment) }
 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 'support/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,42 +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'
-require 'capybara/rspec'
-require 'capybara/rails'
+  # 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_media
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta1
+  version: 1.2.0
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2015-01-26 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.7
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -66,118 +52,76 @@ 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.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.8.1
-- !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: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        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
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.RC1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +203,7 @@ files:
 - lib/spud_media/version.rb
 - lib/tasks/spud_media_tasks.rake
 - lib/tb_media.rb
-- spec/controllers/media_controller_spec.rb
+- spec/controllers/admin/media_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -308,6 +252,7 @@ files:
 - spec/dummy/public/system/spud_media/4/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/4/original/test_img1.png
 - spec/dummy/public/system/spud_media/4/small/test_img1.png
+- spec/dummy/public/system/spud_media/5/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/5/original/test_img1.png
 - spec/dummy/public/system/spud_media/5/small/test_img1.png
 - spec/dummy/script/rails
@@ -317,6 +262,7 @@ files:
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
 - spec/models/spud_media_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/authlogic_helper.rb
 homepage: http://bitbucket.org/westlakedesign/tb_media
@@ -333,17 +279,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.2.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: TB File upload/management module
 test_files:
-- spec/controllers/media_controller_spec.rb
+- spec/controllers/admin/media_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -390,6 +336,7 @@ test_files:
 - spec/dummy/public/system/spud_media/4/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/4/original/test_img1.png
 - spec/dummy/public/system/spud_media/4/small/test_img1.png
+- spec/dummy/public/system/spud_media/5/cropped/test_img1.jpg
 - spec/dummy/public/system/spud_media/5/original/test_img1.png
 - spec/dummy/public/system/spud_media/5/small/test_img1.png
 - spec/dummy/Rakefile
@@ -401,5 +348,6 @@ test_files:
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
 - spec/models/spud_media_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/authlogic_helper.rb