Reworded clients page and changed nav links and rubocop

also devdata

Author: reconbot

.rubocop.yml

@@ -1,29 +1,58 @@
 AllCops:
   RunRailsCops: true
   Exclude:
-    - 'lib/tasks/cucumber.rake'
-    - 'config/unicorn.rb'
-    - 'db/**/*'
     - 'Guardfile'
+    - 'bin/**/*'
+    - 'db/**/*'
     - 'vendor/bundle/**/*'
 
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
-# Offense count: 45
-# Configuration parameters: AllowURI.
 Metrics/LineLength:
-  Max: 112
+  Max: 120
+
+Metrics/MethodLength:
+  Max: 10
+
+Metrics/AbcSize:
+  Max: 14
 
-# We don't use this often but sometimes it improves readability
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/BracesAroundHashParameters:
+Metrics/ClassLength:
+  Max: 100
+
+Rails/Output:
+  Enabled: false
+
+Style/BlockDelimiters:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 
-# Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/IndentHash:
   Enabled: false
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Style/SignalException:
+  Enabled: false
+
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+# Style/StringLiterals:
+  # EnforcedStyle: double_quotes
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Style/AlignParameters:
+  Enabled: false
+
+Style/FirstParameterIndentation:
+  Enabled: false

Gemfile.lock

@@ -40,9 +40,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.6)
     arel (6.0.0)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     aws-sdk (1.60.2)
       aws-sdk-v1 (= 1.60.2)
     aws-sdk-v1 (1.60.2)
