diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/app/controllers/audiences_controller.rb b/app/controllers/audiences_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/audiences_controller.rb
+++ b/app/controllers/audiences_controller.rb
@@ -1,12 +1,14 @@ class AudiencesController < ApplicationController
def show
- @guides = Publication.any_in(audiences: [params[:id]]).collect(&:published_edition).compact
- render :json => @guides.collect do |g|
+ publications = Publication.any_in(audiences: [params[:id]]).collect(&:published_edition).compact
+ details = publications.to_a.collect do |g|
{
:title => g.title,
- :tags => g.tags,
- :url => admin_guide_url(g)
+ :tags => g.container.tags,
+ :url => guide_url(:id => g.container.slug, :format => :json)
}
end
+
+ render :json => details
end
end
| Extend audiences API code to better include transactions
|
diff --git a/app/controllers/responses_controller.rb b/app/controllers/responses_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/responses_controller.rb
+++ b/app/controllers/responses_controller.rb
@@ -1,7 +1,7 @@ class ResponsesController < ApplicationController
def new
- if logged_in?
+ if current_user != nil
@parent = parent_object
@parent_name = @parent.class.name.downcase.pluralize
@response = Response.new
| Change controller logic on new route to pass tests
|
diff --git a/app/controllers/snapshots_controller.rb b/app/controllers/snapshots_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/snapshots_controller.rb
+++ b/app/controllers/snapshots_controller.rb
@@ -26,7 +26,7 @@ def destroy
@snapshot.destroy
- redirect_to @snapshot.url
+ redirect_to @snapshot.url, notice: 'Snapshot was successfully destroyed.'
end
def set_as_baseline
| Add notice to redirect when destroying Snapshots
The create action redirect has a notice, so it seems reasonable that the
destroy action would have a similar notice. This should make the app
more usable.
Change-Id: Ifd14bed542f96eba7c2ce9326a3de9a2a248d1ae
|
diff --git a/db/seeds.rb b/db/seeds.rb
index abc1234..def5678 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,5 +5,3 @@ #
# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
# Mayor.create(name: 'Emanuel', city: cities.first)
-user = CreateAdminService.new.call
-puts 'CREATED ADMIN USER: ' << user.email
| Remove useless seed (autogen code from rails-composer)
|
diff --git a/db/seeds.rb b/db/seeds.rb
index abc1234..def5678 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,9 +1,18 @@ # This code is free software; you can redistribute it and/or modify it under
# the terms of the new BSD License.
#
-# Copyright (c) 2012, Sebastian Staudt
+# Copyright (c) 2012-2013, Sebastian Staudt
-Repository.find_or_create_by name: 'mxcl/homebrew'
+Repository.find_or_create_by name: 'Homebrew/homebrew'
+Repository.find_or_create_by name: 'Homebrew/homebrew-apache'
+Repository.find_or_create_by name: 'Homebrew/homebrew-binary'
+Repository.find_or_create_by name: 'Homebrew/homebrew-boneyard'
+Repository.find_or_create_by name: 'Homebrew/homebrew-completions'
+Repository.find_or_create_by name: 'Homebrew/homebrew-dupes'
+Repository.find_or_create_by name: 'Homebrew/homebrew-games'
+Repository.find_or_create_by name: 'Homebrew/homebrew-headonly'
+Repository.find_or_create_by name: 'Homebrew/homebrew-science'
+Repository.find_or_create_by name: 'Homebrew/homebrew-versions'
Repository.all.each do |repo|
repo.refresh
| Use all Homebrew repositories for seeding
|
diff --git a/db/seeds.rb b/db/seeds.rb
index abc1234..def5678 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,7 +5,8 @@
baby = Movie.create(
name: "Adventures in Babysitting",
- description: "A lifetime of fun. In just one night"
+ description: "A lifetime of fun. In just one night",
+ rating: 5
)
live_action = Genre.create(
| Add ranking to one seed entry
|
diff --git a/lib/create_audit_tables_for_existing_tables.rb b/lib/create_audit_tables_for_existing_tables.rb
index abc1234..def5678 100644
--- a/lib/create_audit_tables_for_existing_tables.rb
+++ b/lib/create_audit_tables_for_existing_tables.rb
@@ -0,0 +1,21 @@+# frozen_string_literal: true
+module AuditTables
+ class CreateAuditTablesForExistingTables < Base
+ attr_reader :klasses
+
+ def initialize
+ @klasses = ActiveRecord::Base.connection.tables
+ @klasses -= Module::BLACK_LISTED_TABLES
+ end
+
+ def process
+ klasses.each do |klass|
+ AuditTables::BuildAuditTrigger.new(klass).build
+ @table_name = klass
+ @klass = klass.classify.safe_constantize
+ @audit_table_name = "audit_#{klass}"
+ sync_audit_tables
+ end
+ end
+ end
+end
| Add create audit table for existing tables method
|
diff --git a/lib/generators/authem/model/model_generator.rb b/lib/generators/authem/model/model_generator.rb
index abc1234..def5678 100644
--- a/lib/generators/authem/model/model_generator.rb
+++ b/lib/generators/authem/model/model_generator.rb
@@ -6,7 +6,7 @@ argument :model_name, type: :string, default: "user"
def generate_model
- generate("model #{model_name} email:string, password_digest:string, reset_password_token:string, session_token:string")
+ generate("model #{model_name} email:string, password_digest:string, reset_password_token:string, session_token:string, remember_token:string")
end
def update_model_to_include_authem
| Add remember token to migration generator
[fixes #19]
|
diff --git a/lib/generators/bower_vendor/clean_generator.rb b/lib/generators/bower_vendor/clean_generator.rb
index abc1234..def5678 100644
--- a/lib/generators/bower_vendor/clean_generator.rb
+++ b/lib/generators/bower_vendor/clean_generator.rb
@@ -5,7 +5,10 @@ class_option :cached, type: :boolean, desc: "Delete only the bower cache from #{BowerVendor::BOWER_ROOT}"
desc 'Cleans bower assets (CAUTION: Vendored asset directories for all bower packages will be deleted!)'
def clean_packages
- return false unless Dir.exist? BowerVendor::BOWER_ROOT
+ unless Dir.exist? BowerVendor::BOWER_ROOT
+ say_status :run, 'bower install --production'
+ `bower install --production`
+ end
if !options.cached?
@utils = BowerVendor::Utils.new
utils.merged_paths.keys.each do |package|
| Allow cleaning when bower tmp is missing.
Adds an extra `bower install` pass for install generator, but meh...
|
diff --git a/libraries/mysql_server_installation_package.rb b/libraries/mysql_server_installation_package.rb
index abc1234..def5678 100644
--- a/libraries/mysql_server_installation_package.rb
+++ b/libraries/mysql_server_installation_package.rb
@@ -14,9 +14,9 @@
# Actions
action :install do
- package package_name do
- version package_version if package_version
- options package_options if package_options
+ package new_resource.package_name do
+ version new_resource.package_version if new_resource.package_version
+ options new_resource.package_options if new_resource.package_options
notifies :install, 'package[perl-Sys-Hostname-Long]', :immediately if platform_family?('suse')
notifies :run, 'execute[Initial DB setup script]', :immediately if platform_family?('suse')
action :install
@@ -34,7 +34,7 @@ end
action :delete do
- package package_name do
+ package new_resource.package_name do
action :remove
end
end
| Resolve more Chef 14 deprecation warnings
Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
|
diff --git a/core/config/initializers/monkey_patch.rb b/core/config/initializers/monkey_patch.rb
index abc1234..def5678 100644
--- a/core/config/initializers/monkey_patch.rb
+++ b/core/config/initializers/monkey_patch.rb
@@ -0,0 +1,21 @@+module Sprockets
+ module Helpers
+ module RailsHelper
+ class AssetPaths < ::ActionView::AssetPaths
+ private
+ def rewrite_extension(source, dir, ext)
+ source_ext = File.extname(source)[1..-1]
+ if !ext || ext == source_ext
+ source
+ elsif source_ext.blank?
+ "#{source}.#{ext}"
+ elsif File.exists?(source) || exact_match_present?(source)
+ source
+ else
+ "#{source}.#{ext}"
+ end
+ end
+ end
+ end
+ end
+end
| Add monkey patch to load assets faster - fixes bu in Rails 3.2.13
See pull request for more info:
https://github.com/rails/rails/pull/9820
|
diff --git a/oauth2_server/lib/social_stream/oauth2_server/controllers/helpers.rb b/oauth2_server/lib/social_stream/oauth2_server/controllers/helpers.rb
index abc1234..def5678 100644
--- a/oauth2_server/lib/social_stream/oauth2_server/controllers/helpers.rb
+++ b/oauth2_server/lib/social_stream/oauth2_server/controllers/helpers.rb
@@ -4,6 +4,10 @@ # Common methods added to ApplicationController
module Helpers
extend ActiveSupport::Concern
+
+ def authenticate_user!
+ oauth2_token? || super
+ end
def current_subject
super ||
@@ -18,7 +22,7 @@ end
def current_from_oauth_token(type)
- return if oauth2_token.blank?
+ return unless oauth2_token?
oauth2_token.__send__(type)
end
@@ -27,6 +31,10 @@ @oauth2_token ||=
request.env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN]
end
+
+ def oauth2_token?
+ oauth2_token.present?
+ end
end
end
end
| Include oauth2 in authenticate user filter
|
diff --git a/app/mailers/bhsi_applications_mailer.rb b/app/mailers/bhsi_applications_mailer.rb
index abc1234..def5678 100644
--- a/app/mailers/bhsi_applications_mailer.rb
+++ b/app/mailers/bhsi_applications_mailer.rb
@@ -1,15 +1,21 @@ class BhsiApplicationsMailer < ActionMailer::Base
- default :from => ApplicationHelper::CIW_BHSI_SUBM_EMAIL
- default :subject => 'BHSI Application Form Submission'
+ default from: "test@example.com"
+ default subject: 'BHSI Application Form Submission'
- def send_form(bhsi_application, filename)
- attachments[filename] = File.read(bhsi_application.pdf)
- mail(:to => "#{ApplicationHelper::CIW_JESSICA_EMAIL}, #{ApplicationHelper::CIW_COREY_EMAIL}, #{ApplicationHelper::DAVID_EMAIL}")
+ def send_form(bhsi)
+ @bhsi = bhsi
+ attachments[bhsi.pdf_file_name] = open(bhsi.pdf.url).read
+ attachments[bhsi.previous_budget_file_name] = open(bhsi.previous_budget.url).read
+ attachments[bhsi.press_clipping_1_file_name] = open(bhsi.press_clipping_1.url).read if bhsi.press_clipping_1.present?
+ attachments[bhsi.press_clipping_2_file_name] = open(bhsi.press_clipping_2.url).read if bhsi.press_clipping_2.present?
+ attachments[bhsi.press_clipping_3_file_name] = open(bhsi.press_clipping_3.url).read if bhsi.press_clipping_3.present?
+
+ mail(to: 'leanucci@gmail.com')
end
- def thank_you_application(bhsi_application)
- mail(:to => bhsi_application.email)
+ def thank_you_application(bhsi)
+ mail(to: bhsi.email)
end
end
| Send attachments in bhsi applications
|
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index abc1234..def5678 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -2,7 +2,7 @@
describe FakeLDAP::Server do
before :all do
- @port = rand(1000) + 1000
+ @port = 1389
@server = FakeLDAP::Server.new(:port => @port)
@server.run_tcpserver
| Use port 1389 in spec
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,9 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'active_model/jobs'
-require './spec/support/mocks'
if ENV['CI']
require "codeclimate-test-reporter"
CodeClimate::TestReporter.start
end
+
+require 'active_model/jobs'
+require './spec/support/mocks'
| Move location of codeclimate test reporter
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,6 +8,20 @@ config = YAML::load(File.open(File.dirname(__FILE__) + '/database.yml'))
ActiveRecord::Base.establish_connection(config['test'])
load(File.dirname(__FILE__) + "/schema.rb")
+
+# Fixes 'address'.singularize # => 'addres'
+ActiveSupport::Inflector.inflections do |inflect|
+ inflect.singular(/ess$/i, 'ess')
+end
+
+class Account < ActiveRecord::Base
+end
+
+class Address < ActiveRecord::Base
+end
+
+class Profile < ActiveRecord::Base
+end
# Define ActiveRecord classes to use while testing.
class Author < ActiveRecord::Base
@@ -30,3 +44,4 @@ class Session < ActiveRecord::Base
belongs_to :author
end
+
| Define the additional classes that are needed.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,7 +9,7 @@
require 'bashcov'
-Dir["./spec/support/**/*.rb"].each { |file| require file }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |file| require file }
RSpec.configure do |config|
config.before(:each) do
| Use absolute path so it works even if we're not into the root dir
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,3 +7,7 @@ def app
Rails.application
end
+
+RSpec.configure do |config|
+ config.after { clear_cookies }
+end
| Clear Rack::Test session after each spec.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,6 @@ require 'rspec'
require 'webmock/rspec'
require 'fulcrum'
-require 'debugger'
require 'client_helper'
require 'resource_examples'
| Remove debugger gem from specs.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,6 +6,15 @@
RSpec.configure do |config|
+ # Use color in STDOUT
+ config.color = true
+
+ # Use color not only in STDOUT but also in pagers and files
+ config.tty = true
+
+ # Use the specified formatter
+ config.formatter = :documentation # :progress, :html, :textmate
+
config.expect_with :rspec do |c|
c.syntax = [:should, :expect] # Disable warnings
end
| Enable color when executing rake
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,7 +8,7 @@ require 'rubygems'
require 'bundler/setup'
-MINIMUM_COVERAGE = 82
+MINIMUM_COVERAGE = 81
if ENV['COVERAGE']
require 'simplecov'
| Reduce coverage requirement due to rails4 code branches
* These branches mean they avoid large sections of legacy code
which results in lower coverage numbers
|
diff --git a/lib/tasks/gobierto_budgets/update_multisearch_indexes.rake b/lib/tasks/gobierto_budgets/update_multisearch_indexes.rake
index abc1234..def5678 100644
--- a/lib/tasks/gobierto_budgets/update_multisearch_indexes.rake
+++ b/lib/tasks/gobierto_budgets/update_multisearch_indexes.rake
@@ -0,0 +1,75 @@+# frozen_string_literal: true
+
+namespace :gobierto_budgets do
+ namespace :pg_search do
+ desc "Rebuild multisearch indexes of Budget lines by domain and year"
+ task :reindex, [:site_domain, :year] => [:environment] do |_t, args|
+ site = Site.find_by!(domain: args[:site_domain])
+ year = args[:year].to_i
+ organization_id = site.organization_id
+
+ puts "== Reindexing records for site #{site.domain}=="
+
+ # Delete all Budget Line PgSearch documents within this site
+ site.pg_search_documents.where(searchable_type: "GobiertoBudgets::BudgetLine").where("meta @> ?", { year: year }.to_json).destroy_all
+
+ GobiertoBudgets::BudgetArea.all_areas.each do |area|
+ area.available_kinds.each do |kind|
+ puts "\n[INFO] area = '#{area.area_name}' kind = '#{kind}'"
+ puts "---------------------------------------------------"
+
+ forecast_hits = request_budget_lines_from_elasticsearch(
+ GobiertoBudgets::SearchEngineConfiguration::BudgetLine.index_forecast,
+ area,
+ organization_id,
+ year
+ )
+
+ puts "[INFO] Found #{forecast_hits.size} forecast #{area.area_name} #{kind} BudgetLine records"
+
+ forecast_budget_lines = forecast_hits.map do |h|
+ create_budget_line(site, "index_forecast", h)
+ end
+
+ GobiertoBudgets::BudgetLine.pg_search_reindex_collection(forecast_budget_lines)
+ end
+ end
+ end
+
+ def create_budget_line(site, index, elasticsearch_hit)
+ GobiertoBudgets::BudgetLine.new(
+ site: site,
+ index: index,
+ area_name: elasticsearch_hit["_type"],
+ kind: elasticsearch_hit["_source"]["kind"],
+ code: elasticsearch_hit["_source"]["code"],
+ year: elasticsearch_hit["_source"]["year"],
+ amount: elasticsearch_hit["_source"]["amount"]
+ )
+ end
+
+ def request_budget_lines_from_elasticsearch(index, area, organization_id, year)
+ query = {
+ query: {
+ filtered: {
+ filter: {
+ bool: {
+ must: [
+ { term: { organization_id: organization_id } },
+ { term: { year: year } }
+ ]
+ }
+ }
+ }
+ },
+ size: 10_000
+ }
+
+ GobiertoBudgets::SearchEngine.client.search(
+ index: index,
+ type: area.area_name,
+ body: query
+ )["hits"]["hits"]
+ end
+ end
+end
| Add task to regenerate search documents of budget lines by site and year
|
diff --git a/app/models/drawing.rb b/app/models/drawing.rb
index abc1234..def5678 100644
--- a/app/models/drawing.rb
+++ b/app/models/drawing.rb
@@ -14,7 +14,11 @@ validates :age, numericality: { only_integer: true }, allow_nil: true
validates :mood_rating, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 10 }, allow_nil: true
- has_attached_file :image, styles: { medium: "640x" }
+ has_attached_file :image, styles: {
+ medium: "640x",
+ thumb: "100x100#"
+ }
+
validates_attachment_content_type :image, content_type: %r{\Aimage\/.*\Z}
belongs_to :user
| Add thumb size to paperclip image styles |
diff --git a/app/serializers/changeset_serializer.rb b/app/serializers/changeset_serializer.rb
index abc1234..def5678 100644
--- a/app/serializers/changeset_serializer.rb
+++ b/app/serializers/changeset_serializer.rb
@@ -17,10 +17,5 @@ :applied_at,
:created_at,
:updated_at,
- :payload
-
- def payload
- {changes: object.change_payloads.map {|x| x.payload_as_ruby_hash[:changes]}}
- end
-
+ :change_payload_ids
end
| Remove included payload in Changeset serialization
|
diff --git a/recipes/libreoffice.rb b/recipes/libreoffice.rb
index abc1234..def5678 100644
--- a/recipes/libreoffice.rb
+++ b/recipes/libreoffice.rb
@@ -1,5 +1,5 @@-node.default["libreoffice"]["source"] = "http://download.documentfoundation.org/libreoffice/stable/3.5.4/mac/x86/LibO_3.5.4_MacOS_x86_install_en-US.dmg"
-node.default["libreoffice"]["checksum"] = "b4302f30f6aafe384f13673aaba05ff85c1b4617f997c22e1079df48c6172fee"
+node.default["libreoffice"]["source"] = "http://download.documentfoundation.org/libreoffice/stable/3.5.5/mac/x86/LibO_3.5.5_MacOS_x86_install_en-US.dmg"
+node.default["libreoffice"]["checksum"] = "a6edaaf2c257d04fc33f8dbaaab9a98feb407e73bf33c5e6ec873b0b08413af4"
pivotal_workstation_package "LibreOffice" do
volumes_dir "LibreOffice"
| Update LibreOffice to version 3.5.5
|
diff --git a/recipes/server_streaming_master.rb b/recipes/server_streaming_master.rb
index abc1234..def5678 100644
--- a/recipes/server_streaming_master.rb
+++ b/recipes/server_streaming_master.rb
@@ -21,7 +21,6 @@ if node['postgresql']['version'].to_f < 9.3
Chef::Log.fatal!("Streaming replication requires postgresql 9.3 or greater and
you have configured #{node['postgresql']['version']}. Bail.")
- node.override['postgresql']['version'] = "9.3"
end
node['postgresql']['streaming']['master']['config'].each do |k,v|
@@ -33,9 +32,11 @@
include_recipe 'postgresql::server'
-directory node['postgresql']['shared_archive'] do
- owner "postgres"
- group "postgres"
- mode 00755
- action :create
+if node['postgresql'].attribute? 'shared_archive'
+ directory node['postgresql']['shared_archive'] do
+ owner "postgres"
+ group "postgres"
+ mode 00755
+ action :create
+ end
end | Remove unused line. Make archive dir creation conditional
|
diff --git a/config/initializers/active_encode.rb b/config/initializers/active_encode.rb
index abc1234..def5678 100644
--- a/config/initializers/active_encode.rb
+++ b/config/initializers/active_encode.rb
@@ -6,8 +6,9 @@ Rubyhorn.init
when :elastic_transcoder
require 'aws-sdk'
+ require 'avalon/elastic_transcoder'
- # MasterFile.default_encoder_class = ActiveEncode::Base
+ MasterFile.default_encoder_class = ElasticTranscoderEncode
pipeline = Aws::ElasticTranscoder::Client.new.read_pipeline(id: Settings.encoding.pipeline)
# Set environment variables to guard against reloads
ENV['SETTINGS__ENCODING__MASTERFILE_BUCKET'] = Settings.encoding.masterfile_bucket = pipeline.pipeline.input_bucket
| Load lib/avalon/elastic_transcoder if adapter is :elastic_transcoder
|
diff --git a/spec_helper.rb b/spec_helper.rb
index abc1234..def5678 100644
--- a/spec_helper.rb
+++ b/spec_helper.rb
@@ -35,6 +35,7 @@ :operatingsystemrelease => possible_releases[dist_preferred],
:lsbdistid => 'Debian',
:lsbdistcodename => dist_preferred.capitalize,
+ :lsbmajdistrelease => 14,
:architecture => 'amd64',
}
end
| Add a default lsbmajdistrelease fact
This is set to our current default choice of Ubuntu version. Having this fact fixes
issues in govuk_postgresql, puppet and puppetdb specs.
|
diff --git a/scrummin.gemspec b/scrummin.gemspec
index abc1234..def5678 100644
--- a/scrummin.gemspec
+++ b/scrummin.gemspec
@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
spec.name = "scrummin"
spec.version = Scrummin::VERSION
- spec.authors = ["Chris Thorn"]
- spec.email = ["cthorn@resdat.com"]
+ spec.authors = ["Chris Thorn", "Sonhui Lamson"]
+ spec.email = ["oss@resdat.com"]
spec.description = "Simple tool for facilitating SCRUM meetings"
spec.summary = "Simple tool for facilitating SCRUM meetings"
spec.license = "MIT"
| Update authors and email address
|
diff --git a/app/controllers/storytime/pages_controller.rb b/app/controllers/storytime/pages_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/storytime/pages_controller.rb
+++ b/app/controllers/storytime/pages_controller.rb
@@ -10,11 +10,12 @@ end
#allow overriding in the host app
- sanitized_id = ActionController::Base.helpers.sanitize params[:id]
+ slug = @page.nil? ? ActionController::Base.helpers.sanitize(params[:id]) : @page.slug
+
potential_templates = [
- "storytime/#{@current_storytime_site.custom_view_path}/pages/#{sanitized_id}",
+ "storytime/#{@current_storytime_site.custom_view_path}/pages/#{slug}",
"storytime/#{@current_storytime_site.custom_view_path}/pages/show",
- "storytime/pages/#{sanitized_id}",
+ "storytime/pages/#{slug}",
"storytime/pages/show",
].each do |template|
if lookup_context.template_exists?(template)
| Fix updated pages controller view template lookup to work with home pages
|
diff --git a/test/sepa/banks/nordea/nordea_renew_cert_application_request_test.rb b/test/sepa/banks/nordea/nordea_renew_cert_application_request_test.rb
index abc1234..def5678 100644
--- a/test/sepa/banks/nordea/nordea_renew_cert_application_request_test.rb
+++ b/test/sepa/banks/nordea/nordea_renew_cert_application_request_test.rb
@@ -27,11 +27,15 @@ end
test "customer id is set correctly" do
- assert_equal @doc.at_css("CustomerId").content, @params[:customer_id]
+ assert_equal @params[:customer_id], @doc.at_css("CustomerId").content
end
test "timestamp is set correctly" do
timestamp = Time.strptime(@doc.at_css("Timestamp").content, '%Y-%m-%dT%H:%M:%S%z')
assert timestamp <= Time.now && timestamp > (Time.now - 60), "Timestamp was not set correctly"
end
+
+ test "environment is set correctly" do
+ assert_equal @params[:environment].upcase, @doc.at_css("Environment").content
+ end
end
| Test that environment is set correctly
|
diff --git a/app/controllers/neighborly/balanced/creditcard/payments_controller.rb b/app/controllers/neighborly/balanced/creditcard/payments_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/neighborly/balanced/creditcard/payments_controller.rb
+++ b/app/controllers/neighborly/balanced/creditcard/payments_controller.rb
@@ -16,6 +16,7 @@ @customer.save
current_user.create_balanced_contributor(uri: @customer.uri)
end
+ @cards = @customer.cards
end
end
end
| Add cards variables to payment controller
|
diff --git a/lib/activerecord_reindex.rb b/lib/activerecord_reindex.rb
index abc1234..def5678 100644
--- a/lib/activerecord_reindex.rb
+++ b/lib/activerecord_reindex.rb
@@ -11,8 +11,14 @@
def initialize
@index_queue = :elastic_index
- @index_class = ActiverecordReindex::AsyncAdapter::UpdateJob
- @mass_index_class = ActiverecordReindex::AsyncAdapter::MassUpdateJob
+ end
+
+ def index_class
+ @index_class || ActiverecordReindex::AsyncAdapter::UpdateJob
+ end
+
+ def mass_index_class
+ @mass_index_class || ActiverecordReindex::AsyncAdapter::MassUpdateJob
end
end
| Fix circular dependency in reindexer.
|
diff --git a/app/models/game.rb b/app/models/game.rb
index abc1234..def5678 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -1,5 +1,7 @@ class Game < ActiveRecord::Base
after_initialize :init
+ before_save :before_save
+ after_save :after_save
def init
self.status = :in_play
@@ -12,4 +14,14 @@ self.moves << ['yellow', 0]
self.grid[0] << 'yellow'
end
+
+ def before_save
+ self.moves = self.moves.to_json
+ self.grid = self.grid.to_json
+ end
+
+ def after_save
+ self.moves = JSON.parse(self.moves)
+ self.grid = JSON.parse(self.grid)
+ end
end
| Save the moves and grid fields as serialized JSON (rather than YAML)
|
diff --git a/lib/did_you_mean/core_ext/name_error.rb b/lib/did_you_mean/core_ext/name_error.rb
index abc1234..def5678 100644
--- a/lib/did_you_mean/core_ext/name_error.rb
+++ b/lib/did_you_mean/core_ext/name_error.rb
@@ -15,7 +15,7 @@
def to_s
msg = original_message.dup
- bt = caller.first(6)
+ bt = caller(1, 6)
msg << Formatter.new(suggestions).to_s if IGNORED_CALLERS.all? {|ignored| bt.grep(ignored).empty? }
msg
| Create a list of backtrace that is 6-depth only
Calling #caller without arguments creates a whole list of backtrace which allocates a lof of memory.
|
diff --git a/lib/jrails_auto_complete.rb b/lib/jrails_auto_complete.rb
index abc1234..def5678 100644
--- a/lib/jrails_auto_complete.rb
+++ b/lib/jrails_auto_complete.rb
@@ -7,13 +7,13 @@ def auto_complete_for(object_name, method_name, options = {})
self.send(:define_method, "auto_complete_for_#{object_name}_#{method_name}") do
find_options = {
- :conditions => [ "LOWER(#{method}) LIKE ?", '%' + params[object][method].downcase + '%' ],
- :order => "#{method} ASC",
+ :conditions => [ "LOWER(#{method_name}) LIKE ?", '%' + params[object_name][method_name].downcase + '%' ],
+ :order => "#{method_name} ASC",
:limit => 10
}.merge!(options)
- @items = object.to_s.camelize.constantize.find(:all, find_options)
- render :inline => "<%= auto_complete_result @items, '#{method}' %>"
+ @items = object_name.to_s.camelize.constantize.find(:all, find_options)
+ render :inline => "<%= auto_complete_result @items, '#{method_name}' %>"
end
end
end
| Fix fatal bug: use object_name and method_name instead of object and method.
|
diff --git a/lib/govuk_content_models/require_all.rb b/lib/govuk_content_models/require_all.rb
index abc1234..def5678 100644
--- a/lib/govuk_content_models/require_all.rb
+++ b/lib/govuk_content_models/require_all.rb
@@ -1,7 +1,7 @@ # Require this file in a non-Rails app to load all the things
require "active_model"
require "mongoid"
-require "mongoid/monkey_patches"
+require "govuk_content_models"
%w[ app/models app/validators app/repositories app/traits lib ].each do |path|
full_path = File.expand_path(
| Clean up how mongoid patch dependencies are required
|
diff --git a/rails.gemspec b/rails.gemspec
index abc1234..def5678 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -25,5 +25,5 @@ s.add_dependency('activeresource', version)
s.add_dependency('actionmailer', version)
s.add_dependency('railties', version)
- s.add_dependency('bundler', '>= 1.0.0.beta.2')
+ s.add_dependency('bundler', '>= 1.0.0.beta.3')
end
| Revert "Revert "Bump bundler to 1.0.0.beta.3""
It's out for reals!
This reverts commit 951dbf06b4177b1c3d912213166ca0b14374a48b.
|
diff --git a/app/models/pie.rb b/app/models/pie.rb
index abc1234..def5678 100644
--- a/app/models/pie.rb
+++ b/app/models/pie.rb
@@ -1,4 +1,5 @@ class Pie < ActiveRecord::Base
belongs_to :user
validates_uniqueness_of :title, scope: :user_id
+ has_many :pie_pieces
end
| Add Pie has_many PiePieces association
|
diff --git a/app/models/tag.rb b/app/models/tag.rb
index abc1234..def5678 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -10,5 +10,6 @@ #
class Tag < ApplicationRecord
+ validates :name, :slug, presence: true
has_and_belongs_to_many :products
end
| Tag validates name and slugs
|
diff --git a/config/schedule.rb b/config/schedule.rb
index abc1234..def5678 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -8,7 +8,8 @@ bundler_prefix = ENV.fetch('BUNDLER_PREFIX', '/usr/local/bin/govuk_setenv finder-frontend')
job_type :rake, "cd :path && #{bundler_prefix} bundle exec rake :task :output"
-every 1.hour do
+cache_refresh_schedule = Random.new.rand(45..60)
+every cache_refresh_schedule.minutes do
rake "registries:cache_refresh"
end
| Add variance to the cache refresh period
At present this refreshes hourly. If we greatly increase the number of machines
this might present an unhelpful load all at once to a number of services.
By adding some semblance of variance, we're less likely to all be calling the
same things at the same time except on deploy.
|
diff --git a/support/rspec2_formatter.rb b/support/rspec2_formatter.rb
index abc1234..def5678 100644
--- a/support/rspec2_formatter.rb
+++ b/support/rspec2_formatter.rb
@@ -27,10 +27,16 @@ exception = example.metadata[:execution_result][:exception]
backtrace = format_backtrace(exception.backtrace, example).join("\n")
+ message = exception.message
+ if shared_group = find_shared_group(example)
+ message += "\nShared example group called from " +
+ backtrace_line(shared_group.metadata[:example_group][:location])
+ end
+
@@buffet_server.example_failed(@@slave_name, {
:description => example.description,
:backtrace => backtrace,
- :message => exception.message,
+ :message => message,
:location => example.location,
:slave_name => @@slave_name,
})
| Return information about example groups on failure
Example#execution_result[:exception] only has information about the
example that failed, which does not include the example group for
shared examples. This appends the calling location to the failure
message for shared examples.
Reference code: https://github.com/rspec/rspec-core/blob/v2.8.0/
lib/rspec/core/formatters/base_text_formatter.rb#L178
Change-Id: I8d3ae6583c1b66ffa3a5e1021e47ce371d69d431
Reviewed-on: https://gerrit.causes.com/9699
Reviewed-by: Elliot Block <de602badf61da69092c03807d41b60ec8901ad87@causes.com>
Tested-by: Lann Martin <564fa7a717c51b612962ea128f146981a0e99d90@causes.com>
|
diff --git a/fpm.gemspec b/fpm.gemspec
index abc1234..def5678 100644
--- a/fpm.gemspec
+++ b/fpm.gemspec
@@ -15,10 +15,26 @@ spec.description = "Convert directories, rpms, python eggs, rubygems, and " \
"more to rpms, debs, solaris packages and more. Win at package " \
"management without wasting pointless hours debugging bad rpm specs!"
- spec.add_dependency("json")
- spec.add_dependency("cabin", "~> 0.4.2")
- spec.add_dependency("backports", "2.3.0")
- spec.add_development_dependency("rush")
+
+ # For parsing JSON (required for some Python support, etc)
+ # http://flori.github.com/json/doc/index.html
+ spec.add_dependency("json") # license: Ruby License
+
+ # For logging
+ # https://github.com/jordansissel/ruby-cabin
+ spec.add_dependency("cabin", "~> 0.4.2") # license: Apache 2
+
+ # For backports to older rubies
+ # https://github.com/marcandre/backports
+ spec.add_dependency("backports", "2.3.0") # license: MIT
+
+ # For reading and writing rpms
+ spec.add_dependency("arr-pm") # license: Apache 2
+
+ # For simple shell/file hackery in the tests.
+ # http://rush.heroku.com/rdoc/
+ spec.add_development_dependency("rush") # license: MIT
+
spec.files = files
spec.require_paths << "lib"
spec.bindir = "bin"
| Add license and general info for dependencies
|
diff --git a/spec/decorators/content_text_decorator_spec.rb b/spec/decorators/content_text_decorator_spec.rb
index abc1234..def5678 100644
--- a/spec/decorators/content_text_decorator_spec.rb
+++ b/spec/decorators/content_text_decorator_spec.rb
@@ -0,0 +1,20 @@+require 'rails_helper'
+
+describe ContentTextDecorator do
+ it '#render' do
+ text = build(:content_text, content: 'Foo')
+ expect(text.decorate.render).to eq 'Foo'
+ end
+
+ it '#text?' do
+ expect(build(:content_text).decorate).to be_text
+ end
+
+ it '#image?' do
+ expect(build(:content_text).decorate).not_to be_image
+ end
+
+ it '#respond_to?' do
+ expect(build(:content_text).decorate).to respond_to(:render, :text?, :image?)
+ end
+end
| Add spec for the content text decorator.
|
diff --git a/spec/questrade_api/modules/market_call_spec.rb b/spec/questrade_api/modules/market_call_spec.rb
index abc1234..def5678 100644
--- a/spec/questrade_api/modules/market_call_spec.rb
+++ b/spec/questrade_api/modules/market_call_spec.rb
@@ -0,0 +1,68 @@+require 'spec_helper'
+
+require 'questrade_api/modules/market_call'
+
+describe QuestradeApi::MarketCall do
+ class DummyClass
+ attr_accessor :authorization
+
+ def initialize(authorization)
+ @authorization = authorization
+ end
+ end
+
+ let(:authorization) do
+ OpenStruct.new(access_token: '123', url: 'test')
+ end
+
+ subject { DummyClass.new(authorization).extend(QuestradeApi::MarketCall) }
+
+ context '.markets' do
+ it 'calls proper endpoint' do
+ expect(QuestradeApi::REST::Market).to receive(:fetch).and_return([])
+ expect(subject.markets).to eq([])
+ end
+ end
+
+ context '.symbols' do
+ it 'calls proper endpoint' do
+ expect(QuestradeApi::REST::Symbol).to receive(:fetch).and_return([])
+ expect(subject.symbols('')).to eq([])
+ end
+ end
+
+ context '.search_symbols' do
+ it 'calls proper endpoint' do
+ expect(QuestradeApi::REST::Symbol).to receive(:search).and_return([])
+ expect(subject.search_symbols('')).to eq([])
+ end
+ end
+
+ context '.quotes' do
+ it 'calls proper endpoint' do
+ expect(QuestradeApi::REST::Quote).to receive(:fetch).and_return([])
+ expect(subject.quotes([123])).to eq([])
+ end
+ end
+
+ context '.quote' do
+ it 'calls proper endpoint' do
+ expect_any_instance_of(QuestradeApi::REST::Quote).to receive(:fetch).and_return([])
+ expect(subject.quote(1)).to be_a(QuestradeApi::REST::Quote)
+ end
+ end
+
+ context '.candles' do
+ it 'calls proper endpoint' do
+ expect(QuestradeApi::REST::Candle).to receive(:fetch).and_return([])
+ expect(subject.candles('', '12')).to eq([])
+ end
+ end
+
+ context '.symbol_options' do
+ it 'calls proper endpoint' do
+ expect(QuestradeApi::REST::Market).to receive(:fetch).and_return([])
+ expect(subject.markets).to eq([])
+ end
+ end
+end
| Add tests for market call module
|
diff --git a/d3js-rails.gemspec b/d3js-rails.gemspec
index abc1234..def5678 100644
--- a/d3js-rails.gemspec
+++ b/d3js-rails.gemspec
@@ -17,5 +17,5 @@ gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]
- gem.add_dependency "railties", "~> 3.1"
+ gem.add_dependency "railties", ">= 3.0", "< 5.0"
end
| Tweak gem railties dependency version to make gem compatible with Rails 4
|
diff --git a/lib/dynflow/persistence_adapters/sequel_migrations/020_drop_duplicate_indices.rb b/lib/dynflow/persistence_adapters/sequel_migrations/020_drop_duplicate_indices.rb
index abc1234..def5678 100644
--- a/lib/dynflow/persistence_adapters/sequel_migrations/020_drop_duplicate_indices.rb
+++ b/lib/dynflow/persistence_adapters/sequel_migrations/020_drop_duplicate_indices.rb
@@ -0,0 +1,30 @@+# frozen_string_literal: true
+Sequel.migration do
+ up do
+ alter_table(:dynflow_actions) do
+ drop_index [:execution_plan_uuid, :id]
+ end
+
+ alter_table(:dynflow_execution_plans) do
+ drop_index :uuid
+ end
+
+ alter_table(:dynflow_steps) do
+ drop_index [:execution_plan_uuid, :id]
+ end
+ end
+
+ down do
+ alter_table(:dynflow_actions) do
+ add_index [:execution_plan_uuid, :id], :unique => true
+ end
+
+ alter_table(:dynflow_execution_plans) do
+ add_index :uuid, :unique => true
+ end
+
+ alter_table(:dynflow_steps) do
+ add_index [:execution_plan_uuid, :id], :unique => true
+ end
+ end
+end
| Remove indices that duplicate primary key constraints
|
diff --git a/neighborly-balanced-bankaccount.gemspec b/neighborly-balanced-bankaccount.gemspec
index abc1234..def5678 100644
--- a/neighborly-balanced-bankaccount.gemspec
+++ b/neighborly-balanced-bankaccount.gemspec
@@ -6,18 +6,20 @@ Gem::Specification.new do |spec|
spec.name = "neighborly-balanced-bankaccount"
spec.version = Neighborly::Balanced::Bankaccount::VERSION
- spec.authors = ["Josemar Luedke"]
- spec.email = ["josemarluedke@gmail.com"]
- spec.summary = %q{TODO: Write a short summary. Required.}
- spec.description = %q{TODO: Write a longer description. Optional.}
- spec.homepage = ""
+ spec.authors = ['Josemar Luedke', 'Irio Musskopf']
+ spec.email = %w(josemarluedke@gmail.com iirineu@gmail.com)
+ spec.summary = 'Neighbor.ly integration with Bank Account Balanced Payments.'
+ spec.description = 'Neighbor.ly integration with Bank Account Balanced Payments.'
+ spec.homepage = 'https://github.com/neighborly/neighborly-balanced-bankaccount'
spec.license = "MIT"
spec.files = `git ls-files -z`.split("\x0")
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]
+ spec.add_dependency 'neighborly-balanced', '~> 0'
- spec.add_development_dependency "bundler", "~> 1.5"
- spec.add_development_dependency "rake"
+ spec.add_dependency 'rails'
+ spec.add_development_dependency 'rspec-rails'
+ spec.add_development_dependency "sqlite3"
end
| Update gem description, add authors and add dependencies
|
diff --git a/test/empty_test.rb b/test/empty_test.rb
index abc1234..def5678 100644
--- a/test/empty_test.rb
+++ b/test/empty_test.rb
@@ -0,0 +1,14 @@+require 'test_helper'
+
+module Schemacop
+ class EmptyTest < Minitest::Test
+ def test_empty_hash
+ schema = Schema.new do
+ type Hash
+ end
+
+ assert_nothing_raised { schema.validate!({}) }
+ assert_verr { schema.validate!(foo: :bar) }
+ end
+ end
+end
| Add test for validating empty schemas
|
diff --git a/oauth2_server/app/models/site/client.rb b/oauth2_server/app/models/site/client.rb
index abc1234..def5678 100644
--- a/oauth2_server/app/models/site/client.rb
+++ b/oauth2_server/app/models/site/client.rb
@@ -1,5 +1,21 @@ class Site::Client < Site
validates_presence_of :url, :callback_url, :secret
+
+ has_many :oauth2_tokens,
+ foreign_key: 'site_id',
+ dependent: :destroy
+
+ has_many :authorization_codes,
+ foreign_key: 'site_id',
+ class_name: 'Oauth2Token::AuthorizationCode'
+
+ has_many :access_tokens,
+ foreign_key: 'site_id',
+ class_name: 'Oauth2Token::AccessToken'
+
+ has_many :refresh_tokens,
+ foreign_key: 'site_id',
+ class_name: 'Oauth2Token::RefreshToken'
before_validation :set_secret,
on: :create
| Declare token associations in Site::Client
|
diff --git a/test/factories/api_users.rb b/test/factories/api_users.rb
index abc1234..def5678 100644
--- a/test/factories/api_users.rb
+++ b/test/factories/api_users.rb
@@ -10,7 +10,7 @@ end
factory :xss_api_user do
- email { 'a@"><script class="xss-test">alert("Hello first_name");</script>.com' }
+ email { 'a@"><script class="xss-test">alert("Hello-first_name");</script>.com' }
first_name { '"><script class="xss-test">alert("Hello first_name");</script>' }
last_name { '"><script class="xss-test">alert("Hello last_name");</script>' }
use_description { '"><script class="xss-test">alert("Hello use_description");</script>' }
| Fix XSS test due to changes in e-mail regex.
|
diff --git a/test/unit/todo_list_test.rb b/test/unit/todo_list_test.rb
index abc1234..def5678 100644
--- a/test/unit/todo_list_test.rb
+++ b/test/unit/todo_list_test.rb
@@ -1,10 +1,6 @@ require 'test_helper'
class TodoListTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-
test "should create todo list on page" do
page = Page.first
page_content = page.inner_content
| Remove truth test from TodoListTest
|
diff --git a/spec/celluloid/cpu_counter_spec.rb b/spec/celluloid/cpu_counter_spec.rb
index abc1234..def5678 100644
--- a/spec/celluloid/cpu_counter_spec.rb
+++ b/spec/celluloid/cpu_counter_spec.rb
@@ -0,0 +1,10 @@+require 'spec_helper'
+
+describe Celluloid::CPUCounter, actor_system: :global do
+ describe :cores do
+ it 'should return an integer' do
+ p Celluloid::CPUCounter.cores
+ Celluloid::CPUCounter.cores.should be_kind_of(Fixnum)
+ end
+ end
+end
| Test to check that CPUCounter.cores is an integer, i.e., implemented on the current system
|
diff --git a/create-symlinks.rb b/create-symlinks.rb
index abc1234..def5678 100644
--- a/create-symlinks.rb
+++ b/create-symlinks.rb
@@ -0,0 +1,11 @@+DOTFILES = %w(.vimrc .emacs .zshrc)
+
+dotfilesdir = File.expand_path(File.dirname(__FILE__))
+homedir = Dir.home
+
+DOTFILES.each do |f|
+ local_path = File.join(dotfilesdir, f)
+ remote_path = File.join(homedir, f)
+
+ `ln -s --verbose #{local_path} #{remote_path}`
+end
| Add a Ruby script for creating symlinks in HOME
|
diff --git a/lib/aweplug/helpers/searchisko_social.rb b/lib/aweplug/helpers/searchisko_social.rb
index abc1234..def5678 100644
--- a/lib/aweplug/helpers/searchisko_social.rb
+++ b/lib/aweplug/helpers/searchisko_social.rb
@@ -24,14 +24,22 @@ contributor
end
- def normalize normalization, existing, searchisko, sys_title = nil
- searchisko.normalize(normalization, existing) do |normalized|
- if normalized['sys_contributor'].nil?
- return OpenStruct.new({:sys_title => sys_title || existing})
- else
- return add_social_links(normalized['contributor_profile'])
+ def normalize normalization, existing, searchisko, name = nil
+ res = nil
+ if !existing.nil?
+ searchisko.normalize(normalization, existing) do |normalized|
+ unless normalized['sys_contributor'].nil?
+ res = add_social_links(normalized['contributor_profile'])
+ end
+ end
+ elsif !name.nil?
+ searchisko.normalize('contributor_profile_by_jbossdeveloper_quickstart_author', name) do |normalized|
+ unless normalized['sys_contributor'].nil?
+ res = add_social_links(normalized['contributor_profile'])
+ end
end
end
+ res || OpenStruct.new({ :sys_title => name || existing })
end
private
| Make searchisko normalisation a bit cleverer
|
diff --git a/lib/puppet/parser/functions/api_fetch.rb b/lib/puppet/parser/functions/api_fetch.rb
index abc1234..def5678 100644
--- a/lib/puppet/parser/functions/api_fetch.rb
+++ b/lib/puppet/parser/functions/api_fetch.rb
@@ -38,11 +38,8 @@ cx.request(req)
end
- case response
- when Net::HTTPSuccess
- if response.body.length > 0
- puts response.body.split("\n")
- end
+ if response.kind_of? Net::HTTPSuccess and response.body.length > 0
+ puts response.body.split("\n")
end
rescue Net::OpenTimeout, Net::ReadTimeout
return Array.new
| Replace case statement with if
|
diff --git a/config/application.rb b/config/application.rb
index abc1234..def5678 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,7 +18,15 @@ #{config.root}/app/models/website
)
- config.assets.precompile += %w( admin.css admin.js frontend.css frontend.js )
+ config.assets.precompile += %w(
+ admin.css
+ admin.js
+ frontend.css
+ frontend.js
+ frontend/base-ie6.css
+ frontend/base-ie7.css
+ frontend/base-ie8.css
+ )
# Generators
config.generators do |g|
| Add ie stylesheets to asset pipeline so they work on preview
|
diff --git a/config/application.rb b/config/application.rb
index abc1234..def5678 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -20,7 +20,7 @@ # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
config.i18n.default_locale = :en
config.i18n.fallbacks = [:en]
- config.i18n.available_locales = [:en, :fr]
+ config.i18n.available_locales = [:en]
# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
| Disable :fr locale in config.i18n.available_locales
|
diff --git a/db/seeds.rb b/db/seeds.rb
index abc1234..def5678 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -37,13 +37,19 @@
## Teams
#
-with_header "Creating defualt on-call teams" do
- ["Clinical","Surgical"].each do |team_name|
- Shift.all.each do |shift|
- puts " #{shift.name}: #{team_name}"
- team = { name: team_name, shift_id: shift.id }
- t = Team.where(team).first || Team.create(team)
- t.save
- end
+def create_teams(shift, *team_names)
+ team_names.each do |team_name|
+ puts " #{shift.name}: #{team_name}"
+ team = { name: team_name, shift_id: shift.id }
+ t = Team.where(team).first || Team.create(team)
+ t.save
end
end
+
+with_header "Creating defualt on-call teams" do
+ create_teams(Shift.on_call, "Clinical","Surgical")
+end
+
+with_header "Creating day shift teams" do
+ create_teams(Shift.day, "Ward 1", "Ward 2", "Ward 3", "Cardiac Response")
+end
| Create sensible day shift team names
|
diff --git a/core/app/views/fact_relations/_fact_relation.json.jbuilder b/core/app/views/fact_relations/_fact_relation.json.jbuilder
index abc1234..def5678 100644
--- a/core/app/views/fact_relations/_fact_relation.json.jbuilder
+++ b/core/app/views/fact_relations/_fact_relation.json.jbuilder
@@ -25,6 +25,8 @@ json.positive_active positive_active
json.fact_base fact_base.to_hash
+json.opinion_presenter = OpinionPresenter.new fact_relation.get_user_opinion
+
json.created_by do |json|
json.partial! 'users/user_partial', user: fact_relation.created_by.user
json.authority creator_authority
| Return the OpinionPresenter instance in the FactRelation JSON
|
diff --git a/db/migrate/20170929173803_destroy_inactive_iep_documents.rb b/db/migrate/20170929173803_destroy_inactive_iep_documents.rb
index abc1234..def5678 100644
--- a/db/migrate/20170929173803_destroy_inactive_iep_documents.rb
+++ b/db/migrate/20170929173803_destroy_inactive_iep_documents.rb
@@ -0,0 +1,28 @@+class DestroyInactiveIepDocuments < ActiveRecord::Migration[5.1]
+ def change
+ district_name = ENV['DISTRICT_NAME']
+
+ return unless district_name == 'Somerville'
+
+ Student.find_each do |student|
+ destroy_inactive_iep_documents_for(student)
+ end
+ end
+
+ def destroy_inactive_iep_documents_for(student)
+ documents = IepDocument.where(student_id: student.id)
+ .order(created_at: :desc)
+ .to_a
+
+ return if documents.length == 0
+ return if documents.length == 1
+
+ puts; puts "Found #{documents.length} IEP documents..."
+
+ active_document = documents.shift
+
+ puts "Destroying #{documents.length} inactive documents..."
+
+ documents.destroy_all
+ end
+end
| Write migration to destroy inactive IEPs
|
diff --git a/lib/cortex/snippets/client/helper.rb b/lib/cortex/snippets/client/helper.rb
index abc1234..def5678 100644
--- a/lib/cortex/snippets/client/helper.rb
+++ b/lib/cortex/snippets/client/helper.rb
@@ -26,7 +26,14 @@ end
def seo_robots
- build_robot_information
+ robot_information = []
+ index_options = [:noindex, :nofollow, :noodp, :nosnippet, :noarchive, :noimageindex]
+
+ index_options.each do |index_option|
+ robot_information << index_option if webpage[index_option]
+ end
+
+ robot_information
end
def noindex
@@ -58,21 +65,6 @@ def webpage
Cortex::Snippets::Client::current_webpage(request)
end
-
- def build_robot_information
- robot_information = []
- index_options = [:noindex, :nofollow, :noodp, :nosnippet, :noarchive, :noimageindex]
-
- index_options.each do |index_option|
- robot_information << index_option if valid_index_option?(index_option)
- end
-
- robot_information.join(", ")
- end
-
- def valid_index_option?(index_option)
- webpage[index_option]
- end
end
end
end
| Modify output to not assume view logic
|
diff --git a/lib/gds_api/test_helpers/need_api.rb b/lib/gds_api/test_helpers/need_api.rb
index abc1234..def5678 100644
--- a/lib/gds_api/test_helpers/need_api.rb
+++ b/lib/gds_api/test_helpers/need_api.rb
@@ -7,9 +7,9 @@ # you could redefine/override the constant or stub directly.
NEED_API_ENDPOINT = Plek.current.find('needapi')
- def need_api_has_organisations(organisations)
+ def need_api_has_organisations(organisation_ids)
url = NEED_API_ENDPOINT + "/organisations"
- orgs = organisations.map do |o|
+ orgs = organisation_ids.map do |o|
{ "id" => o,
"name" => o.split('-').map(&:capitalize).join(' ')
}
| Rename method parameter to highlight organisation ids expected.
|
diff --git a/lib/kaleidoscope/instance_methods.rb b/lib/kaleidoscope/instance_methods.rb
index abc1234..def5678 100644
--- a/lib/kaleidoscope/instance_methods.rb
+++ b/lib/kaleidoscope/instance_methods.rb
@@ -4,11 +4,11 @@ end
def generate_colors
- Kaleidoscope.log("Generating colors.")
+ Kaleidoscope.log("Generating colors for #{self.class.model_name}.")
end
def destroy_colors
- Kaleidoscope.log("Deleting colors.")
+ Kaleidoscope.log("Deleting colors for #{self.class.model_name}.")
end
end
end | Add model name to logs for instance methods
|
diff --git a/tapestry.gemspec b/tapestry.gemspec
index abc1234..def5678 100644
--- a/tapestry.gemspec
+++ b/tapestry.gemspec
@@ -16,10 +16,13 @@
gem.required_rubygems_version = '>= 1.3.6'
- gem.files = Dir['README.md', 'lib/**/*']
+ gem.files = Dir['README.md', 'lib/**/*', '*.gemspec', '**/*.rb', '**/*.rake']
gem.require_path = 'lib'
gem.add_development_dependency 'rake'
gem.add_development_dependency 'rspec'
gem.add_development_dependency 'rdoc'
+
+ gem.add_dependency 'cool.io'
+ gem.add_dependency 'iobuffer'
end
| Include transitive dependencies in gemfile and be more generous about the files we include in the package
|
diff --git a/lib/market_bot/play/app/constants.rb b/lib/market_bot/play/app/constants.rb
index abc1234..def5678 100644
--- a/lib/market_bot/play/app/constants.rb
+++ b/lib/market_bot/play/app/constants.rb
@@ -26,7 +26,6 @@ :updated,
:votes,
:website_url,
- :whats_new
]
end
end
| Remove :whats_new contant from apps.
|
diff --git a/tasks/console.rb b/tasks/console.rb
index abc1234..def5678 100644
--- a/tasks/console.rb
+++ b/tasks/console.rb
@@ -1,10 +1,8 @@-desc "Open a pry console with the gem loaded"
+desc "Open a pry console with the #{Bundler::GemHelper.gemspec.name} gem loaded"
task :console do
require "pry"
require "byebug"
- Dir[File.join(File.dirname(__FILE__), "..", "*.gemspec")].each do |file|
- require Gem::Specification.load(file).name
- end
+ require Bundler::GemHelper.gemspec.name
Pry.start
end
| Modify rake task description and implementation.
|
diff --git a/spec/acceptance/borrador_spec.rb b/spec/acceptance/borrador_spec.rb
index abc1234..def5678 100644
--- a/spec/acceptance/borrador_spec.rb
+++ b/spec/acceptance/borrador_spec.rb
@@ -0,0 +1,20 @@+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+feature "Borrador", %q{
+ Para no publicar cambios sin revisar
+ Como administrador
+ Quiero poder editar borradores de las páginas
+} do
+
+ background do
+ login
+ end
+
+ scenario do
+ visit new_pagina_path
+ click_on "Guardar borrador"
+ page.should have_success text: "Borrador guardado"
+ end
+end
| Test de integración de la creación de borradores.
|
diff --git a/spec/bin/protoc-gen-ruby_spec.rb b/spec/bin/protoc-gen-ruby_spec.rb
index abc1234..def5678 100644
--- a/spec/bin/protoc-gen-ruby_spec.rb
+++ b/spec/bin/protoc-gen-ruby_spec.rb
@@ -4,15 +4,20 @@
describe 'protoc-gen-ruby' do
let(:binpath) { ::File.expand_path('../../../bin/protoc-gen-ruby', __FILE__) }
- let(:request_bytes) { ::Google::Protobuf::Compiler::CodeGeneratorRequest.new(:file_to_generate => [ "test/foo.proto" ]) }
- let(:expected_file) { ::Google::Protobuf::Compiler::CodeGeneratorResponse::File.new(:name => 'test/foo.pb.rb') }
- let(:expected_response_bytes) { ::Google::Protobuf::Compiler::CodeGeneratorRequest.encode(:files => [ expected_file ]) }
+ let(:package) { 'test' }
+ let(:request_bytes) do
+ ::Google::Protobuf::Compiler::CodeGeneratorRequest.encode(
+ :proto_file => [{ :package => package }],
+ )
+ end
it 'reads the serialized request bytes and outputs serialized response bytes' do
::IO.popen(binpath, 'w+') do |pipe|
pipe.write(request_bytes)
- expect(pipe.read(expected_response_bytes.size)).to eq expected_response_bytes
+ pipe.close_write # needed so we can implicitly read until EOF
+ response_bytes = pipe.read
+ response = ::Google::Protobuf::Compiler::CodeGeneratorResponse.decode(response_bytes)
+ expect(response.file.first.content).to include("module #{package.titleize}")
end
end
end
-
| Fix flakey spec by closing write pipe, generating an empty test module
Signed-off-by: Tamir Duberstein <c96a05aaafbe4b3abc1841a4083a1b0f402c2ba6@squareup.com>
|
diff --git a/spec/factories/media_consents.rb b/spec/factories/media_consents.rb
index abc1234..def5678 100644
--- a/spec/factories/media_consents.rb
+++ b/spec/factories/media_consents.rb
@@ -2,6 +2,9 @@ factory :media_consent do
first_name "John"
last_name "Smith"
+ image_file_name 'upload.png'
+ image_content_type 'image/png'
+ image_file_size '1024'
consent true
end
end
| Add paperclip params for image attribute of media consents factory
|
diff --git a/spec/features/commenting_spec.rb b/spec/features/commenting_spec.rb
index abc1234..def5678 100644
--- a/spec/features/commenting_spec.rb
+++ b/spec/features/commenting_spec.rb
@@ -7,7 +7,6 @@ login_as(user, scope: :user)
visit submission_path(submission)
fill_in 'comment_body', with: comment_body
- expect{click_button 'Comment'}.to change(submission.comments, :count).by(1)
expect(page).to have_text(comment_body)
end
end
| Remove checking if comment was saved from commenting process feature spec
|
diff --git a/spec/mailers/post_mailer_spec.rb b/spec/mailers/post_mailer_spec.rb
index abc1234..def5678 100644
--- a/spec/mailers/post_mailer_spec.rb
+++ b/spec/mailers/post_mailer_spec.rb
@@ -8,7 +8,7 @@ let(:mail) { PostMailer.created(post.id, user.id) }
it 'renders the subject' do
- expect(mail.subject).to eql("#{post.title}")
+ expect(mail.subject).to eql("[#{product.name}] #{post.title}")
end
it 'sets unsubscribe tag' do
| Fix failing spec with updated subject
|
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index abc1234..def5678 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -3,7 +3,7 @@
describe UserMailer do
let :user do
- FactoryGirl.create(:user, email: 'chuck@heartbreaker.com')
+ FactoryGirl.create(:user, email: 'test@example.org')
end
subject do
@@ -11,7 +11,7 @@ end
describe 'User signed up' do
- it { is_expected.to deliver_to 'chuck@heartbreaker.com' }
+ it { is_expected.to deliver_to 'test@example.org' }
it { is_expected.to have_subject 'Willkommen bei wheelmap.org' }
it { is_expected.to have_body_text(/herzlich Willkommen bei Wheelmap.org!/) }
| Use test@example.org instead of bothering heartbreaker.com
|
diff --git a/Casks/hydra.rb b/Casks/hydra.rb
index abc1234..def5678 100644
--- a/Casks/hydra.rb
+++ b/Casks/hydra.rb
@@ -0,0 +1,9 @@+class Hydra < Cask
+ version '1.0 beta 6'
+ sha256 'b1d16db3b6a38b85c7a60b81e1eab98c47ca417263672847e73021df885c16cb'
+
+ url 'https://github.com/sdegutis/hydra/releases/download/v1.0.b6/Hydra-1.0.0.b6.app.tar.gz'
+ homepage 'https://github.com/sdegutis/hydra'
+
+ link 'Hydra.app'
+end
| Add Hydra 1.0 Beta 6
|
diff --git a/peregrine.gemspec b/peregrine.gemspec
index abc1234..def5678 100644
--- a/peregrine.gemspec
+++ b/peregrine.gemspec
@@ -12,6 +12,7 @@ gem.email = ['solucet@icloud.com']
gem.homepage = 'http://github.com/solucet/peregrine'
gem.platform = Gem::Platform::RUBY
+ gem.license = 'MIT'
# Gem summary and description.
gem.summary = 'Flexible Entity-Component framework for Ruby.'
| Add MIT license to gemspec.
|
diff --git a/sansu.gemspec b/sansu.gemspec
index abc1234..def5678 100644
--- a/sansu.gemspec
+++ b/sansu.gemspec
@@ -14,14 +14,6 @@ spec.homepage = "TODO: Put your gem's website or public repo URL here."
spec.license = "MIT"
- # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
- # delete this section to allow pushing this gem to any host.
- if spec.respond_to?(:metadata)
- spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
- else
- raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
- end
-
spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
spec.bindir = "exe"
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
| Allow pushing this gem to any host
|
diff --git a/pixelator.gemspec b/pixelator.gemspec
index abc1234..def5678 100644
--- a/pixelator.gemspec
+++ b/pixelator.gemspec
@@ -11,7 +11,7 @@ s.email = ["dev@howaboutwe.com"]
s.homepage = "http://wwww.github.com/howaboutwe/pixelator"
s.summary = "Add tracking pixels to your code in a manageable, performant way"
- s.description = "TODO: Description of Pixelator."
+ s.description = "Add tracking pixels to your code in a manageable, performant way"
s.licenses = ["MIT"]
s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.markdown"]
| Update description in Gemfile for bundler
|
diff --git a/hephaestus/lib/resque/collisions_detector_task.rb b/hephaestus/lib/resque/collisions_detector_task.rb
index abc1234..def5678 100644
--- a/hephaestus/lib/resque/collisions_detector_task.rb
+++ b/hephaestus/lib/resque/collisions_detector_task.rb
@@ -3,7 +3,7 @@
attr_reader :document
- def perform(id)
+ def self.perform(id)
self.new(id).call
end
| [hephaestus] Add perform method to collisions
|
diff --git a/test/test_cli.rb b/test/test_cli.rb
index abc1234..def5678 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -0,0 +1,59 @@+require File.dirname(__FILE__) + '/helper'
+
+class CliTest < Test::Unit::TestCase
+ TEMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp")
+ BIN_P = File.expand_path(File.dirname(__FILE__) + "/../bin/tracksperanto")
+
+ def setup
+ @old_dir = Dir.pwd
+ Dir.mkdir(TEMP_DIR)
+ Dir.chdir(TEMP_DIR)
+ end
+
+ def teardown
+ Dir.chdir(@old_dir)
+ FileUtils.rm_rf(TEMP_DIR)
+ end
+
+ def cli(cmd)
+ # Spin up a fork and do system() from there. This means that we can suppress the output
+ # coming from the cli process, but capture the exit code.
+ cpid = fork do
+ STDOUT.reopen("tout")
+ STDERR.reopen("tout")
+ state = system(cmd)
+ File.unlink("tout")
+ exit(0) if state
+ exit(-1)
+ end
+ Process.waitpid(cpid)
+ end
+
+ def test_basic_cli
+ FileUtils.cp(File.dirname(__FILE__) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer", TEMP_DIR + "/flm.stabilizer")
+ cli("#{BIN_P} #{TEMP_DIR}/flm.stabilizer")
+ fs = %w(. ..
+ flm.stabilizer flm_3de_v3.txt flm_3de_v4.txt flm_flame.stabilizer
+ flm_matchmover.rz2 flm_mayalive.txt flm_nuke.nk flm_pftrack_v4.2dt
+ flm_pftrack_v5.2dt flm_shake_trackers.txt flm_syntheyes_2dt.txt
+ )
+ assert_equal fs, Dir.entries(TEMP_DIR)
+ end
+
+ def test_cli_with_only_option
+ FileUtils.cp(File.dirname(__FILE__) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer", TEMP_DIR + "/flm.stabilizer")
+ cli("#{BIN_P} --only syntheyes #{TEMP_DIR}/flm.stabilizer")
+ fs = %w(. .. flm.stabilizer flm_syntheyes_2dt.txt )
+ assert_equal fs, Dir.entries(TEMP_DIR)
+ end
+
+ def test_cli_reformat
+ FileUtils.cp(File.dirname(__FILE__) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer", TEMP_DIR + "/flm.stabilizer")
+ cli("#{BIN_P} --reformat-x 1204 --reformat-y 340 --only flamestabilizer #{TEMP_DIR}/flm.stabilizer")
+
+ p = Tracksperanto::Import::FlameStabilizer.new
+ f = p.parse(File.open(TEMP_DIR + "/flm_flame.stabilizer"))
+ assert_equal 1204, p.width, "The width of the converted setup should be that"
+ assert_equal 340, p.height, "The height of the converted setup should be that"
+ end
+end | Add a basic CLI test (doesnt run on Win32 yet)
|
diff --git a/lib/premailer/rails/css_loaders/asset_pipeline_loader.rb b/lib/premailer/rails/css_loaders/asset_pipeline_loader.rb
index abc1234..def5678 100644
--- a/lib/premailer/rails/css_loaders/asset_pipeline_loader.rb
+++ b/lib/premailer/rails/css_loaders/asset_pipeline_loader.rb
@@ -25,6 +25,7 @@
def asset_pipeline_present?
defined?(::Rails) &&
+ ::Rails.respond_to?(:application) &&
::Rails.application &&
::Rails.application.respond_to?(:assets_manifest) &&
::Rails.application.assets_manifest
| Check that Rails.configuration is defined before calling
|
diff --git a/Clappr.podspec b/Clappr.podspec
index abc1234..def5678 100644
--- a/Clappr.podspec
+++ b/Clappr.podspec
@@ -4,8 +4,13 @@ s.summary = "An extensible media player for iOS"
s.homepage = "http://clappr.io"
s.license = 'MIT'
- s.author = { "Diego Marcon" => "diego.marcon@corp.globo.com" }
- s.source = { :git => "https://github.com/clappr/clappr-ios.git", :branch => 'migration-to-swift', :tag => s.version.to_s }
+ s.authors = {
+ "Diego Marcon" => "dm.marcon@gmail.com",
+ "Thiago Pontes" => "thiagopnts@gmail.com",
+ "Gustavo Barbosa" => "gustavocsb@gmail.com"
+ }
+
+ s.source = { :git => "https://github.com/clappr/clappr-ios.git", :tag => s.version.to_s }
s.platform = :ios, '8.0'
s.requires_arc = true
@@ -14,4 +19,4 @@ s.resources = 'Pod/Resources/*.{xib,ttf,png}'
s.dependency 'HanekeSwift', '~> 0.10'
-end+end
| Podspec: Add authors and remove branch from source
|
diff --git a/metadata.rb b/metadata.rb
index abc1234..def5678 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -6,7 +6,8 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.1.3'
-supports 'redhat'
-supports 'centos'
+%w(debian centos redhat ubuntu).each do |os|
+ supports os
+end
depends 'poise-python', '~> 1.6.0'
| Add debian and ubuntu to supports
|
diff --git a/server/app/models/client.rb b/server/app/models/client.rb
index abc1234..def5678 100644
--- a/server/app/models/client.rb
+++ b/server/app/models/client.rb
@@ -1,7 +1,8 @@ class Client < ActiveRecord::Base
has_many :facts, :dependent => :destroy
- has_many :configs, :dependent => :destroy
+ has_many :originals, :dependent => :destroy
+ has_many :etch_configs, :dependent => :destroy
has_many :results, :dependent => :destroy
validates_presence_of :name
| Update the relationships with other models
|
diff --git a/features/step_definitions/call_steps.rb b/features/step_definitions/call_steps.rb
index abc1234..def5678 100644
--- a/features/step_definitions/call_steps.rb
+++ b/features/step_definitions/call_steps.rb
@@ -20,11 +20,11 @@ all(".organ-members:contains('#{title}') .member-card" ).count().should == person_count.to_i
end
-def member(name)
- find ".edit_call .member-card:contains('#{name}')"
+def applicant(name)
+ find ".applicants .member-card:contains('#{name}')"
end
Then %r/^I set applicant '([^']*)' as '([^']*)'$/ do |name, position|
member_slot = find ".member-card-empty:contains('#{position.downcase}')"
- member(name).drag_to member_slot
+ applicant(name).drag_to member_slot
end
| Fix step to find the applicant card |
diff --git a/test/needs.rb b/test/needs.rb
index abc1234..def5678 100644
--- a/test/needs.rb
+++ b/test/needs.rb
@@ -0,0 +1,81 @@+require 'smeltery'
+
+Smeltery::Storage.dir = "#{__dir__}/ingots"
+
+class TestConnection
+ attr_accessor :records
+
+ def initialize
+ @records = 0
+ end
+
+ def insert_fixture(columns, table_name)
+ @records += 1
+ end
+
+ def clear
+ @records = 0
+ end
+end
+
+class TestModel
+ @@last = nil
+ # @connection = TestConnection.new
+
+ def self.default_timezone
+ :utc
+ end
+
+ def self.connection
+ @connection ||= TestConnection.new
+ end
+
+ def self.table_name
+ self.inspect
+ end
+
+ def self.last
+ @@last
+ end
+
+ attr_accessor :destroyed, :invalid, :attributes
+
+ def initialize(attributes, options)
+ @attributes = { created_at: nil, updated_at: nil }.merge attributes
+ @options = options
+ @@last = self
+ end
+
+ def invalid?
+ @destroyed = false # костыль для того чтобы считать модели сохраненными.
+ @invalid
+ end
+
+ def delete
+ self.class.connection.records -= 1
+ @destroyed = true
+ end
+
+ def destroyed?
+ @destroyed
+ end
+end
+
+User = Class.new TestModel
+Article = Class.new TestModel
+
+UserComment = Class.new TestModel
+
+Resources = Module.new
+Resources::Clone = Class.new TestModel
+
+class LibraryTest < Test::Unit::TestCase
+ def self.startup
+ Smeltery::Storage.cache = Array.new
+ TestModel.connection.clear
+ Article.connection.clear
+ UserComment.connection.clear
+ User.connection.clear
+ Resources::Clone.connection.clear
+ end
+end | Add necessary abstractions for testing.
|
diff --git a/Kakapo.podspec b/Kakapo.podspec
index abc1234..def5678 100644
--- a/Kakapo.podspec
+++ b/Kakapo.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = "Kakapo"
- s.version = "0.0.1-alpha3"
+ s.version = "0.0.1-alpha4"
s.summary = "Next generation network mocking library."
s.description = <<-DESC
| Prepare for multi-platform release 0.0.1-alpha4
|
diff --git a/lib/generators/easymin/layout/layout_generator.rb b/lib/generators/easymin/layout/layout_generator.rb
index abc1234..def5678 100644
--- a/lib/generators/easymin/layout/layout_generator.rb
+++ b/lib/generators/easymin/layout/layout_generator.rb
@@ -9,7 +9,7 @@ def generate_layout
path = "app/views/layouts"
- template 'easymin.haml', "#{path}/#{options.name}.haml"
+ template 'easymin.haml', "#{path}/#{options.name}.html.haml"
end
end
end
| Change extension of generated layout to *.html.haml instead of *.haml
|
diff --git a/HackerRankDrills/array_ds.rb b/HackerRankDrills/array_ds.rb
index abc1234..def5678 100644
--- a/HackerRankDrills/array_ds.rb
+++ b/HackerRankDrills/array_ds.rb
@@ -0,0 +1,25 @@+# Output Format
+#
+# Print all N integers in A in reverse order as a single line of space-separated integers.
+#
+# Sample Input
+# 4
+# 1 4 3 2
+#
+# Sample Output
+# 2 3 4 1
+
+n = gets.strip.to_i
+arr = gets.strip
+arr = arr.split(' ').map(&:to_i)
+
+def bwarr(arr)
+ result = ""
+ arr.reverse_each do |number|
+ result << number.to_s + " "
+ end
+ result
+end
+
+answer = bwarr(arr)
+print answer
| Complete drill decrementing through array.
|
diff --git a/lib/kosmos/packages/kerbal_joint_reinforcement.rb b/lib/kosmos/packages/kerbal_joint_reinforcement.rb
index abc1234..def5678 100644
--- a/lib/kosmos/packages/kerbal_joint_reinforcement.rb
+++ b/lib/kosmos/packages/kerbal_joint_reinforcement.rb
@@ -0,0 +1,8 @@+class KerbalJointReinforcement < Kosmos::Package
+ title 'Kerbal Joint Reinforcement'
+ url 'http://kerbalspaceport.com/wp/wp-content/themes/kerbal/inc/download.php?f=uploads/2014/04/KerbalJointReinforcement_v2.3.zip'
+
+ def install
+ merge_directory 'GameData'
+ end
+end
| Add a package for Kerbal Joint Reinforcement.
|
diff --git a/lib/slugs/extensions/action_dispatch/generator.rb b/lib/slugs/extensions/action_dispatch/generator.rb
index abc1234..def5678 100644
--- a/lib/slugs/extensions/action_dispatch/generator.rb
+++ b/lib/slugs/extensions/action_dispatch/generator.rb
@@ -4,18 +4,36 @@ module Generator
def generate
- @set.formatter.generate(
- named_route,
- options,
- recall,
- lambda do |name, value|
- if name == :controller
- value
- else
- Slugs.parameterize value, options
+ if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
+ @set.formatter.generate(
+ named_route,
+ options,
+ recall,
+ lambda do |name, value|
+ if name == :controller
+ value
+ else
+ Slugs.parameterize value, options
+ end
end
- end
- )
+ )
+ else
+ @set.formatter.generate(
+ :path_info,
+ named_route,
+ options,
+ recall,
+ lambda do |name, value|
+ if name == :controller
+ value
+ elsif value.is_a?(Array)
+ value.map{ |value| Slugs.parameterize value, options }.join('/')
+ else
+ Slugs.parameterize value, options
+ end
+ end
+ )
+ end
end
end
| Fix rails 4.1 and 4.0 compatibility
|
diff --git a/spec/support/matchers/have_value.rb b/spec/support/matchers/have_value.rb
index abc1234..def5678 100644
--- a/spec/support/matchers/have_value.rb
+++ b/spec/support/matchers/have_value.rb
@@ -10,6 +10,6 @@ end
failure_message_for_should do |actual|
- %{expected variable #{actual} to have value #{expected}}
+ %{expected variable #{actual} to have value "#{expected}"}
end
end
| Add double quotes to custom failure message
|
diff --git a/spec/support/shared_context/gitlab_rails_shared_context.rb b/spec/support/shared_context/gitlab_rails_shared_context.rb
index abc1234..def5678 100644
--- a/spec/support/shared_context/gitlab_rails_shared_context.rb
+++ b/spec/support/shared_context/gitlab_rails_shared_context.rb
@@ -0,0 +1,14 @@+require 'chef_helper'
+
+RSpec.shared_context 'gitlab-rails' do
+ let(:chef_run) { ChefSpec::SoloRunner.new(step_into: 'templatesymlink').converge('gitlab::default') }
+ let(:gitlab_yml_template) { chef_run.template('/var/opt/gitlab/gitlab-rails/etc/gitlab.yml') }
+ let(:gitlab_yml_file_content) { ChefSpec::Renderer.new(chef_run, gitlab_yml_template).content }
+ let(:gitlab_yml) { YAML.safe_load(gitlab_yml_file_content, [], [], true, symbolize_names: true) }
+ let(:config_dir) { '/var/opt/gitlab/gitlab-rails/etc/' }
+
+ before do
+ allow(Gitlab).to receive(:[]).and_call_original
+ allow(File).to receive(:symlink?).and_call_original
+ end
+end
| Add shared context for testing gitlab.yml rendering
Signed-off-by: Balasankar "Balu" C <0bac1367e81975601fd06ab8b2ef22d05b331732@autistici.org>
|
diff --git a/OHMKit.podspec b/OHMKit.podspec
index abc1234..def5678 100644
--- a/OHMKit.podspec
+++ b/OHMKit.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = "OHMKit"
- s.version = "0.1.0"
+ s.version = "0.2.0"
s.summary = "Map service responses to objects in Objective-C."
s.description = <<-DESC
Map service responses to objects.
@@ -14,7 +14,7 @@ s.homepage = "https://github.com/fcanas/OHMKit"
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { "Fabian Canas" => "fcanas@gmail.com" }
- s.source = { :git => "https://github.com/fcanas/OHMKit.git", :tag => "0.1.0" }
+ s.source = { :git => "https://github.com/fcanas/OHMKit.git", :tag => "v0.2.0" }
s.ios.deployment_target = '5.0'
s.osx.deployment_target = '10.7'
s.source_files = 'Core'
| Update pod spec for version 0.2.0
|
diff --git a/lib/puppet/provider/mongodb.rb b/lib/puppet/provider/mongodb.rb
index abc1234..def5678 100644
--- a/lib/puppet/provider/mongodb.rb
+++ b/lib/puppet/provider/mongodb.rb
@@ -0,0 +1,42 @@+class Puppet::Provider::Mongodb < Puppet::Provider
+
+ # Without initvars commands won't work.
+ initvars
+ commands :mongo => 'mongo'
+
+ # Optional defaults file
+ def self.mongorc_file
+ if File.file?("#{Facter.value(:root_home)}/.mongorc.js")
+ "load('#{Facter.value(:root_home)}/.mongorc.js'); "
+ else
+ nil
+ end
+ end
+
+ def mongorc_file
+ self.class.mongorc_file
+ end
+
+ # Mongo Command Wrapper
+ def self.mongo_eval(cmd, db = 'admin')
+ if mongorc_file
+ cmd = mongorc_file + cmd
+ end
+
+ mongo([db, '--quiet', '--eval', cmd])
+ end
+
+ def mongo_eval(cmd, db = 'admin')
+ self.class.mongo_eval(cmd, db)
+ end
+
+ # Mongo Version checker
+ def self.mongo_version
+ @@mongo_version ||= self.mongo_eval('db.version()')
+ end
+
+ def mongo_version
+ self.mongo_version
+ end
+
+end
| Add Puppet::Provider::Mongodb for shared provider code.
|
diff --git a/lib/tech404logs/application.rb b/lib/tech404logs/application.rb
index abc1234..def5678 100644
--- a/lib/tech404logs/application.rb
+++ b/lib/tech404logs/application.rb
@@ -11,7 +11,7 @@ erb :messages
end
- get '/sitemap' do
+ get %r{/sitemap(.xml)?} do
content_type :xml
erb :sitemap, layout: false
end
| Make sitemap URL optionally take .xml extension
Lots of crawlers look for that URL specifically.
|
diff --git a/lib/dmtx.rb b/lib/dmtx.rb
index abc1234..def5678 100644
--- a/lib/dmtx.rb
+++ b/lib/dmtx.rb
@@ -6,7 +6,7 @@ NoText = Class.new StandardError
NoFile = Class.new StandardError
- attr_accessor :text, :height, :width, :file
+ attr_accessor :text, :file
def initialize
@enc = DmtxLib.dmtxEncodeCreate()
| Remove unused height and width instance methods
|
diff --git a/rails_template.rb b/rails_template.rb
index abc1234..def5678 100644
--- a/rails_template.rb
+++ b/rails_template.rb
@@ -29,3 +29,12 @@ git :init
git add: "."
git commit: "-a -m initial"
+
+file 'Dockerfile', <<-CODE
+CODE
+
+file 'docker-compose.yml', <<-CODE
+CODE
+
+file 'docker-compose.dev.yml', <<-CODE
+CODE
| Add empty docker files for rails projects
|
diff --git a/wak.gemspec b/wak.gemspec
index abc1234..def5678 100644
--- a/wak.gemspec
+++ b/wak.gemspec
@@ -19,6 +19,7 @@ spec.require_paths = ["lib"]
spec.add_dependency "thor", "~> 0.19.1"
+ spec.add_dependency "mustache", "~> 0.99.7"
spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "rake", "~> 10.0"
| Add mustache for rendering the nginx template
This will make it easier to override the templates later on when we
implement custom user templates.
|
diff --git a/metadata.rb b/metadata.rb
index abc1234..def5678 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -21,4 +21,5 @@ depends 'golang'
depends 'compat_resource'
-suggests 'bluepill', '~> 2.3'
+# this should really be a suggests
+depends 'bluepill', '~> 2.3'
| Insert note about bluepill dependency really should be a suggests - this is not actually implemented and causes testing failures etc.
|
diff --git a/resources/cask.rb b/resources/cask.rb
index abc1234..def5678 100644
--- a/resources/cask.rb
+++ b/resources/cask.rb
@@ -1,4 +1,4 @@-property :name, String, regex: /^[\w-]+$/, name_property: true
+property :name, String, regex: %r(^[\w/-]+$), name_property: true
property :options, String
action :install do
@@ -24,6 +24,7 @@ alias_method :action_uncask, :action_uninstall
def casked?
- shell_out('/usr/local/bin/brew cask list 2>/dev/null', user: Homebrew.owner).stdout.split.include?(name)
+ unscoped_name = name.split('/').last
+ shell_out('/usr/local/bin/brew cask list 2>/dev/null', user: Homebrew.owner).stdout.split.include?(unscoped_name)
end
end
| Allow Cask name to be scoped to tap
If multiple taps include the same cask name, then the only way to
install/uninstall is by specifying the name scoped with the tap name
(e.g. myuser/mytap/mycask). However, `brew cask list` only shows the
unscoped name.
Signed-off-by: Andrew Marshall <02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@johnandrewmarshall.com>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.