landable 1.13.1 → 1.13.2

data/.rubocop.yml

@@ -0,0 +1,281 @@
+Lint/AmbiguousOperator:
+  Enabled: true
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: true
+
+Lint/AssignmentInCondition:
+  Enabled: true
+
+Lint/BlockAlignment:
+  Enabled: true
+
+Lint/Debugger:
+  Enabled: true
+  Exclude:
+    - features/step_definitions/debug_steps.rb
+
+Lint/DeprecatedClassMethods:
+  Enabled: true
+
+Lint/Eval:
+  Enabled: true
+
+Lint/LiteralInInterpolation:
+  Enabled: true
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
+
+Lint/StringConversionInInterpolation:
+  Enabled: true
+
+Lint/UnusedBlockArgument:
+  Enabled: true
+
+Lint/UnusedMethodArgument:
+  Enabled: true
+
+Lint/UselessAssignment:
+  Enabled: true
+
+Lint/Void:
+  Enabled: true
+
+Metrics/AbcSize:
+  Max: 391
+
+Metrics/ClassLength:
+  Max: 240
+
+Metrics/CyclomaticComplexity:
+  Max: 12
+
+Metrics/LineLength:
+  Max: 298
+
+Metrics/MethodLength:
+  Max: 224
+
+Metrics/ModuleLength:
+  Max: 160
+  Exclude:
+    - spec/**/*
+
+Metrics/PerceivedComplexity:
+  Max: 13
+
+Performance/Detect:
+  Enabled: true
+
+Style/AccessModifierIndentation:
+  Enabled: true
+
+Style/AccessorMethodName:
+  Enabled: true
+
+Style/Alias:
+  Enabled: true
+
+Style/AlignHash:
+  Enabled: true
+
+Style/AlignParameters:
+  Enabled: true
+
+Style/AndOr:
+  Enabled: true
+
+Style/BarePercentLiterals:
+  Enabled: true
+
+Style/BlockDelimiters:
+  Enabled: true
+
+Style/BlockEndNewline:
+  Enabled: true
+
+Style/BracesAroundHashParameters:
+  Enabled: true
+
+Style/CaseEquality:
+  Enabled: true
+
+Style/ClassAndModuleChildren:
+  Enabled: true
+  Exclude:
+    - db/migrate/*
+
+Style/ClassCheck:
+  Enabled: true
+
+Style/ClassVars:
+  Enabled: true
+
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/CommentAnnotation:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Style/DotPosition:
+  Enabled: true
+
+Style/DoubleNegation:
+  Enabled: true
+
+Style/EmptyLines:
+  Enabled: true
+
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: true
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: true
+
+Style/EmptyLinesAroundClassBody:
+  Enabled: true
+
+Style/EmptyLinesAroundMethodBody:
+  Enabled: true
+
+Style/EmptyLinesAroundModuleBody:
+  Enabled: true
+
+Style/FormatString:
+  Enabled: true
+
+Style/GuardClause:
+  Enabled: true
+
+Style/HashSyntax:
+  Enabled: true
+
+Style/IfUnlessModifier:
+  Enabled: true
+
+Style/IndentHash:
+  Enabled: true
+
+Style/IndentationConsistency:
+  Enabled: true
+
+Style/IndentationWidth:
+  Enabled: true
+
+Style/Lambda:
+  Enabled: true
+
+Style/MethodCallParentheses:
+  Enabled: true
+
+Style/MethodDefParentheses:
+  Enabled: true
+
+Style/MultilineBlockLayout:
+  Enabled: true
+
+Style/MultilineOperationIndentation:
+  Enabled: true
+
+Style/NegatedIf:
+  Enabled: true
+
+Style/NilComparison:
+  Enabled: true
+
+Style/Not:
+  Enabled: true
+
+Style/PercentLiteralDelimiters:
+  Enabled: true
+
+Style/PerlBackrefs:
+  Enabled: true
+
+Style/PredicateName:
+  Enabled: true
+
+Style/RaiseArgs:
+  Enabled: true
+
+Style/RedundantBegin:
+  Enabled: true
+
+Style/RedundantSelf:
+  Enabled: true
+
+Style/RegexpLiteral:
+  Enabled: true
+
+Style/RescueModifier:
+  Enabled: true
+
+Style/SignalException:
+  Enabled: true
+
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: true
+
+Style/SpaceAfterColon:
+  Enabled: true
+
+Style/SpaceAfterComma:
+  Enabled: true
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Style/SpaceAroundOperators:
+  Enabled: true
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: true
+
+Style/SpaceBeforeModifierKeyword:
+  Enabled: true
+
+Style/SpaceInsideBlockBraces:
+  Enabled: true
+
+Style/SpaceInsideBrackets:
+  Enabled: true
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Style/SpaceInsideParens:
+  Enabled: true
+
+Style/SpecialGlobalVars:
+  Enabled: true
+
+Style/StringLiterals:
+  Enabled: true
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+
+Style/Tab:
+  Enabled: true
+
+Style/TrailingBlankLines:
+  Enabled: true
+
+Style/TrailingComma:
+  Enabled: true
+
+Style/TrailingWhitespace:
+  Enabled: true
+
+Style/TrivialAccessors:
+  Enabled: true
+
+Style/VariableInterpolation:
+  Enabled: true
+
+Style/WordArray:
+  MinSize: 11

data/.travis.yml

@@ -7,7 +7,6 @@ env:
   - RAILS_VERSION=4.1.1
 
 rvm:
-  - 1.9.3-p448
   - 2.0.0-p247
   - 2.1.2
 

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 See README.md before updating this file.
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.13.0...v1.13.1)
+## Unreleased [#](https://github.com/enova/landable/compare/v1.13.2...master)
+
+## 1.13.2 [#](https://github.com/enova/landable/compare/v1.13.1...v1.13.2)
+* Bugfix: Fix landable traffic errors
+* Remove support for Ruby < 2.0.0
 
 ## 1.13.1 [#](https://github.com/enova/landable/compare/v1.12.3...v1.13.1)
 * BugFix: Default referer.path to '' [#60]

data/Gemfile

@@ -1,17 +1,16 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # load dependencies from landable.gemspec
 gemspec
 
 # allow us to load up a specific version of rails, since the gemspec is
 # concerned only with compatibility (see bin/test)
-if ENV.key? 'RAILS_VERSION'
-  gem 'rails', ENV['RAILS_VERSION']
-end
+gem 'rails', ENV['RAILS_VERSION'] if ENV.key? 'RAILS_VERSION'
 
 # development/test dependencies, and anything else that doesn't belong or fit
 # in the gemspec
 group :test do
+  gem 'rubocop'
   gem 'minitest'
   gem 'shoulda-matchers'
   gem 'cucumber-rails', require: false

data/README.md

@@ -49,6 +49,8 @@ Run `./script/redb` to refresh the dummy app's database.
 
 Run the test suite with `rake landable`.
 
+We use [Rubocop](https://github.com/bbatsov/rubocop), so your test must all pass Rubocops Tests in order for your PR to be accepted!
+
 ## Contributing 
 Contributions are welcome - submit a pull request.
 

data/Rakefile

@@ -1,10 +1,11 @@
 begin
   require 'bundler/setup'
+  require 'rubocop/rake_task'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
@@ -12,10 +13,12 @@ Bundler::GemHelper.install_tasks
 Dir.glob(File.expand_path('../lib/tasks/landable/*.rake', __FILE__)).each { |f| load f }
 
 desc 'Landable test suite'
-task :landable => [
+task landable: [
+  'rubocop',
   'app:db:test:prepare',
   'landable:seed',
   'landable:spec',
   'landable:cucumber',
   'landable:pgtap'
-]
+]
+RuboCop::RakeTask.new

data/app/controllers/concerns/landable/variables_concern.rb

@@ -4,35 +4,35 @@ module Landable
   module VariablesConcern
     # includes
     extend ActiveSupport::Concern
-    
+
     included do
       # attribute definitions
       cattr_accessor :imported_variables do
         {}
       end
     end
-    
+
     # standard methods
-    
+
     # custom methods
     module ClassMethods
       def register_landable_variable(variable_name, method_name = nil)
         method_name ||= variable_name
-        
+
         imported_variables[variable_name] = method_name
       end
     end
-    
+
     def fetch_landable_variables
       variables = {}
-      
-      imported_variables.each do |variable_name, method_name| 
+
+      imported_variables.each do |variable_name, method_name|
         variables[variable_name] = send(method_name)
       end
 
       variables.with_indifferent_access
     end
-    
+
     # end
   end
-end
+end

data/app/controllers/landable/api/access_tokens_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
@@ -33,16 +33,15 @@ module Landable
         head :unauthorized
       end
 
-
       private
 
-        def find_own_access_token(id = params[:id])
-          current_author.access_tokens.fresh.find(id)
-        end
+      def find_own_access_token(id = params[:id])
+        current_author.access_tokens.fresh.find(id)
+      end
 
-        def asset_token_params
-          params.require(:access_token).permit(:username, :password)
-        end
+      def asset_token_params
+        params.require(:access_token).permit(:username, :password)
+      end
     end
   end
 end

data/app/controllers/landable/api/assets_controller.rb

@@ -6,30 +6,31 @@ module Landable
     class AssetsController < ApiController
       # filters
       before_filter :load_asset, except: [:create, :index]
-      
+
       # RESTful methods
       def create
         asset = Asset.new(asset_params)
+        original = asset.duplicate_of
 
-        if original = asset.duplicate_of
+        if original
           head :moved_permanently, location: asset_url(original)
           return
         end
-        
+
         Asset.transaction do
           asset.author = current_author
           asset.save!
         end
-        
+
         respond_with asset, status: :created, location: asset_url(asset)
       end
-      
+
       def destroy
         @asset.try(:deactivate)
-        
+
         respond_with @asset
       end
-      
+
       def index
         search = Landable::AssetSearchEngine.new(search_params.merge(ids: params[:ids]))
         respond_with search.results, meta: search.meta
@@ -37,37 +38,39 @@ module Landable
 
       def reactivate
         @asset.try(:reactivate)
-        
+
         respond_with @asset
       end
-      
+
       def show
         respond_with @asset
       end
-      
+
       def update
         @asset.update_attributes!(asset_params)
 
         respond_with @asset
       end
-      
+
       # custom methods
+
       private
-        def asset_params
-          params.require(:asset).permit(:id, :name, :description, :data, :file)
-        end
-      
-        def load_asset
-          @asset = Asset.find(params[:id])
-        end
-      
-        def search_params
-          @search_params ||=
-            begin
-              hash = params.permit(search: [:name])
-              hash[:search] || {}
-            end
-        end
+
+      def asset_params
+        params.require(:asset).permit(:id, :name, :description, :data, :file)
+      end
+
+      def load_asset
+        @asset = Asset.find(params[:id])
+      end
+
+      def search_params
+        @search_params ||=
+          begin
+            hash = params.permit(search: [:name])
+            hash[:search] || {}
+          end
+      end
     end
   end
 end