diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/app/auth.rb b/lib/app/auth.rb
index abc1234..def5678 100644
--- a/lib/app/auth.rb
+++ b/lib/app/auth.rb
@@ -45,7 +45,7 @@
# params[:splat] might be an empty array
# which suits us just fine.
- redirect [root_path, params[:splat].first].join('/')
+ redirect [root_path, params[:splat].first].flatten.join('/')
end
end
|
Fix double slash after login
|
diff --git a/lib/tasks/collegestar.rake b/lib/tasks/collegestar.rake
index abc1234..def5678 100644
--- a/lib/tasks/collegestar.rake
+++ b/lib/tasks/collegestar.rake
@@ -3,6 +3,6 @@ namespace :collegestar do
desc "Use pg_dump to backup collegestar database"
task backup_db: :environment do
- sh "PGPASSWORD=\"#{ENV['DB_PASS']}\" pg_dump -h localhost -U #{ENV['DB_USER']} #{ENV['DATABASE']} > #{Time.now.strftime("%Y%m%d%H%M")}_#{ENV['DATABASE']}.sql"
+ sh "PGPASSWORD=\"#{ENV['DB_PASS']}\" pg_dump -h #{ENV['DB_HOST']} -U #{ENV['DB_USER']} #{ENV['DATABASE']} > #{Time.now.strftime("%Y%m%d%H%M")}_#{ENV['DATABASE']}.sql"
end
end
|
Add host to db back task
|
diff --git a/spec/features/admin/promotion_rule_store_spec.rb b/spec/features/admin/promotion_rule_store_spec.rb
index abc1234..def5678 100644
--- a/spec/features/admin/promotion_rule_store_spec.rb
+++ b/spec/features/admin/promotion_rule_store_spec.rb
@@ -12,8 +12,9 @@ if SolidusSupport.solidus_gem_version < Gem::Version.new('2.3.x')
select2 "Store", from: "Add rule of type"
else
- select "Store", from: "Add rule of type"
+ select "Store", from: "promotion_rule_type"
end
+
within("#rules_container") { click_button "Add" }
select2_search store.name, from: "Choose Stores"
|
Fix failing test that used incorrect select ID
|
diff --git a/test/test_sass.rb b/test/test_sass.rb
index abc1234..def5678 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -1,47 +1,6 @@ require 'helper'
class TestSass < Test::Unit::TestCase
- def converter(overrides = {})
- Jekyll::Converters::Sass.new(site_configuration({"sass" => overrides}))
- end
-
- def sass_content
- <<-SASS
-$font-stack: Helvetica, sans-serif
-body
- font-family: $font-stack
- font-color: fuschia
-SASS
- end
-
- def scss_content
- <<-SCSS
-$font-stack: Helvetica, sans-serif;
-body {
- font-family: $font-stack;
- font-color: fuschia;
-}
-SCSS
- end
-
- def css_output
- <<-CSS
-body {\n font-family: Helvetica, sans-serif;\n font-color: fuschia; }
-CSS
- end
-
- context "converting sass" do
- should "produce CSS" do
- assert_equal css_output, converter.convert(sass_content)
- end
- end
-
- context "converting SCSS" do
- should "produce CSS" do
- assert_equal css_output, converter.convert(scss_content)
- end
- end
-
context "importing partials" do
setup do
@site = Jekyll::Site.new(Jekyll.configuration({
|
Remove unneeded tests for the sass converter plugin.
|
diff --git a/lib/discordrb/logger.rb b/lib/discordrb/logger.rb
index abc1234..def5678 100644
--- a/lib/discordrb/logger.rb
+++ b/lib/discordrb/logger.rb
@@ -7,7 +7,7 @@ # Writes a debug message to the console.
# @param important [true, false] Whether this message should be printed regardless of debug mode being on or off.
def debug(message, important = false)
- puts "[DEBUG : #{Thread.current[:discordrb_name]} @ #{Time.now}] #{message}" if @debug || important
+ puts "[DEBUG : #{Thread.current[:discordrb_name]} @ #{Time.now.strftime('%Y-%m-%d %H:%M:%S.%L %z')}] #{message}" if @debug || important
end
# Logs an exception to the console.
|
Add milliseconds to Logger timestamp
|
diff --git a/lib/zencoder/extensions.rb b/lib/zencoder/extensions.rb
index abc1234..def5678 100644
--- a/lib/zencoder/extensions.rb
+++ b/lib/zencoder/extensions.rb
@@ -29,11 +29,3 @@ end
end
end
-
-unless String.method_defined?(:shell_escape)
- class String
- def shell_escape
- empty? ? "''" : gsub(/([^A-Za-z0-9_\-.,:\/@\n])/n, '\\\\\\1').gsub(/\n/, "'\n'")
- end
- end
-end
|
Remove shell_escape method because it was unused
|
diff --git a/lib/boom/color.rb b/lib/boom/color.rb
index abc1234..def5678 100644
--- a/lib/boom/color.rb
+++ b/lib/boom/color.rb
@@ -4,6 +4,8 @@
# Color collects some methods for colorizing terminal output.
module Color
+
+ extend self
CODES = {
:reset => "\e[0m",
|
Modify Boom::Color to extend itself (easier to test).
|
diff --git a/app/workers/atmosphere/vm_template_monitoring_worker.rb b/app/workers/atmosphere/vm_template_monitoring_worker.rb
index abc1234..def5678 100644
--- a/app/workers/atmosphere/vm_template_monitoring_worker.rb
+++ b/app/workers/atmosphere/vm_template_monitoring_worker.rb
@@ -9,9 +9,17 @@ begin
logger.debug { "#{jid}: Starting VMTs monitoring for site #{site_id}" }
site = ComputeSite.find(site_id)
- filters = site.template_filters ? JSON.parse(site.template_filters) : nil
+ filters = site.template_filters ? JSON.parse(site.template_filters) : {}
+
logger.debug { "#{jid}: getting images state for site #{site_id} from compute site" }
- update_images(site, site.cloud_client.images.all(filters))
+
+ images = if filters.empty?
+ site.cloud_client.images.all
+ else
+ site.cloud_client.images.all(filters)
+ end
+
+ update_images(site, images)
logger.debug { "#{jid}: updating VMTs finished for site #{site_id}" }
rescue Excon::Errors::HTTPStatusError => e
logger.error "#{jid}: Unable to perform VMTs monitoring job: #{e}"
|
Use filter only when it is not empty
|
diff --git a/test/resque_test.rb b/test/resque_test.rb
index abc1234..def5678 100644
--- a/test/resque_test.rb
+++ b/test/resque_test.rb
@@ -4,8 +4,13 @@ class ResqueTest < Minitest::Test
def test_resque_version
major, minor, patch = Resque::Version.split('.')
- assert_equal 2, major.to_i, 'major version does not match'
- assert_operator minor.to_i, :>=, 0, 'minor version is too low'
+ assert major.to_i == 1 || major.to_i == 2, 'major version does not match'
+
+ if major.to_i == 1
+ assert_operator minor.to_i, :>=, 8, 'minor version is too low'
+ else
+ assert_operator minor.to_i, :>=, 0, 'minor version is too low'
+ end
end
def test_good_job
|
Change test assertions for compatibility with resque v1 and v2.
|
diff --git a/test/test_base32.rb b/test/test_base32.rb
index abc1234..def5678 100644
--- a/test/test_base32.rb
+++ b/test/test_base32.rb
@@ -27,4 +27,15 @@ assert_encode_decode("foobar", "MZXW6YTBOI======")
assert_encode_decode("\u{3042}\u{3044}\u{3046}\u{3048}\u{304a}", "4OAYFY4BQTRYDBXDQGEOHAMK")
end
+
+ def test_truncated_decode
+ assert_decode("f", "MY")
+ assert_decode("fo", "MZXQ")
+ assert_decode("foo", "MZXW6")
+ assert_decode("foob", "MZXW6YQ")
+ assert_decode("f", "my")
+ assert_decode("fo", "mzxq")
+ assert_decode("foo", "mzxw6")
+ assert_decode("foob", "mzxw6yq")
+ end
end
|
Test for values which truncated trailing "=".
|
diff --git a/lib/is_numeric.rb b/lib/is_numeric.rb
index abc1234..def5678 100644
--- a/lib/is_numeric.rb
+++ b/lib/is_numeric.rb
@@ -2,8 +2,10 @@
# Extending the class String to perform checks on string to get
# if is a number
-class String
+module IsNumeric
def numeric?
!(self !~ /^-?\d+(\.\d*)?$/)
end
end
+
+String.include IsNumeric
|
Change IsNumeric to a module and include it to String class instead of openning directly
|
diff --git a/lib/fake_env.rb b/lib/fake_env.rb
index abc1234..def5678 100644
--- a/lib/fake_env.rb
+++ b/lib/fake_env.rb
@@ -3,35 +3,14 @@
module FakeEnv
class << self
- attr_reader :actual, :fake, :actual_get_method, :actual_set_method
+ attr_reader :actual
def activate!
- @actual = ENV.clone
- @fake = Hash.new do |fake, key|
- val = @actual[key]
-
- fake[key] = val ? val : val.clone
- end
-
- @actual_get_method ||= ENV.method(:[])
- @actual_set_method ||= ENV.method(:[]=)
-
- class << ENV
- def [](key)
- FakeEnv.fake[key]
- end
-
- def []=(key, val)
- FakeEnv.fake[key] = val.freeze
- end
- end
+ @actual = ENV.to_h
end
def deactivate!
- class << ENV
- define_method(:[], FakeEnv.actual_get_method)
- define_method(:[]=, FakeEnv.actual_set_method)
- end
+ ENV.replace(@actual)
end
def within
|
Save ENV on activate! and restore on deactivate!
rather than overriding [] and []=.
Note that it makes child processes take over a faked ENV.
|
diff --git a/lib/calligraphy/rails/web_dav_requests_controller.rb b/lib/calligraphy/rails/web_dav_requests_controller.rb
index abc1234..def5678 100644
--- a/lib/calligraphy/rails/web_dav_requests_controller.rb
+++ b/lib/calligraphy/rails/web_dav_requests_controller.rb
@@ -1,6 +1,49 @@ module Calligraphy::Rails
class WebDavRequestsController < ActionController::Base
+ before_action :verify_resource_scope
+ before_action :set_resource
+
def invoke_method
+ method = request.request_method.downcase
+
+ if check_preconditions
+ if method == 'head'
+ status = get head: true
+ elsif Calligraphy.allowed_methods.include? method
+ status, body = send method
+ else
+ status = :method_not_allowed
+ end
+
+ send_response status: status, body: body
+ else
+ send_response status: :precondition_failed
+ end
+ end
+
+ private
+
+ def verify_resource_scope
+ head :forbidden if params[:resource].include? '..'
+ end
+
+ def set_resource
+ resource_id = if params[:format]
+ [params[:resource], params[:format]].join '.'
+ else
+ params[:resource]
+ end
+
+ @resource_class = params[:resource_class]
+ @resource = @resource_class.new resource: resource_id, req: request
+ end
+
+ def send_response(status:, body: nil)
+ if body.nil?
+ head status
+ else
+ render body: body, status: status
+ end
end
end
end
|
Add methods to route and respond to WebDAV requests
|
diff --git a/app/services/flight_info.rb b/app/services/flight_info.rb
index abc1234..def5678 100644
--- a/app/services/flight_info.rb
+++ b/app/services/flight_info.rb
@@ -1,5 +1,19 @@ #!/usr/bin/env ruby
class FlightInfo
+ def self.save_yesterday_info
+ haha = Alohaha.new
+ haha.flights.each do |flight|
+ if flight.datetime > Date.yesterday && flight.datetime < Date.today
+ destination = Destination.find_or_create(flight.destination)
+ other_route = Destination.find_or_create(flight.other_route)
+ flight_filter = flight.to_hash.reject {|key, value| key == :raw || key == :destination || key == :other_route}
+ flight_info = Flight.new(flight_filter)
+ flight_info.destination = destination
+ flight_info.other_route = other_route
+ flight_info.save
+ end
+ end
+ end
end
|
Add flight info and add save_yesterday_info method
|
diff --git a/spec/features/add_event_spec.rb b/spec/features/add_event_spec.rb
index abc1234..def5678 100644
--- a/spec/features/add_event_spec.rb
+++ b/spec/features/add_event_spec.rb
@@ -8,7 +8,7 @@
visit "/events/new"
fill_in "Event Name", with: 'Something'
- fill_in "Venue", with: "urban"
+ fill_in "venue_name", with: "urban"
expect(page).to_not have_text("New Relic")
expect(page).to have_text("Urban Airship")
|
Test seems to be working
|
diff --git a/adauth.gemspec b/adauth.gemspec
index abc1234..def5678 100644
--- a/adauth.gemspec
+++ b/adauth.gemspec
@@ -10,6 +10,7 @@ s.email = ["gems@arcath.net"]
s.homepage = "http://adauth.arcath.net"
s.summary = "Provides Active Directory authentication for Rails"
+ s.description = "A full featured library for working with Microsofts Active Directory in Ruby."
s.add_development_dependency "rake"
s.add_development_dependency "rspec"
|
Add a description to the gemspec
|
diff --git a/db/migrate/20160524234655_create_student_identifiers.rb b/db/migrate/20160524234655_create_student_identifiers.rb
index abc1234..def5678 100644
--- a/db/migrate/20160524234655_create_student_identifiers.rb
+++ b/db/migrate/20160524234655_create_student_identifiers.rb
@@ -5,6 +5,8 @@ t.string :name, null: false
t.string :description, null: false
t.integer :content_type, null: false
+ t.datetime :created_at
+ t.datetime :updated_at
t.datetime :deleted_at
end
@@ -13,6 +15,8 @@ t.belongs_to :user, index: true
t.belongs_to :student_identifier_type
t.string :value, null: false
+ t.datetime :created_at
+ t.datetime :updated_at
t.datetime :deleted_at
end
|
Add `created_at` and `updated_at` to StudentIdentifierType and StudentIdentifier
|
diff --git a/lib/how_is/date_time_helpers.rb b/lib/how_is/date_time_helpers.rb
index abc1234..def5678 100644
--- a/lib/how_is/date_time_helpers.rb
+++ b/lib/how_is/date_time_helpers.rb
@@ -4,6 +4,8 @@ require "date"
module HowIs
+ ##
+ # Various helper functions for working with DateTime objects.
module DateTimeHelpers
def date_le(left, right)
left = str_to_dt(left)
|
Add top-level module comment for HowIs::DateTimeHelpers.
|
diff --git a/lib/letter_opener_web/engine.rb b/lib/letter_opener_web/engine.rb
index abc1234..def5678 100644
--- a/lib/letter_opener_web/engine.rb
+++ b/lib/letter_opener_web/engine.rb
@@ -11,5 +11,9 @@ initializer "letter_opener_web.add_delivery_method" do
ActionMailer::Base.add_delivery_method :letter_opener_web, LetterOpenerWeb::DeliveryMethod, :location => Rails.root.join("tmp", "letter_opener")
end
+
+ initializer "assets" do |app|
+ Rails.application.config.assets.precompile += %w( letter_opener_web/application.js letter_opener_web/application.css )
+ end
end
end
|
Add assets to list for precompile task
|
diff --git a/lib/stradivari.rb b/lib/stradivari.rb
index abc1234..def5678 100644
--- a/lib/stradivari.rb
+++ b/lib/stradivari.rb
@@ -1,11 +1,5 @@ require 'stradivari/version'
require 'stradivari/engine'
-
-require 'stradivari/details'
-require 'stradivari/filter'
-require 'stradivari/tabs'
-require 'stradivari/table'
-require 'stradivari/csv'
module Stradivari
@@ -14,6 +8,12 @@ autoload :Helpers, 'stradivari/helpers'
autoload :Controller, 'stradivari/controller'
+ autoload :Details, 'stradivari/details'
+ autoload :Table, 'stradivari/table'
+ autoload :Tabs, 'stradivari/tabs'
+ autoload :Filter, 'stradivari/filter'
+
+ autoload :CSV, 'stradivari/csv'
autoload :XLSX, 'stradivari/xlsx'
module Concerns
|
Move on to autoload'ing everything
|
diff --git a/AppSession.podspec b/AppSession.podspec
index abc1234..def5678 100644
--- a/AppSession.podspec
+++ b/AppSession.podspec
@@ -2,7 +2,7 @@ s.name = "AppSession"
s.version = "0.1.0"
s.summary = "A lightweight key-value store to share data across ViewControllers and or SKScenes"
- s.description = "A lightweight key-value store to share data across ViewControllers and or SKScenes"
+ s.description = "AppSession was created due to my frustrations with existing tools that either needed to access the disk for caching, required modifying my code to implement some strange Protocol(s) and or couldn't handle storing reference types. So during the creation/debugging of one of my SpriteKit games I started building a class that let me initialize a SKScene based on any arbitrary game data; I extracted the code from my game and re-named it AppSession."
s.homepage = "https://github.com/taywils/SwiftAppSession"
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = { "taywils" => "DemetriousWilson@gmail.com" }
@@ -10,5 +10,5 @@ s.platform = :ios, '8.0'
s.requires_arc = true
s.source_files = 'Pod/Classes/**/*'
- s.resource_bundles = { 'AppSession' => ['Pod/Assets/*.png'] }
+ # s.resource_bundles = { 'AppSession' => ['Pod/Assets/*.png'] }
end
|
Comment out line to pass pod lint
|
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index abc1234..def5678 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -0,0 +1,11 @@+require "benchmark"
+
+namespace :db do
+ desc "Refreshes all materialized views e.g. audits. May take a while so only run overnight."
+ task refresh_all_materialized_views: :environment do
+ ms = Benchmark.ms do
+ ActiveRecord::Base.connection.execute("SELECT refresh_all_matierialized_views();")
+ end
+ puts "Refreshing materialized views took #{ms}"
+ end
+end
|
Create rake task to refresh all materialised views
Materialised views are currently used for auditing but need to be periodically refreshed.
|
diff --git a/lib/phony/trunk_code.rb b/lib/phony/trunk_code.rb
index abc1234..def5678 100644
--- a/lib/phony/trunk_code.rb
+++ b/lib/phony/trunk_code.rb
@@ -11,7 +11,7 @@ #
def initialize code, options = {}
@code = code
- @trunk_code_replacement = /\A#{code}/
+ @trunk_code_replacement = /\A#{code.rstrip}/
@normalize = options[:normalize]
@split = options[:split]
end
|
Add the possibility to add whitespace to a trunk code for formatting.
|
diff --git a/lib/pry-power_assert.rb b/lib/pry-power_assert.rb
index abc1234..def5678 100644
--- a/lib/pry-power_assert.rb
+++ b/lib/pry-power_assert.rb
@@ -3,10 +3,7 @@ require "pry-power_assert/power_assert-ext"
module PryPowerAssert
- class PowerAssertCommand < Pry::ClassCommand
- match 'pa'
- group 'Misc'
- description ''
+ Pry::Commands.create_command('pa', '') do
banner <<-'BANNER'
Usage: pa RUBY_CODE
@@ -35,10 +32,8 @@ result = pa.message_proc.()
end
- _pry_.pager.page result
+ output.puts result
end
- Pry::Commands.add_command(PowerAssertCommand)
end
end
-
|
Change way to create command to support pry 0.9.8
|
diff --git a/lib/searchjoy/search.rb b/lib/searchjoy/search.rb
index abc1234..def5678 100644
--- a/lib/searchjoy/search.rb
+++ b/lib/searchjoy/search.rb
@@ -3,7 +3,7 @@ belongs_to :convertable, polymorphic: true
# the devise way
- if Rails::VERSION::MAJOR == 3 and !defined?(ActionController::StrongParameters)
+ if (Rails::VERSION::MAJOR == 3 and !defined?(ActionController::StrongParameters)) or defined?(ActiveModel::MassAssignmentSecurity)
attr_accessible :search_type, :query, :results_count
end
|
Add attr_accessible if ProtectedAttributes gem present
|
diff --git a/lib/merb_cucumber/world/base.rb b/lib/merb_cucumber/world/base.rb
index abc1234..def5678 100644
--- a/lib/merb_cucumber/world/base.rb
+++ b/lib/merb_cucumber/world/base.rb
@@ -2,6 +2,8 @@ module Test
module World
module Base
+ include Merb::Test::Matchers
+
include Merb::Test::ControllerHelper
include Merb::Test::RouteHelper
include Merb::Test::ViewHelper
|
Include Merb's matchers. (Waiting for patch to merb-core to be accepted.)
|
diff --git a/lib/feature_definitions.rb b/lib/feature_definitions.rb
index abc1234..def5678 100644
--- a/lib/feature_definitions.rb
+++ b/lib/feature_definitions.rb
@@ -2,23 +2,29 @@
class FeatureDefinitions
extend LazyConst
+ attr_reader :opts, :test_proc
def self.define_feature(name, opts = {}, &block)
- lazy_const(name){ new(opts, &block) }
+ lazy_const(name){ new(opts, block.to_proc) }
end
- def initialize(opts = {}, &block)
+ def initialize(opts, proc)
@opts = opts
- @proc = block.to_proc
+ @test_proc = proc
end
def self.context=(context)
@@context = context
end
- def enabled?
- args = @opts[:using].map { |sym| @@context.public_send(sym) }
- @proc.call(*args)
+ def context
+ @@context
end
+ def enabled?(&block)
+ args = opts[:using].map { |sym| context.public_send(sym) }
+ test_proc.call(*args).tap do |verdict|
+ yield if block_given? and verdict
+ end
+ end
end
|
Refactor out instance/class variable access, add block mode
|
diff --git a/lib/scaffolder/test/sequence.rb b/lib/scaffolder/test/sequence.rb
index abc1234..def5678 100644
--- a/lib/scaffolder/test/sequence.rb
+++ b/lib/scaffolder/test/sequence.rb
@@ -27,7 +27,7 @@ if @options[:inserts]
hash['inserts'] = Array.new
@options[:inserts].each_with_index do |insert,i|
- hash['inserts'] = {'source' => "insert#{i+1}"}.merge stringify_keys(insert)
+ hash['inserts'] << {'source' => "insert#{i+1}"}.merge(stringify_keys(insert))
end
end
{'sequence' => hash}
|
Fix to_hash method to produce list of inserts
|
diff --git a/lib/services/locale_resolver.rb b/lib/services/locale_resolver.rb
index abc1234..def5678 100644
--- a/lib/services/locale_resolver.rb
+++ b/lib/services/locale_resolver.rb
@@ -11,7 +11,6 @@
def resolve
if user_locale == 'default' || user_locale.nil?
- server_locale = ::Settings.server.locale
if server_locale == "default" || server_locale.nil?
headers['Accept-Language']
else
@@ -27,4 +26,8 @@ def user_locale
@user_locale ||= (User.current_user.try(:settings) || {}).fetch_path(:display, :locale)
end
+
+ def server_locale
+ @server_locale ||= ::Settings.server.locale
+ end
end
|
Replace server_locale temp with query
|
diff --git a/lib/slatan/affiliation/users.rb b/lib/slatan/affiliation/users.rb
index abc1234..def5678 100644
--- a/lib/slatan/affiliation/users.rb
+++ b/lib/slatan/affiliation/users.rb
@@ -11,6 +11,43 @@ def set(users)
@users = users
end
+
+ ## return id of user name
+ # @param name: user name
+ def get_id(name)
+ @users.each do |user|
+ return user[:id] if user[:name] == name
+ end
+ nil
+ end
+
+ ## return name of user id
+ # @param id: user id
+ def get_name(id)
+ @users.each do |user|
+ return user[:name] if user[:id] == id
+ end
+ nil
+ end
+
+ ## check bot or human
+ # @return bool true: bot, false: human
+ def is_bot?(ident)
+ key = is_id?(ident) : :id ? :name
+ @users.each do |user|
+ if user[key] == ident
+ return user[:is_bot]
+ end
+ end
+
+ return false
+ end
+
+ ## check id or name
+ # @return bool true: id, false: name
+ def is_id?(key)
+ key ~= /^[A-Z0-9]+$/
+ end
end
end
end
|
Add some method to Affiliation::Users module
|
diff --git a/spec/lib/active_remote/serialization_spec.rb b/spec/lib/active_remote/serialization_spec.rb
index abc1234..def5678 100644
--- a/spec/lib/active_remote/serialization_spec.rb
+++ b/spec/lib/active_remote/serialization_spec.rb
@@ -1,6 +1,18 @@ require 'spec_helper'
describe ActiveRemote::Serialization do
+ describe ".serialize_records" do
+ let(:records) { [ { :foo => 'bar' } ] }
+
+ subject { Tag.new }
+
+ it "serializes records into active remote objects" do
+ Tag.serialize_records(records).each do |record|
+ record.should be_a Tag
+ end
+ end
+ end
+
describe "#add_errors" do
let(:error) { Generic::Error.new(:field => 'name', :message => 'Boom!') }
let(:response) {
@@ -18,30 +30,4 @@ end
end
end
-
- # describe "#serialize_records" do
- # let(:last_response) {
- # MessageWithOptions.new(:records => records)
- # }
- # let(:records) { [ { :foo => 'bar' } ] }
- #
- # subject { Tag.new }
- #
- # context "when the last response has records" do
- #
- # before { subject.stub(:last_response).and_return(last_response) }
- #
- # it "serializes records into active remote objects" do
- # subject.serialize_records.each do |record|
- # record.should be_a Tag
- # end
- # end
- # end
- #
- # context "when the last response doesn't respond to records" do
- # it "returns nil" do
- # subject.serialize_records.should be_nil
- # end
- # end
- # end
end
|
Add a spec for Base.serialize_records
|
diff --git a/spec/unit/schnitzelpress/environment_spec.rb b/spec/unit/schnitzelpress/environment_spec.rb
index abc1234..def5678 100644
--- a/spec/unit/schnitzelpress/environment_spec.rb
+++ b/spec/unit/schnitzelpress/environment_spec.rb
@@ -0,0 +1,71 @@+require 'spec_helper'
+
+describe Schnitzelpress::Environment do
+
+ subject { object.state }
+
+ let(:object) { described_class.new(env_vars) }
+
+ describe '#current' do
+
+ describe 'rack env test' do
+ let(:env_vars) { {'RACK_ENV' => 'test'} }
+
+ it { should eql(:test) }
+ end
+
+ describe 'rack env development' do
+ let(:env_vars) { {'RACK_ENV' => 'development'} }
+
+ it { should eql(:development) }
+ end
+
+ describe 'rack env production' do
+ let(:env_vars) { {'RACK_ENV' => 'production'} }
+
+ it { should eql(:production) }
+ end
+
+ describe '#current' do
+
+ let(:env_vars) { {'RACK_ENV' => '<sdfsdfds>'} }
+
+ it 'throws exception on unknown environment' do
+ expect { subject }.to raise_error(RuntimeError, 'Could not determine current environment!')
+ end
+ end
+ end
+
+ describe '#test?' do
+
+ let(:env_vars) { {'RACK_ENV' => 'test'} }
+
+ specify do
+ expect(object.test?).to be(true)
+ expect(object.development?).to be(false)
+ expect(object.production?).to be(false)
+ end
+ end
+
+ describe '#production?' do
+
+ let(:env_vars) { {'RACK_ENV' => 'production'} }
+
+ specify do
+ expect(object.test?).to be(false)
+ expect(object.development?).to be(false)
+ expect(object.production?).to be(true)
+ end
+ end
+
+ describe '#development?' do
+
+ let(:env_vars) { {'RACK_ENV' => 'development'} }
+
+ specify do
+ expect(object.test?).to be(false)
+ expect(object.development?).to be(true)
+ expect(object.production?).to be(false)
+ end
+ end
+end
|
Move spec in the new spec directory structure
|
diff --git a/test/models/racing_on_rails/vestal_versions/versioned_test.rb b/test/models/racing_on_rails/vestal_versions/versioned_test.rb
index abc1234..def5678 100644
--- a/test/models/racing_on_rails/vestal_versions/versioned_test.rb
+++ b/test/models/racing_on_rails/vestal_versions/versioned_test.rb
@@ -5,7 +5,7 @@ # :stopdoc:
class VersionedTest < ActiveSupport::TestCase
test "updated by person name" do
- person = Person.create!(updated_by: "Bike race")
+ person = ::Person.create!(updated_by: "Bike race")
assert_equal "Bike race", person.updated_by_person_name, "updated_by_person_name"
end
end
|
Use root namespace for Person
|
diff --git a/lita-google-images.gemspec b/lita-google-images.gemspec
index abc1234..def5678 100644
--- a/lita-google-images.gemspec
+++ b/lita-google-images.gemspec
@@ -1,12 +1,13 @@ Gem::Specification.new do |spec|
spec.name = "lita-google-images"
- spec.version = "1.0.2"
+ spec.version = "1.0.3"
spec.authors = ["Jimmy Cuadra"]
spec.email = ["jimmy@jimmycuadra.com"]
spec.description = %q{A Lita handler for fetching images from Google.}
spec.summary = %q{A Lita handler for fetching images from Google.}
spec.homepage = "https://github.com/jimmycuadra/lita-google-images"
spec.license = "MIT"
+ spec.metadata = { "lita_plugin_type" => "handler" }
spec.files = `git ls-files`.split($/)
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
Add plugin type metadata and bump version to 1.0.3.
|
diff --git a/benchmarks/agi_env_parse.rb b/benchmarks/agi_env_parse.rb
index abc1234..def5678 100644
--- a/benchmarks/agi_env_parse.rb
+++ b/benchmarks/agi_env_parse.rb
@@ -0,0 +1,13 @@+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler/setup'
+require 'ruby_ami'
+require 'benchmark/ips'
+
+env_string = "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
+
+Benchmark.ips do |ips|
+ ips.report("environment parsing") { RubyAMI::AsyncAGIEnvironmentParser.new(env_string).to_hash }
+ ips.report("CGI unescaping") { CGI.unescape(env_string) }
+end
|
[CS] Add benchmark for AGI environment parsing
|
diff --git a/fake-ajax-server.gemspec b/fake-ajax-server.gemspec
index abc1234..def5678 100644
--- a/fake-ajax-server.gemspec
+++ b/fake-ajax-server.gemspec
@@ -17,4 +17,5 @@
gem.add_dependency 'jquery-rails'
gem.add_dependency 'sinon-rails'
+ gem.add_dependency 'coffee-rails'
end
|
Add dependency on coffee-rails as well
|
diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -16,11 +16,11 @@ end
def index
- @mrs = project.merge_requests.includes(:author, :patches).pending.paginate(page: params[:page])
+ @mrs = merge_requests.pending.paginate(page: params[:page])
end
def old_ones
- @mrs = project.merge_requests.includes(:author, :patches).closed.paginate(page: params[:page])
+ @mrs = merge_requests.closed.paginate(page: params[:page])
end
def show
@@ -31,6 +31,10 @@ end
private
+
+ def merge_requests
+ project.merge_requests.includes(:author, :patches).order(updated_at: :desc)
+ end
def accept
@mr.integrate! current_user
|
Order merge requests by last update.
|
diff --git a/app/controllers/spree/firmware_controller.rb b/app/controllers/spree/firmware_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/spree/firmware_controller.rb
+++ b/app/controllers/spree/firmware_controller.rb
@@ -1,50 +1,54 @@-class Spree::FirmwareController < Spree::Admin::BaseController
+require 'firmware'
- class FirmwareParams
- def self.build( params )
- params.require( :firmware ).permit( :version, :file )
+module Spree
+ class FirmwareController < Spree::Admin::BaseController
+
+ class FirmwareParams
+ def self.build( params )
+ params.require( :firmware ).permit( :version, :file )
+ end
+ end
+
+ def index
+ @firmware_list = Spree::Firmware.order( 'version DESC' )
+ end
+
+ def new
+ @firmware = Spree::Firmware.new
+ end
+
+ def create
+ if params[:firmware][:file]
+ file = params[:firmware][:file]
+ params[:firmware].delete :file
+ end
+
+ @firmware = Spree::Firmware.new( FirmwareParams.build(params) ) do |t|
+ t.file = file.read if file
+ end
+
+ if @firmware.save
+ redirect_to firmware_index_path
+ else
+ render action: :new
+ end
+ end
+
+ def destroy
+ @firmware = Spree::Firmware.find params[:id]
+ @firmware.destroy
+ redirect_to firmware_index_path
+ end
+
+ def serve
+ @firmware = Spree::Firmware.find params[:id]
+ send_data @firmware.file, type: 'application/octet-stream', filename: file_name, disposition: 'inline'
+ end
+
+ private
+
+ def file_name
+ "app_mt_update-#{@firmware.version}.bin"
end
end
-
- def index
- @firmware_list = Spree::Firmware.order( 'version DESC' )
- end
-
- def new
- @firmware = Spree::Firmware.new
- end
-
- def create
- if params[:firmware][:file]
- file = params[:firmware][:file]
- params[:firmware].delete :file
- end
-
- @firmware = Spree::Firmware.new( FirmwareParams.build(params) ) do |t|
- t.file = file.read if file
- end
-
- if @firmware.save
- redirect_to firmware_index_path
- else
- render action: :new
- end
- end
-
- def destroy
- @firmware = Spree::Firmware.find params[:id]
- @firmware.destroy
- redirect_to firmware_index_path
- end
-
- def serve
- @firmware = Spree::Firmware.find params[:id]
- send_data @firmware.file, type: 'application/octet-stream', filename: file_name, disposition: 'inline'
- end
-
- private
-
- def file_name
- "app_mt_update-#{@firmware.version}.bin"
- end
end
|
Fix autoloader failing to include firmware module
|
diff --git a/SDDKit.podspec b/SDDKit.podspec
index abc1234..def5678 100644
--- a/SDDKit.podspec
+++ b/SDDKit.podspec
@@ -1,13 +1,24 @@ Pod::Spec.new do |s|
s.name = "SDDKit"
- s.version = "1.0.4"
- s.summary = "Fastest way for implementing hierarchical state machine(HSM) based programs in Objective-C."
- s.description = "Fastest way for implementing hierarchical state based programs in Objective-C. Including built-in supports like readable DSL parser, event dispatcher, a visual macOS monitor program, etc."
+ s.version = "1.0.5"
+ s.license = "MIT"
+ s.summary = "Easiest way for implementing hierarchical state machine(HSM) based programs in Objective-C."
s.homepage = "https://github.com/charleslyh/SDDKit"
- s.license = "MIT"
- s.author = "CharlesLyh"
- s.platform = :ios, "7.0"
- s.source = { :git => "https://github.com/charleslyh/SDDKit.git", :tag => "1.0.4" }
- s.source_files = "SDD", "SDD/SDD/**/*.{h,c,m}", "SDD/SDDI/**/*.{h,m}"
+ s.authors = { 'Charles Lee' => 'charles.liyh@gmail.com' }
+ s.platform = :ios, "8.0"
+ s.source = { :git => "https://github.com/charleslyh/SDDKit.git", :tag => s.version, :submodules => true }
s.requires_arc = true
+
+ s.public_header_files = 'SDDKit/SDDKit.h'
+ s.source_files = 'SDDKit/SDDKit.h'
+
+ s.subspec 'Core' do |ss|
+ ss.source_files = 'SDDKit/lex.yy.c', 'SDDKit/y.tab.{h,c}', 'SDDKit/sdd_*.{h,c}'
+ end
+
+ s.subspec 'Parser' do |ss|
+ ss.source_files = 'SDDKit', 'SDDKit/SDD{EventsPool,Scheduler,SchedulerBuilder}.{h.m}'
+ ss.public_header_files = 'SDDKit/SDD{EventsPool,Scheduler,SchedulerBuilder}.{h.m}'
+ end
+
end
|
Update podspec to support both static lib and framework uses
|
diff --git a/mixlib-shellout.gemspec b/mixlib-shellout.gemspec
index abc1234..def5678 100644
--- a/mixlib-shellout.gemspec
+++ b/mixlib-shellout.gemspec
@@ -17,8 +17,6 @@ s.add_development_dependency "rspec", "~> 3.0"
s.add_development_dependency "chefstyle"
- s.bindir = "bin"
- s.executables = []
s.require_path = "lib"
s.files = %w{Gemfile Rakefile LICENSE README.md} + Dir.glob("*.gemspec") +
Dir.glob("lib/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
|
Remove bin / executable defs
Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
|
diff --git a/db/migrate/20140212153406_rename_industry_sector_tag_type_to_specialist_sector.rb b/db/migrate/20140212153406_rename_industry_sector_tag_type_to_specialist_sector.rb
index abc1234..def5678 100644
--- a/db/migrate/20140212153406_rename_industry_sector_tag_type_to_specialist_sector.rb
+++ b/db/migrate/20140212153406_rename_industry_sector_tag_type_to_specialist_sector.rb
@@ -0,0 +1,9 @@+class RenameIndustrySectorTagTypeToSpecialistSector < Mongoid::Migration
+ def self.up
+ Tag.where(tag_type: "industry_sector").update_all(tag_type: "specialist_sector")
+ end
+
+ def self.down
+ Tag.where(tag_type: "specialist_sector").update_all(tag_type: "industry_sector")
+ end
+end
|
Add migration to update existing industry sector tags
This adds a migration to update tags with the "industry_sector" type to
now have the type "specialist_sector".
|
diff --git a/tinytable.gemspec b/tinytable.gemspec
index abc1234..def5678 100644
--- a/tinytable.gemspec
+++ b/tinytable.gemspec
@@ -8,12 +8,13 @@ gem.summary = %q{TODO: Write a gem summary}
gem.homepage = "https://github.com/leocassarani/tinytable"
- gem.add_development_dependency "rspec"
-
gem.files = `git ls-files`.split($\)
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.name = "tinytable"
gem.require_paths = ["lib"]
gem.version = TinyTable::VERSION
+
+ gem.add_development_dependency "rake"
+ gem.add_development_dependency "rspec"
end
|
Add rake as a development dependency
|
diff --git a/rb/spec/integration/selenium/webdriver/mouse_spec.rb b/rb/spec/integration/selenium/webdriver/mouse_spec.rb
index abc1234..def5678 100644
--- a/rb/spec/integration/selenium/webdriver/mouse_spec.rb
+++ b/rb/spec/integration/selenium/webdriver/mouse_spec.rb
@@ -25,9 +25,7 @@ text = droppable.find_element(:tag_name => "p").text
text.should == "Dropped!"
end
- end
- compliant_on :browser => :chrome do
it "double clicks an element" do
driver.navigate.to url_for("javascriptPage.html")
element = driver.find_element(:id, 'doubleClickField')
|
JariBakken: Enable double/context click specs for IE.
r13526
|
diff --git a/week-4/smallest-integer/smallest_integer_spec.rb b/week-4/smallest-integer/smallest_integer_spec.rb
index abc1234..def5678 100644
--- a/week-4/smallest-integer/smallest_integer_spec.rb
+++ b/week-4/smallest-integer/smallest_integer_spec.rb
@@ -0,0 +1,39 @@+require_relative "my_solution"
+
+describe 'smallest_integer' do
+ it "returns nil when the array is empty ([])" do
+ expect(smallest_integer([])).to be_nil
+ end
+
+ it "returns 0 when that is the only element in the array" do
+ expect(smallest_integer([0])).to eq 0
+ end
+
+ it "returns -10 when that is the only element in the array" do
+ expect(smallest_integer([-10])).to eq -10
+ end
+
+ it "returns -10 for [-10, 0, 10]" do
+ expect(smallest_integer([-10, 0, 10])).to eq -10
+ end
+
+ it "returns 1 for [1, 2, 3]" do
+ expect(smallest_integer([1, 2, 3])).to eq 1
+ end
+
+ it "returns -30 for [-10, -20, -30]" do
+ expect(smallest_integer([-10, -20, -30])).to eq -30
+ end
+
+ it "returns the smallest positive integer regardless of ordering" do
+ array = (1..100).to_a.shuffle
+
+ expect(smallest_integer(array)).to eq 1
+ end
+
+ it "returns the smallest negative integer regardless of ordering" do
+ array = (-100..-10).to_a.shuffle
+
+ expect(smallest_integer(array)).to eq -100
+ end
+end
|
Add rspec file for smallest integer
|
diff --git a/examples/monitor.rb b/examples/monitor.rb
index abc1234..def5678 100644
--- a/examples/monitor.rb
+++ b/examples/monitor.rb
@@ -9,18 +9,21 @@ exclusions = ARGV.select { |arg| arg =~ /^!/ }.collect { |arg| arg[1..-1] }
EM.error_handler{ |e|
- puts "Error raised during event loop: #{e.class.name} #{e.message}"
- puts e.backtrace
+ puts "Error raised during event loop: #{e.class.name} #{e.message}"
+ puts e.backtrace
}
EM.run {
- dw = EMDirWatcher.watch dir, :include_only => inclusions, :exclude => exclusions do |path|
- full_path = File.join(dir, path)
- if File.exists? full_path
- puts "Modified: #{path}"
- else
- puts "Deleted: #{path}"
- end
+ dw = EMDirWatcher.watch dir, :include_only => inclusions, :exclude => exclusions do |paths|
+ paths.each do |path|
+ puts path
+ full_path = File.join(dir, path)
+ if File.exists? full_path
+ puts "Modified: #{path}"
+ else
+ puts "Deleted: #{path}"
+ end
end
- puts "Monitoring #{File.expand_path(dir)}..."
+ end
+ puts "Monitoring #{File.expand_path(dir)}..."
}
|
Fix example due to changed EMDirWatcher.watch API
|
diff --git a/Formula/nspr.rb b/Formula/nspr.rb
index abc1234..def5678 100644
--- a/Formula/nspr.rb
+++ b/Formula/nspr.rb
@@ -6,15 +6,18 @@ @md5='c78384602b4b466081a55025446641db'
def install
+ require 'hardware'
+
ENV.deparallelize
Dir.chdir "mozilla/nsprpub" do
inreplace "pr/src/Makefile.in", "-framework CoreServices -framework CoreFoundation", ""
- system "./configure", "--prefix=#{prefix}",
- "--disable-debug",
- "--enable-strip",
- "--enable-optimize",
- "--enable-64bit"
+
+ conf = %W[--prefix=#{prefix} --disable-debug --enable-strip --enable-optimize]
+ conf << "--enable-64bit" if Hardware.is_64_bit? and MACOS_VERSION >= 10.6
+ system "./configure", *conf
+
inreplace "config/autoconf.mk", "-install_name @executable_path/$@ ", ""
+
system "make"
system "make install"
end
|
Enable 64 bits on 64 bit machines only
|
diff --git a/tools/rest_api.rb b/tools/rest_api.rb
index abc1234..def5678 100644
--- a/tools/rest_api.rb
+++ b/tools/rest_api.rb
@@ -1,5 +1,5 @@ #! /usr/bin/env ruby
-require 'bundler/setup'
+Dir.chdir(File.join(__dir__, "..")) { require 'bundler/setup' }
require 'pathname'
gem_dir = Pathname.new(Bundler.locked_gems.specs.select { |g| g.name == "manageiq-api" }.first.gem_dir)
|
Allow the wrapper script to be invoked outside the app directory.
|
diff --git a/IRLSize.podspec b/IRLSize.podspec
index abc1234..def5678 100644
--- a/IRLSize.podspec
+++ b/IRLSize.podspec
@@ -14,7 +14,7 @@ s.source = { :git => "https://github.com/detroit-labs/IRLSize.git",
:tag => s.version.to_s }
- s.ios.deployment_target = '2.0'
+ s.ios.deployment_target = '8.0'
s.watchos.deployment_target = '2.0'
s.requires_arc = true
|
Set the target to 8.0.
We’re using some 8.0-only APIs.
|
diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec
index abc1234..def5678 100644
--- a/minimal-mistakes-jekyll.gemspec
+++ b/minimal-mistakes-jekyll.gemspec
@@ -15,14 +15,13 @@ f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i)
end
- spec.add_dependency "jekyll", "~> 3.3"
-
- spec.add_development_dependency "bundler", "~> 1.12"
- spec.add_development_dependency "rake", "~> 10.0"
-
+ spec.add_runtime_dependency "jekyll", "~> 3.3"
spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
spec.add_runtime_dependency "jekyll-sitemap", "~> 0.12"
spec.add_runtime_dependency "jekyll-gist", "~> 1.4"
spec.add_runtime_dependency "jekyll-feed", "~> 0.8"
spec.add_runtime_dependency "jemoji", "~> 0.7"
+
+ spec.add_development_dependency "bundler", "~> 1.12"
+ spec.add_development_dependency "rake", "~> 10.0"
end
|
Change Jekyll to a runtime dependency
|
diff --git a/phonegap-ios-template.podspec b/phonegap-ios-template.podspec
index abc1234..def5678 100644
--- a/phonegap-ios-template.podspec
+++ b/phonegap-ios-template.podspec
@@ -1,7 +1,7 @@ Pod::Spec.new do |s|
s.name = "phonegap-ios-template"
- s.version = "0.1.0"
+ s.version = "0.1.1"
s.summary = "PhoneGap sample template project for iOS."
s.description = <<-DESC "A PhoneGap sample project to get started quickly with an embedded webview in a native iOS project."
@@ -10,7 +10,7 @@ s.homepage = "https://github.com/hollyschinsky/ios-webview-www"
s.author = { "The Adobe PhoneGap Team" => "" }
s.social_media_url = "http://twitter.com/phonegap"
- s.source = { :git => "https://github.com/phonegap/phonegap-webview-ios.git", :tag => "0.1.0" }
+ s.source = { :git => "https://github.com/phonegap/phonegap-webview-ios.git", :tag => "0.1.1" }
s.resources = "resources/*"
end
|
Update tag for repo to include latest updates in podspec.
|
diff --git a/LBBlurredImage.podspec b/LBBlurredImage.podspec
index abc1234..def5678 100644
--- a/LBBlurredImage.podspec
+++ b/LBBlurredImage.podspec
@@ -9,6 +9,6 @@ s.source = { :git => "https://github.com/lukabernardi/LBBlurredImage.git", :revision => "0.0.1" }
s.platform = :ios, '6.0'
s.source_files = 'Classes', 'LBBlurredImage/UIImageView+LBBlurredImage.{h,m}'
- s.frameworks = 'CoreImage', 'CoreGraphics'
+ s.frameworks = 'CoreImage', 'CoreGraphics', 'UIKit'
s.requires_arc = true
end
|
Add UIKit as depended framework on podspec
Signed-off-by: Luca Bernardi <38200982d3b71b1094dcbc14c9cc15f8acc5a0cb@gmail.com>
|
diff --git a/plugin.rb b/plugin.rb
index abc1234..def5678 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -35,8 +35,4 @@ background: #606060 !important;
}
-.btn-social.persona:before {
- content: "]";
-}
-
CSS
|
Remove icon since it looks like Discourse no longer bundles a social
icon set.
|
diff --git a/test/service_test.rb b/test/service_test.rb
index abc1234..def5678 100644
--- a/test/service_test.rb
+++ b/test/service_test.rb
@@ -10,6 +10,7 @@ def test_default_path_to_ca_file
s = CC::Service.new({}, {name: "test"})
assert_equal(File.expand_path("../../config/cacert.pem", __FILE__), s.ca_file)
+ assert File.exist?(s.ca_file)
end
def test_custom_path_to_ca_file
|
Make sure the ca file exist.
|
diff --git a/bounce.gemspec b/bounce.gemspec
index abc1234..def5678 100644
--- a/bounce.gemspec
+++ b/bounce.gemspec
@@ -12,7 +12,7 @@ s.summary = "bounce is a rails method that saves and returns an active record object. If you like skinny controllers, you'll love bounce."
s.description = %q{
- `bounce` will save and return an active record object. This results in a nice refactor of update and create actions in your controllers when used with`respond_with`.
+ `bounce` will save and return an active record object. This results in a nice refactor of update and create actions in your controllers when used with `respond_with`.
}
s.rubyforge_project = 'bounce'
|
Add spacing to gemspec description
|
diff --git a/test/raw_sql_builder_test.rb b/test/raw_sql_builder_test.rb
index abc1234..def5678 100644
--- a/test/raw_sql_builder_test.rb
+++ b/test/raw_sql_builder_test.rb
@@ -2,10 +2,63 @@
class RawSqlBuilderTest < Minitest::Test
def test_that_it_has_a_version_number
- refute_nil ::RawSqlBuilder::VERSION
+ assert_not_nil ::RawSqlBuilder::VERSION
end
- def test_it_does_something_useful
- assert false
+ def setup
+ @objects = User.all
+ end
+
+ def test_mass_create
+ assert_not_nil RawSqlBuilder.mass_create(prep_objects_for_benchmark(@objects, 50, true))
+ end
+
+ def test_mass_update
+ assert_not_nil RawSqlBuilder.mass_update(prep_objects_for_benchmark(@objects, 50))
+ end
+
+ def test_mass_create_or_update
+ assert_not_nil RawSqlBuilder.mass_create_or_update(
+ prep_objects_for_benchmark(@objects, 25, true) + prep_objects_for_benchmark(@objects, 25))
+ end
+
+ def test_create_or_update_all_tables
+ ActiveRecord::Base.connection.tables.each do |t|
+ objects = t.camelize.singularize.constantize.order(id: :asc).limit(10)
+ next if objects.none?
+ assert_not_nil RawSqlBuilder.mass_create_or_update(
+ prep_objects_for_benchmark(objects, 25, true) + prep_objects_for_benchmark(objects, 25))
+ end
+ end
+
+ def test_created_at_and_updated_at_on_create
+ RawSqlBuilder.mass_create(prep_objects_for_benchmark(@objects, 50, true))
+ assert @objects.first.created_at > Time.zone.now - 5.minutes
+ assert @objects.first.updated_at > Time.zone.now - 5.minutes
+ end
+
+ def test_updated_at_on_update
+ RawSqlBuilder.mass_update(prep_objects_for_benchmark(@objects, 50))
+ assert @objects.first.updated_at > Time.zone.now - 5.minutes
+ end
+
+ private
+
+ def prep_objects_for_benchmark(objects, percent, new = false)
+ objects = [*objects]
+ object_class = objects.first.class
+ objects_array = []
+ objects[0..((objects.size * (percent.to_f / 100)).ceil)].each do |o|
+ obj = new ? object_class.new : o
+ obj.attributes.each do |k, v|
+ if v.is_a?(String) && [true, false].sample
+ obj[k] = (0...20).map { (65 + rand(26)).chr }.join
+ end
+ end
+
+ obj.last_name = "O'Reilly" if object_class.columns_hash['last_name']
+ objects_array << obj
+ end
+ objects_array
end
end
|
Add to test file. Still need to create a test table.
|
diff --git a/poller-json.gemspec b/poller-json.gemspec
index abc1234..def5678 100644
--- a/poller-json.gemspec
+++ b/poller-json.gemspec
@@ -18,6 +18,5 @@ gem.add_runtime_dependency('multi_json', '~> 1.8.1')
gem.add_runtime_dependency('json', '~> 1.8.0') if RUBY_VERSION == '1.8.7'
gem.add_development_dependency('rspec', '~> 2.14.1')
- gem.add_development_dependency('simplecov', '0.7.1') if RUBY_VERSION == '1.8.7'
- gem.add_development_dependency('simplecov', '~> 0.8.2') if RUBY_VERSION != '1.8.7'
+ gem.add_development_dependency('simplecov', '~> 0.8.2')
end
|
Revert "Ruby 1.8.7 cant work with dependencies introduced by simplecov-0.8.2"
This reverts commit 1d0f7af57182bbdda2ac47115b050182790111a1.
|
diff --git a/Amplitude-iOS.podspec b/Amplitude-iOS.podspec
index abc1234..def5678 100644
--- a/Amplitude-iOS.podspec
+++ b/Amplitude-iOS.podspec
@@ -7,7 +7,7 @@ s.author = { "Amplitude" => "dev@amplitude.com" }
s.source = { :git => "https://github.com/amplitude/Amplitude-iOS.git", :tag => "v3.12.1" }
s.platform = :ios, '5.0'
- s.source_files = 'Amplitude/*.{h,m}', 'Amplitude/SSLCertificatePinning/*.{h,m,pch}'
+ s.source_files = 'Amplitude/*'
s.requires_arc = true
s.library = 'sqlite3.0'
end
|
Include everything in Amplitude subdirectory
|
diff --git a/Casks/freefilesync.rb b/Casks/freefilesync.rb
index abc1234..def5678 100644
--- a/Casks/freefilesync.rb
+++ b/Casks/freefilesync.rb
@@ -0,0 +1,11 @@+cask :v1 => 'freefilesync' do
+ version '6.13'
+ sha256 '0abcfd5d96ee8a51ae243138f410f68b2dae6320fd7337237047bd53d263e90f'
+
+ url "http://downloads.sourceforge.net/project/freefilesync/FreeFileSync/#{version}/FreeFileSync_#{version}_Mac_OS_X_64-bit.zip"
+ homepage 'http://freefilesync.sourceforge.net/'
+ license :gpl
+
+ app 'FreeFileSync.app'
+ app 'RealtimeSync.app'
+end
|
Add Freefilesync Cask to boneyard
See <https://github.com/caskroom/homebrew-cask/issues/9734>.
|
diff --git a/Casks/phpstorm-eap.rb b/Casks/phpstorm-eap.rb
index abc1234..def5678 100644
--- a/Casks/phpstorm-eap.rb
+++ b/Casks/phpstorm-eap.rb
@@ -1,6 +1,6 @@ cask :v1 => 'phpstorm-eap' do
- version '141.1815'
- sha256 '4e66c2f600b67d9c29614d7ba78b1d3fbf051d21728bb3df00bb39b3548429bf'
+ version '141.2017'
+ sha256 'f0ec9828aab591159531cdeb815dcf976d9707bb126a84daa4554809c9fc34b2'
url "https://download.jetbrains.com/webide/PhpStorm-EAP-#{version}.dmg"
name 'PhpStorm EAP'
|
Update PhpStorm EAP.app to version 141.2017
|
diff --git a/application.rb b/application.rb
index abc1234..def5678 100644
--- a/application.rb
+++ b/application.rb
@@ -23,7 +23,7 @@
get '/lookup.json' do
@words = Word.where(
- Sequel.like(:word, "%#{params[:q].downcase}%")
+ Sequel.like(:word, "#{params[:q].downcase}%")
).limit(20).order(:word).all
content_type 'application/json'
|
Change search back to start of word
|
diff --git a/lib/alfabank/api/base.rb b/lib/alfabank/api/base.rb
index abc1234..def5678 100644
--- a/lib/alfabank/api/base.rb
+++ b/lib/alfabank/api/base.rb
@@ -19,7 +19,7 @@ end
def url
- Alfabank::Configuration.mode == :production ? self.class::URL : self.class::TEST_URL
+ Alfabank::Configuration.mode.to_s == 'production' ? self.class::URL : self.class::TEST_URL
end
def credentials
|
Convert mode to string to allow both symbols and strings
|
diff --git a/spec/helpers.rb b/spec/helpers.rb
index abc1234..def5678 100644
--- a/spec/helpers.rb
+++ b/spec/helpers.rb
@@ -1,7 +1,7 @@ module Helpers
- def setup_reporter_spec(reporter, reporter_options = {})
+ def setup_reporter_spec(reporter)
before { ProgressHandler.configure {|config| config.reporters = {reporter => reporter_options} } }
-
+ let(:reporter_options) { {} }
let(:items) { 5.times.map &:to_s }
let(:progress_handler) { ProgressHandler.new name: 'Specs', report_gap: 2 }
end
|
Allow reporter parameters (re)definition in simple let statements
|
diff --git a/lib/chronic/time_zone.rb b/lib/chronic/time_zone.rb
index abc1234..def5678 100644
--- a/lib/chronic/time_zone.rb
+++ b/lib/chronic/time_zone.rb
@@ -18,7 +18,7 @@ def self.scan_for_all(token)
scan_for token, self,
{
- /[PMCE][DS]T/i => :tz,
+ /[PMCE][DS]T|UTC/i => :tz,
/(tzminus)?\d{4}/ => :tz
}
end
|
Allow Chronic to recognize UTC as a timezone.
This allows for a common UTC timestamp format, recognizable to `date' among
others, to be used.
|
diff --git a/lib/garufa/garufa_app.rb b/lib/garufa/garufa_app.rb
index abc1234..def5678 100644
--- a/lib/garufa/garufa_app.rb
+++ b/lib/garufa/garufa_app.rb
@@ -20,6 +20,8 @@
options[:port] = DEFAULT_PORT
+ opts.on('-V', '--version', 'Display version and exit') { puts "Garufa version #{Garufa::VERSION}"; exit }
+
opts.separator ""
opts.separator "Pusher options:"
@@ -32,8 +34,6 @@ opts.on(v.first, v.last) { |value| Garufa::Config[k] = value }
end
- opts.separator ""
- opts.on('-V', '--version', 'Display version and exit') { puts "Garufa version #{Garufa::VERSION}"; exit }
end
def response(env)
|
Move --version option to common options.
|
diff --git a/lib/groovehq/resource.rb b/lib/groovehq/resource.rb
index abc1234..def5678 100644
--- a/lib/groovehq/resource.rb
+++ b/lib/groovehq/resource.rb
@@ -10,7 +10,7 @@ links = @data.delete(:links)
links[:self] = @data.delete(:href) if @data.has_key?(:href)
- @rels = parse_links(links)
+ @rels = parse_links(links).with_indifferent_access
end
def parse_links(links)
|
Make rels also a hash with indifferent access
|
diff --git a/lib/socializer/engine.rb b/lib/socializer/engine.rb
index abc1234..def5678 100644
--- a/lib/socializer/engine.rb
+++ b/lib/socializer/engine.rb
@@ -8,12 +8,12 @@
config.generators do |g|
g.test_framework :rspec,
- fixtures: true,
- view_specs: false,
- helper_specs: false,
- routing_specs: true,
- controller_specs: true,
- request_specs: false
+ fixtures: true,
+ view_specs: false,
+ helper_specs: false,
+ routing_specs: true,
+ controller_specs: true,
+ request_specs: false
g.integration_tool false
g.fixture_replacement :factory_girl, dir: 'spec/factories'
end
|
Align the parameters of a method call if they span more than one line.
|
diff --git a/lib/tasks/emergency.rake b/lib/tasks/emergency.rake
index abc1234..def5678 100644
--- a/lib/tasks/emergency.rake
+++ b/lib/tasks/emergency.rake
@@ -29,5 +29,16 @@ end
end
end
+
+ desc "Delete duplicate enqueued Sidekiq scraper jobs. Sidekiq should be stopped for this to be effective"
+ task delete_duplicate_scraper_jobs: :environment do
+ queue = Sidekiq::Queue["scraper"].to_a
+ queue.select do |x|
+ if queue.count { |y| x.item["args"].first == y.item["args"].first } > 1
+ puts "Deleting duplicate job for run ID: #{x.item["args"].first}..."
+ x.delete
+ end
+ end
+ end
end
end
|
Add rake task to find and delete duplicate scraper jobs
|
diff --git a/lib/tasks/scheduler.rake b/lib/tasks/scheduler.rake
index abc1234..def5678 100644
--- a/lib/tasks/scheduler.rake
+++ b/lib/tasks/scheduler.rake
@@ -0,0 +1,15 @@+# See https://devcenter.heroku.com/articles/scheduler
+
+namespace :feed_simple do
+ desc 'Load latest content from RSS feed (replaces previous content)'
+ task :load => :environment do
+ puts '----- load start -----'
+ require 'open-uri'
+ url = 'http://www.macleans.ca/multimedia/feed/'
+ open(url) do |rss|
+ Content.destroy_all
+ Content.create(json: Hash.from_xml(rss).to_json)
+ end
+ puts '----- load done -----'
+ end
+end
|
Add schedule.rake containing feed_simple:load task
|
diff --git a/app.rb b/app.rb
index abc1234..def5678 100644
--- a/app.rb
+++ b/app.rb
@@ -5,6 +5,7 @@
class SpaceHolder < Sinatra::Base
set :server, :puma
+ set :protection, :except => [:frame_options, :xss_header]
set :views, "#{settings.root}/app/views"
set :assets_css_compressor, :sass
|
Disable Rack::Protection X-* headers as NGINX handles this.
|
diff --git a/spec/application_spec.rb b/spec/application_spec.rb
index abc1234..def5678 100644
--- a/spec/application_spec.rb
+++ b/spec/application_spec.rb
@@ -1,31 +1,30 @@ require 'hyperloop'
describe Hyperloop::Application do
- before :each do
- @root = 'spec/fixtures/simple/'
- @app = Hyperloop::Application.new(@root)
- end
+ describe 'with a flat views directory' do
+ before :each do
+ @app = Hyperloop::Application.new('spec/fixtures/simple/')
+ @request = Rack::MockRequest.new(@app)
+ end
- it 'responds successfully to a request for root' do
- request = Rack::MockRequest.new(@app)
- response = request.get('/')
+ it 'responds successfully to a request for root' do
+ response = @request.get('/')
- expect(response).to be_ok
- expect(response.body).to match(/<h1>Simple/)
- end
+ expect(response).to be_ok
+ expect(response.body).to match(/<h1>Simple/)
+ end
- it 'responds successfully to a request for a different page' do
- request = Rack::MockRequest.new(@app)
- response = request.get('/about')
+ it 'responds successfully to a request for a different page' do
+ response = @request.get('/about')
- expect(response).to be_ok
- expect(response.body).to match(/<h1>About/)
- end
+ expect(response).to be_ok
+ expect(response.body).to match(/<h1>About/)
+ end
- it '404s on a request for a nonexistent page' do
- request = Rack::MockRequest.new(@app)
- response = request.get('/nonexistent')
+ it '404s on a request for a nonexistent page' do
+ response = @request.get('/nonexistent')
- expect(response).to be_not_found
+ expect(response).to be_not_found
+ end
end
end
|
Move Application specs into flat context
|
diff --git a/spec/gui_spec_tmp_out.rb b/spec/gui_spec_tmp_out.rb
index abc1234..def5678 100644
--- a/spec/gui_spec_tmp_out.rb
+++ b/spec/gui_spec_tmp_out.rb
@@ -18,7 +18,7 @@ describe '#draw' do
it 'notifies each robot renderer' do
robot_renderer = double('robot_renderer')
- RobotRenderer.stub(:new) { robot_renderer }
+ allow(RobotRenderer).to receive(:new) { robot_renderer }
expect(robot_renderer).to receive(:draw)
@@ -27,7 +27,7 @@
it 'notifies each bullet renderer' do
bullet_renderer = double('bullet_renderer')
- BulletRenderer.stub(:new) { bullet_renderer }
+ allow(BulletRenderer).to receive(:new) { bullet_renderer }
expect(bullet_renderer).to receive(:draw)
|
Refactor stub in favor of allow (new syntax)
|
diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb
index abc1234..def5678 100644
--- a/spec/models/crop_spec.rb
+++ b/spec/models/crop_spec.rb
@@ -30,7 +30,8 @@ end
it 'displays the main_image_path' do
- expect(crop.main_image_path).to eq(nil)
+ expect(crop.main_image_path).to_not eq(nil)
+ # TODO: test for placeholder image?
fancy_crop = FactoryGirl.create(:crop_picture).photographic
expect(fancy_crop.main_image_path).to be_kind_of(String)
expect(fancy_crop.main_image_path).to include("pictures/attachments")
|
Fix test for crops without set images
|
diff --git a/TBStateMachine.podspec b/TBStateMachine.podspec
index abc1234..def5678 100644
--- a/TBStateMachine.podspec
+++ b/TBStateMachine.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = "TBStateMachine"
- s.version = "3.0.0"
+ s.version = "3.0.1"
s.summary = "A lightweight implementation of a hierarchical state machine in Objective-C."
s.description = <<-DESC
A lightweight implementation of a hierarchical state machine in Objective-C.
|
Raise version number to 3.0.1.
|
diff --git a/lib/generators/ops_care/setup_generator.rb b/lib/generators/ops_care/setup_generator.rb
index abc1234..def5678 100644
--- a/lib/generators/ops_care/setup_generator.rb
+++ b/lib/generators/ops_care/setup_generator.rb
@@ -30,6 +30,7 @@ RUBY
["staging", "production"].each do |env|
inject_into_file "config/environments/#{env}.rb", logstasher_config, after: "Application.configure do\n"
+ inject_into_file "config/environments/#{env}.rb", logstasher_config, after: "Rails.application.configure do\n"
end
end
def copy_deploy_hooks
|
Make generator rails 3-4 compatible
|
diff --git a/spec/factories/user_factory.rb b/spec/factories/user_factory.rb
index abc1234..def5678 100644
--- a/spec/factories/user_factory.rb
+++ b/spec/factories/user_factory.rb
@@ -3,6 +3,7 @@ provider { Faker::Company.name.parameterize.underscore }
uid { "#{Faker::Number.digit}" }
name { Faker::Name.name }
- sequence(:email) { |n| "email#{n}@hanso.dk" }
+ sequence(:email) { |n| "example-email#{n}@orientation.io" }
+ avatar { "http://i.pravatar.cc/160?u=#{email}" }
end
end
|
Use realistic avatars for realisticness
It’s a word if you want it to be
|
diff --git a/recipes/install_package.rb b/recipes/install_package.rb
index abc1234..def5678 100644
--- a/recipes/install_package.rb
+++ b/recipes/install_package.rb
@@ -19,3 +19,16 @@
package "haproxy"
+directory node['haproxy']['conf_dir']
+
+template "/etc/init.d/haproxy" do
+ source "haproxy-init.erb"
+ owner "root"
+ group "root"
+ mode 00755
+ variables(
+ :hostname => node['hostname'],
+ :conf_dir => node['haproxy']['conf_dir'],
+ :prefix => "/usr"
+ )
+end
|
[COOK-3188] Allow setting of conf_dir attribute when using the default package install
Signed-off-by: Seth Vargo <81550dbf04dfd8537ff7b3c014c6fbf86e0889dc@gmail.com>
|
diff --git a/spec/lib/deploy_utils_spec.rb b/spec/lib/deploy_utils_spec.rb
index abc1234..def5678 100644
--- a/spec/lib/deploy_utils_spec.rb
+++ b/spec/lib/deploy_utils_spec.rb
@@ -0,0 +1,29 @@+require 'rails_helper'
+require 'openstax/rescue_from/deploy_utils'
+
+RSpec.describe OpenStax::RescueFrom::DeployUtils do
+ describe '.server_nickname' do
+ it 'bases the nickname from url cname parts after tutor-' do
+ Rails.application.secrets.mail_site_url = 'tutor-test.openstax.org'
+ expect(described_class.server_nickname).to eq('test')
+
+ Rails.application.secrets.mail_site_url = 'tutor-multi-word-cname.openstax.org'
+ expect(described_class.server_nickname).to eq('multi-word-cname')
+ end
+
+ it 'recognizes production' do
+ Rails.application.secrets.mail_site_url = 'tutor.openstax.org'
+ expect(described_class.server_nickname).to eq('production')
+ end
+
+ it 'fallsback to non-conventional urls' do
+ Rails.application.secrets.mail_site_url = 'something-wild.com'
+ expect(described_class.server_nickname).to eq('something-wild.com')
+ end
+
+ it 'copes when mail_site_url nil' do
+ Rails.application.secrets.mail_site_url = nil
+ expect(described_class.server_nickname).to eq('unknown deploy')
+ end
+ end
+end
|
Add specs for deploy utils
|
diff --git a/spec/spec-i18n/example_spec.rb b/spec/spec-i18n/example_spec.rb
index abc1234..def5678 100644
--- a/spec/spec-i18n/example_spec.rb
+++ b/spec/spec-i18n/example_spec.rb
@@ -21,7 +21,7 @@ descreva Pessoa do
antes(:de_todos) do
- @pessoa = Pessoa.new("Tomás", "D'Stefano")
+ @pessoa = Pessoa.new("Homer", "Simpson")
end
antes(:de_cada) do
@@ -36,12 +36,27 @@ @outras_pessoas = []
end
- exemplo "deve retornar o nome completo" do
- @pessoa.nome_completo.deve == "Tomás D'Stefano"
+ contexto "Nome completo" do
+
+ antes(:de_cada_exemplo) do
+ @pessoa = Pessoa.new("Tomás", "D'Stefano")
+ end
+
+ exemplo "deve retornar o nome completo" do
+ @pessoa.nome_completo.deve == "Tomás D'Stefano"
+ end
+
end
-
- especificar "a idade é opcional" do
- Pessoa.new("Aaromn", "Monkey", 20).idade.deve == 20
+
+ contexto "a idade" do
+
+ antes(:de_todos_exemplos) do
+ @pessoa = Pessoa.new("Aaromn", "Monkey", 20)
+ end
+
+ especificar "deve ser opcional" do
+ @pessoa.idade.deve == 20
+ end
end
end
|
Add context in the spec example
|
diff --git a/spec/support/example_helper.rb b/spec/support/example_helper.rb
index abc1234..def5678 100644
--- a/spec/support/example_helper.rb
+++ b/spec/support/example_helper.rb
@@ -10,7 +10,12 @@ end
def pending_example
- example = base_example { pending('Pending') }
+ if ::RSpec::Version::STRING >= '2.99.0'
+ example = base_example { skip('Pending') }
+ else
+ example = base_example { pending('Pending') }
+ end
+
example.execution_result[:pending_message] = 'No such step(0): '
example
end
|
Switch pending method RSpec 2.x/3.x
|
diff --git a/spec/webhook_endpoints_spec.rb b/spec/webhook_endpoints_spec.rb
index abc1234..def5678 100644
--- a/spec/webhook_endpoints_spec.rb
+++ b/spec/webhook_endpoints_spec.rb
@@ -1,8 +1,9 @@ require 'spec_helper'
+require 'securerandom'
RSpec.describe 'WebhookEndpoints', :vcr, class: Pin::WebhookEndpoints do
let(:token) {
- Pin::WebhookEndpoints.create({ url: "http://example.com/webhooks#{Time.now.to_i}/" })['token']
+ Pin::WebhookEndpoints.create({ url: "http://example.com/webhooks#{SecureRandom.urlsafe_base64}/" })['token']
}
before(:each) do
|
Use a secure random slug for webhook specs
|
diff --git a/brakeman.gemspec b/brakeman.gemspec
index abc1234..def5678 100644
--- a/brakeman.gemspec
+++ b/brakeman.gemspec
@@ -14,7 +14,7 @@ s.add_dependency "ruby2ruby", "~>2.0.5"
s.add_dependency "terminal-table", "~>1.4"
s.add_dependency "fastercsv", "~>1.5"
- s.add_dependency "highline", "~>1.6.19"
+ s.add_dependency "highline", "~>1.6.20"
s.add_dependency "erubis", "~>2.6"
s.add_dependency "haml", ">=3.0", "<5.0"
s.add_dependency "sass", "~>3.0"
|
Change highline dependency to 1.6.20
|
diff --git a/app/models/book.rb b/app/models/book.rb
index abc1234..def5678 100644
--- a/app/models/book.rb
+++ b/app/models/book.rb
@@ -19,6 +19,6 @@
def display_genre
genre = self.genres.map { |genre| genre.name }
- genre.join("")
+ genre.join(", ")
end
end
|
Refactor display genre method to show multiple genres properly
|
diff --git a/app/models/game.rb b/app/models/game.rb
index abc1234..def5678 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -4,4 +4,46 @@
has_many :pictures
validates :name, presence: true
+
+ rails_admin do
+ list do
+ configure :id do
+ column_width 25
+ end
+
+ configure :players_min do
+ column_width 90
+ end
+
+ configure :players_max do
+ column_width 90
+ end
+
+ configure :playing_time_min do
+ label 'Time Min'
+ column_width 80
+ end
+
+ configure :playing_time_max do
+ label 'Time Max'
+ column_width 80
+ end
+
+ configure :age do
+ column_width 50
+ end
+
+ configure :published_at do
+ column_width 100
+ end
+
+ exclude_fields :created_at, :updated_at, :description, :website, :bgg_link,
+ :wikipedia_link, :pictures
+ end
+
+ edit do
+ exclude_fields :created_at, :updated_at, :website, :bgg_link,
+ :wikipedia_link
+ end
+ end
end
|
Configure the admin page appearance
|
diff --git a/range_sentence_parser.gemspec b/range_sentence_parser.gemspec
index abc1234..def5678 100644
--- a/range_sentence_parser.gemspec
+++ b/range_sentence_parser.gemspec
@@ -4,9 +4,9 @@ Gem::Specification.new do |gem|
gem.authors = ["Gabriel Sobrinho"]
gem.email = ["gabriel.sobrinho@gmail.com"]
- gem.description = %q{TODO: Write a gem description}
- gem.summary = %q{TODO: Write a gem summary}
- gem.homepage = ""
+ gem.description = %q{Parser for range sentences like '1990; 1995-2000; 2005'}
+ gem.summary = %q{Parser for range sentences like '1990; 1995-2000; 2005'}
+ gem.homepage = "https://github.com/sobrinho/range_sentence_parser"
gem.files = `git ls-files`.split($\)
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
|
Update description, summary and homepage on gemspec
|
diff --git a/app/models/role.rb b/app/models/role.rb
index abc1234..def5678 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,21 +1,29 @@ class Role < ActiveRecord::Base
- ADMIN = 'admin'
- CONVENOR = 'convenor'
- TUTOR = 'tutor'
- STUDENT = 'student'
+
+ def self.student
+ Role.find(student_id)
+ end
- ROLES = [ADMIN, CONVENOR, TUTOR, STUDENT]
+ def self.tutor
+ Role.find(tutor_id)
+ end
+ def self.convenor
+ Role.find(convenor_id)
+ end
- scope :student, -> { Role.find(1) }
- scope :tutor, -> { Role.find(2) }
- scope :convenor, -> { Role.find(3) }
- scope :moderator, -> { Role.find(4) }
+ def self.admin
+ Role.find(admin_id)
+ end
#
# Helpers to get the role id's:
# - These could be made into DB queries, but these values should not change
#
+ def self.student_id
+ 1
+ end
+
def self.tutor_id
2
end
@@ -24,11 +32,7 @@ 3
end
- def self.student_id
- 1
- end
-
- def self.moderator_id
+ def self.admin_id
4
end
end
|
Change Role to use functions instead of scope queries
|
diff --git a/lib/arrthorizer/rspec.rb b/lib/arrthorizer/rspec.rb
index abc1234..def5678 100644
--- a/lib/arrthorizer/rspec.rb
+++ b/lib/arrthorizer/rspec.rb
@@ -1,3 +1,4 @@+require 'rspec/core/version'
require 'rspec/expectations'
module Arrthorizer
@@ -8,8 +9,17 @@
role_spec = {
type: :role,
+ }
+
+ example_group_spec = {
file_path: %r(spec/roles)
}
+
+ if ::RSpec::Core::Version::STRING =~ /\A2/
+ role_spec[:example_group] = example_group_spec
+ else
+ role_spec.merge!(example_group_spec)
+ end
::RSpec.configure do |config|
config.include Arrthorizer::RSpec::Matchers::Roles, role_spec
|
Make Arrthorizer::RSpec extensions work from the box with RSpec 2 as well
|
diff --git a/app/models/user.rb b/app/models/user.rb
index abc1234..def5678 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,13 @@ validates :password, presence: { message: "Password field can't be left blank" }, length: { in: 4..10, message: "Password must be between 4-15 characters in length" }
has_secure_password validations: false
+
+ # Returns the hash digest of the given string.
+ def User.digest(string)
+ cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST :
+ BCrypt::Engine.cost
+ BCrypt::Password.create(string, cost: cost)
+ end
# Returns a random token
def User.new_token
|
Create own User.digest method to deal with encrypted strings
|
diff --git a/app/controllers/campaigns_controller.rb b/app/controllers/campaigns_controller.rb
index abc1234..def5678 100644
--- a/app/controllers/campaigns_controller.rb
+++ b/app/controllers/campaigns_controller.rb
@@ -22,7 +22,7 @@
def join_request
JoinMailer.join_request(current_user, campaign).deliver
- redirect_to campaigns_path
+ redirect_to campaigns_path, notice: "Your request has been sent succesfully."
end
def manage_members
|
Add notice to join request
|
diff --git a/lib/capify-ec2/server.rb b/lib/capify-ec2/server.rb
index abc1234..def5678 100644
--- a/lib/capify-ec2/server.rb
+++ b/lib/capify-ec2/server.rb
@@ -10,7 +10,7 @@ end
def name
- tags["Name"]
+ tags["Name"] || ""
end
end
end
|
Handle cases where the EC2 instance 'name' tag is empty.
|
diff --git a/config/initializers/rack.rb b/config/initializers/rack.rb
index abc1234..def5678 100644
--- a/config/initializers/rack.rb
+++ b/config/initializers/rack.rb
@@ -2,8 +2,4 @@ # https://github.com/rack/rack/issues/1075
# The middleware approach was not reliable.
# Setting the const, in my tests, is always reliable.
-# This makes large file uploads process MUCH faster
-# The new rack code sets this to 1_048_576 so I think this
-# hack is still a better approach for this scenario with
-# huge scorm files.
-Rack::Multipart::Parser.const_set("BUFSIZE", 100 * 1024 * 1024)
+Rack::Multipart::Parser.const_set("BUFSIZE", 1024 * 1024)
|
Reduce the buffer from 100 MB to 1 MB
|
diff --git a/server.rb b/server.rb
index abc1234..def5678 100644
--- a/server.rb
+++ b/server.rb
@@ -21,7 +21,7 @@
s = UDPSocket.new
s.bind(nil, 2111)
-5.times do
+while true do
buffer, sender = s.recvfrom(1024)
|
Remove 5 request loop limit
|
diff --git a/client.rb b/client.rb
index abc1234..def5678 100644
--- a/client.rb
+++ b/client.rb
@@ -4,6 +4,7 @@ require_relative 'client/request'
require_relative 'client/locations'
require_relative 'client/menus'
+require_relative 'client/photos'
module Singleplatform
class Client
|
Add require for Photos file
|
diff --git a/lib/requests/find_all.rb b/lib/requests/find_all.rb
index abc1234..def5678 100644
--- a/lib/requests/find_all.rb
+++ b/lib/requests/find_all.rb
@@ -12,16 +12,18 @@ def call
client = HonestRenter::Client.new
request = HonestRenter::Request.new(client, @session)
- query = {}.tap do |params|
+
+ request.get(@resource_name, query)
+ end
+
+ def query
+ {}.tap do |params|
unless @expansions.nil? || @expansions.empty?
params[:expand] = JSON(@expansions)
end
-
params[:limit] = @limit unless @limit.nil?
params[:offset] = @offset unless @offset.nil?
end
-
- request.get(@resource_name, query)
end
end
end
|
Move query to helper method
|
diff --git a/lib/ryespy/redis_conn.rb b/lib/ryespy/redis_conn.rb
index abc1234..def5678 100644
--- a/lib/ryespy/redis_conn.rb
+++ b/lib/ryespy/redis_conn.rb
@@ -26,9 +26,5 @@ @redis.quit
end
- def add
- @redis.add("")
- end
-
end
end
|
Remove spurious debug from RedisConn.
|
diff --git a/lib/tasks/moneybird.rake b/lib/tasks/moneybird.rake
index abc1234..def5678 100644
--- a/lib/tasks/moneybird.rake
+++ b/lib/tasks/moneybird.rake
@@ -1,11 +1,11 @@ namespace :moneybird do
task sync: :environment do
# TODO: Filter out fully synced orders
- syncable_orders = Spree::Order.where('moneybird_invoice_sent_at is null')
+ syncable_orders = Spree::Order.complete.where('moneybird_invoice_sent_at is null')
syncable_orders.each do |order|
begin
- order.sync_with_moneybird
+ order.sync_with_moneybird
rescue Exception => e
Appsignal.add_exception(e) if defined? Appsignal
Rails.logger.error e
|
Order must be completed before sync
|
diff --git a/lib/tasks/user_data.rake b/lib/tasks/user_data.rake
index abc1234..def5678 100644
--- a/lib/tasks/user_data.rake
+++ b/lib/tasks/user_data.rake
@@ -1,10 +1,24 @@-desc "This task generates a list of user information for use by Tom Ash"
-task generate_user_profile_urls: :environment do
- include ActionView::Helpers::UrlHelper
- User.find_each do |user|
- url = Rails.application.routes.url_helpers.user_url(user, host: "http://skillshare.im")
- name = user.name
- email = user.email
- puts [name, email, url].join(";")
+namespace :user_data do
+ desc "This task generates a list of user information for use by Tom Ash"
+ task generate_user_profile_urls: :environment do
+ include ActionView::Helpers::UrlHelper
+ User.find_each do |user|
+ url = Rails.application.routes.url_helpers.user_url(user, host: "http://skillshare.im")
+ name = user.name
+ email = user.email
+ puts [name, email, url].join(";")
+ end
+ end
+
+ desc "Add EA profile URLs to users with matching e-mail addresses."
+ task import_ea_profile_urls: :environment do
+ while line = STDIN.gets
+ CSV.parse(line) do |skillshare_name, email, skillshare_url, ea_hub_url, ea_hub_name|
+ user = User.find_by(email: email)
+ if user && user.ea_profile.blank?
+ user.update ea_profile: ea_hub_url
+ end
+ end
+ end
end
end
|
Create Rake task to import EA Hub links.
|
diff --git a/lib/emcee/railtie.rb b/lib/emcee/railtie.rb
index abc1234..def5678 100644
--- a/lib/emcee/railtie.rb
+++ b/lib/emcee/railtie.rb
@@ -6,6 +6,10 @@
module Emcee
class Railtie < Rails::Railtie
+ initializer :add_asset_paths do |app|
+ app.assets.paths.unshift(Rails.root.join("vendor", "assets", "components"))
+ end
+
initializer :add_preprocessors do |app|
app.assets.register_mime_type "text/html", ".html"
app.assets.register_preprocessor "text/html", DirectiveProcessor
|
Add `vendor/assets/components` to asset path
|
diff --git a/lib/jekyll-events.rb b/lib/jekyll-events.rb
index abc1234..def5678 100644
--- a/lib/jekyll-events.rb
+++ b/lib/jekyll-events.rb
@@ -40,12 +40,21 @@ entries.each do |f|
if Post.valid?(f)
event = Event.new(site, site.source, dir, f)
- if event.published && event.date >= site.time
+ if event.published && end_date(event).to_i >= site.time.to_i
site.aggregate_post_info(event)
end
end
end
end
+
+ def end_date(event)
+ if event.data.key?('end_date')
+ event_end_date = Time.parse(event.data['end_date'].to_s)
+ else
+ event_end_date = event.date
+ end
+ event_end_date
+ end
end
end
end
|
Update to support end_date in YAML front matter
|
diff --git a/rails-footnotes.gemspec b/rails-footnotes.gemspec
index abc1234..def5678 100644
--- a/rails-footnotes.gemspec
+++ b/rails-footnotes.gemspec
@@ -16,7 +16,7 @@
s.add_dependency "rails", ">= 3.2"
- s.add_development_dependency "rspec-rails", '~> 3.2.1'
+ s.add_development_dependency "rspec-rails", '~> 3.3.2'
s.add_development_dependency "capybara"
s.files = `git ls-files`.split("\n")
|
Upgrade rspec-rails, this is supposed to fix compatibility with rails 3.2 and Ruby 2.2
|
diff --git a/test/controllers/comments_controller_test.rb b/test/controllers/comments_controller_test.rb
index abc1234..def5678 100644
--- a/test/controllers/comments_controller_test.rb
+++ b/test/controllers/comments_controller_test.rb
@@ -6,7 +6,6 @@
setup do
@ad = create(:ad)
- @user = create(:user, 'email' => 'jaimito@gmail.com', 'username' => 'jaimito')
end
test 'should not create a comment as anonymous' do
@@ -18,7 +17,7 @@ end
test 'should create a comment as a user' do
- sign_in @user
+ sign_in @ad.user
assert_difference('Comment.count', 1) do
post :create, id: @ad.id, body: 'hola mundo'
end
|
Remove instance variable from test
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.