@@ -206,10 +206,10 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    parser (2.2.0.2)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     pg (0.17.1)
-    powerpack (0.0.9)
+    powerpack (0.1.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -287,16 +287,16 @@ GEM
       rspec-mocks (~> 3.1.0)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rubocop (0.28.0)
+    rubocop (0.33.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
+      parser (>= 2.2.2.5, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-freshbooks (0.4.1)
       builder (>= 2.1.2)
       httparty (>= 0.5.0)
-    ruby-progressbar (1.7.1)
+    ruby-progressbar (1.7.5)
     ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)

app/controllers/contracts_controller.rb

@@ -2,11 +2,9 @@ class ContractsController < ApplicationController
   before_action :hide_nav
 
   def view
-    client = OpenStruct.new({
-      name: 'vRide Inc.',
-      full_address: 'vRide, Inc., 568 Broadway, Ste 603a, New York, NY. 10012',
-      accepted_date: '10/20/2014'
-    })
+    client = OpenStruct.new(name: 'vRide Inc.',
+                            full_address: 'vRide, Inc., 568 Broadway, Ste 603a, New York, NY. 10012',
+                            accepted_date: '10/20/2014')
     @content = render_to_string partial: 'msa', locals: { client: client }
   end
 end

app/models/blog_entry.rb

@@ -3,7 +3,7 @@ class BlogEntry < ActiveRecord::Base
     medium: '300x300>'
   }
 
-  validates_attachment_content_type :blog_image, content_type: /\Aimage\/.*\Z/
+  validates_attachment_content_type :blog_image, content_type: %r{\Aimage/.*\Z}
 
   def self.update_blog(blog_rss_url = ENV['BLOG_RSS_URL'])
     blog = Feedjira::Feed.fetch_and_parse(blog_rss_url)
@@ -15,15 +15,17 @@ def self.create_or_update_entries(entries)
   end
 
   def self.create_or_update_entry(entry)
-    blog_entry = where(guid: entry.id).first_or_initialize
-    blog_entry.assign_attributes(
+    find_entry(entry).update!(
       name:         entry.title,
       summary:      entry.summary,
       url:          entry.url,
       published_at: entry.published,
       blog_image:   entry.image || extract_image(entry.content)
     )
-    blog_entry.save!
+  end
+
+  def self.find_entry(entry)
+    where(guid: entry.id).first_or_initialize
   end
 
   def self.extract_image(content)

app/views/application/_navbar.html.erb

@@ -7,10 +7,10 @@
     <div class="right-nav">
       <ul class="js-nav-menu navigation-menu">
         <li><%= link_to "Services", root_path(anchor: "services") %></li>
-        <li><%= link_to "Clients", root_path(anchor: "clients") %></li>
+        <li><%= link_to "Clients", clients_path %></li>
         <li><%= link_to "Team", root_path(anchor: "team") %></li>
         <li><%= link_to "Contact", root_path(anchor: "contact") %></li>
-        <li><%= link_to "Blog", root_path(anchor: "recent-articles") %></li>
+        <li><%= link_to "Blog", "http://wizard.codes/", target: '_blank' %></li>
       </ul>
     </div>
   </div>

app/views/home/clients.html.erb

@@ -1,7 +1,9 @@
 <article class="casestudies-container">
   <h2>Featured Clients</h2>
-  <p class="tagline">We work with small businesses owners to solve the challenges within their industries. Our websites are custom built using the latest technology, automated testing, and modern design.
-  <%= render 'winnower' %>
-  <%= render 'bakecycle' %>
-  <%= render 'one_month' %>
+  <p class="tagline">
+    We work with various sized organizations, from YC backed startups to large established firms. We help them tackle the difficult problems to grow their apps into what they should to be.
+  </p>
+  <%= render "winnower" %>
+  <%= render "bakecycle" %>
+  <%= render "one_month" %>
 </article>

config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

config/initializers/session_store.rb

@@ -1,5 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-WizardDevelopment::Application.config.session_store :cookie_store, {
-  key: '_wizarddevelopment_com_session'
-}
+WizardDevelopment::Application.config.session_store :cookie_store, key: '_wizarddevelopment_com_session'

config/unicorn.rb

@@ -3,7 +3,6 @@
 timeout((ENV['WEB_TIMEOUT'] || 5).to_i)
 preload_app true
 
-
 before_fork do |_server, _worker|
   Signal.trap 'TERM' do
     puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
@@ -21,4 +20,4 @@
   end
 
   ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
-end
+end

db/seeds.rb

@@ -4,62 +4,64 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
+unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gems:* tasks
 
-unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+  vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+  $LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
 
-vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+  begin
+    require 'cucumber/rake/task'
 
-begin
-  require 'cucumber/rake/task'
+    namespace :cucumber do
+      Cucumber::Rake::Task.new({ ok: 'test:prepare' }, 'Run features that should pass') do |t|
+        t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+        t.fork = true # You may get faster startup if you set this to false
+        t.profile = 'default'
+      end
 
-  namespace :cucumber do
-    Cucumber::Rake::Task.new({:ok => 'test:prepare'}, 'Run features that should pass') do |t|
-      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'default'
-    end
-
-    Cucumber::Rake::Task.new({:wip => 'test:prepare'}, 'Run features that are being worked on') do |t|
-      t.binary = vendored_cucumber_bin
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'wip'
-    end
+      Cucumber::Rake::Task.new({ wip: 'test:prepare' }, 'Run features that are being worked on') do |t|
+        t.binary = vendored_cucumber_bin
+        t.fork = true # You may get faster startup if you set this to false
+        t.profile = 'wip'
+      end
 
-    Cucumber::Rake::Task.new({:rerun => 'test:prepare'}, 'Record failing features and run only them if any exist') do |t|
-      t.binary = vendored_cucumber_bin
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'rerun'
-    end
+      Cucumber::Rake::Task.new({
+          rerun: 'test:prepare'
+        },
+        'Record failing features and run only them if any exist') do |t|
+        t.binary = vendored_cucumber_bin
+        t.fork = true # You may get faster startup if you set this to false
+        t.profile = 'rerun'
+      end
 
-    desc 'Run all features'
-    task :all => [:ok, :wip]
+      desc 'Run all features'
+      task all: [:ok, :wip]
 
-    task :statsetup do
-      require 'rails/code_statistics'
-      ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
-      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+      task :statsetup do
+        require 'rails/code_statistics'
+        ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+        ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+      end
     end
-  end
-  desc 'Alias for cucumber:ok'
-  task :cucumber => 'cucumber:ok'
+    desc 'Alias for cucumber:ok'
+    task cucumber: 'cucumber:ok'
 
-  task :default => :cucumber
+    task default: :cucumber
 
-  task :features => :cucumber do
-    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
-  end
+    task features: :cucumber do
+      STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+    end
 
-  # In case we don't have the generic Rails test:prepare hook, append a no-op task that we can depend upon.
-  task 'test:prepare' do
-  end
+    # In case we don't have the generic Rails test:prepare hook, append a no-op task that we can depend upon.
+    task 'test:prepare' do
+    end
 
-  task :stats => 'cucumber:statsetup'
-rescue LoadError
-  desc 'cucumber rake task not available (cucumber not installed)'
-  task :cucumber do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+    task stats: 'cucumber:statsetup'
+  rescue LoadError
+    desc 'cucumber rake task not available (cucumber not installed)'
+    task :cucumber do
+      abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+    end
   end
-end
 
 end