diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/lib/compare.rb b/lib/compare.rb
index abc1234..def5678 100644
--- a/lib/compare.rb
+++ b/lib/compare.rb
@@ -1,46 +1,35 @@-@code = 'BYYY'
+@code = %w(R R B B)
-@guess = 'RGGG'
+@guess = 'BGRB'
-def match?
- @code == @guess
+def color_and_postion?(color, position)
+ color == @code[position]
end
-def number_of_colors
- result = @code.split('').map do |x|
- @guess[x] == @code[x]
+def color_only?(color)
+ @code.include?(color)
+end
+
+def evaluate_turn
+ @pegs = { black: [], white: [] }
+ @guess.split('').each_with_index do |color, position|
+ if color_and_postion?(color, position)
+ @pegs[:black] << true
+ elsif color_only?(color)
+ @pegs[:white] << true
+ end
+ end
+ @pegs
+end
+
+def print_turn_result
+ if @pegs[:black].length == 4
+ puts 'Win'
+ else
+ puts "Black Pegs: #{@pegs[:black].count}"
+ puts "White Pegs: #{@pegs[:white].count}"
end
end
-def white_pegs
- number_of_colors.count(true)
-end
-
-def correct_position
- result = []
- x = 0
- 4.times do
- result << @code[x].match(@guess[x])
- x += 1
- end
- result
-end
-
-def black_pegs
- 4 - correct_position.count(nil)
-end
-
-
-
-match?
-
-number_of_colors
-
-white_pegs
-
-correct_position
-
-black_pegs
-
-
-
+evaluate_turn
+print_turn_result
| Refactor logic for comparison of guess
* Use hash to hold black / white pegs(results)
* Compare with #each_with_index for color, position |
diff --git a/app/models/contact.rb b/app/models/contact.rb
index abc1234..def5678 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -4,8 +4,6 @@ validates :email, :format => {:with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i}
validates :order_number, :format => {:with => /(^$)|(^R\d{9}$)/i, :message => I18n.t("invalid_order_number")}
- def topic
- @topic ||= Topic.find(topic_id)
- end
-
-end+ belongs_to :topic
+
+end
| Replace topic method with association
|
diff --git a/mustermann/mustermann.gemspec b/mustermann/mustermann.gemspec
index abc1234..def5678 100644
--- a/mustermann/mustermann.gemspec
+++ b/mustermann/mustermann.gemspec
@@ -7,8 +7,8 @@ s.authors = ["Konstantin Haase", "Zachary Scott"]
s.email = "sinatrarb@googlegroups.com"
s.homepage = "https://github.com/sinatra/mustermann"
- s.summary = %q{use patterns like regular expressions}
- s.description = %q{library implementing patterns that behave like regular expressions}
+ s.summary = %q{Your personal string matching expert.}
+ s.description = %q{A library implementing patterns that behave like regular expressions.}
s.license = 'MIT'
s.required_ruby_version = '>= 2.2.0'
s.files = `git ls-files`.split("\n")
| Update summary and description in gemspec file.
|
diff --git a/frag.gemspec b/frag.gemspec
index abc1234..def5678 100644
--- a/frag.gemspec
+++ b/frag.gemspec
@@ -8,7 +8,7 @@ gem.authors = ['George Ogata']
gem.email = ['george.ogata@gmail.com']
gem.license = 'MIT'
- gem.summary = "Generate regions of files from the output of shell commands."
+ gem.summary = "Generate fragments of files from shell commands."
gem.homepage = 'http://github.com/oggy/frag'
gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
| Make gem summary match Github project.
|
diff --git a/ci_environment/perlbrew/attributes/multi.rb b/ci_environment/perlbrew/attributes/multi.rb
index abc1234..def5678 100644
--- a/ci_environment/perlbrew/attributes/multi.rb
+++ b/ci_environment/perlbrew/attributes/multi.rb
@@ -7,5 +7,5 @@ { :name => "5.12", :version => "perl-5.12.5" },
{ :name => "5.10", :version => "perl-5.10.1" },
{ :name => "5.8", :version => "perl-5.8.9" }],
- :modules => %w(Dist::Zilla Moose Test::Pod Test::Pod::Coverage Test::Exception Test::Kwalitee LWP Module::Install Test::Most)
+ :modules => %w(Dist::Zilla Moose Test::Pod Test::Pod::Coverage Test::Exception Test::Kwalitee Dist::Zilla::Plugin::Bootstrap::lib LWP Module::Install Test::Most)
}
| Revert "updated the preinstalled perl modules"
Looks like the issue is fixed! https://github.com/travis-ci/travis-cookbooks/commit/8d3b68d0153b75419df460ca0f4458cdd628c5e0#commitcomment-4625656
Thanks @kentfredric !!!
This reverts commit 8d3b68d0153b75419df460ca0f4458cdd628c5e0.
|
diff --git a/db/migrate/20140808035741_create_comments.rb b/db/migrate/20140808035741_create_comments.rb
index abc1234..def5678 100644
--- a/db/migrate/20140808035741_create_comments.rb
+++ b/db/migrate/20140808035741_create_comments.rb
@@ -2,6 +2,10 @@ def change
create_table :comments do |t|
t.text :comment
+
+ t.integer :commentable_id
+ t.string :commentable_type
+ t.string :ancestry
t.belongs_to :user
t.belongs_to :query
| Change comments migration file to have commentable_id, commentable_type, and ancestry
|
diff --git a/automaton.rb b/automaton.rb
index abc1234..def5678 100644
--- a/automaton.rb
+++ b/automaton.rb
@@ -1,6 +1,7 @@ class Automaton
PICTURE = [" ", "█"]
ROW_WIDTH = `/usr/bin/env tput cols`.to_i
+ UNKNOWN_VALUE_PICTURE = "?"
def display_grid(grid)
puts grid.map { |cell| picture(cell) }.join
@@ -13,10 +14,19 @@ end
end
+ # Assumes 1*n neighbourhood matrix
+ def wolfram_code(neighbourhood)
+ size = neighbourhood.size
+ powers = size.times.map { |i| 2 ** i }.reverse
+ size.times
+ .map { |i| neighbourhood[i] * powers[i] }
+ .inject(0) { |sum, n| sum + n }
+ end
+
private
def picture(cell)
- PICTURE[cell] || "?"
+ PICTURE[cell] || UNKNOWN_VALUE_PICTURE
end
end
@@ -25,4 +35,7 @@ automaton = Automaton.new
automaton.display_grid(grid)
p automaton.neighbourhoods(grid)
+ p automaton.wolfram_code([0, 0, 0])
+ p automaton.wolfram_code([1, 1, 1])
+ p automaton.wolfram_code([0, 1, 0])
end
| Convert neighbourhood into Wolfram code
|
diff --git a/files/default/tests/minitest/default_test.rb b/files/default/tests/minitest/default_test.rb
index abc1234..def5678 100644
--- a/files/default/tests/minitest/default_test.rb
+++ b/files/default/tests/minitest/default_test.rb
@@ -17,18 +17,8 @@ #
require 'minitest/spec'
-require 'net/http'
+require File.expand_path('../support/helpers', __FILE__)
describe_recipe 'npm_registry::default' do
- it 'should receive status 200 on /_replicator' do
- assert_equal 200, Net::HTTP.get_response(URI("#{node['npm_registry']['registry']['url']}/_replicator")).code
- end
-
- it 'should receive status 200 on /_replicator/_design/_replicator' do
- assert_equal 200, Net::HTTP.get_response(URI("#{node['npm_registry']['registry']['url']}/_replicator")).code
- end
-
- it 'should receive status 200 on /registry' do
- assert_equal 200, Net::HTTP.get_response(URI("#{node['npm_registry']['registry']['url']}/registry")).code
- end
+ include Helpers::NPM_Registry
end | Remove failing tests from minitest.
|
diff --git a/sluggi.gemspec b/sluggi.gemspec
index abc1234..def5678 100644
--- a/sluggi.gemspec
+++ b/sluggi.gemspec
@@ -15,8 +15,8 @@
spec.required_ruby_version = ">= 1.9.3"
- spec.add_dependency "activerecord", "~> 4.0"
- spec.add_dependency "railties", "~> 4.0"
+ spec.add_dependency "activerecord", ">= 4.0"
+ spec.add_dependency "railties", ">= 4.0"
spec.add_development_dependency "rake", "~> 10.4"
spec.add_development_dependency "sqlite3", "~> 1.3"
| Allow newer versions of activerecord, railties
|
diff --git a/lib/lifesaver/indexing/model_additions.rb b/lib/lifesaver/indexing/model_additions.rb
index abc1234..def5678 100644
--- a/lib/lifesaver/indexing/model_additions.rb
+++ b/lib/lifesaver/indexing/model_additions.rb
@@ -42,8 +42,9 @@ private
def enqueue_indexing(options)
+ operation = options[:operation]
Lifesaver::Indexing::Enqueuer.new(model: self,
- operation: options[:operation]).enqueue
+ operation: operation).enqueue
end
def suppress_indexing?
| Use variable to remove 80 char violation
|
diff --git a/lib/mindbody-api/services/sale_service.rb b/lib/mindbody-api/services/sale_service.rb
index abc1234..def5678 100644
--- a/lib/mindbody-api/services/sale_service.rb
+++ b/lib/mindbody-api/services/sale_service.rb
@@ -5,7 +5,7 @@
operation :get_accepted_card_type, :locals => false
operation :get_sales
- operation :checkout_shopping_cart, :required => [:client_id, :cart_items, :payments]
+ operation :checkout_shopping_cart, :required => [:client_id, :cart_items, :payments, :location_id]
operation :get_services
operation :get_packages
operation :get_products
| Add location attribute to checkout_shopping_cart method |
diff --git a/lib/nanoc/toolbox/nanoc_monkey_patches.rb b/lib/nanoc/toolbox/nanoc_monkey_patches.rb
index abc1234..def5678 100644
--- a/lib/nanoc/toolbox/nanoc_monkey_patches.rb
+++ b/lib/nanoc/toolbox/nanoc_monkey_patches.rb
@@ -1,19 +1,3 @@ module Nanoc3::Helpers::Blogging
- # patch url_for and atom_tag_for to omit .html
-
- old_url_for = instance_method(:url_for)
-
- define_method(:url_for) do |item|
- url = old_url_for.bind(self).(item)
- url.gsub(/\.html$/, '')
- end
-
- old_atom_tag_for = instance_method(:atom_tag_for)
-
- define_method(:atom_tag_for) do |item|
- tag = old_atom_tag_for.bind(self).(item)
- tag.gsub(/\.html$/, '')
- end
-
end
| Remove the monkey patches functions |
diff --git a/lib/rb/lib/thrift/transport/httpclient.rb b/lib/rb/lib/thrift/transport/httpclient.rb
index abc1234..def5678 100644
--- a/lib/rb/lib/thrift/transport/httpclient.rb
+++ b/lib/rb/lib/thrift/transport/httpclient.rb
@@ -1,6 +1,7 @@ require 'thrift/transport'
require 'net/http'
+require 'net/https'
require 'uri'
require 'stringio'
@@ -17,7 +18,9 @@ def write(buf); @outbuf << buf end
def flush
http = Net::HTTP.new @url.host, @url.port
- resp, data = http.post(@url.path, @outbuf)
+ http.use_ssl = @url.scheme == "https"
+ headers = { 'Content-Type' => 'application/x-thrift' }
+ resp, data = http.post(@url.path, @outbuf, headers)
@inbuf = StringIO.new data
@outbuf = ""
end
| rb: Support SSL and correct Content-Type in HTTPClient [THRIFT-156]
Author: Dave Engberg
git-svn-id: 8d8e29b1fb681c884914062b88f3633e3a187774@704994 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/plugins/hosts/windows/cap/ssh.rb b/plugins/hosts/windows/cap/ssh.rb
index abc1234..def5678 100644
--- a/plugins/hosts/windows/cap/ssh.rb
+++ b/plugins/hosts/windows/cap/ssh.rb
@@ -10,14 +10,15 @@ def self.set_ssh_key_permissions(env, key_path)
script_path = Host.scripts_path.join("set_ssh_key_permissions.ps1")
result = Vagrant::Util::PowerShell.execute(
- script_path.to_s, path.to_s,
- module_path: Host.module_path.to_s
+ script_path.to_s, key_path.to_s,
+ module_path: Host.modules_path.to_s
)
if result.exit_code != 0
raise Vagrant::Errors::PowerShellError,
script: script_path,
stderr: result.stderr
end
+ result
end
end
end
| Fix path variable name. Return process result.
|
diff --git a/lib/generators/cover_me/install/templates/cover_me.rake b/lib/generators/cover_me/install/templates/cover_me.rake
index abc1234..def5678 100644
--- a/lib/generators/cover_me/install/templates/cover_me.rake
+++ b/lib/generators/cover_me/install/templates/cover_me.rake
@@ -1,11 +1,11 @@ namespace :cover_me do
-
+
desc "Generates and opens code coverage report."
task :report do
require 'cover_me'
CoverMe.complete!
end
-
+
end
task :test do
| Remove whitespace from rake task template ಠ_ಠ
|
diff --git a/config/deploy.rb b/config/deploy.rb
index abc1234..def5678 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -23,9 +23,15 @@ { :host => "127.0.0.1", :port => free_server_port },
],
+ # The public site.
+ :public_site => [
+ { :host => "127.0.0.1", :port => 50100 },
+ ],
+
# API backends.
+ # For local services, start assigning ports in the 50500+ range.
:api_sfv => [
- { :host => "127.0.0.1", :port => 50100 },
+ { :host => "127.0.0.1", :port => 50500 },
],
:api_georeserv => [
{ :host => "rosselli.nrel.gov", :port => 8010 },
| Add public site to the server config.
|
diff --git a/config/routes.rb b/config/routes.rb
index abc1234..def5678 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,7 +11,7 @@ post 'start_work', to: 'editions#progress',
activity: { request_type: 'start_work' }
post 'skip_fact_check', to: 'editions#progress',
- activity: { request_type: 'receive_fact_check', comment: "Fact check skipped by request."}
+ activity: { request_type: 'skip_fact_check', comment: "Fact check skipped by request."}
end
end
| Make skip_fact_check use proper workflow transitions
|
diff --git a/config/initializers/resolve_controller.rb b/config/initializers/resolve_controller.rb
index abc1234..def5678 100644
--- a/config/initializers/resolve_controller.rb
+++ b/config/initializers/resolve_controller.rb
@@ -1,6 +1,6 @@-# Re-open ResolveController include the highlight helper
+# Re-open ResolveController include the highlight helper and the E-ZBorrow helper
ActiveSupport.on_load(:after_initialize) do
ResolveController.class_eval do
- helper :resolve_highlight
+ helper :resolve_highlight, :ezborrow
end
end
| Add the E-ZBorrow helper to the ResolveController
|
diff --git a/hako.gemspec b/hako.gemspec
index abc1234..def5678 100644
--- a/hako.gemspec
+++ b/hako.gemspec
@@ -19,7 +19,7 @@ spec.require_paths = ['lib']
spec.required_ruby_version = '>= 2.3.0'
- spec.add_dependency 'aws-sdk', '>= 2.3.22'
+ spec.add_dependency 'aws-sdk', '>= 2.6.43'
spec.add_development_dependency 'bundler'
spec.add_development_dependency 'rake'
| Use aws-sdk v2.6.43 or later for setting placement policy.
|
diff --git a/ellen-syoboi_calendar.gemspec b/ellen-syoboi_calendar.gemspec
index abc1234..def5678 100644
--- a/ellen-syoboi_calendar.gemspec
+++ b/ellen-syoboi_calendar.gemspec
@@ -7,9 +7,8 @@ spec.version = Ellen::SyoboiCalendar::VERSION
spec.authors = ["Ryo Nakamura"]
spec.email = ["r7kamura@gmail.com"]
- spec.summary = %q{TODO: Write a short summary. Required.}
- spec.description = %q{TODO: Write a longer description. Optional.}
- spec.homepage = ""
+ spec.summary = "Ask today's Japanese anime line-up from cal.syoboi.jp."
+ spec.homepage = "https://github.com/r7kamura/ellen-syoboi_calendar"
spec.license = "MIT"
spec.files = `git ls-files -z`.split("\x0")
| Write summary and homepage into gemspec
|
diff --git a/event_store-messaging.gemspec b/event_store-messaging.gemspec
index abc1234..def5678 100644
--- a/event_store-messaging.gemspec
+++ b/event_store-messaging.gemspec
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
s.name = 'event_store-messaging'
s.summary = 'Messaging primitives for EventStore using the EventStore Client HTTP library'
- s.version = '0.1.1.0'
+ s.version = '0.2.0.0'
s.authors = ['']
s.require_paths = ['lib']
s.files = Dir.glob('{lib}/**/*')
| Package version is increased from 0.1.1.0 to 0.2.0.0
|
diff --git a/event_store-messaging.gemspec b/event_store-messaging.gemspec
index abc1234..def5678 100644
--- a/event_store-messaging.gemspec
+++ b/event_store-messaging.gemspec
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
s.name = 'event_store-messaging'
s.summary = 'Messaging primitives for EventStore using the EventStore Client HTTP library'
- s.version = '0.2.4'
+ s.version = '0.2.5'
s.authors = ['']
s.require_paths = ['lib']
s.files = Dir.glob('{lib}/**/*')
| Package version is increased from 0.2.4 to 0.2.5
|
diff --git a/lib/solid.rb b/lib/solid.rb
index abc1234..def5678 100644
--- a/lib/solid.rb
+++ b/lib/solid.rb
@@ -14,7 +14,8 @@ class << self
def unproxify(object)
- if object.class.name.end_with?('::LiquidDropClass')
+ class_name = object.class.name
+ if class_name && class_name.end_with?('::LiquidDropClass')
return object.instance_variable_get('@object')
end
object
| Fix unproxify now support anonymous classes
|
diff --git a/rightscale-cli.gemspec b/rightscale-cli.gemspec
index abc1234..def5678 100644
--- a/rightscale-cli.gemspec
+++ b/rightscale-cli.gemspec
@@ -2,14 +2,14 @@ s.name = 'rightscale-cli'
s.version = '0.5.6'
s.date = '2014-02-18'
- s.summary = "rightscale-cli"
- s.description = "RightScale command line interface client."
- s.authors = ["Chris Fordham"]
+ s.summary = 'rightscale-cli'
+ s.description = 'RightScale command line interface client.'
+ s.authors = ['Chris Fordham']
s.email = 'chris@fordham-nagy.id.au'
s.licenses = ['Apache 2.0']
- s.files = Dir['{bin,lib}/**/*', 'README*', 'LICENSE*']
+ s.files = Dir['{bin,lib}/**/*', 'README*', 'LICENSE*']
s.bindir = 'bin'
- s.executables = Dir.entries(s.bindir) - [".", "..", '.gitignore']
+ s.executables = Dir.entries(s.bindir) - ['.', '..', '.gitignore']
s.homepage = 'https://github.com/flaccid/rightscale-cli'
s.add_runtime_dependency 'activesupport', '~> 4.0'
s.add_runtime_dependency 'builder', '~> 3.0'
| Use single quotes appropriately in gemspec.
|
diff --git a/lib/tasks/configuration/expression_engine.rb b/lib/tasks/configuration/expression_engine.rb
index abc1234..def5678 100644
--- a/lib/tasks/configuration/expression_engine.rb
+++ b/lib/tasks/configuration/expression_engine.rb
@@ -17,7 +17,7 @@ Pathname.new(paths.first).join('..').basename
end
- def ee_systems
+ def ee_system
system_dir
end
| Fix typo: ee_systems => ee_system
|
diff --git a/resources/default.rb b/resources/default.rb
index abc1234..def5678 100644
--- a/resources/default.rb
+++ b/resources/default.rb
@@ -7,17 +7,17 @@ action :checkout do
daun = ::Daun::RuggedDaun.new(destination)
unless ::File.foreach("#{destination}/.git/config").any?{ |l| l[repository] }
- # TODO: how to show up to date?
converge_by("Initialize daun repository at #{destination}") do
daun.init repository
end
end
config.each do |key, value|
- # TODO: how to show up to date?
@repository = ::Rugged::Repository.init_at(destination)
- converge_by("Updating daun repository config '#{key}' to '#{value}'") do
- @repository.config[key] = value
+ if @repository.config[key] != value.to_s
+ converge_by("Updating daun repository config '#{key}' to '#{value}'") do
+ @repository.config[key] = value
+ end
end
end
| Check config value before converging.
|
diff --git a/handlebars-rails.gemspec b/handlebars-rails.gemspec
index abc1234..def5678 100644
--- a/handlebars-rails.gemspec
+++ b/handlebars-rails.gemspec
@@ -11,7 +11,7 @@ gem.description = "Use Handlebars.js client- and server-side"
gem.email = "james.a.rosen@gmail.com"
gem.homepage = "http://github.com/jamesarosen/handlebars-rails"
- gem.authors = ["James A. Rosen", "Yehuda Katz"]
+ gem.authors = ["James A. Rosen", "Yehuda Katz", "Charles Lowell"]
gem.test_files = []
gem.require_paths = [".", "lib"]
gem.has_rdoc = 'false'
| Add myself to the authors list |
diff --git a/contribsearch.rb b/contribsearch.rb
index abc1234..def5678 100644
--- a/contribsearch.rb
+++ b/contribsearch.rb
@@ -3,7 +3,9 @@ require 'pp'
require 'json'
-
-octo = Octokit.contribs('pengwynn/octokit')
-
-pp octo+#returns an array of all usernames from a repo
+def repo_contrib_locs(user_repo)
+ repo_contribs = Octokit.contribs(user_repo)
+ contrib_locs = repo_contribs.collect { |user| user.fetch("login") }
+ contrib_locs
+end | Add initial working method to return all contributor usernames from a repo
|
diff --git a/lib/cosy/helper/midi_renderer_helper.rb b/lib/cosy/helper/midi_renderer_helper.rb
index abc1234..def5678 100644
--- a/lib/cosy/helper/midi_renderer_helper.rb
+++ b/lib/cosy/helper/midi_renderer_helper.rb
@@ -28,30 +28,18 @@
# Make MIDIator cleanup at program termination:
class MIDIator::Driver
+
alias orig_init initialize
- alias orig_note_on note_on
- alias orig_note_off note_off
-
+
def initialize(*params)
orig_init(*params)
- @held_notes = Hash.new {|hash,key| hash[key]={} }
at_exit do
- @held_notes.each do |channel,notes|
- notes.each do |note,velocity|
- orig_note_off(note, channel, velocity)
+ for channel in 0..15 do
+ for note in 0..127 do
+ note_off(note, channel, 100)
end
end
- close
end
- end
-
- def note_on( note, channel, velocity )
- orig_note_on( note, channel, velocity )
- @held_notes[channel][note] = velocity
end
-
- def note_off( note, channel, velocity = 0 )
- orig_note_off( note, channel, velocity )
- @held_notes[channel].delete(note)
- end
+
end
| Send note offs for every pitch/channel combination instead of tracking held notes |
diff --git a/semantic_range.gemspec b/semantic_range.gemspec
index abc1234..def5678 100644
--- a/semantic_range.gemspec
+++ b/semantic_range.gemspec
@@ -13,9 +13,7 @@ spec.homepage = "https://libraries.io/github/librariesio/semantic_range"
spec.license = "MIT"
- 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) }
+ spec.files = Dir["lib/**/*"] + ["README.md", "LICENSE.txt"]
spec.require_paths = ["lib"]
spec.add_development_dependency "bundler", "~> 1.11"
| gemspec: Reduce size of packaged gem
- Drop bindir and executables setting, since this gem ships no executable
|
diff --git a/html5_validators.gemspec b/html5_validators.gemspec
index abc1234..def5678 100644
--- a/html5_validators.gemspec
+++ b/html5_validators.gemspec
@@ -19,6 +19,8 @@ s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ['lib']
s.add_development_dependency 'test-unit-rails'
+ s.add_development_dependency 'selenium-webdriver'
+ s.add_development_dependency 'puma'
s.add_development_dependency 'capybara', '>= 2'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'rake'
| Add required development dependency (selenium-webdriver and puma.)
|
diff --git a/lib/gitlab/build/ha_validate/nightly.rb b/lib/gitlab/build/ha_validate/nightly.rb
index abc1234..def5678 100644
--- a/lib/gitlab/build/ha_validate/nightly.rb
+++ b/lib/gitlab/build/ha_validate/nightly.rb
@@ -32,7 +32,7 @@ end
def self.get_access_token
- ENV['HA_VALIDATE_TOKEN']
+ ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
end
end
end
| Use general token to poll gitlab-provisioner pipeline status
|
diff --git a/lib/recaptcha_mailhide/configuration.rb b/lib/recaptcha_mailhide/configuration.rb
index abc1234..def5678 100644
--- a/lib/recaptcha_mailhide/configuration.rb
+++ b/lib/recaptcha_mailhide/configuration.rb
@@ -1,5 +1,15 @@ module RecaptchaMailhide
class Configuration
- attr_accessor :private_key, :public_key
+ attr_writer :private_key, :public_key
+
+ def private_key
+ raise "RecaptchaMailhide's private_key is not set. If you're using Rails add an initializer to config/initializers." unless @private_key
+ @private_key
+ end
+
+ def public_key
+ raise "RecaptchaMailhide's public_key is not set. If you're using Rails add an initializer to config/initializers." unless @public_key
+ @public_key
+ end
end
end
| Make private_key and public_key raise exceptions if missing from config.
|
diff --git a/iOS-Slide-Menu.podspec b/iOS-Slide-Menu.podspec
index abc1234..def5678 100644
--- a/iOS-Slide-Menu.podspec
+++ b/iOS-Slide-Menu.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = 'iOS-Slide-Menu'
- s.version = '1.4.5'
+ s.version = '1.4.6'
s.summary = 'A Slide Menu for iOS'
s.homepage = 'https://github.com/aryaxt/iOS-Slide-Menu'
s.license = {
@@ -8,7 +8,7 @@ :file => 'License.txt'
}
s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/iOS-Slide-Menu'}
- s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.5'}
+ s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.6'}
s.platform = :ios, '6.0'
s.source_files = 'SlideMenu/Source/*.{h,m}', 'SlideMenu/Source/Animations/*.{h,m}'
s.resources = ['SlideMenu/Source/Assets/**/*']
| Update pod spec for version 1.4.6
|
diff --git a/iOS-Slide-Menu.podspec b/iOS-Slide-Menu.podspec
index abc1234..def5678 100644
--- a/iOS-Slide-Menu.podspec
+++ b/iOS-Slide-Menu.podspec
@@ -8,7 +8,7 @@ :file => 'License.txt'
}
s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/iOS-Slide-Menu'}
- s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.4'}
+ s.source = {:git => 'https://github.com/thelearningclinic/iOS-Slide-Menu.git', :tag => '1.4.4'}
s.platform = :ios, '6.0'
s.source_files = 'SlideMenu/Source/*.{h,m}', 'SlideMenu/Source/Animations/*.{h,m}', 'SlideMenu/Source/Assets/*.{png}'
s.resources = ['SlideMenu/Source/Assets/**/*']
| Update podspec to point to our repo
|
diff --git a/lib/embulk/input/googlespreadsheet/error.rb b/lib/embulk/input/googlespreadsheet/error.rb
index abc1234..def5678 100644
--- a/lib/embulk/input/googlespreadsheet/error.rb
+++ b/lib/embulk/input/googlespreadsheet/error.rb
@@ -1,7 +1,8 @@ module Embulk
module Input
class Googlespreadsheet < InputPlugin
- module Traceable
+
+ class ConfigError < ::Embulk::ConfigError
def initialize(e)
message = "(#{e.class}) #{e}.\n\t#{e.backtrace.join("\t\n")}\n"
while e.respond_to?(:cause) and e.cause
@@ -14,12 +15,17 @@ end
end
- class ConfigError < ::Embulk::ConfigError
- include Traceable
- end
+ class DataError < ::Embulk::DataError
+ def initialize(e)
+ message = "(#{e.class}) #{e}.\n\t#{e.backtrace.join("\t\n")}\n"
+ while e.respond_to?(:cause) and e.cause
+ # Java Exception cannot follow the JRuby causes.
+ message << "Caused by (#{e.cause.class}) #{e.cause}\n\t#{e.cause.backtrace.join("\t\n")}\n"
+ e = e.cause
+ end
- class DataError < ::Embulk::DataError
- include Traceable
+ super(message)
+ end
end
class CompatibilityError < DataError; end
| Remove Traceable module cuz doesnt work
|
diff --git a/test/helper.rb b/test/helper.rb
index abc1234..def5678 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,8 +1,10 @@-require 'cutest'
-require 'redis'
-require 'ohm'
-require 'ohm/contrib'
-require 'override'
+$:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
+
+require "cutest"
+require "redis"
+require "ohm"
+require "ohm/contrib"
+require "override"
Ohm.connect :host => "localhost", :port => 6379, :db => 1
| Make running tests easier by adding ../lib to load path.
|
diff --git a/test/helper.rb b/test/helper.rb
index abc1234..def5678 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,4 +1,3 @@-require 'rubygems'
require 'test/unit'
if ENV['LEFTRIGHT']
@@ -9,10 +8,6 @@ end
end
-unless $LOAD_PATH.include? 'lib'
- $LOAD_PATH.unshift(File.dirname(__FILE__))
- $LOAD_PATH.unshift(File.join($LOAD_PATH.first, '..', 'lib'))
-end
require 'faraday'
begin
| Remove unnecessary and require 'rubygems'
|
diff --git a/spec/unit/veritas/immutable/freeze_spec.rb b/spec/unit/veritas/immutable/freeze_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/veritas/immutable/freeze_spec.rb
+++ b/spec/unit/veritas/immutable/freeze_spec.rb
@@ -43,8 +43,9 @@ expect { subject }.to_not change { object.instance_variable_get(:@__memory) }
end
- it 'sets an instance variable for memoization' do
- subject.instance_variable_get(:@__memory).should be_instance_of(Hash)
+ it 'does not set an instance variable for memoization' do
+ object.instance_variable_get(:@__memory).should be_instance_of(Hash)
+ subject
end
end
end
| Fix spec description to match the fact that it does not set the ivar
|
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index abc1234..def5678 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -1,4 +1,5 @@ Given /^I am logged in as a user$/ do
+ User.destroy_all
user = User.create(:email => "jack@johnson.com",
:password => "12345678",
:password_confirmation => "12345678")
| Destroy previous users before creating new one
|
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index abc1234..def5678 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -1,24 +1,12 @@ require 'spec_helper_acceptance'
-describe 'graphite' do
+shared_examples_for "working graphite" do |puppet_manifest|
it 'should run successfully' do
- pp = <<-END
- class { 'python':
- pip => true,
- dev => true,
- virtualenv => true,
- }
-
- class { 'graphite':
- require => Class['python'],
- }
- END
-
# Apply twice to ensure no errors the second time.
- apply_manifest(pp, :catch_failures => true) do |r|
+ apply_manifest(puppet_manifest, :catch_failures => true) do |r|
expect(r.stderr).not_to match(/error/i)
end
- apply_manifest(pp, :catch_failures => true) do |r|
+ apply_manifest(puppet_manifest, :catch_failures => true) do |r|
expect(r.stderr).not_to match(/error/i)
# ensure idempotency
@@ -44,3 +32,34 @@ end
end
end
+
+describe 'graphite' do
+ context 'default params' do
+ it_should_behave_like "working graphite", <<-END
+ class { 'python':
+ pip => true,
+ dev => true,
+ virtualenv => true,
+ }
+
+ class { 'graphite':
+ require => Class['python'],
+ }
+ END
+ end
+
+ context 'custom root_dir' do
+ it_should_behave_like "working graphite", <<-END
+ class { 'python':
+ pip => true,
+ dev => true,
+ virtualenv => true,
+ }
+
+ class { 'graphite':
+ root_dir => '/usr/local/graphite',
+ require => Class['python'],
+ }
+ END
+ end
+end
| Extend acceptance tests to cover custom root_dir
This will prevent us from breaking the functionality in ed5642d again.
|
diff --git a/spec/bluster/listener_spec.rb b/spec/bluster/listener_spec.rb
index abc1234..def5678 100644
--- a/spec/bluster/listener_spec.rb
+++ b/spec/bluster/listener_spec.rb
@@ -0,0 +1,35 @@+# encoding: utf-8
+
+require 'spec_helper'
+
+module Bluster
+ shared_examples_for 'a Rubyesque listener' do
+ let :listener do
+ described_class.new
+ end
+
+ it 'responds to #joined' do
+ listener.should respond_to(:joined)
+ end
+
+ it 'responds to #start_work' do
+ listener.should respond_to(:start_work)
+ end
+
+ it 'responds to #shutdown_work' do
+ listener.should respond_to(:shutdown_work)
+ end
+
+ it 'responds to #left' do
+ listener.should respond_to(:left)
+ end
+ end
+
+ describe ClusterListener do
+ it_behaves_like 'a Rubyesque listener'
+ end
+
+ describe SmartListener do
+ it_behaves_like 'a Rubyesque listener'
+ end
+end
| Add simple tests for Listeners |
diff --git a/app/helpers/bounties_helper.rb b/app/helpers/bounties_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/bounties_helper.rb
+++ b/app/helpers/bounties_helper.rb
@@ -3,6 +3,7 @@ def scoped_product_bounties_path(product, options={})
state = options[:state] || params[:state]
user = options[:user] || params[:user]
+ user_id = options[:user_id] || params[:user_id]
sort = options[:sort] || params[:sort]
project = options[:project] || params[:project]
tag = options[:tag] || params[:tag]
@@ -10,6 +11,7 @@ product_wips_path(product,
state: state,
user: user,
+ user_id: user_id,
sort: sort,
project: project,
tag: tag
| Include user filter in scoped helper
|
diff --git a/app/models/lottery_division.rb b/app/models/lottery_division.rb
index abc1234..def5678 100644
--- a/app/models/lottery_division.rb
+++ b/app/models/lottery_division.rb
@@ -27,7 +27,7 @@ end
def reverse_loaded_draws
- ordered_loaded_draws.reorder(created_at: :desc)
+ loaded_draws.reorder(created_at: :desc)
end
def wait_list_entrants
@@ -40,9 +40,8 @@
private
- def ordered_loaded_draws
+ def loaded_draws
draws.includes(ticket: :entrant)
- .order(:created_at)
end
def ordered_drawn_entrants
| Remove redundant ordering in lottery division model
|
diff --git a/app/validators/ip_validator.rb b/app/validators/ip_validator.rb
index abc1234..def5678 100644
--- a/app/validators/ip_validator.rb
+++ b/app/validators/ip_validator.rb
@@ -8,7 +8,7 @@ if BLOCKED_COUNTRIES.include? geocode&.country_code&.upcase
record.errors.add :base, "Spam registration suspected"
else
- record.geocode = geocode.data
+ record.geocode = geocode&.data
end
end
end
| Fix issue with missing geocode data locally
|
diff --git a/lib/cowsay.rb b/lib/cowsay.rb
index abc1234..def5678 100644
--- a/lib/cowsay.rb
+++ b/lib/cowsay.rb
@@ -1,6 +1,16 @@ require 'active_support'
require 'logger'
module Cowsay
+ class NullObject
+ def method_missing(*args, &block)
+ self
+ end
+ end
+
+ def Maybe(value)
+ value.nil? ? NullObject.new : value
+ end
+
class Cow
def initialize(options={})
@io_class = options.fetch(:io_class){IO}
| Use Null Object for output
|
diff --git a/spec/classes/git_gitosis_spec.rb b/spec/classes/git_gitosis_spec.rb
index abc1234..def5678 100644
--- a/spec/classes/git_gitosis_spec.rb
+++ b/spec/classes/git_gitosis_spec.rb
@@ -0,0 +1,10 @@+require 'spec_helper'
+
+describe 'git::gitosis' do
+
+ context 'defaults' do
+ it { should contain_package('gitosis') }
+ it { should contain_class('git') }
+ it { should create_class('git::gitosis') }
+ end
+end
| Add spec for gitosis class |
diff --git a/spec/core/core_spec.rb b/spec/core/core_spec.rb
index abc1234..def5678 100644
--- a/spec/core/core_spec.rb
+++ b/spec/core/core_spec.rb
@@ -45,6 +45,32 @@ end
end
+ context 'a postfix conditional' do
+
+ it 'is a call wrapped' do
+ #
+ # `break if a == 3`
+ # is equivalent to
+ # ```
+ # ife a == 3
+ # break _
+ # ```
+ # (note the underscore)
+
+ flon = %{
+ set a 3
+ until true
+ break if a == 3
+ set a (+ a 1)
+ }
+
+ r = @executor.launch(flon)
+
+ expect(r['point']).to eq('terminated')
+ expect(r['payload']['ret']).to eq(nil)
+ end
+ end
+
context 'common _att' do
describe 'vars' do
| Add core spec for `break if a == 3`
|
diff --git a/lib/wbench.rb b/lib/wbench.rb
index abc1234..def5678 100644
--- a/lib/wbench.rb
+++ b/lib/wbench.rb
@@ -3,6 +3,7 @@ require 'net/http'
require 'uri'
require 'capybara'
+require 'selenium/webdriver'
require 'wbench/version'
require 'wbench/benchmark'
@@ -14,10 +15,14 @@ require 'wbench/timings/latency'
module WBench
- CAPYBARA_DRIVER = :wbench_browser
- DEFAULT_LOOPS = 10
+ CAPYBARA_DRIVER = :wbench_browser
+ DEFAULT_LOOPS = 10
+ CAPYBARA_TIMEOUT = 10
Capybara.register_driver(CAPYBARA_DRIVER) do |app|
- Capybara::Selenium::Driver.new(app, :browser => :chrome)
+ http_client = Selenium::WebDriver::Remote::Http::Default.new
+ http_client.timeout = CAPYBARA_TIMEOUT
+
+ Capybara::Selenium::Driver.new(app, :browser => :chrome, :http_client => http_client)
end
end
| Set capybara timeout to 10 seconds.
|
diff --git a/config/application.rb b/config/application.rb
index abc1234..def5678 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -11,5 +11,7 @@ # Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
+
+ config.active_record.sqlite3.represent_boolean_as_integer = true
end
end
| Add represent_boolean_as_integer to fix minitest
|
diff --git a/config/deploy/test.rb b/config/deploy/test.rb
index abc1234..def5678 100644
--- a/config/deploy/test.rb
+++ b/config/deploy/test.rb
@@ -21,4 +21,15 @@ end
after :publishing, :restart
+
+ desc 'Run pending Rails migrations'
+ task :migrate do
+ on roles(:db) do
+ within current_path.join('rails') do
+ with rails_env: :production do
+ execute :rake, 'db:migrate'
+ end
+ end
+ end
+ end
end
| Add task to migrate our Rails app that's in a subdirectory
|
diff --git a/config/environment.rb b/config/environment.rb
index abc1234..def5678 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,6 +2,10 @@ require 'active_record'
require 'yaml'
require 'erb'
+require 'dotenv'
+require 'octokit'
+
+Dotenv.load
if ENV['DATABASE_URL']
db = URI.parse(ENV['DATABASE_URL'] || 'postgres://localhost/mydb')
@@ -17,16 +21,11 @@ environment = ENV['RACK_ENV'] || 'development'
db = YAML.load(File.read('config/database.yml'))[environment]
ActiveRecord::Base.establish_connection(db)
+end
- require 'dotenv'
- require 'octokit'
-
- Dotenv.load
-
- Octokit.configure do |c|
- c.client_id = ENV["GITHUB_CLIENT_ID"]
- c.client_secret = ENV["GITHUB_CLIENT_SECRET"]
- end
+Octokit.configure do |c|
+ c.client_id = ENV["GITHUB_CLIENT_ID"]
+ c.client_secret = ENV["GITHUB_CLIENT_SECRET"]
end
ActiveRecord::Base.include_root_in_json = false
| Configure octokit in production in addition to development
|
diff --git a/spec/builders/mobi_spec.rb b/spec/builders/mobi_spec.rb
index abc1234..def5678 100644
--- a/spec/builders/mobi_spec.rb
+++ b/spec/builders/mobi_spec.rb
@@ -10,13 +10,15 @@ end
end
- before(:all) { generate_book }
+ before(:all) do
+ generate_book
+ @builder = Polytexnic::Builders::Mobi.new
+ @built = @builder.build!
+ chdir_to_book
+ end
after(:all) { remove_book }
describe "#build!" do
- subject(:builder) { Polytexnic::Builders::Mobi.new }
- before { @built = builder.build! }
-
it "should generate the EPUB" do
expect('epub/book.epub').to exist
end
@@ -24,11 +26,11 @@ # Because of the way kindlegen uses tempfiles, testing for the
# actual generation of the MOBI causes an error, so we just
# check the command.
- it "should generate the MOBI" do
- expect(@built).to match(/kindlegen/)
- expect(@built).to match(/epub\/book.epub/)
+ describe "MOBI generation" do
+ subject(:built) { @built }
+ it { should match /kindlegen/ }
+ it { should match /epub\/book\.epub/ }
end
-
end
end
end
| Move builder.build! into before(:all) block for MOBI
[#52758883]
|
diff --git a/spec/factories/link_set.rb b/spec/factories/link_set.rb
index abc1234..def5678 100644
--- a/spec/factories/link_set.rb
+++ b/spec/factories/link_set.rb
@@ -8,12 +8,12 @@
after(:create) do |link_set, evaluator|
evaluator.links_hash.each do |link_type, target_content_ids|
- target_content_ids.each do |target_content_id|
- create(
- :link,
+ target_content_ids.each_with_index do |target_content_id, index|
+ create(:link,
link_type: link_type,
link_set: link_set,
- target_content_id: target_content_id
+ target_content_id: target_content_id,
+ position: index,
)
end
end
| Include position in LinkSet factory
This includes the position value that was missing previously.
|
diff --git a/spec/unit/api_actions_spec.rb b/spec/unit/api_actions_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/api_actions_spec.rb
+++ b/spec/unit/api_actions_spec.rb
@@ -14,11 +14,13 @@
describe '#find' do
let(:story) { subject.find(:story, 1) }
+
it 'calls get and returns resource object' do
expect(subject).to receive(:get).with('stories/1').and_return({"name" => "Story 1", "id" => 1})
expect(story).to be_instance_of Story
+
+ expect(story.id).to eq 1
expect(story.name).to eq 'Story 1'
-
end
it 'raises an error when resource is unknown' do
@@ -27,8 +29,7 @@ end
describe '#resource' do
-
- it 'returns object matching the label' do
+ it 'returns class name and endpoint as keys mapping to the class' do
expect(subject.known_resources).to eq({
stories: Clubhouse::Story,
story: Clubhouse::Story
| Improve title of spec and removing extra whitespace
|
diff --git a/spec/factories/user_tables.rb b/spec/factories/user_tables.rb
index abc1234..def5678 100644
--- a/spec/factories/user_tables.rb
+++ b/spec/factories/user_tables.rb
@@ -22,6 +22,24 @@ user_table.unstub(:create_canonical_visualization)
end
+ trait :with_db_table do
+ before(:create) do |user_table|
+ user_table.service.unstub(:before_create)
+ user_table.service.unstub(:after_create)
+ end
+ end
+
+ trait :with_canonical_visualization do
+ before(:create) do |user_table|
+ user_table.service.stubs(:is_raster?).returns(false)
+ user_table.unstub(:create_canonical_visualization)
+ end
+
+ after(:create) do |user_table|
+ user_table.service.unstub(:is_raster?)
+ end
+ end
+
factory :private_user_table do
privacy Carto::UserTable::PRIVACY_PRIVATE
end
| Add trait for full user table
|
diff --git a/recipes/reserve_ip_for_vcac_vm_in_network.rb b/recipes/reserve_ip_for_vcac_vm_in_network.rb
index abc1234..def5678 100644
--- a/recipes/reserve_ip_for_vcac_vm_in_network.rb
+++ b/recipes/reserve_ip_for_vcac_vm_in_network.rb
@@ -1,7 +1,9 @@ # Cookbook Name: Infoblox
# Recipe Name: reserve_ip_for_vcac_vm_in_network
-infoblox_ip_address 'Reserve static IP for host record' do
+include_recipe 'infoblox::default'
+
+infoblox_ip_address 'Reserve available nextowk IP for host record' do
name node['vcac_vm_network_ip']['hostname']
extattrs node['vcac_vm_network_ip']['extattrs']
comment node['vcac_vm_network_ip']['comment']
@@ -9,6 +11,7 @@ exclude node['vcac_vm_network_ip']['exclude']
usage_type node['vcac_vm_network_ip']['usage_type']
record_type node['vcac_vm_network_ip']['record_type']
+ notifies :provision, 'infoblox_vm[Provision a VM]', :immediately
action :reserve_network_ip
end
| Revert changes for network workflow
|
diff --git a/spec/default_search_spec.rb b/spec/default_search_spec.rb
index abc1234..def5678 100644
--- a/spec/default_search_spec.rb
+++ b/spec/default_search_spec.rb
@@ -8,6 +8,7 @@
it "Should match partial titles" do
default_search('b2041590', 'remains of the day', 10)
+ default_search('b7113006', 'time is a toy', 3)
end
it "Should match full title strings without quotes" do
| Add another example that was previously failing.
|
diff --git a/spec/features/editing_submissions_spec.rb b/spec/features/editing_submissions_spec.rb
index abc1234..def5678 100644
--- a/spec/features/editing_submissions_spec.rb
+++ b/spec/features/editing_submissions_spec.rb
@@ -18,7 +18,7 @@ visit edit_assignment_submission_path assignment, submission
within ".pageContent" do
- expect(page).to have_content "Resubmission"
+ expect(page).to have_content "Resubmission!"
end
end
end
| Update the alert content for resubmissions
|
diff --git a/lib/adhearsion/initializer/punchblock.rb b/lib/adhearsion/initializer/punchblock.rb
index abc1234..def5678 100644
--- a/lib/adhearsion/initializer/punchblock.rb
+++ b/lib/adhearsion/initializer/punchblock.rb
@@ -1,4 +1,5 @@ require 'punchblock'
+require 'timeout'
module Adhearsion
class Initializer
@@ -23,9 +24,28 @@ Events.register_callback(:after_initialized) do
begin
IMPORTANT_THREADS << client.run
+ first_event = nil
+ Timeout::timeout(30) { first_event = client.event_queue.pop }
+ ahn_log.punchblock.info "Connected via Punchblock" if first_event == client.connected
+ poll_queue
rescue => e
- ahn_log.fatal "Failed to start Punchblock client! #{e.inspect}"
+ ahn_log.punchblock.fatal "Failed to start Punchblock client! #{e.inspect}"
abort
+ end
+ end
+ end
+
+ def poll_queue
+ Thread.new do
+ loop do
+ event = client.event_queue.pop
+ ahn_log.punchblock.events.notice "#{event.class} event for call: #{event.call_id}"
+ case event
+ when Punchblock::Rayo::Event::Offer
+ ahn_log.punchblock.events.info "Offer received for call ID #{event.call_id}"
+ else
+ ahn_log.punchblock.events.error "Unknown event: #{event.inspect}"
+ end
end
end
end
| Add very basic Punchblock queue polling |
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index abc1234..def5678 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -2,8 +2,9 @@
describe 'elasticsearch_lwrp::default' do
let(:chef_run) { ChefSpec::SoloRunner.new.converge(described_recipe) }
-
+ let(:node) { chef_run.node }
+
it 'will install elasticsearch' do
- expect(chef_run).to create_elasticsearch('1.4.4')
+ expect(chef_run).to install_elasticsearch(node.elasticsearch.version)
end
end
| Correct resource action to allow ChefSpec to pass
|
diff --git a/lib/cb/models/cb_application_external.rb b/lib/cb/models/cb_application_external.rb
index abc1234..def5678 100644
--- a/lib/cb/models/cb_application_external.rb
+++ b/lib/cb/models/cb_application_external.rb
@@ -10,7 +10,7 @@ def initialize(args = {})
@job_did = args[:job_did] || ''
@email = args[:email] || ''
- @site_id = args[:site_id] || ''
+ @site_id = args[:site_id] || 'cbnsv'
@ipath = args[:ipath] || ''
@apply_url = ''
end
| Add default SiteID (cbnsv) to external applications if none present
|
diff --git a/test_app/spec/rails_generators/rails_generators_spec.rb b/test_app/spec/rails_generators/rails_generators_spec.rb
index abc1234..def5678 100644
--- a/test_app/spec/rails_generators/rails_generators_spec.rb
+++ b/test_app/spec/rails_generators/rails_generators_spec.rb
@@ -6,6 +6,7 @@ describe Impressionist do
fixtures :articles,:impressions,:posts
it "should delete existing migration and generate the migration file" do
+ pending
migrations_dir = "#{Rails.root}/db/migrate"
impressions_migration = Dir.entries(migrations_dir).grep(/impressions/)[0]
File.delete("#{migrations_dir}/#{impressions_migration}") unless impressions_migration.blank?
@@ -15,6 +16,7 @@ end
it "should run the migration created in the previous spec" do
+ pending
migrate_output = systemu("rake db:migrate RAILS_ENV=test")
migrate_output[1].include?("CreateImpressionsTable: migrated").should be_true
end
| Mark failing tests as pending
|
diff --git a/lib/iron_worker_ng/code/dir_container.rb b/lib/iron_worker_ng/code/dir_container.rb
index abc1234..def5678 100644
--- a/lib/iron_worker_ng/code/dir_container.rb
+++ b/lib/iron_worker_ng/code/dir_container.rb
@@ -0,0 +1,29 @@+require 'fileutils'
+
+module IronWorkerNG
+ module Code
+ class DirContainer
+ def initialize(dir)
+ @dir = dir
+ end
+
+ def full_dest(dest)
+ @dir + '/' + dest
+ end
+
+ def add(dest, src)
+ FileUtils.mkdir_p(full_dest(dest))
+
+ FileUtils.cp(src, full_dest(dest))
+ end
+
+ def get_output_stream(dest, &block)
+ FileUtils.mkdir_p(File.dirname(full_dest(dest)))
+
+ file = File.open(full_dest(dest), 'wb')
+ yield file
+ file.close
+ end
+ end
+ end
+end
| Support for local code execution.
|
diff --git a/lib/tugboat/middleware/create_droplet.rb b/lib/tugboat/middleware/create_droplet.rb
index abc1234..def5678 100644
--- a/lib/tugboat/middleware/create_droplet.rb
+++ b/lib/tugboat/middleware/create_droplet.rb
@@ -6,23 +6,17 @@
say "Queueing creation of droplet '#{env["create_droplet_name"]}'...", nil, false
- unless env["create_droplet_region_id"]
- droplet_region_id = env["config"].default_region
- else
- droplet_region_id = env["create_droplet_region_id"]
- end
+ env["create_droplet_region_id"] ?
+ droplet_region_id = env["create_droplet_region_id"] :
+ droplet_region_id = env["config"].default_region
- unless env["create_droplet_image_id"]
- droplet_image_id = env["config"].default_image
- else
- droplet_image_id = env["create_droplet_image_id"]
- end
+ env["create_droplet_image_id"] ?
+ droplet_image_id = env["create_droplet_image_id"] :
+ droplet_image_id = env["config"].default_image
- unless env["create_droplet_size_id"]
- droplet_size_id = env["config"].default_size
- else
- droplet_size_id = env["create_droplet_size_id"]
- end
+ env["create_droplet_size_id"] ?
+ droplet_size_id = env["create_droplet_size_id"] :
+ droplet_size_id = env["config"].default_size
req = ocean.droplets.create :name => env["create_droplet_name"],
:size_id => droplet_size_id,
| Change to tenary operators for defaults
|
diff --git a/lib/admin_module/command/client_access.rb b/lib/admin_module/command/client_access.rb
index abc1234..def5678 100644
--- a/lib/admin_module/command/client_access.rb
+++ b/lib/admin_module/command/client_access.rb
@@ -9,7 +9,8 @@ module AdminModule
module Command
module ClientAccess
- private def credentials
+ private
+ def credentials
config = AdminModule.configuration
user, pass = config.user_credentials
if user.nil? || pass.nil?
@@ -21,7 +22,7 @@ [user, pass]
end
- private def client
+ def client
return @client unless @client.nil?
@client = AdminModule.client
| Put 'private' specifier on separate line
* Older versions of ruby do not like individual 'private' specifiers for
method definitions
|
diff --git a/lib/alternate_rails/controller_helpers.rb b/lib/alternate_rails/controller_helpers.rb
index abc1234..def5678 100644
--- a/lib/alternate_rails/controller_helpers.rb
+++ b/lib/alternate_rails/controller_helpers.rb
@@ -1,9 +1,21 @@ module AlternateRails
module ControllerHelpers
- def set_alternate_formats(formats)
+ def alternate_formats(formats)
@alternate_formats = formats
+ send_headers
end
-
+
+ def send_headers
+ if params[:format].nil? && request.headers['action_dispatch.request.accepts']
+ format = request.headers['action_dispatch.request.accepts'].first
+ params[:format] = format.ref
+ params[:only_path] = true
+ if @alternate_formats.include? params[:format]
+ headers['Content-Location'] = url_for params
+ end
+ end
+ end
+
end
end | Send Content-Location headers if no extension has been provided
|
diff --git a/dmm-ruby.gemspec b/dmm-ruby.gemspec
index abc1234..def5678 100644
--- a/dmm-ruby.gemspec
+++ b/dmm-ruby.gemspec
@@ -20,6 +20,7 @@ gem.add_dependency('faraday', '~> 0.8')
gem.add_dependency('faraday_middleware')
gem.add_dependency('multi_xml')
+ gem.add_development_dependency('rake')
gem.add_development_dependency('rspec')
gem.add_development_dependency('webmock')
end
| Add `rake` for development dependency.
|
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
@@ -5,6 +5,8 @@ render text: "#{params[:id]}.3agPbEGMW8yyXAdNJmtYhleq07pUgmnN1oCrhN9iRwA"
when "OLj4hja-R9m7nOL2UWmj8jG-WlnX7Y2XJqGPEJ_WGXc"
render text: "#{params[:id]}.3agPbEGMW8yyXAdNJmtYhleq07pUgmnN1oCrhN9iRwA"
+ when "C8WHrIIU7RaJl6ZBKB3iDTI6fiN_PYyEzws6KzJ18B8"
+ render text: "#{params[:id]}.jOl0WYrEi5GTa1BlXCSMh31NLeYmWZbZA_QaK-ZpnIE"
else
render text: "#{params[:id]}.x2TXuRtPY5PkPL4YMeiKaMl4xBtFrjfOe94AR0Iyg1M"
end
| Update challenge response for March 2017 SSL renewal
|
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -27,6 +27,10 @@ private
def step_params
- params.require(:step).permit @step.questions.keys
+ if params.has_key?(:step)
+ params.require(:step).permit(@step.questions.keys)
+ else
+ {}
+ end
end
end
| Allow pressing Continue from a static step
|
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
@@ -1,15 +1,23 @@ class UsersController < ApplicationController
- def new
+
+ def new
+ @user = User.new
end
def create
- end
-
- def show
+ @user = User.new(user_params)
+ if @user.save
+ session[:user_id] = @user.id
+ redirect_to '/', notice: "You have successfully signed up!"
+ else
+ render 'new'
+ end
end
private
def user_params
+ params.require(:user).permit(:username, :email, :password, :password_confirmation)
end
+
end
| Add logic to user controller
|
diff --git a/jsonapi-authorization.gemspec b/jsonapi-authorization.gemspec
index abc1234..def5678 100644
--- a/jsonapi-authorization.gemspec
+++ b/jsonapi-authorization.gemspec
@@ -6,15 +6,13 @@ Gem::Specification.new do |spec|
spec.name = "jsonapi-authorization"
spec.version = JSONAPI::Authorization::VERSION
- spec.authors = ["Vesa Laakso"]
- spec.email = ["vesa.laakso@venuu.fi"]
+ spec.authors = ["Vesa Laakso", "Emil Sågfors"]
+ spec.email = ["laakso.vesa@gmail.com", "emil.sagfors@iki.fi"]
spec.summary = "Generic authorization for jsonapi-resources gem"
- spec.homepage = "TODO: Put your gem's website or public repo URL here."
+ spec.homepage = "https://github.com/venuu/jsonapi-authorization"
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) }
spec.require_paths = ["lib"]
spec.add_dependency "jsonapi-resources", "0.7.0"
| Update gemspec with correct informations
|
diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/votes_controller.rb
+++ b/app/controllers/votes_controller.rb
@@ -1,6 +1,6 @@ class VotesController < ApplicationController
- before_filter :authenticate_user!
+ before_filter :authenticate_user! # Require users to be authenticated for any voting actions.
def create
@idea = Idea.find(params[:id])
| Add comment note about Voting authentication
|
diff --git a/app/models/concerns/address_part.rb b/app/models/concerns/address_part.rb
index abc1234..def5678 100644
--- a/app/models/concerns/address_part.rb
+++ b/app/models/concerns/address_part.rb
@@ -2,6 +2,8 @@
class AddressPart < Tokenable
include Mongoid::Geospatial
+
+ validates_presence_of :name
field :name, type: String
field :lat_lng, type: Point
| Validate presence of name for address parts
|
diff --git a/lib/marc2linkeddata/oclc_creative_work.rb b/lib/marc2linkeddata/oclc_creative_work.rb
index abc1234..def5678 100644
--- a/lib/marc2linkeddata/oclc_creative_work.rb
+++ b/lib/marc2linkeddata/oclc_creative_work.rb
@@ -8,23 +8,32 @@
def get_works
# assume an exampleOfWork can only ever link to one work?
- q = SPARQL.parse("SELECT * WHERE { <#{@iri}> <http://schema.org/exampleOfWork> ?o }")
+ q = query_work(@iri)
works = rdf.query(q).collect {|s| s[:o] }
if works.empty?
- # OCLC data is inconsistent in use of 'www' in IRI, so try again?
- # The OclcResource coerces @iri so it includes 'www', so try without it.
+ # OCLC data is inconsistent in use of 'www.' in IRI, so try again.
+ # The OclcResource coerces @iri so it includes 'www.', so try without it.
uri = @iri.to_s.gsub('www.','')
- q = SPARQL.parse("SELECT * WHERE { <#{uri}> <http://schema.org/exampleOfWork> ?o }")
+ q = query_work(uri)
works = rdf.query(q).collect {|s| s[:o] }
end
if works.empty?
- # OCLC IRIs use inconsistent identifiers, sometimes the ID is an integer.
- uri = iri.to_s.gsub(id, id.to_i.to_s)
- q = SPARQL.parse("SELECT * WHERE { <#{uri}> <http://schema.org/exampleOfWork> ?o }")
+ # Keep the 'www.', cast the ID to an integer.
+ uri = @iri.to_s.gsub(id, id.to_i.to_s)
+ q = query_work(uri)
works = rdf.query(q).collect {|s| s[:o] }
end
+ if works.empty?
+ # Remove the 'www.' AND cast the ID to an integer.
+ uri = @iri.to_s.gsub('www.','').gsub(id, id.to_i.to_s)
+ q = query_work(uri)
+ works = rdf.query(q).collect {|s| s[:o] }
+ end
+ works
+ end
- works
+ def query_work(uri)
+ SPARQL.parse("SELECT * WHERE { <#{uri}> <http://schema.org/exampleOfWork> ?o }")
end
# TODO: get ISBN?
| Revise OCLC query for works in an example work
|
diff --git a/lib/test/spec/rails/controller_helpers.rb b/lib/test/spec/rails/controller_helpers.rb
index abc1234..def5678 100644
--- a/lib/test/spec/rails/controller_helpers.rb
+++ b/lib/test/spec/rails/controller_helpers.rb
@@ -1,3 +1,5 @@+require 'action_controller/test_case'
+
module Test
module Spec
module Rails
@@ -9,7 +11,8 @@ end
end
module InstanceMethods
- include Assertions
+ include ActionController::TestProcess
+ include ActionController::TestCase::Assertions
attr_reader :controller
| Include the TestProcess module so functional tests run.
|
diff --git a/app/views/login/login.json.jbuilder b/app/views/login/login.json.jbuilder
index abc1234..def5678 100644
--- a/app/views/login/login.json.jbuilder
+++ b/app/views/login/login.json.jbuilder
@@ -5,5 +5,6 @@ json.status 'success'
json.apikey @apikey
json.expires @expires
+ json.authenticated_as_id @user.id
json.user user_url @user
end
| Add authenticated_as_id to login response
|
diff --git a/app/workers/process_album_worker.rb b/app/workers/process_album_worker.rb
index abc1234..def5678 100644
--- a/app/workers/process_album_worker.rb
+++ b/app/workers/process_album_worker.rb
@@ -3,7 +3,6 @@ sidekiq_options queue: :utility
def perform(title, versions=:all)
- require 'process_photos'
ProcessPhotos.new(title).process(versions.map(&:to_sym))
end
end
| Remove explicit require, this is autoloaded now
|
diff --git a/lib/authlogic/regex.rb b/lib/authlogic/regex.rb
index abc1234..def5678 100644
--- a/lib/authlogic/regex.rb
+++ b/lib/authlogic/regex.rb
@@ -10,7 +10,7 @@ # for regular expressions.
def self.email
return @email_regex if @email_regex
- email_name_regex = '[A-Z0-9\.%\+\-]+'
+ email_name_regex = '[A-Z0-9_\.%\+\-]+'
domain_head_regex = '(?:[A-Z0-9\-]+\.)+'
domain_tld_regex = '(?:[A-Z]{2,4}|museum|travel)'
@email_regex = /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
| Add _ as allowed character in email, fixes change made last night
|
diff --git a/app/controllers/ajax/report_controller.rb b/app/controllers/ajax/report_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/ajax/report_controller.rb
+++ b/app/controllers/ajax/report_controller.rb
@@ -39,7 +39,7 @@ current_user.report object, params[:reason]
@response[:status] = :okay
- @response[:message] = t(".success", parameter: params[:type])
+ @response[:message] = t(".success", parameter: params[:type].titleize)
@response[:success] = true
end
end
| Apply review suggestion from @raccube
Co-authored-by: Karina Kwiatek <a279f78642aaf231facf94ac593d2ad2fd791699@users.noreply.github.com> |
diff --git a/lib/core_ext/object.rb b/lib/core_ext/object.rb
index abc1234..def5678 100644
--- a/lib/core_ext/object.rb
+++ b/lib/core_ext/object.rb
@@ -14,6 +14,8 @@ end
def to_equal(expected)
- self == expected
+ if self != expected
+ raise RuntimeError.new("expected #{self} to equal #{expected}")
+ end
end
end
| Raise an exception to make the test fail
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -10,7 +10,7 @@ def page_is_mine?
(current_user && (params[:username] == current_user._?.username)) ||
request.path == stream_path ||
- request.path == entries_path
+ request.path['/entries'] == 0
end
# TODO: deprecate
| Fix page_is_mine? to work for /entries/anything
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,8 @@ # Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
+
+ def get_current_user
+ User.find(1)
+ end
end
| Add get_current_user to base app controller
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,6 +2,10 @@ # Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
+
+ BASIC_AUTH_USERS = { "tahi" => "tahi3000" }
+
+ before_action :basic_auth, if: -> { %w(production staging).include? Rails.env }
before_filter :configure_permitted_parameters, if: :devise_controller?
@@ -10,4 +14,10 @@ def configure_permitted_parameters
devise_parameter_sanitizer.for(:sign_up).concat %i(first_name last_name affiliation email username)
end
+
+ def basic_auth
+ authenticate_or_request_with_http_digest("Application") do |name|
+ BASIC_AUTH_USERS[name]
+ end
+ end
end
| Add Basic Auth to production & staging
|
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,7 +21,9 @@ helper_method :current_user
def require_staff
- redirect_to "/" unless current_user.staff?
+ if current_user
+ redirect_to "/" unless current_user.staff?
+ end
end
def ssl_configured?
| Fix require_staff to not crash
|
diff --git a/lib/seory.rb b/lib/seory.rb
index abc1234..def5678 100644
--- a/lib/seory.rb
+++ b/lib/seory.rb
@@ -1,7 +1,7 @@ require "seory/version"
module Seory
- CONTENTS = %w[title h1 h2 meta_description meta_keywords canonical_url image_url].map(&:to_sym)
+ CONTENTS = %w[title h1 h2 meta_description meta_keywords canonical_url og_image_url].map(&:to_sym)
class Error < RuntimeError
end
| Change content name image_url -> og_image_url
|
diff --git a/walkon.gemspec b/walkon.gemspec
index abc1234..def5678 100644
--- a/walkon.gemspec
+++ b/walkon.gemspec
@@ -14,11 +14,11 @@ spec.license = "MIT"
spec.files = `git ls-files`.split($/)
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
- spec.test_files = spec.files.grep(%r{^(spec)/})
+
+ spec.files = Dir["{bin,lib,spec}/**/*", "README.md", "Rakefile"]
+ spec.executables = Dir["bin/*"].map { |f| File.basename(f) }
+ spec.test_files = Dir["spec/**/*"]
spec.require_paths = ["lib"]
-
- spec.add_dependency 'resque'
spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rake"
| Remove gems we don't need and refactor gemspec dir lookups
|
diff --git a/lib/tictactoe_rules.rb b/lib/tictactoe_rules.rb
index abc1234..def5678 100644
--- a/lib/tictactoe_rules.rb
+++ b/lib/tictactoe_rules.rb
@@ -28,4 +28,14 @@ board.valid_slots == [] || won?(board, "X") || won?(board, "O") ? true : false
end
+ def winner(board)
+ if won?(board, turn)
+ "X"
+ elsif won?(board, turn)
+ puts "O"
+ elsif draw?(board, turn)
+ puts "It's a draw!"
+ end
+ end
+
end | Add logic to return winner
|
diff --git a/lib/speed_gun/railtie.rb b/lib/speed_gun/railtie.rb
index abc1234..def5678 100644
--- a/lib/speed_gun/railtie.rb
+++ b/lib/speed_gun/railtie.rb
@@ -9,6 +9,7 @@ SpeedGun.config[:backtrace_remove] = Rails.root.to_s + '/'
SpeedGun.config[:backtrace_includes] = [/^(app|config|lib|test|spec)/]
SpeedGun.config.skip_paths << /^#{Regexp.escape(app.config.assets.prefix)}/
+ SpeedGun.config.authorize_proc = ->(request) { Rails.env.development? }
ActiveSupport.on_load(:action_controller) do
require 'speed_gun/profiler/action_controller'
| Add default config of authorize
|
diff --git a/lib/tasks/webpacker.rake b/lib/tasks/webpacker.rake
index abc1234..def5678 100644
--- a/lib/tasks/webpacker.rake
+++ b/lib/tasks/webpacker.rake
@@ -19,4 +19,21 @@ task :install do
exec "./bin/rails app:template LOCATION=#{WEBPACKER_APP_TEMPLATE_PATH}"
end
+
+ desc "add everything needed for react"
+ task :react do
+ config_path = Rails.root.join('config/webpack/shared.js')
+
+ config = File.read(config_path)
+
+ if config.include?("presets: ['es2015']")
+ puts "Replacing loader presets to include react in #{config_path}"
+ new_config = config.gsub(/presets: \['es2015'\]/, "presets: ['react', 'es2015']")
+ File.write config_path, new_config
+ else
+ puts "Couldn't automatically update loader presets in #{config_path}. Please set presets: ['react', 'es2015']."
+ end
+
+ exec './bin/yarn add babel-preset-react react react-dom'
+ end
end
| Add task for installing react requirements and configuring them against the default
|
diff --git a/lib/thailand/district.rb b/lib/thailand/district.rb
index abc1234..def5678 100644
--- a/lib/thailand/district.rb
+++ b/lib/thailand/district.rb
@@ -23,6 +23,8 @@ all
end
+ alias_method :subdistricts, :subregions
+ alias_method :subdistricts?, :subregions?
alias_method :tambon, :subregions
alias_method :tambon?, :subregions?
alias_method :khwaeng, :subregions
| Add alias methods for District
|
diff --git a/app.rb b/app.rb
index abc1234..def5678 100644
--- a/app.rb
+++ b/app.rb
@@ -1,9 +1,14 @@ # myapp.rb
require 'sinatra'
require 'json'
+
get '/c/:id' do |id|
"Hello world! #{id}"
{"id" => id,
"ala" => "Some html string. <i>with formatting</i>"}.to_json
end
+
+get '/' do
+ redirect to('index.html')
+end
| Add root path redirect to index.html
|
diff --git a/app.rb b/app.rb
index abc1234..def5678 100644
--- a/app.rb
+++ b/app.rb
@@ -1,6 +1,12 @@ require "sinatra/base"
class F2fIncomingApp < Sinatra::Base
+ hook_path = ENV["WEBHOOK_SECRET_PATH"] || "incoming"
+
+ get "/#{hook_path}" do
+ ":metal:\n"
+ end
+
get "/*" do
redirect "http://www.farmtoforkmarket.org/", 301
end
| Set up the incoming hook path
|
diff --git a/lib/faye-rails/server_list.rb b/lib/faye-rails/server_list.rb
index abc1234..def5678 100644
--- a/lib/faye-rails/server_list.rb
+++ b/lib/faye-rails/server_list.rb
@@ -19,6 +19,11 @@ end
alias push <<
- alias clear! clear
+ def clear!
+ self.each do |server|
+ server.stop
+ end
+ clear
+ end
end
| Make sure that if there is a listening server that it's shut down before clearing the server list.
|
diff --git a/lib/geocoder/results/yahoo.rb b/lib/geocoder/results/yahoo.rb
index abc1234..def5678 100644
--- a/lib/geocoder/results/yahoo.rb
+++ b/lib/geocoder/results/yahoo.rb
@@ -11,7 +11,7 @@ (1..3).to_a.map{ |i| @data["line#{i}"] }.reject{ |i| i.nil? or i == "" }.join(", ")
end
- def self.yahoo_attributes
+ def self.response_attributes
%w[quality latitude longitude offsetlat offsetlon radius boundingbox name
line1 line2 line3 line4 cross house street xstreet unittype unit postal
neighborhood city county state country countrycode statecode countycode
@@ -19,7 +19,7 @@ timezone areacode uzip hash woeid woetype]
end
- yahoo_attributes.each do |a|
+ response_attributes.each do |a|
define_method a do
@data[a]
end
| Use more generic method name.
|
diff --git a/lib/modules/autocompletion.rb b/lib/modules/autocompletion.rb
index abc1234..def5678 100644
--- a/lib/modules/autocompletion.rb
+++ b/lib/modules/autocompletion.rb
@@ -16,9 +16,15 @@ type = result.class.name.underscore
identifier = result.send(identifier_field(type))
+ geom_type = result.is_a?(ProtectedArea) ? result.the_geom.geometry_type.to_s : 'N/A'
url = type == 'country' ? "/country/#{identifier}" : "/#{identifier}"
- { title: name, url: url }
+ {
+ id: identifier,
+ geom_type: geom_type,
+ title: name,
+ url: url,
+ }
end
end
| Add identifier and geom_type to autocomplete results
|
diff --git a/lib/postmark/handlers/mail.rb b/lib/postmark/handlers/mail.rb
index abc1234..def5678 100644
--- a/lib/postmark/handlers/mail.rb
+++ b/lib/postmark/handlers/mail.rb
@@ -12,6 +12,7 @@ api_key = settings.delete(:api_key)
api_client = ::Postmark::ApiClient.new(api_key, settings)
api_client.deliver_message(mail)
+ self
end
end
| Return self from Mail::Postmark delivery handler.
|
diff --git a/lib/tic_tac_toe/rack_shell.rb b/lib/tic_tac_toe/rack_shell.rb
index abc1234..def5678 100644
--- a/lib/tic_tac_toe/rack_shell.rb
+++ b/lib/tic_tac_toe/rack_shell.rb
@@ -6,37 +6,42 @@ module TicTacToe
class RackShell
+ attr_accessor :req
+ def self.new_shell
+ router, player = TicTacToe::Router.new, TicTacToe::Human.new
+ shell = RackShell.new(router)
- def self.new_shell
- return RackShell.new(TicTacToe::Router.new, TicTacToe::Human.new)
- end
-
- def initialize(router, player)
- @router, @player = router, player
- player.set_shell(self)
- @router.add_route("/", :GET, TicTacToe::View::Home) { |_| nil }
- @router.add_route("/new-game", :GET, TicTacToe::View::Game) do |env|
+ router.add_route("/", :GET, TicTacToe::View::Home) { |_| nil }
+ router.add_route("/new-game", :GET, TicTacToe::View::Game) do |env|
req = Rack::Request.new(env)
game = TicTacToe::Game.new_game(TicTacToe::Board.empty_board)
- game.set_players(@player, @player)
+ game.set_players(player, player)
req.session[:game] = game
game
end
- @router.add_route("/make-move", :POST, TicTacToe::View::Game) do |env|
- @req = Rack::Request.new(env)
- game = @req.session[:game]
+ router.add_route("/make-move", :POST, TicTacToe::View::Game) do |env|
+ shell.req= Rack::Request.new(env)
+ game = shell.req.session[:game]
if game
game.next_turn
end
- @req = nil
+ shell.req= nil
game
end
+
+ player.set_shell(shell)
+
+ return shell
+ end
+
+ def initialize(router)
+ @router = router
end
def get_move
- Integer(@req["move"]) unless @req.nil?
+ Integer(req["move"]) unless @req.nil?
end
def call(env)
| Move the router setup code into the new_shell function
|
diff --git a/client.rb b/client.rb
index abc1234..def5678 100644
--- a/client.rb
+++ b/client.rb
@@ -14,6 +14,7 @@
include Singleplatform::Client::Locations
include Singleplatform::Client::Menus
+ include Singleplatform::Client::Photos
def initialize
@base_url = BASE_URL
| Include Photos module in Client class
|
diff --git a/lib/biovision/base/privilege_methods.rb b/lib/biovision/base/privilege_methods.rb
index abc1234..def5678 100644
--- a/lib/biovision/base/privilege_methods.rb
+++ b/lib/biovision/base/privilege_methods.rb
@@ -12,6 +12,11 @@ ::UserPrivilege.user_has_privilege?(current_user, privilege_name)
end
+ # @param [Symbol] group_name
+ def current_user_in_group?(group_name)
+ ::UserPrivilege.user_in_group?(current_user, group_name)
+ end
+
protected
# @param [Symbol] privilege_name
@@ -19,6 +24,12 @@ return if current_user_has_privilege?(privilege_name)
handle_http_401("Current user has no privilege #{privilege_name}")
end
+
+ # @param [Symbol] group_name
+ def require_privilege_group(group_name)
+ return if current_user_in_group?(group_name)
+ handle_http_401("Current user is not in group #{group_name}")
+ end
end
end
end | Add helpers to check if current user is in privilege group
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.