text
stringlengths
17
1.47k
positive
stringlengths
673
4.43k
negative
stringlengths
677
2.81k
Add fields to the query Added the fields which are then by default in the profile normalisation.
// Load modules var Crypto = require('crypto'); // Declare internals var internals = {}; exports = module.exports = function (options) { return { protocol: 'oauth2', useParamsAuth: true, auth: 'https://www.facebook.com/v2.3/dialog/oauth', token: 'https://graph.facebook.com/oauth/access_token', scope: ['email'], scopeSeparator: ',', profile: function (credentials, params, get, callback) { var query = { appsecret_proof: Crypto.createHmac('sha256', this.clientSecret).update(credentials.token).digest('hex'), fields: 'id,name,email,first_name,last_name,middle_name' }; get('https://graph.facebook.com/v2.3/me', query, function (profile) { credentials.profile = { id: profile.id, username: profile.username, displayName: profile.name, name: { first: profile.first_name, last: profile.last_name, middle: profile.middle_name }, email: profile.email, raw: profile }; return callback(); }); } }; };
// Load modules var Crypto = require('crypto'); // Declare internals var internals = {}; exports = module.exports = function (options) { return { protocol: 'oauth2', useParamsAuth: true, auth: 'https://www.facebook.com/v2.3/dialog/oauth', token: 'https://graph.facebook.com/oauth/access_token', scope: ['email'], scopeSeparator: ',', profile: function (credentials, params, get, callback) { var query = { appsecret_proof: Crypto.createHmac('sha256', this.clientSecret).update(credentials.token).digest('hex') }; get('https://graph.facebook.com/v2.3/me', query, function (profile) { credentials.profile = { id: profile.id, username: profile.username, displayName: profile.name, name: { first: profile.first_name, last: profile.last_name, middle: profile.middle_name }, email: profile.email, raw: profile }; return callback(); }); } }; };
Fix bug with getting url for transition
import Router from '@ember/routing/router'; export function initialize() { const isEmbedded = window !== window.top; if (isEmbedded) { Router.reopen({ notifyTopFrame: function() { window.top.postMessage({ action: 'did-transition', url: this.currentURL }) }.on('didTransition'), willTranstionNotify: function(transition) { const router = window.ls('router'); let url; if (transition.targetName && transition.to) { try { url = router.urlFor(transition.targetName, transition.to.params ); } catch (e) {} } window.top.postMessage({ action: 'before-navigation', target: transition.targetName, url }) }.on('willTransition') }); // Add listener for post messages to change the route in the application window.addEventListener('message', (event) => { const msg = event.data || {}; // Navigate when asked to if (msg.action === 'navigate') { const router = window.ls('router'); // If the route being asked for is already loaded, send a did-transition event if (router.currentRouteName === msg.name) { window.top.postMessage({ action: 'did-transition', url: router.urlFor(msg.name) }) } router.transitionTo(msg.name); } else if (msg.action === 'set-theme') { const userTheme = window.ls('userTheme'); if (userTheme) { userTheme.setTheme( msg.name, false); } } }); } } export default { name: 'route-spy', initialize, };
import Router from '@ember/routing/router'; export function initialize() { const isEmbedded = window !== window.top; if (isEmbedded) { Router.reopen({ notifyTopFrame: function() { window.top.postMessage({ action: 'did-transition', url: this.currentURL }) }.on('didTransition'), willTranstionNotify: function(transition) { const router = window.ls('router'); window.top.postMessage({ action: 'before-navigation', target: transition.targetName, url: router.urlFor(transition.targetName) }) }.on('willTransition') }); // Add listener for post messages to change the route in the application window.addEventListener('message', (event) => { const msg = event.data || {}; // Navigate when asked to if (msg.action === 'navigate') { const router = window.ls('router'); // If the route being asked for is already loaded, then if (router.currentRouteName === msg.name) { window.top.postMessage({ action: 'did-transition', url: router.urlFor(msg.name) }) } router.transitionTo(msg.name); } else if (msg.action === 'set-theme') { const userTheme = window.ls('userTheme'); if (userTheme) { userTheme.setTheme( msg.name, false); } } }); } } export default { name: 'route-spy', initialize, };
Fix new lines in definition of UD module
"""Looks up a term from urban dictionary @package ppbot @syntax ud <word> """ import requests import json from modules import * class Urbandictionary(Module): def __init__(self, *args, **kwargs): """Constructor""" Module.__init__(self, kwargs=kwargs) self.url = "http://www.urbandictionary.com/iphone/search/define?term=%s" def _register_events(self): """Register module commands.""" self.add_command('ud') def ud(self, event): """Action to react/respond to user calls.""" if self.num_args >= 1: word = '%20'.join(event['args']) r = requests.get(self.url % (word)) ur = json.loads(r.text) try: definition = ur['list'][0] definition['definition'] = definition['definition'].replace("\r", " ").replace("\n", " ") definition['example'] = definition['example'].replace("\r", " ").replace("\n", " ") message = "%(word)s (%(thumbs_up)d/%(thumbs_down)d): %(definition)s (ex: %(example)s)" % (definition) self.msg(event['target'], message) except KeyError: self.msg(event['target'], 'Could find word "%s"' % ' '.join(event['args'])) else: self.syntax_message(event['nick'], '.ud <word>')
"""Looks up a term from urban dictionary @package ppbot @syntax ud <word> """ import requests import json from modules import * class Urbandictionary(Module): def __init__(self, *args, **kwargs): """Constructor""" Module.__init__(self, kwargs=kwargs) self.url = "http://www.urbandictionary.com/iphone/search/define?term=%s" def _register_events(self): """Register module commands.""" self.add_command('ud') def ud(self, event): """Action to react/respond to user calls.""" if self.num_args >= 1: word = '%20'.join(event['args']) r = requests.get(self.url % (word)) ur = json.loads(r.text) try: definition = ur['list'][0] definition['example'] = definition['example'].replace("\r", "").replace("\n", "") message = "%(word)s (%(thumbs_up)d/%(thumbs_down)d): %(definition)s (ex: %(example)s)" % (definition) self.msg(event['target'], message) except KeyError: self.msg(event['target'], 'Could find word "%s"' % ' '.join(event['args'])) else: self.syntax_message(event['nick'], '.ud <word>')
Make the "empty queue" log message less verbose
<?php namespace Phive\TaskQueue; use Phive\Queue\NoItemAvailableException; use Phive\TaskQueue\ExecutorAdapter\ExecutorAdapter; class Executor { /** * @var ExecutorAdapter */ private $adapter; /** * @var ExecutionContext */ protected $context; public function __construct(ExecutorAdapter $adapter, ExecutionContext $context) { $this->adapter = $adapter; $this->context = $context; } /** * @return bool True if a task was processed, false otherwise. */ public function execute() { $logger = $this->context->getLogger(); try { $payload = $this->context->getQueue()->pop(); } catch (NoItemAvailableException $e) { $logger->debug($e->getMessage()); return false; } $logger->info('Start executing.', ['payload' => $payload]); try { $this->adapter->execute($payload, $this->context); $logger->info('Payload was successfully executed.', ['payload' => $payload]); } catch (\Exception $e) { $logger->error('An error occurred while executing payload.', ['payload' => $payload, 'exception' => $e]); } return true; } }
<?php namespace Phive\TaskQueue; use Phive\Queue\NoItemAvailableException; use Phive\TaskQueue\ExecutorAdapter\ExecutorAdapter; class Executor { /** * @var ExecutorAdapter */ private $adapter; /** * @var ExecutionContext */ protected $context; public function __construct(ExecutorAdapter $adapter, ExecutionContext $context) { $this->adapter = $adapter; $this->context = $context; } /** * @return bool True if a task was processed, false otherwise. */ public function execute() { $logger = $this->context->getLogger(); try { $payload = $this->context->getQueue()->pop(); } catch (NoItemAvailableException $e) { $logger->debug($e->getMessage(), ['exception' => $e]); return false; } $logger->info('Start executing.', ['payload' => $payload]); try { $this->adapter->execute($payload, $this->context); $logger->info('Payload was successfully executed.', ['payload' => $payload]); } catch (\Exception $e) { $logger->error('An error occurred while executing payload.', ['payload' => $payload, 'exception' => $e]); } return true; } }
Fix encoding (thanks to Yasushi Masuda)
# -*- coding: utf-8 -*- #$HeadURL$ #$LastChangedDate$ #$LastChangedRevision$ import sys from reportlab.platypus import PageBreak, Spacer from flowables import * import shlex from log import log def parseRaw (data): '''Parse and process a simple DSL to handle creation of flowables. Supported (can add others on request): * PageBreak * Spacer width, height ''' elements=[] lines=data.splitlines() for line in lines: lexer=shlex.shlex(line) lexer.whitespace+=',' tokens=list(lexer) command=tokens[0] if command == 'PageBreak': if len(tokens)==1: elements.append(MyPageBreak()) else: elements.append(MyPageBreak(tokens[1])) if command == 'Spacer': elements.append(Spacer(int(tokens[1]),int(tokens[2]))) if command == 'Transition': elements.append(Transition(*tokens[1:])) return elements # Looks like this is not used anywhere now #def depth (node): # if node.parent==None: # return 0 # else: # return 1+depth(node.parent)
#$HeadURL$ #$LastChangedDate$ #$LastChangedRevision$ import sys from reportlab.platypus import PageBreak, Spacer from flowables import * import shlex from log import log def parseRaw (data): '''Parse and process a simple DSL to handle creation of flowables. Supported (can add others on request): * PageBreak * Spacer width, height ''' elements=[] lines=data.splitlines() for line in lines: lexer=shlex.shlex(line) lexer.whitespace+=',' tokens=list(lexer) command=tokens[0] if command == 'PageBreak': if len(tokens)==1: elements.append(MyPageBreak()) else: elements.append(MyPageBreak(tokens[1])) if command == 'Spacer': elements.append(Spacer(int(tokens[1]),int(tokens[2]))) if command == 'Transition': elements.append(Transition(*tokens[1:])) return elements # Looks like this is not used anywhere now #def depth (node): # if node.parent==None: # return 0 # else: # return 1+depth(node.parent)
Test travis fails with wrong test
const OrderLib = artifacts.require("OrderLib"); const MarketContractOraclize = artifacts.require("MarketContractOraclize"); const utility = require('./utility.js'); contract('OrderLib', function(accounts) { var orderLib; it("Orders are signed correctly", async function() { orderLib = await OrderLib.deployed(); var timeStamp = ((new Date()).getTime() / 1000) + 60*5; // order expires 5 minute from now. var orderAddresses = [accounts[0], accounts[1], accounts[2]]; var unsignedOrderValues = [0, 0, 33025, timeStamp, 0]; var orderQty = 5; // user is attempting to buy 5 var orderHash = await orderLib.createOrderHash.call( MarketContractOraclize.address, orderAddresses, unsignedOrderValues, orderQty ); var orderSignature = utility.signMessage(web3, accounts[0], orderHash) assert.isTrue(await orderLib.isValidSignature.call( accounts[0], orderHash, orderSignature[0], orderSignature[1], orderSignature[2]), "Order hash doesn't match signer" ); assert.isTrue(await orderLib.isValidSignature.call( accounts[1], orderHash, orderSignature[0], orderSignature[1], orderSignature[2]), "Order hash matches a non signer" ); }); });
const OrderLib = artifacts.require("OrderLib"); const MarketContractOraclize = artifacts.require("MarketContractOraclize"); const utility = require('./utility.js'); contract('OrderLib', function(accounts) { var orderLib; it("Orders are signed correctly", async function() { orderLib = await OrderLib.deployed(); var timeStamp = ((new Date()).getTime() / 1000) + 60*5; // order expires 5 minute from now. var orderAddresses = [accounts[0], accounts[1], accounts[2]]; var unsignedOrderValues = [0, 0, 33025, timeStamp, 0]; var orderQty = 5; // user is attempting to buy 5 var orderHash = await orderLib.createOrderHash.call( MarketContractOraclize.address, orderAddresses, unsignedOrderValues, orderQty ); var orderSignature = utility.signMessage(web3, accounts[0], orderHash) assert.isTrue(await orderLib.isValidSignature.call( accounts[0], orderHash, orderSignature[0], orderSignature[1], orderSignature[2]), "Order hash doesn't match signer" ); assert.isTrue(!await orderLib.isValidSignature.call( accounts[1], orderHash, orderSignature[0], orderSignature[1], orderSignature[2]), "Order hash matches a non signer" ); }); });
Use `selected = false`, over `_.omit` to deselect a source From a basic functionality standpoint, this accomplishes the same purpose as the previous implementation using `_.omit`. However, rather than removing the `selected` attribute from the sources, this will keep the structure the same by only altering the value of the source. If your usage of this plugin requires a stable source format, e.g. for comparing sources to see if the source changed, please provide the `selected` attribute when programmatically setting the player source. At this time, we don't have a simple way to standardize the `selected` attribute on initial source load. (i.e. It's up to the programmer to set the initial format on the sources before giving them to the player)
'use strict'; var _ = require('underscore'), events = require('./events'), qualitySelectorFactory = require('./components/QualitySelector'), sourceInterceptorFactory = require('./middleware/SourceInterceptor'); module.exports = function(videojs) { videojs = videojs || window.videojs; qualitySelectorFactory(videojs); sourceInterceptorFactory(videojs); videojs.hook('setup', function(player) { // Add handler to switch sources when the user requests a change player.on(events.QUALITY_SELECTED, function(event, newSource) { var sources = player.currentSources(), currentTime = player.currentTime(), isPaused = player.paused(), selectedSource; // Clear out any previously selected sources (see: #11) _.each(sources, function(source) { source.selected = false; }); selectedSource = _.findWhere(sources, { src: newSource.src }); // Note: `_.findWhere` returns a reference to an object. Thus the // following updates the original object in `sources`. selectedSource.selected = true; player.src(sources); player.one('loadeddata', function() { player.currentTime(currentTime); if (!isPaused) { player.play(); } }); }); }); }; module.exports.EVENTS = events;
'use strict'; var _ = require('underscore'), events = require('./events'), qualitySelectorFactory = require('./components/QualitySelector'), sourceInterceptorFactory = require('./middleware/SourceInterceptor'); module.exports = function(videojs) { videojs = videojs || window.videojs; qualitySelectorFactory(videojs); sourceInterceptorFactory(videojs); videojs.hook('setup', function(player) { // Add handler to switch sources when the user requests a change player.on(events.QUALITY_SELECTED, function(event, newSource) { var sources = player.currentSources(), currentTime = player.currentTime(), isPaused = player.paused(), selectedSource; sources = _.map(sources, _.partial(_.omit, _, 'selected')); selectedSource = _.findWhere(sources, { src: newSource.src }); // Note: `_.findWhere` returns a reference to an object. Thus the // following updates the original object in `sources`. selectedSource.selected = true; player.src(sources); player.one('loadeddata', function() { player.currentTime(currentTime); if (!isPaused) { player.play(); } }); }); }); }; module.exports.EVENTS = events;
Update google-cloud-bigquery version to incorporate PollingFuture retry changes. Specifically: https://github.com/googleapis/google-cloud-python/commit/f576d148f802666dbd11cf7c50a0629a77f81665 Change-Id: Id3244786ffa73cbe3a166cfe35cb7f2219140a31
# Copyright 2017 Verily Life Sciences Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. """Package configuration.""" from setuptools import find_packages from setuptools import setup REQUIRED_PACKAGES = ['pandas', 'google-api-core==1.5.1', 'google-auth==1.4.1', 'google-cloud-bigquery==1.7.0', 'google-cloud-storage==1.10.0', 'pysqlite>=2.8.3', 'ddt', 'typing'] setup( name='analysis-py-utils', version='0.4.0', license='Apache 2.0', author='Verily Life Sciences', url='https://github.com/verilylifesciences/analysis-py-utils', install_requires=REQUIRED_PACKAGES, packages=find_packages(), include_package_data=True, description='Python utilities for data analysis.', requires=[])
# Copyright 2017 Verily Life Sciences Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. """Package configuration.""" from setuptools import find_packages from setuptools import setup REQUIRED_PACKAGES = ['pandas', 'google-api-core==1.5.1', 'google-auth==1.4.1', 'google-cloud-bigquery==1.6.0', 'google-cloud-storage==1.10.0', 'pysqlite>=2.8.3', 'ddt', 'typing'] setup( name='analysis-py-utils', version='0.4.0', license='Apache 2.0', author='Verily Life Sciences', url='https://github.com/verilylifesciences/analysis-py-utils', install_requires=REQUIRED_PACKAGES, packages=find_packages(), include_package_data=True, description='Python utilities for data analysis.', requires=[])
Fix permalinks test which was breaking other tests.
from django.contrib.contenttypes.models import ContentType from django.core import urlresolvers from django.core.exceptions import ImproperlyConfigured from django.db import models from django.test import TestCase from ..permalinks import expand, resolve, PermalinkError class TestPermalinkModel(models.Model): def __unicode__(self): return 'Foo' def get_absolute_url(self): return '/foo/' class PermalinksTest(TestCase): def test_resolve(self): obj = TestPermalinkModel.objects.create() url = resolve('/r/{}-{}/'.format( ContentType.objects.get_for_model(TestPermalinkModel).pk, obj.pk )) self.assertEqual(url, obj) with self.assertRaises(PermalinkError): # A valid URL, but not a permalink. resolve('/admin/') original_urlconf = urlresolvers.get_urlconf() with self.assertRaises(ImproperlyConfigured): urlresolvers.set_urlconf('cms.tests.urls') resolve('/r/') urlresolvers.set_urlconf(original_urlconf) def test_expand(self): obj = TestPermalinkModel.objects.create() self.assertEqual(obj.__unicode__(), 'Foo') url = expand('/r/{}-{}/'.format( ContentType.objects.get_for_model(TestPermalinkModel).pk, obj.pk )) self.assertEqual(url, '/foo/')
from django.contrib.contenttypes.models import ContentType from django.core import urlresolvers from django.core.exceptions import ImproperlyConfigured from django.db import models from django.test import TestCase from ..permalinks import expand, resolve, PermalinkError class TestPermalinkModel(models.Model): def __unicode__(self): return 'Foo' def get_absolute_url(self): return '/foo/' class PermalinksTest(TestCase): def test_resolve(self): obj = TestPermalinkModel.objects.create() url = resolve('/r/{}-{}/'.format( ContentType.objects.get_for_model(TestPermalinkModel).pk, obj.pk )) self.assertEqual(url, obj) with self.assertRaises(PermalinkError): # A valid URL, but not a permalink. resolve('/admin/') with self.assertRaises(ImproperlyConfigured): urlresolvers.set_urlconf('cms.tests.urls') resolve('/r/') def test_expand(self): obj = TestPermalinkModel.objects.create() self.assertEqual(obj.__unicode__(), 'Foo') url = expand('/r/{}-{}/'.format( ContentType.objects.get_for_model(TestPermalinkModel).pk, obj.pk )) self.assertEqual(url, '/foo/')
Update the minimum name and slug length for Businesses (3->4)
<?php namespace App\Http\Requests; use App\Http\Requests\Request; class BusinessFormRequest extends Request { /** * Determine if the user is authorized to make this request. * * @return bool */ public function authorize() { return true; } /** * Get the validation rules that apply to the request. * * @return array */ public function rules() { switch ($this->method()) { case 'PATCH': case 'PUT': return [ 'name' => 'required|min:4', 'description' => 'required|min:10', 'timezone' => 'timezone', 'strategy' => 'required' ]; break; case 'POST': return [ 'name' => 'required|min:4', 'slug' => 'required|min:4|unique:businesses', 'description' => 'required|min:10', 'timezone' => 'timezone', 'strategy' => 'required' ]; break; default: return []; break; } } }
<?php namespace App\Http\Requests; use App\Http\Requests\Request; class BusinessFormRequest extends Request { /** * Determine if the user is authorized to make this request. * * @return bool */ public function authorize() { return true; } /** * Get the validation rules that apply to the request. * * @return array */ public function rules() { switch ($this->method()) { case 'PATCH': case 'PUT': return [ 'name' => 'required|min:3', 'description' => 'required|min:10', 'timezone' => 'timezone', 'strategy' => 'required' ]; break; case 'POST': return [ 'name' => 'required|min:3', 'slug' => 'required|min:3|unique:businesses', 'description' => 'required|min:10', 'timezone' => 'timezone', 'strategy' => 'required' ]; break; default: return []; break; } } }
Fix Travis while the Atom support is incomplete.
# Copyright (c) 2014, Matt Layman import os import sys from werkzeug.contrib.atom import AtomFeed from handroll import logger from handroll.composers import Composer class AtomComposer(Composer): """Compose an Atom feed from an Atom metadata file (``.atom``). The ``AtomComposer`` parses the metadata specified in the source file and produces an XML Atom feed. ``AtomComposer`` uses parameters that are needed by Werkzeug's ``AtomFeed`` API. Refer to the `Werkzeug documentation <http://werkzeug.pocoo.org/docs/contrib/atom/>`_ for all the available options. """ def compose(self, template, source_file, out_dir): logger.info('Generating Atom XML for {0} ...'.format(source_file)) # TODO: Determine what the input file will look like (YAML? JSON?). try: feed = AtomFeed('Dummy Title', id='temporary') except ValueError as error: logger.error('Invalid feed {0}: {1}'.format( source_file, error.message)) sys.exit('Incomplete.') root, _ = os.path.splitext(os.path.basename(source_file)) output_file = os.path.join(out_dir, root + '.xml') with open(output_file, 'wb') as out: out.write(feed.to_string().encode('utf-8')) out.write(b'<!-- handrolled for excellence -->\n')
# Copyright (c) 2014, Matt Layman import os import sys from werkzeug.contrib.atom import AtomFeed from handroll import logger from handroll.composers import Composer class AtomComposer(Composer): """Compose an Atom feed from an Atom metadata file (``.atom``). The ``AtomComposer`` parses the metadata specified in the source file and produces an XML Atom feed. ``AtomComposer`` uses parameters that are needed by Werkzeug's ``AtomFeed`` API. Refer to the `Werkzeug documentation <http://werkzeug.pocoo.org/docs/contrib/atom/>`_ for all the available options. """ def compose(self, template, source_file, out_dir): logger.info('Generating Atom XML for {0} ...'.format(source_file)) # TODO: Determine what the input file will look like (YAML? JSON?). try: feed = AtomFeed('Dummy Title') except ValueError as error: logger.error('Invalid feed {0}: {1}'.format( source_file, error.message)) sys.exit('Incomplete.') root, _ = os.path.splitext(os.path.basename(source_file)) output_file = os.path.join(out_dir, root + '.xml') with open(output_file, 'wb') as out: out.write(feed.to_string().encode('utf-8')) out.write(b'<!-- handrolled for excellence -->\n')
Improve the error handling, better use of ArgumentParser.
# This file is part of Viper - https://github.com/botherder/viper # See the file 'LICENSE' for copying permission. import argparse class ArgumentErrorCallback(Exception): def __init__(self, message, level=''): self.message = message.strip() + '\n' self.level = level.strip() def __str__(self): return '{}: {}'.format(self.level, self.message) def get(self): return self.level, self.message class ArgumentParser(argparse.ArgumentParser): def print_usage(self): raise ArgumentErrorCallback(self.format_usage()) def print_help(self): raise ArgumentErrorCallback(self.format_help()) def error(self, message): raise ArgumentErrorCallback(message, 'error') def exit(self, status, message=None): if message is not None: raise ArgumentErrorCallback(message) class Module(object): cmd = '' description = '' args = [] authors = [] output = [] def __init__(self): self.parser = ArgumentParser(prog=self.cmd, description=self.description) def set_args(self, args): self.args = args def log(self, event_type, event_data): self.output.append(dict( type=event_type, data=event_data )) def usage(self): self.log('', self.parser.format_usage()) def help(self): self.log('', self.parser.format_help()) def run(self): self.parsed_args = None if len(self.args) == 0: self.usage() else: try: self.parsed_args = self.parser.parse_args(self.args) except ArgumentErrorCallback as e: self.log(*e.get())
# This file is part of Viper - https://github.com/botherder/viper # See the file 'LICENSE' for copying permission. import argparse class ArgumentParser(argparse.ArgumentParser): def error(self, message): raise Exception('error: {}\n'.format(message)) class Module(object): cmd = '' description = '' args = [] authors = [] output = [] def __init__(self): self.parser = ArgumentParser(prog=self.cmd, description=self.description, add_help=False) self.parser.add_argument('-h', '--help', action='store_true', help='show this help message') def set_args(self, args): self.args = args def log(self, event_type, event_data): self.output.append(dict( type=event_type, data=event_data )) def usage(self): self.log('', self.parser.format_usage()) def help(self): self.log('', self.parser.format_help()) def run(self, *args): self.parsed_args = None try: self.parsed_args = self.parser.parse_args(self.args) if self.parsed_args.help: self.help() self.parsed_args = None except Exception as e: self.usage() self.log('', e)
Reset warnings before testing warnings
# -*- coding: utf-8 -* from __future__ import absolute_import, unicode_literals import warnings from django.test import SimpleTestCase from wagtail.utils.deprecation import RemovedInWagtail17Warning, SearchFieldsShouldBeAList class TestThisShouldBeAList(SimpleTestCase): def test_add_a_list(self): with warnings.catch_warnings(record=True) as w: warnings.simplefilter('always') base = SearchFieldsShouldBeAList(['hello']) result = base + ['world'] # Ensure that adding things together works self.assertEqual(result, ['hello', 'world']) # Ensure that a new SearchFieldsShouldBeAList was returned self.assertIsInstance(result, SearchFieldsShouldBeAList) # Check that no deprecation warnings were raised self.assertEqual(len(w), 0) def test_add_a_tuple(self): with warnings.catch_warnings(record=True) as w: warnings.simplefilter('always') base = SearchFieldsShouldBeAList(['hello']) result = base + ('world',) # Ensure that adding things together works self.assertEqual(result, ['hello', 'world']) # Ensure that a new SearchFieldsShouldBeAList was returned self.assertIsInstance(result, SearchFieldsShouldBeAList) # Check that a deprecation warning was raised self.assertEqual(len(w), 1) warning = w[0] self.assertIs(warning.category, RemovedInWagtail17Warning)
# -*- coding: utf-8 -* from __future__ import absolute_import, unicode_literals import warnings from django.test import SimpleTestCase from wagtail.utils.deprecation import RemovedInWagtail17Warning, SearchFieldsShouldBeAList class TestThisShouldBeAList(SimpleTestCase): def test_add_a_list(self): with warnings.catch_warnings(record=True) as w: base = SearchFieldsShouldBeAList(['hello']) result = base + ['world'] # Ensure that adding things together works self.assertEqual(result, ['hello', 'world']) # Ensure that a new SearchFieldsShouldBeAList was returned self.assertIsInstance(result, SearchFieldsShouldBeAList) # Check that no deprecation warnings were raised self.assertEqual(len(w), 0) def test_add_a_tuple(self): with warnings.catch_warnings(record=True) as w: base = SearchFieldsShouldBeAList(['hello']) result = base + ('world',) # Ensure that adding things together works self.assertEqual(result, ['hello', 'world']) # Ensure that a new SearchFieldsShouldBeAList was returned self.assertIsInstance(result, SearchFieldsShouldBeAList) # Check that a deprecation warning was raised self.assertEqual(len(w), 1) warning = w[0] self.assertIs(warning.category, RemovedInWagtail17Warning)
Fix broken code, comment out sun.awt.X11.XLayerProtocol
package dr.inference.model; import dr.xml.*; //import sun.awt.X11.XLayerProtocol; /** * @author Joseph Heled * Date: 4/09/2009 */ public class ValuesPoolParser extends dr.xml.AbstractXMLObjectParser { public static String VALUES_POOL = "valuesPool"; public static String VALUES = "values"; public static String SELECTOR = "selector"; public Object parseXMLObject(XMLObject xo) throws XMLParseException { final Variable pool = (Variable)xo.getElementFirstChild(VALUES); final Variable selector = (Variable)xo.getElementFirstChild(SELECTOR); if( pool.getSize() != selector.getSize() ) { throw new XMLParseException("variable Pool and selector must have equal length."); } return new ValuesPool(pool, selector); } public XMLSyntaxRule[] getSyntaxRules() { return new XMLSyntaxRule[] { new ElementRule(VALUES, new XMLSyntaxRule[]{ new ElementRule(Variable.class,1,1) }), new ElementRule(SELECTOR, new XMLSyntaxRule[]{ new ElementRule(Variable.class,1,1) }) }; } public String getParserDescription() { return ""; } public Class getReturnType() { return ValuesPool.class; } public String getParserName() { return VALUES_POOL; } }
package dr.inference.model; import dr.xml.*; import sun.awt.X11.XLayerProtocol; /** * @author Joseph Heled * Date: 4/09/2009 */ public class ValuesPoolParser extends dr.xml.AbstractXMLObjectParser { public static String VALUES_POOL = "valuesPool"; public static String VALUES = "values"; public static String SELECTOR = "selector"; public Object parseXMLObject(XMLObject xo) throws XMLParseException { final Variable pool = (Variable)xo.getElementFirstChild(VALUES); final Variable selector = (Variable)xo.getElementFirstChild(SELECTOR); if( pool.getSize() != selector.getSize() ) { throw new XMLParseException("variable Pool and selector must have equal length."); } return new ValuesPool(pool, selector); } public XMLSyntaxRule[] getSyntaxRules() { return new XMLSyntaxRule[] { new ElementRule(VALUES, new XMLSyntaxRule[]{ new ElementRule(Variable.class,1,1) }), new ElementRule(SELECTOR, new XMLSyntaxRule[]{ new ElementRule(Variable.class,1,1) }) }; } public String getParserDescription() { return ""; } public Class getReturnType() { return ValuesPool.class; } public String getParserName() { return VALUES_POOL; } }
Revise to include 'SerialPort' object as field, instead of inheriting therefrom
/* *\ ** SICU Stress Measurement System ** ** Project P04 | C380 Team A ** ** EBME 380: Biomedical Engineering Design Experience ** ** Case Western Reserve University ** ** 2016 Fall Semester ** \* */ package edu.cwru.sicu_sms.util; import jssc.SerialPort; import jssc.SerialPortEventListener; /** * This class is an abstraction of a serial port comprising all the necessary parameters and core functionality needed for the client application. * * @since December 12, 2016 * @author Ted Frohlich <[email protected]> * @author Abby Walker <[email protected]> */ abstract class AbstractSerialPort implements SerialPortEventListener { private SerialPort serialPort; }
/* *\ ** SICU Stress Measurement System ** ** Project P04 | C380 Team A ** ** EBME 380: Biomedical Engineering Design Experience ** ** Case Western Reserve University ** ** 2016 Fall Semester ** \* */ package edu.cwru.sicu_sms.util; import jssc.SerialPort; import jssc.SerialPortEventListener; /** * This class is an abstraction of a serial port comprising all the necessary parameters and core functionality needed for the client application. * * @since December 12, 2016 * @author Ted Frohlich <[email protected]> * @author Abby Walker <[email protected]> */ abstract class AbstractSerialPort extends SerialPort implements SerialPortEventListener { public AbstractSerialPort(String portName) { super(portName); } }
Make readpst partial output ingest.
from ingestors.base import Ingestor from ingestors.support.temp import TempFileSupport from ingestors.support.shell import ShellSupport from ingestors.support.ole import OLESupport from ingestors.directory import DirectoryIngestor class OutlookPSTIngestor(Ingestor, TempFileSupport, ShellSupport, OLESupport): MIME_TYPES = [ 'application/vnd.ms-outlook' ] EXTENSIONS = ['pst', 'ost', 'pab'] BASE_SCORE = 5 COMMAND_TIMEOUT = 12 * 60 * 60 def ingest(self, file_path): self.extract_ole_metadata(file_path) self.result.flag(self.result.FLAG_DIRECTORY) with self.create_temp_dir() as temp_dir: if self.result.mime_type is None: self.result.mime_type = 'application/vnd.ms-outlook' try: self.exec_command('readpst', '-e', # make subfolders, files per message '-D', # include deleted '-r', # recursive structure '-8', # utf-8 where possible '-b', '-q', # quiet '-o', temp_dir, file_path) self.manager.delegate(DirectoryIngestor, self.result, temp_dir) except Exception: # Handle partially extracted archives. self.manager.delegate(DirectoryIngestor, self.result, temp_dir) raise
from ingestors.base import Ingestor from ingestors.support.temp import TempFileSupport from ingestors.support.shell import ShellSupport from ingestors.support.ole import OLESupport from ingestors.directory import DirectoryIngestor class OutlookPSTIngestor(Ingestor, TempFileSupport, ShellSupport, OLESupport): MIME_TYPES = [ 'application/vnd.ms-outlook' ] EXTENSIONS = ['pst', 'ost', 'pab'] BASE_SCORE = 5 COMMAND_TIMEOUT = 12 * 60 * 60 def ingest(self, file_path): self.extract_ole_metadata(file_path) self.result.flag(self.result.FLAG_DIRECTORY) with self.create_temp_dir() as temp_dir: if self.result.mime_type is None: self.result.mime_type = 'application/vnd.ms-outlook' self.exec_command('readpst', '-M', # make subfolders, files per message '-D', # include deleted '-r', # recursive structure '-8', # utf-8 where possible '-b', '-q', # quiet '-o', temp_dir, file_path) self.manager.delegate(DirectoryIngestor, self.result, temp_dir)
Fix unused variable and url selection
/** * Created by Andrew on 12/7/2015. */ function LaughingMan() { this.laughingManImage = "https://i.imgur.com/u6A3oCM.gif"; } LaughingMan.prototype.start = function() { if (!document.getElementsByTagName) return; var imageArray = document.getElementsByTagName("img"); var content = new Array(); var activeImages = 0; for (var i = 0; i < imageArray.length; i++) { content[activeImages] = imageArray[i]; activeImages++; } for (var x = 0, y = imageArray.length; x < y; x++) { if (content[x]) { content[x].style.background = "url(" + content[x].src + ")"; if (!content.push || !document.all) { content[x].height = imageArray[x].height; content[x].width = imageArray[x].width; content[x].src = this.laughingManImage; } else { content[x].style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled='true',src='img/new_png.png')"; content[x].height = imageArray[x].height; content[x].width = imageArray[x].width; content[x].src = this.laughingManImage; } } } }; var laughingman = new LaughingMan();
/** * Created by Andrew on 12/7/2015. */ function LaughingMan() { this.laughingManImage = "https://i.imgur.com/u6A3oCM.gif"; } LaughingMan.prototype.start = function() { if (!document.getElementsByTagName) return; var imageArray = document.getElementsByTagName("img"); var content = new Array(); var zImages; var activeImages = 0; for (var i = 0; i < imageArray.length; i++) { content[activeImages] = imageArray[i]; activeImages++; } for (var x = 0, y = imageArray.length; x < y; x++) { if (content[x]) { content[x].style.background = "url(" + content[x].src + ")"; if (!content.push || !document.all) { content[x].height = imageArray[x].height; content[x].width = imageArray[x].width; content[x].src = "https://i.imgur.com/u6A3oCM.gif"; } else { content[x].style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled='true',src='img/new_png.png')"; content[x].height = imageArray[x].height; content[x].width = imageArray[x].width; content[x].src = this.laughingManImage; } } } }; var laughingman = new LaughingMan();
Test Edge 17 instead of 16
var baseKarma = require('./base-karma') module.exports = function(config) { var baseConfig = baseKarma(config); config.set(Object.assign(baseConfig, { browsers: [ 'bs_firefox_android', 'bs_chrome_mac', 'bs_ie_11', 'bs_edge', ], reporters: [ 'mocha', 'BrowserStack', ], client: { mocha: { reporter: 'html', } }, browserStack: { startTunnel: true }, customLaunchers: { bs_firefox_android: { base: 'BrowserStack', browser: 'Android Browser', real_mobile: true, device: 'Samsung Galaxy S8', os: 'android', os_version: '7.0', }, bs_chrome_mac: { base: 'BrowserStack', browser: 'Chrome', browser_version: '66', os: 'OS X', os_version: 'High Sierra', }, bs_ie_11: { base: 'BrowserStack', browser: 'IE', browser_version: '11', os: 'Windows', os_version: '7', }, bs_edge: { base: 'BrowserStack', browser: 'Edge', browser_version: '17', os: 'Windows', os_version: '10', }, }, })); };
var baseKarma = require('./base-karma') module.exports = function(config) { var baseConfig = baseKarma(config); config.set(Object.assign(baseConfig, { browsers: [ 'bs_firefox_android', 'bs_chrome_mac', 'bs_ie_11', 'bs_edge', ], reporters: [ 'mocha', 'BrowserStack', ], client: { mocha: { reporter: 'html', } }, browserStack: { startTunnel: true }, customLaunchers: { bs_firefox_android: { base: 'BrowserStack', browser: 'Android Browser', real_mobile: true, device: 'Samsung Galaxy S8', os: 'android', os_version: '7.0', }, bs_chrome_mac: { base: 'BrowserStack', browser: 'Chrome', browser_version: '66', os: 'OS X', os_version: 'High Sierra', }, bs_ie_11: { base: 'BrowserStack', browser: 'IE', browser_version: '11', os: 'Windows', os_version: '7', }, bs_edge: { base: 'BrowserStack', browser: 'Edge', browser_version: '16', os: 'Windows', os_version: '10', }, }, })); };
Check for an empty result
(function (env) { "use strict"; env.ddg_spice_thumbtack = function(api_result){ if (!api_result || api_result.error || !api_result.data || !api_result.data.length) { return Spice.failed('thumbtack'); } // Render the response DDG.require('maps', function() { Spice.add({ id: "thumbtack", name: "Professionals", data: api_result.data, model: 'Place', view: 'Places', normalize: function(item) { return { // Street-level Addresses are private to most professionals, // so we instead show a description of the service. address: item.description, image: DDG.toHTTP(item.image) }; }, meta: { sourceName: "Thumbtack", sourceUrl: 'https://thumbtack.com/'+ api_result.landing_page_endpoint, itemType: "Showing " + api_result.data.length + " " + api_result.plural_taxonym }, templates: { group: 'places' } }); }); }; }(this));
(function (env) { "use strict"; env.ddg_spice_thumbtack = function(api_result){ // Don't show anything if we weren't able to return 2 or more services. // In future iterations, we should support a different view in the case // of a single result. if (!api_result || api_result.error) { return Spice.failed('thumbtack'); } // Render the response DDG.require('maps', function() { Spice.add({ id: "thumbtack", name: "Professionals", data: api_result.data, model: 'Place', view: 'Places', normalize: function(item) { return { // Street-level Addresses are private to most professionals, // so we instead show a description of the service. address: item.description, image: DDG.toHTTP(item.image) }; }, meta: { sourceName: "Thumbtack", sourceUrl: 'https://thumbtack.com/'+ api_result.landing_page_endpoint, itemType: "Showing " + api_result.data.length + " " + api_result.plural_taxonym }, templates: { group: 'places' } }); }); }; }(this));
Add laravel 5.2 compat by checking query builder return type
<?php namespace Amelia\Rememberable\Eloquent; use Illuminate\Database\Eloquent\Collection; class Builder extends \Illuminate\Database\Eloquent\Builder { /** * @var \Amelia\Rememberable\Query\Builder */ protected $query; /** * Get the hydrated models without eager loading. * * @param array $columns * @return \Illuminate\Database\Eloquent\Model[] */ public function getModels($columns = ['*']) { $key = $this->query->getCacheKey($columns); $results = $this->query->get($columns); if ($results instanceof Collection) { $results = $results->all(); } $connection = $this->model->getConnectionName(); $models = $this->model->hydrate($results, $connection); $this->tagModels($models, $key); return $models->all(); } /** * Tag this cache key with the ID of every model in the collection. * * @param \Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Eloquent\Model[] $models * @param string $key */ protected function tagModels(Collection $models, $key) { $tags = $this->query->getCacheTags(); $class = get_class($this->model); foreach ($models as $model) { $tags[] = $class.':'.$model->getKey(); } $this->query->setTagsForKey($tags, $key); } }
<?php namespace Amelia\Rememberable\Eloquent; use Illuminate\Database\Eloquent\Collection; class Builder extends \Illuminate\Database\Eloquent\Builder { /** * @var \Amelia\Rememberable\Query\Builder */ protected $query; /** * Get the hydrated models without eager loading. * * @param array $columns * @return \Illuminate\Database\Eloquent\Model[] */ public function getModels($columns = ['*']) { $key = $this->query->getCacheKey($columns); $results = $this->query->get($columns)->all(); $connection = $this->model->getConnectionName(); $models = $this->model->hydrate($results, $connection); $this->tagModels($models, $key); return $models->all(); } /** * Tag this cache key with the ID of every model in the collection. * * @param \Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Eloquent\Model[] $models * @param string $key */ protected function tagModels(Collection $models, $key) { $tags = $this->query->getCacheTags(); $class = get_class($this->model); foreach ($models as $model) { $tags[] = $class.':'.$model->getKey(); } $this->query->setTagsForKey($tags, $key); } }
Stop event bubbling when clicking on document toolbar
$(document).ready(function(){ var i=0; var $td; var state; function checkDocumentsStatuses(){ $.getJSON("/api/documents_states", function(data){ var $bars = $(".bar"); for(i=0;i<$bars.length;i++){ $($bars[i]).css("width", data[i] + "%"); } }); setTimeout(checkDocumentsStatuses, 15000 ); } $(".link a").popover(); $(".link a").click(function(event){ event.preventDefault(); var $this = $(this); $.get($this.attr("href"), null, function(data){ $this.parent().siblings(".content").html(data.p); }, 'json'); }); $("#stillProcessing").alert().css("display", "block"); setTimeout(checkDocumentsStatuses, 15000 ); if($(".tablesorter").length !== 0) { $(".tablesorter").tablesorter(); } $(".documents tbody tr").click(function(e) { $(this).siblings().removeClass("selected"); $(this).addClass("selected"); var url = "/api/" + $(this).data("id") + "/context"; var template = $("#documentContext").html(); $("#document").html("").spin(); $.getJSON(url, null, function(data) { $("#document").html(Mustache.render(template, data)); }).error(function() { $("#document").html(Mustache.render($("#documentContextError").html())); }); }); $(".documents .tools a").click(function(e) { e.stopPropagation(); }); });
$(document).ready(function(){ var i=0; var $td; var state; function checkDocumentsStatuses(){ $.getJSON("/api/documents_states", function(data){ var $bars = $(".bar"); for(i=0;i<$bars.length;i++){ $($bars[i]).css("width", data[i] + "%"); } }); setTimeout(checkDocumentsStatuses, 15000 ); } $(".link a").popover(); $(".link a").click(function(event){ event.preventDefault(); var $this = $(this); $.get($this.attr("href"), null, function(data){ $this.parent().siblings(".content").html(data.p); }, 'json'); }); $("#stillProcessing").alert().css("display", "block"); setTimeout(checkDocumentsStatuses, 15000 ); if($(".tablesorter").length !== 0) { $(".tablesorter").tablesorter(); } $(".documents tbody tr").click(function() { $(this).siblings().removeClass("selected"); $(this).addClass("selected"); var url = "/api/" + $(this).data("id") + "/context"; var template = $("#documentContext").html(); $("#document").html("").spin(); $.getJSON(url, null, function(data) { $("#document").html(Mustache.render(template, data)); }).error(function() { $("#document").html(Mustache.render($("#documentContextError").html())); }); return false; }); });
Call boomcms:publish command if new templates are installed
<?php namespace BoomCMS\Console\Commands; use BoomCMS\Core\Template\Manager as TemplateManager; use Illuminate\Console\Command; use PDOException; class InstallTemplates extends Command { /** * The console command name. * * @var string */ protected $name = 'boomcms:installTemplates'; /** * The console command description. * * @var string */ protected $description = 'Searches the themes directory for new templates and installs them.'; /** * Execute the console command. * * @return mixed */ public function fire(TemplateManager $manager) { try { $installed = $manager->findAndInstallNewTemplates(); if (count($installed)) { foreach ($installed as $i) { list($theme, $template) = $i; $this->info("Installed $template in theme $theme"); } $this->call('boomcms:publish', ['--force']); } else { $this->info('No templates to install'); } } catch (PDOException $e) { $this->info('Unable to install templates: '.$e->getMessage()); } } }
<?php namespace BoomCMS\Console\Commands; use BoomCMS\Core\Template\Manager as TemplateManager; use Illuminate\Console\Command; use PDOException; class InstallTemplates extends Command { /** * The console command name. * * @var string */ protected $name = 'boomcms:installTemplates'; /** * The console command description. * * @var string */ protected $description = 'Searches the themes directory for new templates and installs them.'; /** * Execute the console command. * * @return mixed */ public function fire(TemplateManager $manager) { try { $installed = $manager->findAndInstallNewTemplates(); if (count($installed)) { foreach ($installed as $i) { list($theme, $template) = $i; $this->info("Installed $template in theme $theme"); } $this->call('vendor:publish', ['--force']); } else { $this->info('No templates to install'); } } catch (PDOException $e) { $this->info('Unable to install templates: '.$e->getMessage()); } } }
Fix sku generation not updating list grid properly
(function($, BLCAdmin) { // Add utility functions for products to the BLCAdmin object BLCAdmin.product = { refreshSkusGrid : function($container, listGridUrl) { BLC.ajax({ url : listGridUrl, type : "GET" }, function(data) { BLCAdmin.listGrid.replaceRelatedListGrid($(data)); }); } }; })(jQuery, BLCAdmin); $(document).ready(function() { $('body').on('click', 'button.generate-skus', function() { var $container = $(this).closest('div.listgrid-container'); BLC.ajax({ url : $(this).data('actionurl'), type : "GET" }, function(data) { var alertType = data.error ? 'alert' : ''; BLCAdmin.listGrid.showAlert($container, data.message, { alertType: alertType, clearOtherAlerts: true }); if (data.skusGenerated > 0) { BLCAdmin.product.refreshSkusGrid($container, data.listGridUrl); } }); return false; }); });
(function($, BLCAdmin) { // Add utility functions for products to the BLCAdmin object BLCAdmin.product = { refreshSkusGrid : function($container, listGridUrl) { BLC.ajax({ url : listGridUrl, type : "GET" }, function(data) { BLCAdmin.listGrid.replaceRelatedListGrid($($(data.trim())[0]).find('table')); }); } }; })(jQuery, BLCAdmin); $(document).ready(function() { $('body').on('click', 'button.generate-skus', function() { var $container = $(this).closest('div.listgrid-container'); BLC.ajax({ url : $(this).data('actionurl'), type : "GET" }, function(data) { var alertType = data.error ? 'alert' : ''; BLCAdmin.listGrid.showAlert($container, data.message, { alertType: alertType, clearOtherAlerts: true }); if (data.skusGenerated > 0) { BLCAdmin.product.refreshSkusGrid($container, data.listGridUrl); } }); return false; }); });
Allow javerage to persist as the user if debug is on, otherwise use request.user - allows this to work behind pubcookie/other auth
from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext from django.conf import settings import logging from myuw_api.sws_dao import Quarter from myuw_api.pws_dao import Person as PersonDAO logger = logging.getLogger('myuw_mobile.views') #@mobile_template('{mobile/}index.html') def index(request): context = {'year': None, 'quarter': None, 'regid': None, 'myuw_base_url': '', 'err': None} if settings.DEBUG: netid = 'javerage' else: netid = request.user if netid is None: raise("Must have a logged in user when DEBUG is off") person_dao = PersonDAO() try: person = person_dao.get_person_by_netid(netid) request.session["user_netid"] = person.uwnetid except Exception, message: logger.error(message) context['err'] = 'Failed to get regid' try: cur_term = Quarter().get_cur_quarter() except Exception, message: logger.error(message) context['err'] = 'Failed to get quarter ' else: context['year'] = cur_term.year context['quarter'] = cur_term.quarter return render_to_response('index.html', context, context_instance=RequestContext(request))
from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext import logging from myuw_api.sws_dao import Quarter from myuw_api.pws_dao import Person as PersonDAO logger = logging.getLogger('myuw_mobile.views') #@mobile_template('{mobile/}index.html') def index(request): context = {'year': None, 'quarter': None, 'regid': None, 'myuw_base_url': '', 'err': None} person_dao = PersonDAO() try: person = person_dao.get_person_by_netid("javerage") request.session["user_netid"] = person.uwnetid except Exception, message: logger.error(message) context['err'] = 'Failed to get regid' try: cur_term = Quarter().get_cur_quarter() except Exception, message: logger.error(message) context['err'] = 'Failed to get quarter ' else: context['year'] = cur_term.year context['quarter'] = cur_term.quarter return render_to_response('index.html', context, context_instance=RequestContext(request))
Use source key instead of meta and detail fields
from rest_framework import status from rest_framework.exceptions import APIException def json_api_exception_handler(exc, context): """ Custom exception handler that returns errors object as an array """ # Import inside method to avoid errors when the OSF is loaded without Django from rest_framework.views import exception_handler response = exception_handler(exc, context) # Error objects may have the following members. Title removed to avoid clash with node "title" errors. top_level_error_keys = ['id', 'links', 'status', 'code', 'detail', 'source', 'meta'] errors = [] if response: message = response.data if isinstance(message, dict): for key, value in message.iteritems(): if key in top_level_error_keys: errors.append({key: value}) else: if isinstance(value, list): for reason in value: errors.append({'source': {key: reason}}) else: errors.append({'source': {key: value}}) elif isinstance(message, (list, tuple)): for error in message: errors.append({'detail': error}) else: errors.append({'detail': message}) response.data = {'errors': errors} return response # Custom Exceptions the Django Rest Framework does not support class Gone(APIException): status_code = status.HTTP_410_GONE default_detail = ('The requested resource is no longer available.')
from rest_framework import status from rest_framework.exceptions import APIException def json_api_exception_handler(exc, context): """ Custom exception handler that returns errors object as an array """ # Import inside method to avoid errors when the OSF is loaded without Django from rest_framework.views import exception_handler response = exception_handler(exc, context) # Error objects may have the following members. Title removed to avoid clash with node "title" errors. top_level_error_keys = ['id', 'links', 'status', 'code', 'detail', 'source', 'meta'] errors = [] if response: message = response.data if isinstance(message, dict): for key, value in message.iteritems(): if key in top_level_error_keys: errors.append({key: value}) else: if isinstance(value, list): for reason in value: errors.append({'detail': reason, 'meta': {'field': key}}) else: errors.append({'detail': value, 'meta': {'field': key}}) elif isinstance(message, (list, tuple)): for error in message: errors.append({'detail': error}) else: errors.append({'detail': message}) response.data = {'errors': errors} return response # Custom Exceptions the Django Rest Framework does not support class Gone(APIException): status_code = status.HTTP_410_GONE default_detail = ('The requested resource is no longer available.')
Fix line length > 80 characters
ChannelInfo = BlazeComponent.extendComponent({ onCreated: function () { }, onRendered: function () { var self = this; self.$channelInfo = self.$('.channel-info'); self.$channelFooter = $('.channel-footer'); self.$channelBody = $('.channel-body'); this.autorun(function () { if (App.channelInfo.isVisible.get()) { self.show(); } else { self.hide(); } }); }, show: function () { var self = this; self.$channelInfo.removeClass('channel-info-out'); self.$channelBody.removeClass('channel-body-full'); self.$channelFooter.removeClass('channel-footer-full'); }, hide: function () { var self = this; self.$channelInfo.addClass('channel-info-out'); self.$channelBody.addClass('channel-body-full'); self.$channelFooter.addClass('channel-footer-full'); }, events: function () { return [ { 'click .channel-accordion-section-header': function (event) { event.preventDefault(); $(event.target).parent('.channel-accordion-section') .toggleClass('open'); } } ]; }, creatorUsername : function() { return currentChannel().createdBy ? Meteor.users.findOne(currentChannel().createdBy).username : ''; }, dateCreated: function () { return moment(currentChannel().timestamp).format('MMMM Do YYYY'); } }).register('channelInfo');
ChannelInfo = BlazeComponent.extendComponent({ onCreated: function () { }, onRendered: function () { var self = this; self.$channelInfo = self.$('.channel-info'); self.$channelFooter = $('.channel-footer'); self.$channelBody = $('.channel-body'); this.autorun(function () { if (App.channelInfo.isVisible.get()) { self.show(); } else { self.hide(); } }); }, show: function () { var self = this; self.$channelInfo.removeClass('channel-info-out'); self.$channelBody.removeClass('channel-body-full'); self.$channelFooter.removeClass('channel-footer-full'); }, hide: function () { var self = this; self.$channelInfo.addClass('channel-info-out'); self.$channelBody.addClass('channel-body-full'); self.$channelFooter.addClass('channel-footer-full'); }, events: function () { return [ { 'click .channel-accordion-section-header': function (event) { event.preventDefault(); $(event.target).parent('.channel-accordion-section').toggleClass('open'); } } ]; }, creatorUsername : function() { return currentChannel().createdBy ? Meteor.users.findOne(currentChannel().createdBy).username : ''; }, dateCreated: function () { return moment(currentChannel().timestamp).format('MMMM Do YYYY'); } }).register('channelInfo');
Fix dass bei News Detail Preview Image Admin felder doppelt waren
<?php class Vpc_Abstract_Image_Trl_Form_ImageData extends Vpc_Abstract_Image_Trl_ImageData { public function load($row) { $src = $this->_getImageUrl($row->component_id); if ($src) { return "<img src=\"$src\" />"; } return ''; } } class Vpc_Abstract_Image_Trl_Form extends Vpc_Abstract_Form //nicht von Vpc_Abstract_Composite_Trl_Form, da sonst die felder doppelt eingefügt werden { protected function _initFields() { parent::_initFields(); $imageCaption = Vpc_Abstract::getSetting( Vpc_Abstract::getSetting($this->getClass(), 'masterComponentClass'), 'imageCaption' ); if ($imageCaption) { $this->add(new Vps_Form_Field_TextField('image_caption', trlVps('Image caption'))); } $this->add(new Vps_Form_Field_ShowField('image', trlVps('Master Image'))) ->setData(new Vpc_Abstract_Image_Trl_Form_ImageData()); $fs = $this->add(new Vps_Form_Container_FieldSet(trlVps('Own Image'))); $fs->setCheckboxToggle(true); $fs->setCheckboxName('own_image'); $fs->add(Vpc_Abstract_Form::createChildComponentForm($this->getClass(), '-image', 'image')); } }
<?php class Vpc_Abstract_Image_Trl_Form_ImageData extends Vpc_Abstract_Image_Trl_ImageData { public function load($row) { $src = $this->_getImageUrl($row->component_id); if ($src) { return "<img src=\"$src\" />"; } return ''; } } class Vpc_Abstract_Image_Trl_Form extends Vpc_Abstract_Composite_Trl_Form { protected function _initFields() { parent::_initFields(); $imageCaption = Vpc_Abstract::getSetting( Vpc_Abstract::getSetting($this->getClass(), 'masterComponentClass'), 'imageCaption' ); if ($imageCaption) { $this->add(new Vps_Form_Field_TextField('image_caption', trlVps('Image caption'))); } $this->add(new Vps_Form_Field_ShowField('image', trlVps('Master Image'))) ->setData(new Vpc_Abstract_Image_Trl_Form_ImageData()); $fs = $this->add(new Vps_Form_Container_FieldSet(trlVps('Own Image'))); $fs->setCheckboxToggle(true); $fs->setCheckboxName('own_image'); $fs->add(Vpc_Abstract_Form::createChildComponentForm($this->getClass(), '-image', 'image')); } }
Support assignees when creating a new issue
package org.kohsuke.github; import java.io.IOException; import java.util.ArrayList; import java.util.List; /** * @author Kohsuke Kawaguchi */ public class GHIssueBuilder { private final GHRepository repo; private final Requester builder; private List<String> labels = new ArrayList<String>(); private List<String> assignees = new ArrayList<String>(); GHIssueBuilder(GHRepository repo, String title) { this.repo = repo; this.builder = new Requester(repo.root); builder.with("title",title); } /** * Sets the main text of an issue, which is arbitrary multi-line text. */ public GHIssueBuilder body(String str) { builder.with("body",str); return this; } public GHIssueBuilder assignee(GHUser user) { if (user!=null) assignees.add(user.getLogin()); return this; } public GHIssueBuilder assignee(String user) { if (user!=null) assignees.add(user); return this; } public GHIssueBuilder milestone(GHMilestone milestone) { if (milestone!=null) builder.with("milestone",milestone.getNumber()); return this; } public GHIssueBuilder label(String label) { if (label!=null) labels.add(label); return this; } /** * Creates a new issue. */ public GHIssue create() throws IOException { return builder.with("labels",labels).with("assignees",assignees).to(repo.getApiTailUrl("issues"),GHIssue.class).wrap(repo); } }
package org.kohsuke.github; import java.io.IOException; import java.util.ArrayList; import java.util.List; /** * @author Kohsuke Kawaguchi */ public class GHIssueBuilder { private final GHRepository repo; private final Requester builder; private List<String> labels = new ArrayList<String>(); GHIssueBuilder(GHRepository repo, String title) { this.repo = repo; this.builder = new Requester(repo.root); builder.with("title",title); } /** * Sets the main text of an issue, which is arbitrary multi-line text. */ public GHIssueBuilder body(String str) { builder.with("body",str); return this; } public GHIssueBuilder assignee(GHUser user) { if (user!=null) builder.with("assignee",user.getLogin()); return this; } public GHIssueBuilder assignee(String user) { if (user!=null) builder.with("assignee",user); return this; } public GHIssueBuilder milestone(GHMilestone milestone) { if (milestone!=null) builder.with("milestone",milestone.getNumber()); return this; } public GHIssueBuilder label(String label) { if (label!=null) labels.add(label); return this; } /** * Creates a new issue. */ public GHIssue create() throws IOException { return builder.with("labels",labels).to(repo.getApiTailUrl("issues"),GHIssue.class).wrap(repo); } }
Change Shortcut for Deploy as Ctrl+Shift+P
/** * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * * WSO2 Inc. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except * in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ define(([], function () { var DeployMenu = { id: "deploy", label: "Deploy", items: [ { id: "deploy-to-server", label: "Deploy To Server", command: { id: "deploy-to-server", shortcuts: { mac: { key: "command+shift+p", label: "\u2318\u21E7P" }, other: { key: "ctrl+shift+p", label: "Ctrl+Shift+P" } } }, disabled: false } ] }; return DeployMenu; }));
/** * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * * WSO2 Inc. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except * in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ define(([], function () { var DeployMenu = { id: "deploy", label: "Deploy", items: [ { id: "deploy-to-server", label: "Deploy To Server", command: { id: "deploy-to-server", shortcuts: { mac: { key: "command+shift+d", label: "\u2318\u21E7D" }, other: { key: "ctrl+shift+d", label: "Ctrl+Shift+D" } } }, disabled: false } ] }; return DeployMenu; }));
Include an event with the response log message This is now required by structlog
"""Logging helpers and utilities.""" import uuid from functools import wraps from timeit import default_timer as timer from typing import Any, Callable, TypeVar import structlog from flask import make_response, request __all__ = ["log_route"] F = TypeVar("F", bound=Callable[..., Any]) def log_route() -> Callable[[F], F]: """Route decorator to initialize a thread-local logger for a route.""" def decorator(f): # type: ignore @wraps(f) def decorated_function(*args, **kwargs): # type: ignore # Initialize a timer to capture the response time # This is for convenience, in addition to route monitoring. start_time = timer() # Initialize a new thread-local logger and add a unique request # ID to its context. # http://www.structlog.org/en/stable/examples.html logger = structlog.get_logger() log = logger.new( request_id=str(uuid.uuid4()), path=request.path, method=request.method, ) # Pass through route response = f(*args, **kwargs) response = make_response(response) # Close out the logger end_time = timer() log.info( "Closing endpoint handler", status=response.status_code, response_time=end_time - start_time, ) return response return decorated_function return decorator
"""Logging helpers and utilities.""" import uuid from functools import wraps from timeit import default_timer as timer from typing import Any, Callable, TypeVar import structlog from flask import make_response, request __all__ = ["log_route"] F = TypeVar("F", bound=Callable[..., Any]) def log_route() -> Callable[[F], F]: """Route decorator to initialize a thread-local logger for a route.""" def decorator(f): # type: ignore @wraps(f) def decorated_function(*args, **kwargs): # type: ignore # Initialize a timer to capture the response time # This is for convenience, in addition to route monitoring. start_time = timer() # Initialize a new thread-local logger and add a unique request # ID to its context. # http://www.structlog.org/en/stable/examples.html logger = structlog.get_logger() log = logger.new( request_id=str(uuid.uuid4()), path=request.path, method=request.method, ) # Pass through route response = f(*args, **kwargs) response = make_response(response) # Close out the logger end_time = timer() log.info( status=response.status_code, response_time=end_time - start_time, ) return response return decorated_function return decorator
Change package to geobuf, matching the module name.
from codecs import open as codecs_open import distutils.log import os.path import shutil from setuptools import setup, find_packages import subprocess # Try to convert README markdown to restructured text using pandoc. try: subprocess.call( 'pandoc --from=markdown --to=rst --output=README README.md', shell=True) assert os.path.exists('README') except: distutils.log.warn( "Conversion of README.md to restructured text was not successful.") shutil.copy('README.md', 'README') # Get the long description from the relevant file with codecs_open('README', encoding='utf-8') as f: long_description = f.read() setup(name='geobuf', version='1.0.0', description=( u"Geobuf is a compact binary geospatial format for lossless " u"compression of GeoJSON and TopoJSON data."), long_description=long_description, classifiers=[], keywords='data gis geojson topojson protobuf', author=u"Vladimir Agafonkin", author_email='[email protected]', url='https://github.com/mapbox/pygeobuf', license='MIT', packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), include_package_data=True, zip_safe=False, install_requires=[ 'click', 'protobuf', ], extras_require={ 'test': ['pytest'], }, entry_points=""" [console_scripts] geobuf=geobuf.scripts.cli:cli """)
from codecs import open as codecs_open import distutils.log import os.path import shutil from setuptools import setup, find_packages import subprocess # Try to convert README markdown to restructured text using pandoc. try: subprocess.call( 'pandoc --from=markdown --to=rst --output=README README.md', shell=True) assert os.path.exists('README') except: distutils.log.warn( "Conversion of README.md to restructured text was not successful.") shutil.copy('README.md', 'README') # Get the long description from the relevant file with codecs_open('README', encoding='utf-8') as f: long_description = f.read() setup(name='pygeobuf', version='1.0.0', description=( u"Geobuf is a compact binary geospatial format for lossless " u"compression of GeoJSON and TopoJSON data."), long_description=long_description, classifiers=[], keywords='data gis geojson topojson protobuf', author=u"Vladimir Agafonkin", author_email='[email protected]', url='https://github.com/mapbox/pygeobuf', license='MIT', packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), include_package_data=True, zip_safe=False, install_requires=[ 'click', 'protobuf', ], extras_require={ 'test': ['pytest'], }, entry_points=""" [console_scripts] geobuf=geobuf.scripts.cli:cli """)
Increase to version 0.3.11 due to TG-dev requiring it for ming support
from setuptools import setup, find_packages import os version = '0.3.11' here = os.path.abspath(os.path.dirname(__file__)) try: README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'docs/HISTORY.txt')).read() except IOError: README = CHANGES = '' setup(name='tgext.admin', version=version, description="Admin Controller add-on for basic TG identity model.", long_description=README + "\n" + CHANGES, # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers classifiers=[ "Programming Language :: Python", "Topic :: Software Development :: Libraries :: Python Modules", ], keywords='TG2, TG, sprox, Rest, internet, adminn', author='Christopher Perkins', author_email='[email protected]', url='tgtools.googlecode.com', license='MIT', packages=find_packages(exclude=['ez_setup']), namespace_packages=['tgext'], include_package_data=True, zip_safe=True, install_requires=[ 'setuptools', 'sprox>=0.6.4', 'tgext.crud>=0.3.7', # -*- Extra requirements: -*- ], entry_points=""" # -*- Entry points: -*- """, )
from setuptools import setup, find_packages import os version = '0.3.10' here = os.path.abspath(os.path.dirname(__file__)) try: README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'docs/HISTORY.txt')).read() except IOError: README = CHANGES = '' setup(name='tgext.admin', version=version, description="Admin Controller add-on for basic TG identity model.", long_description=README + "\n" + CHANGES, # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers classifiers=[ "Programming Language :: Python", "Topic :: Software Development :: Libraries :: Python Modules", ], keywords='TG2, TG, sprox, Rest, internet, adminn', author='Christopher Perkins', author_email='[email protected]', url='tgtools.googlecode.com', license='MIT', packages=find_packages(exclude=['ez_setup']), namespace_packages=['tgext'], include_package_data=True, zip_safe=True, install_requires=[ 'setuptools', 'sprox>=0.6.4', 'tgext.crud>=0.3.7', # -*- Extra requirements: -*- ], entry_points=""" # -*- Entry points: -*- """, )
Store ContentItem refs in PageViews by basename
<?php /** * @copyright 2017 Vladimir Jimenez * @license https://github.com/allejo/stakx/blob/master/LICENSE.md MIT */ namespace allejo\stakx\Object; class DynamicPageView extends PageView { /** * The Content Items that belong to this Page View. This array will only have elements if it is a dynamic Page View. * * @var ContentItem[] */ private $contentItems; /** * {@inheritdoc} */ public function __construct($filePath) { parent::__construct($filePath); $this->contentItems = array(); $this->type = PageView::DYNAMIC_TYPE; } /** * Add a ContentItem to this Dynamic PageView * * @param ContentItem $contentItem */ public function addContentItem (&$contentItem) { $filename = $this->fs->getBaseName($contentItem->getFilePath()); $this->contentItems[$filename] = &$contentItem; $contentItem->setPageView($this); } /** * Get all of the ContentItems that belong to this Dynamic PageView * * @return ContentItem[] */ public function getContentItems () { return $this->contentItems; } /** * Get the collection name this dynamic PageView is charged with * * @return string */ public function getCollection () { return $this->getFrontMatter(false)['collection']; } }
<?php /** * @copyright 2017 Vladimir Jimenez * @license https://github.com/allejo/stakx/blob/master/LICENSE.md MIT */ namespace allejo\stakx\Object; class DynamicPageView extends PageView { /** * The Content Items that belong to this Page View. This array will only have elements if it is a dynamic Page View. * * @var ContentItem[] */ private $contentItems; /** * {@inheritdoc} */ public function __construct($filePath) { parent::__construct($filePath); $this->contentItems = array(); $this->type = PageView::DYNAMIC_TYPE; } /** * Add a ContentItem to this Dynamic PageView * * @param ContentItem $contentItem */ public function addContentItem (&$contentItem) { $filePath = $this->fs->getRelativePath($contentItem->getFilePath()); $this->contentItems[$filePath] = &$contentItem; $contentItem->setPageView($this); } /** * Get all of the ContentItems that belong to this Dynamic PageView * * @return ContentItem[] */ public function getContentItems () { return $this->contentItems; } /** * Get the collection name this dynamic PageView is charged with * * @return string */ public function getCollection () { return $this->getFrontMatter(false)['collection']; } }
Mark the unused Servlet Container callback methods as final to ensure subclasses do not rely upon them.
package org.springframework.security.ui; import org.springframework.core.Ordered; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletException; import javax.servlet.FilterChain; import javax.servlet.ServletResponse; import javax.servlet.FilterConfig; import javax.servlet.ServletRequest; import javax.servlet.Filter; import java.io.IOException; /** * Implements Ordered interface as required by security namespace configuration and implements unused filter * lifecycle methods and performs casting of request and response to http versions in doFilter method. * * @author Luke Taylor * @version $Id$ */ public abstract class SpringSecurityFilter implements Filter, Ordered { /** * Does nothing. We use IoC container lifecycle services instead. * * @param filterConfig ignored * @throws ServletException ignored */ public final void init(FilterConfig filterConfig) throws ServletException { } /** * Does nothing. We use IoC container lifecycle services instead. */ public final void destroy() { } public final void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { // Do we really need the checks on the types in practice ? if (!(request instanceof HttpServletRequest)) { throw new ServletException("Can only process HttpServletRequest"); } if (!(response instanceof HttpServletResponse)) { throw new ServletException("Can only process HttpServletResponse"); } doFilterHttp((HttpServletRequest)request, (HttpServletResponse)response, chain); } protected abstract void doFilterHttp(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException; }
package org.springframework.security.ui; import org.springframework.core.Ordered; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletException; import javax.servlet.FilterChain; import javax.servlet.ServletResponse; import javax.servlet.FilterConfig; import javax.servlet.ServletRequest; import javax.servlet.Filter; import java.io.IOException; /** * Implements Ordered interface as required by security namespace configuration and implements unused filter * lifecycle methods and performs casting of request and response to http versions in doFilter method. * * @author Luke Taylor * @version $Id$ */ public abstract class SpringSecurityFilter implements Filter, Ordered { /** * Does nothing. We use IoC container lifecycle services instead. * * @param filterConfig ignored * @throws ServletException ignored */ public void init(FilterConfig filterConfig) throws ServletException { } /** * Does nothing. We use IoC container lifecycle services instead. */ public void destroy() { } public final void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { // Do we really need the checks on the types in practice ? if (!(request instanceof HttpServletRequest)) { throw new ServletException("Can only process HttpServletRequest"); } if (!(response instanceof HttpServletResponse)) { throw new ServletException("Can only process HttpServletResponse"); } doFilterHttp((HttpServletRequest)request, (HttpServletResponse)response, chain); } protected abstract void doFilterHttp(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException; }
Update pid sequence so it will work even if sequence already exists
# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations, models from pidman.pid.noid import decode_noid from pidman.pid import models as pid_models def pid_sequence_lastvalue(apps, schema_editor): # if the database has existing pids, update the sequence last value # so it will start minting pids starting after the current set Pid = apps.get_model("pid", "Pid") Sequence = apps.get_model("sequences", "Sequence") if Pid.objects.count(): print Pid.objects.count() max_noid = Pid.objects.all() \ .aggregate(models.Max('pid')).values()[0] last_val = decode_noid(max_noid) pid_seq, created = Sequence.objects.get_or_create(name=pid_models.Pid.SEQUENCE_NAME) pid_seq.last = last_val pid_seq.save() def remove_pid_sequence(apps, schema_editor): Sequence = apps.get_model("sequences", "Sequence") Sequence.objects.get(name=pid_models.Pid.SEQUENCE_NAME).delete() class Migration(migrations.Migration): dependencies = [ ('pid', '0001_initial'), ('sequences', '0001_initial'), ] operations = [ migrations.RunPython(pid_sequence_lastvalue, remove_pid_sequence), ]
# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations, models from pidman.pid.noid import decode_noid from pidman.pid import models as pid_models def pid_sequence_lastvalue(apps, schema_editor): # if the database has existing pids, update the sequence last value # so it will start minting pids starting after the current set Pid = apps.get_model("pid", "Pid") Sequence = apps.get_model("sequences", "Sequence") if Pid.objects.count(): print Pid.objects.count() max_noid = Pid.objects.all() \ .aggregate(models.Max('pid')).values()[0] last_val = decode_noid(max_noid) pid_seq, created = Sequence.objects.get_or_create(name=pid_models.Pid.SEQUENCE_NAME, last=last_val) print "got HERE 2" pid_seq.save() def remove_pid_sequence(apps, schema_editor): Sequence = apps.get_model("sequences", "Sequence") Sequence.objects.get(name=pid_models.Pid.SEQUENCE_NAME).delete() class Migration(migrations.Migration): dependencies = [ ('pid', '0001_initial'), ('sequences', '0001_initial'), ] operations = [ migrations.RunPython(pid_sequence_lastvalue, remove_pid_sequence), ]
Put SPI slave configurations on Host.
""" Created on 18 May 2017 @author: Bruno Beloff ([email protected]) """ import sys from scs_dfe.particulate.opc_n2 import OPCN2 from scs_host.bus.i2c import I2C from scs_host.sys.host import Host from scs_mfr.test.test import Test # -------------------------------------------------------------------------------------------------------------------- class OPCTest(Test): """ test script """ # ---------------------------------------------------------------------------------------------------------------- def __init__(self, verbose): Test.__init__(self, verbose) # ---------------------------------------------------------------------------------------------------------------- def conduct(self): if self.verbose: print("OPC...", file=sys.stderr) opc = None try: I2C.open(Host.I2C_SENSORS) # resources... opc = OPCN2(Host.opc_spi_bus(), Host.opc_spi_device()) opc.power_on() opc.operations_on() # test... self.datum = opc.firmware() if self.verbose: print(self.datum, file=sys.stderr) # test criterion... return len(self.datum) > 0 and self.datum.startswith('OPC') finally: if opc: opc.operations_off() opc.power_off() I2C.close()
""" Created on 18 May 2017 @author: Bruno Beloff ([email protected]) """ import sys from scs_dfe.particulate.opc_n2 import OPCN2 from scs_host.bus.i2c import I2C from scs_host.sys.host import Host from scs_mfr.test.test import Test # -------------------------------------------------------------------------------------------------------------------- class OPCTest(Test): """ test script """ # ---------------------------------------------------------------------------------------------------------------- def __init__(self, verbose): Test.__init__(self, verbose) # ---------------------------------------------------------------------------------------------------------------- def conduct(self): if self.verbose: print("OPC...", file=sys.stderr) opc = None try: I2C.open(Host.I2C_SENSORS) # resources... opc = OPCN2(Host.OPC_SPI_BUS, Host.OPC_SPI_DEVICE) opc.power_on() opc.operations_on() # test... self.datum = opc.firmware() if self.verbose: print(self.datum, file=sys.stderr) # test criterion... return len(self.datum) > 0 and self.datum.startswith('OPC') finally: if opc: opc.operations_off() opc.power_off() I2C.close()
Add ability to set state of subheader
import { getColor } from './helpers'; import { StyleSheet, View, Text } from 'react-native'; import { TYPO, THEME_NAME } from './config'; import React, { Component, PropTypes } from 'react'; const styles = StyleSheet.create({ container: { padding: 16 }, text: TYPO.paperFontBody1 }); export default class Subheader extends Component { static propTypes = { text: PropTypes.string.isRequired, color: PropTypes.string, inset: PropTypes.bool, theme: PropTypes.oneOf(THEME_NAME), lines: PropTypes.number, style: PropTypes.object, }; static defaultProps = { color: 'rgba(0,0,0,.54)', inset: false, theme: 'light', lines: 1 }; render() { const { text, color, inset, lines, style } = this.props; return ( <View style={[styles.container, { paddingLeft: inset ? 72 : 16 }, style]} > <Text numberOfLines={lines} style={[styles.text, { color: getColor(color), fontWeight: '500' }]} > {text} </Text> </View> ); } }
import { getColor } from './helpers'; import { StyleSheet, View, Text } from 'react-native'; import { TYPO, THEME_NAME } from './config'; import React, { Component, PropTypes } from 'react'; const styles = StyleSheet.create({ container: { padding: 16 }, text: TYPO.paperFontBody1 }); export default class Subheader extends Component { static propTypes = { text: PropTypes.string.isRequired, color: PropTypes.string, inset: PropTypes.bool, theme: PropTypes.oneOf(THEME_NAME), lines: PropTypes.number }; static defaultProps = { color: 'rgba(0,0,0,.54)', inset: false, theme: 'light', lines: 1 }; render() { const { text, color, inset, lines } = this.props; return ( <View style={[styles.container, { paddingLeft: inset ? 72 : 16 }]} > <Text numberOfLines={lines} style={[styles.text, { color: getColor(color), fontWeight: '500' }]} > {text} </Text> </View> ); } }
Add comments & revise space complexity
"""Leetcode 118. Pascal's Triangle Easy URL: https://leetcode.com/problems/pascals-triangle/ Given a non-negative integer numRows, generate the first numRows of Pascal's triangle. In Pascal's triangle, each number is the sum of the two numbers directly above it. Example: Input: 5 Output: [ [1], [1,1], [1,2,1], [1,3,3,1], [1,4,6,4,1] ] """ class Solution(object): def generate(self, numRows): """ :type numRows: int :rtype: List[List[int]] Time complexity: O(n^2). Space complexity: O(n). """ if numRows == 0: return [] # Create base of Pascal triangle. triangle = [[1] * (r + 1) for r in range(numRows)] if numRows <= 2: return triangle for r in range(2, numRows): last_row = triangle[r - 1] current_row = triangle[r] # In middle of current row, sum last row's two numbers. for i in range(1, r): current_row[i] = last_row[i - 1] + last_row[i] return triangle def main(): numRows = 5 print('Pascal\'s triangle:\n{}'.format( Solution().generate(numRows))) if __name__ == '__main__': main()
"""Leetcode 118. Pascal's Triangle Easy URL: https://leetcode.com/problems/pascals-triangle/ Given a non-negative integer numRows, generate the first numRows of Pascal's triangle. In Pascal's triangle, each number is the sum of the two numbers directly above it. Example: Input: 5 Output: [ [1], [1,1], [1,2,1], [1,3,3,1], [1,4,6,4,1] ] """ class Solution(object): def generate(self, numRows): """ :type numRows: int :rtype: List[List[int]] Time complexity: O(n^2). Space complexity: O(n^2). """ if numRows == 0: return [] triangle = [[1] * (r + 1) for r in range(numRows)] if numRows <= 2: return triangle for r in range(2, numRows): last_row = triangle[r - 1] current_row = triangle[r] for i in range(1, r): current_row[i] = last_row[i - 1] + last_row[i] return triangle def main(): numRows = 5 print('Pascal\'s triangle:\n{}'.format( Solution().generate(numRows))) if __name__ == '__main__': main()
Update generics to match changes in jdbi3 branch
/* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jdbi.v3.jpa; import org.jdbi.v3.sqlobject.Binder; import org.jdbi.v3.sqlobject.BinderFactory; import java.lang.annotation.Annotation; public class BindAnnoFactory implements BinderFactory<BindAnno, Object> { @Override public Binder<BindAnno, Object> build(BindAnno annotation) { return (q, parameter, bind, arg) -> { final String prefix; if ("___jdbi_bare___".equals(bind.value())) { prefix = ""; } else { prefix = bind.value() + "."; } try { AnnoClass<?> annos = AnnoClass.get(arg.getClass()); for (AnnoMember anno : annos.getters()) { q.bind(prefix + anno.getName(), anno.read(arg)); } } catch (Exception e) { throw new IllegalStateException( "unable to bind bean properties", e); } }; } }
/* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jdbi.v3.jpa; import org.jdbi.v3.sqlobject.Binder; import org.jdbi.v3.sqlobject.BinderFactory; import java.lang.annotation.Annotation; public class BindAnnoFactory implements BinderFactory { @Override public Binder<BindAnno, Object> build(Annotation annotation) { return (q, parameter, bind, arg) -> { final String prefix; if ("___jdbi_bare___".equals(bind.value())) { prefix = ""; } else { prefix = bind.value() + "."; } try { AnnoClass<?> annos = AnnoClass.get(arg.getClass()); for (AnnoMember anno : annos.getters()) { q.bind(prefix + anno.getName(), anno.read(arg)); } } catch (Exception e) { throw new IllegalStateException( "unable to bind bean properties", e); } }; } }
Fix typo in Mongoose backend
module.exports = function(Model, options) { options || (options = {}) options.idAttribute || (options.idAttribute = '_id') var idQuery = function(model) { var query = {}; query[options.idAttribute] = model[options.idAttribute]; return query; }; this.create = function(model, callback) { Model.create(model, function(err, doc) { if (err) { callback(err); } else { callback(null, doc); } }); }; this.read = function(model, callback) { if (model[options.idAttribute]) { Model.findById(model[options.idAttribute], callback); } else { Model.find(callback); } }; this.update = function(model, callback) { var query = idQuery(model); var id = model[options.idAttribute]; delete model[options.idAttribute]; Model.update(query, { '$set': model }, function(err) { if (err) { callback(err); } else { model[options.idAttribute] = id; callback(null, model); } }); }; this.delete = function(model, callback) { Model.findById(model[options.idAttribute], function(err, doc) { if (err) { callback(err); } else { doc.remove(); callback(null, doc); } }); }; };
module.exports = function(Model, options) { options || (options = {}) options.idAttribute || (options.idAttribute = '_id') var idQuery = function(model) { var query = {}; query[options.idAttribute] = model[options.idAttribute]; }; this.create = function(model, callback) { Model.create(model, function(err, doc) { if (err) { callback(err); } else { callback(null, doc); } }); }; this.read = function(model, callback) { if (model[options.idAttribute]) { Model.findById(model[options.idAttribute], callback); } else { Model.find(callback); } }; this.update = function(model, callback) { var query = idQuery(model); var id = model[options.idAttribute]; delete model[options.idAttribute]; Model.update(query, { '$set': model }, function(err) { if (err) { callback(err); } else { model[options.idAttribute] = id; callback(null, model); } }); }; this.delete = function(model, callback) { Model.findById(model[options.idAttribute], function(err, doc) { if (err) { callback(err); } else { doc.remove(); callback(null, doc); } }); }; };
Fix issues due to module rename
#!/usr/bin/env python # Copyright 2016 University of Chicago # Licensed under the APL 2.0 license import logging import logging.handlers import os LOG_FILENAME = '~/logs/fsurf.log' MAX_BYTES = 1024*1024*50 # 50 MB NUM_BACKUPS = 10 # 10 files def initialize_logging(): """ Initialize logging for fsurf :return: None """ logger = logging.getLogger('fsurf') log_file = os.path.abspath(os.path.expanduser(LOG_FILENAME)) handle = logging.handlers.RotatingFileHandler(log_file, mode='a', maxBytes=MAX_BYTES, backupCount=NUM_BACKUPS) handle.setLevel(logging.WARN) logger.addHandler(handle) def set_debugging(): """ Configure logging to output debug messages :return: None """ logger = logging.getLogger('fsurf') log_file = os.path.abspath(os.path.expanduser('~/logs/fsurf_debug.log')) handle = logging.FileHandler(log_file) handle.setLevel(logging.DEBUG) logger.addHandler(handle) def get_logger(): """ Get logger that can be used for logging :return: logger object """ return logging.getLogger('fsurf')
#!/usr/bin/env python # Copyright 2016 University of Chicago # Licensed under the APL 2.0 license import log import log.handlers import os LOG_FILENAME = '~/logs/fsurf.log' MAX_BYTES = 1024*1024*50 # 50 MB NUM_BACKUPS = 10 # 10 files def initialize_logging(): """ Initialize logging for fsurf :return: None """ logger = log.getLogger('fsurf') log_file = os.path.abspath(os.path.expanduser(LOG_FILENAME)) handle = log.handlers.RotatingFileHandler(log_file, mode='a', maxBytes=MAX_BYTES, backupCount=NUM_BACKUPS) handle.setLevel(log.WARN) logger.addHandler(handle) def set_debugging(): """ Configure logging to output debug messages :return: None """ logger = log.getLogger('fsurf') log_file = os.path.abspath(os.path.expanduser('~/logs/fsurf_debug.log')) handle = log.FileHandler(log_file) handle.setLevel(log.DEBUG) logger.addHandler(handle) def get_logger(): """ Get logger that can be used for logging :return: logger object """ return log.getLogger('fsurf')
Use postcss-sass-extend instead of postcss-extend.
import path from 'path'; import mixins from 'postcss-mixins'; import nested from 'postcss-nested'; import extend from 'postcss-sass-extend'; import repeat from 'postcss-for'; import simpleVars from 'postcss-simple-vars' import cssMqpacker from 'css-mqpacker'; import gulp from 'gulp'; import gulpLoadPlugins from 'gulp-load-plugins'; var pkg = require('./package.json'); var $ = gulpLoadPlugins(); const CSS_SRC_DIR = './css/'; const DIST_DIR = './dist/'; const CSS_DIST_DIR = path.join(DIST_DIR, 'css/'); const JS_DIST_DIR = path.join(DIST_DIR, 'js/'); gulp.task('css', () => { return gulp.src(CSS_SRC_DIR + '**/' + pkg.name + '.css') .pipe($.cssnext({ compress: process.env.NODE_ENV === 'production', plugins: [ mixins, extend, nested, repeat, simpleVars, cssMqpacker, ] })) .pipe(gulp.dest(CSS_DIST_DIR)) .pipe($.livereload()); }); gulp.task('watch', () => { $.livereload.listen(); return gulp.watch(CSS_SRC_DIR + '**/*.css', ['css']); }); gulp.task('build', ['css']); gulp.task('default', ['build']);
import path from 'path'; import mixins from 'postcss-mixins'; import nested from 'postcss-nested'; import extend from 'postcss-extend'; import repeat from 'postcss-for'; import simpleVars from 'postcss-simple-vars'; import each from 'postcss-each'; import cssMqpacker from 'css-mqpacker'; import gulp from 'gulp'; import gulpLoadPlugins from 'gulp-load-plugins'; var pkg = require('./package.json'); var $ = gulpLoadPlugins(); const CSS_SRC_DIR = './css/'; const DIST_DIR = './dist/'; const CSS_DIST_DIR = path.join(DIST_DIR, 'css/'); const JS_DIST_DIR = path.join(DIST_DIR, 'js/'); gulp.task('css', () => { return gulp.src(CSS_SRC_DIR + '**/' + pkg.name + '.css') .pipe($.cssnext({ compress: process.env.NODE_ENV === 'production', plugins: [ mixins, nested, extend, each, repeat, simpleVars, cssMqpacker, ] })) .pipe(gulp.dest(CSS_DIST_DIR)) .pipe($.livereload()); }); gulp.task('watch', () => { $.livereload.listen(); return gulp.watch(CSS_SRC_DIR + '**/*.css', ['css']); }); gulp.task('build', ['css']); gulp.task('default', ['build']);
ASN-8: Add TODO note to unfinished validator method
/* * Created by brightSPARK Labs * www.brightsparklabs.com */ package com.brightsparklabs.asanti.validator; import com.brightsparklabs.asanti.model.data.DecodedAsnData; import com.brightsparklabs.asanti.model.schema.typedefinition.AsnSchemaTypeDefinition; import com.brightsparklabs.asanti.validator.rule.ValidationRule; import com.google.common.collect.ImmutableSet; /** * Default implementation of {@link Validator}. * * @author brightSPARK Labs */ public class ValidatorImpl implements Validator { // ------------------------------------------------------------------------- // INSTANCE VARIABLES // ------------------------------------------------------------------------- /** visitor to determine which {@link ValidationRule} to apply to a tag */ private final ValidationVisitor validationVisitor = new ValidationVisitor(); // ------------------------------------------------------------------------- // IMPLEMENTATION: Validator // ------------------------------------------------------------------------- @Override public ValidationResult validate(DecodedAsnData decodedAsnData) { final ValidationResultImpl.Builder builder = ValidationResultImpl.builder(); for (final String tag : decodedAsnData.getTags()) { final AsnSchemaTypeDefinition type = decodedAsnData.getType(tag); final ValidationRule rule = (ValidationRule) type.visit(validationVisitor); final ImmutableSet<ValidationFailure> failures = rule.validate(tag, decodedAsnData); builder.addAll(failures); } // TODO: ASN-92 process unmapped tags decodedAsnData.getUnmappedTags(); return builder.build(); } }
/* * Created by brightSPARK Labs * www.brightsparklabs.com */ package com.brightsparklabs.asanti.validator; import com.brightsparklabs.asanti.model.data.DecodedAsnData; import com.brightsparklabs.asanti.model.schema.typedefinition.AsnSchemaTypeDefinition; import com.brightsparklabs.asanti.validator.rule.ValidationRule; import com.google.common.collect.ImmutableSet; /** * Default implementation of {@link Validator}. * * @author brightSPARK Labs */ public class ValidatorImpl implements Validator { // ------------------------------------------------------------------------- // INSTANCE VARIABLES // ------------------------------------------------------------------------- /** visitor to determine which {@link ValidationRule} to apply to a tag */ private final ValidationVisitor validationVisitor = new ValidationVisitor(); // ------------------------------------------------------------------------- // IMPLEMENTATION: Validator // ------------------------------------------------------------------------- @Override public ValidationResult validate(DecodedAsnData decodedAsnData) { final ValidationResultImpl.Builder builder = ValidationResultImpl.builder(); for (final String tag : decodedAsnData.getTags()) { final AsnSchemaTypeDefinition type = decodedAsnData.getType(tag); final ValidationRule rule = (ValidationRule) type.visit(validationVisitor); final ImmutableSet<ValidationFailure> failures = rule.validate(tag, decodedAsnData); builder.addAll(failures); } // process unmapped tags decodedAsnData.getUnmappedTags(); return builder.build(); } }
:new: Add env variable to debug resolutions
// @flow import path from 'path' import flatten from 'lodash/flatten' import browserResolve from 'browser-resolve' import { createFileResolver } from 'pundle-api' import manifest from '../package.json' function createComponent({ formats, aliases = {} }: { formats: { [string]: string }, aliases: { [string]: string } }) { // TODO: validation of config? return createFileResolver({ name: 'pundle-file-resolver', version: manifest.version, async callback({ request, requestFile, context }) { let packageRoot = null const response = await new Promise(function(resolve, reject) { browserResolve( request, { modules: aliases, basedir: requestFile ? path.dirname(requestFile) : context.config.rootDirectory, extensions: flatten(Object.values(formats)), packageFilter(pkg, pkgroot) { packageRoot = path.dirname(pkgroot) return pkg }, }, function(err, res) { if (err) reject(err) else resolve(res) }, ) }) if (!response) return null if (process.env.PUNDLE_DEBUG_RESOLVER === '1') { console.log('From', requestFile, 'processed', request, 'to', response) } const ext = path.extname(response) const format = Object.keys(formats).find(entry => formats[entry].includes(ext)) if (!format) { console.error(`File was resolved as '${response}' but extension '${ext}' is not recognized`) return null } return { format, filePath: response, packageRoot, } }, }) } module.exports = createComponent
// @flow import path from 'path' import flatten from 'lodash/flatten' import browserResolve from 'browser-resolve' import { createFileResolver } from 'pundle-api' import manifest from '../package.json' function createComponent({ formats, aliases = {} }: { formats: { [string]: string }, aliases: { [string]: string } }) { // TODO: validation of config? return createFileResolver({ name: 'pundle-file-resolver', version: manifest.version, async callback({ request, requestFile, context }) { let packageRoot = null const response = await new Promise(function(resolve, reject) { browserResolve( request, { modules: aliases, basedir: requestFile ? path.dirname(requestFile) : context.config.rootDirectory, extensions: flatten(Object.values(formats)), packageFilter(pkg, pkgroot) { packageRoot = path.dirname(pkgroot) return pkg }, }, function(err, res) { if (err) reject(err) else resolve(res) }, ) }) if (!response) return null const ext = path.extname(response) const format = Object.keys(formats).find(entry => formats[entry].includes(ext)) if (!format) { console.error(`File was resolved as '${response}' but extension '${ext}' is not recognized`) return null } return { format, filePath: response, packageRoot, } }, }) } module.exports = createComponent
New: Use regex to remove non alphanumerics from post titles
from lxml import html import re import requests from constants import SEP_URL class SEPSearchResult(): query = None results = None def __init__(self, query): self.set_query(query) def set_query(self, query): pattern = re.compile('[^a-zA-Z\d\s]') stripped_query = re.sub(pattern, '', query) self.query = str(stripped_query).lower().split() @property def url(self): url = SEP_URL + "search/searcher.py?query=" for word in self.query: url += word + "+" return url def request_results(self): page = requests.get(self.url) # Remvoe bold tags text_no_bold = re.sub('</? ?b>', '', page.text) text_no_newlines = re.sub('\n', '', text_no_bold) tree = html.fromstring(text_no_newlines) titles = tree.xpath("//div[@class='result_title']/a/text()") urls = tree.xpath("//div[@class='result_title']/a/@href") # Build the output tuples output = [] for i in range(len(titles)): output.append( { "title": titles[i], "url": SEP_URL + urls[i].lstrip("../") } ) self.results = output return output
from lxml import html import re import requests from constants import SEP_URL class SEPSearchResult(): query = None results = None def __init__(self, query): self.set_query(query) def set_query(self, query): self.query = str(query).lower().split() @property def url(self): url = SEP_URL + "search/searcher.py?query=" for word in self.query: url += word + "+" return url def request_results(self): page = requests.get(self.url) # Remvoe bold tags text_no_bold = re.sub('</? ?b>', '', page.text) text_no_newlines = re.sub('\n', '', text_no_bold) tree = html.fromstring(text_no_newlines) titles = tree.xpath("//div[@class='result_title']/a/text()") urls = tree.xpath("//div[@class='result_title']/a/@href") # Build the output tuples output = [] for i in range(len(titles)): output.append( { "title": titles[i], "url": SEP_URL + urls[i].lstrip("../") } ) self.results = output return output
Make sure looking up by id works correctly
import motor import error from tornado import gen from bson.objectid import ObjectId class Connection(object): def __init__(self, host='localhost', port=None, db=None): self.host = host self.port = port self.db = db class Database(object): def __init__(self, connection): if not isinstance(connection, Connection): raise error.StormError('connection must be instance of storm.db.Connection') self.connection = connection self.is_connected = False class MongoDb(Database): def connect(self): if self.is_connected: return self.motor_client = motor.MotorClient( self.connection.host, self.connection.port ).open_sync() self.db = self.motor_client[self.connection.db] self.is_connected = True @gen.coroutine def select_one(self, table, **kwargs): self.connect() if '_id' in kwargs: kwargs['_id'] = ObjectId(kwargs['_id']) result = yield motor.Op(getattr(self.db, table).find_one, **kwargs) if result is None: raise error.StormNotFoundError("Object of type: %s not found with args: %s" % (table, kwargs)) callback = kwargs.get('callback') if callback is None: raise gen.Return(result) callback(result) @gen.coroutine def insert(self, table, data, callback=None): self.connect() result = yield motor.Op(self.db[table].insert, data) if callback is None: raise gen.Return(result) callback(result)
import motor import error from tornado import gen class Connection(object): def __init__(self, host='localhost', port=None, db=None): self.host = host self.port = port self.db = db class Database(object): def __init__(self, connection): if not isinstance(connection, Connection): raise error.StormError('connection must be instance of storm.db.Connection') self.connection = connection self.is_connected = False class MongoDb(Database): def connect(self): if self.is_connected: return self.motor_client = motor.MotorClient( self.connection.host, self.connection.port ).open_sync() self.db = self.motor_client[self.connection.db] self.is_connected = True @gen.coroutine def select_one(self, table, **args): self.connect() result = yield motor.Op(getattr(self.db, table).find_one, args) if result is None: raise error.StormNotFoundError("Object of type: %s not found with args: %s" % (table, args)) callback = args.get('callback') if callback is None: raise gen.Return(result) callback(result) @gen.coroutine def insert(self, table, data, callback=None): self.connect() result = yield motor.Op(self.db[table].insert, data) if callback is None: raise gen.Return(result) callback(result)
Fix FirstChildPage if child page doesn't exist
<?php class Kwc_Basic_LinkTag_FirstChildPage_Data extends Kwf_Component_Data { private $_pageCache = false; public function __get($var) { if ($var == 'url') { $page = $this->_getFirstChildPage(); return $page ? $page->url : ''; } else if ($var == 'rel') { $page = $this->_getFirstChildPage(); return $page ? $page->rel : ''; } else { return parent::__get($var); } } public function getAbsoluteUrl() { $page = $this->_getFirstChildPage(); return $page ? $page->getAbsoluteUrl() : ''; } public function _getFirstChildPage() { if ($this->_pageCache === false) { // zuerst prüfen ob es eine händisch angelegte child page gibt $page = $this->getChildPage(array('pageGenerator' => true)); if (!$page) { $page = $this->getChildPage(array('inherit'=>false), array( 'inherit'=>false, 'page'=>false )); } $this->_pageCache = $page; } return $this->_pageCache; } public function getLinkDataAttributes() { $page = $this->_getFirstChildPage(); return $page ? $page->getLinkDataAttributes() : array(); } }
<?php class Kwc_Basic_LinkTag_FirstChildPage_Data extends Kwf_Component_Data { private $_pageCache = false; public function __get($var) { if ($var == 'url') { $page = $this->_getFirstChildPage(); return $page ? $page->url : ''; } else if ($var == 'rel') { $page = $this->_getFirstChildPage(); return $page ? $page->rel : ''; } else { return parent::__get($var); } } public function getAbsoluteUrl() { return $this->_getFirstChildPage()->getAbsoluteUrl(); } public function _getFirstChildPage() { if ($this->_pageCache === false) { // zuerst prüfen ob es eine händisch angelegte child page gibt $page = $this->getChildPage(array('pageGenerator' => true)); if (!$page) { $page = $this->getChildPage(array('inherit'=>false), array( 'inherit'=>false, 'page'=>false )); } $this->_pageCache = $page; } return $this->_pageCache; } public function getLinkDataAttributes() { return $this->_getFirstChildPage()->getLinkDataAttributes(); } }
Fix log not saving on pause
import Liker from './content/liker'; import OptionManager from './utils/option-manager'; import Debug from './content/debug'; const debug = new Debug(); (async function () { try { debug.log('navigated:', window.location.href); if (process.env.NODE_ENV === 'development') { ['yt-navigate', 'yt-navigate-finish', 'yt-page-data-updated'].forEach((eventType) => { const appRoot = document.querySelector('ytd-app'); if (appRoot) { appRoot.addEventListener(eventType, (e) => { debug.log('event:', e.type); if (eventType === 'yt-navigate-finish') { debug.log('navigated:', window.location.href); } }); } }); } // Create an OptionManager const defaults = { like_what: 'subscribed', like_when: 'instantly', like_when_minutes: '2', like_when_percent: '50', disabled: false, }; const optionManager = new OptionManager(defaults); // Fetch our options then fire things up debug.log('loading options...'); const options = await optionManager.get(); debug.log('...options loaded', `(${JSON.stringify(options, null, 2)})`); const liker = new Liker({ options, log: debug.log }); liker.onPause = debug.save; } catch (err) { debug.log(err); } finally { debug.save(); } })();
import Liker from './content/liker'; import OptionManager from './utils/option-manager'; import Debug from './content/debug'; const debug = new Debug(); (async function () { try { debug.log('navigated:', window.location.href); if (process.env.NODE_ENV === 'development') { ['yt-navigate', 'yt-navigate-finish', 'yt-page-data-updated'].forEach((eventType) => { const appRoot = document.querySelector('ytd-app'); if (appRoot) { appRoot.addEventListener(eventType, (e) => { debug.log('event:', e.type); if (eventType === 'yt-navigate-finish') { debug.log('navigated:', window.location.href); } }); } }); } // Create an OptionManager const defaults = { like_what: 'subscribed', like_when: 'instantly', like_when_minutes: '2', like_when_percent: '50', disabled: false, }; const optionManager = new OptionManager(defaults); // Fetch our options then fire things up debug.log('loading options...'); const options = await optionManager.get(); debug.log('...options loaded', `(${JSON.stringify(options, null, 2)})`); const liker = new Liker({ options, log: debug.log }); liker.onStop = debug.save; } catch (err) { debug.log(err); } finally { debug.save(); } })();
Fix volume button scrolling on phones.
package cc.hughes.droidchatty; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.FragmentActivity; import android.view.KeyEvent; public class SingleThreadView extends FragmentActivity { public static final String THREAD_ID = "threadId"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (savedInstanceState == null) { //create the fragment, and show it! ThreadViewFragment frag = new ThreadViewFragment(); frag.setArguments(getIntent().getExtras()); getSupportFragmentManager().beginTransaction().replace(android.R.id.content, frag).commit(); } } @Override public boolean dispatchKeyEvent(KeyEvent event) { ThreadViewFragment fragment = (ThreadViewFragment)getSupportFragmentManager().findFragmentById(android.R.id.content); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); Boolean handleVolume = prefs.getBoolean("useVolumeButtons", false); if (fragment != null && handleVolume) { if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP) { if (event.getAction() == KeyEvent.ACTION_DOWN) fragment.adjustSelected(-1); return true; } else if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_DOWN) { if (event.getAction() == KeyEvent.ACTION_DOWN) fragment.adjustSelected(1); return true; } } return super.dispatchKeyEvent(event); } }
package cc.hughes.droidchatty; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.FragmentActivity; import android.view.KeyEvent; public class SingleThreadView extends FragmentActivity { public static final String THREAD_ID = "threadId"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (savedInstanceState == null) { //create the fragment, and show it! ThreadViewFragment frag = new ThreadViewFragment(); frag.setArguments(getIntent().getExtras()); getSupportFragmentManager().beginTransaction().replace(android.R.id.content, frag).commit(); } } @Override public boolean dispatchKeyEvent(KeyEvent event) { ThreadViewFragment fragment = (ThreadViewFragment)getSupportFragmentManager().findFragmentById(R.id.singleThread); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); Boolean handleVolume = prefs.getBoolean("useVolumeButtons", false); if (fragment != null && handleVolume) { if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP) { if (event.getAction() == KeyEvent.ACTION_DOWN) fragment.adjustSelected(-1); return true; } else if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_DOWN) { if (event.getAction() == KeyEvent.ACTION_DOWN) fragment.adjustSelected(1); return true; } } return super.dispatchKeyEvent(event); } }
Change package name from VCCS to vccs_auth. There will be a separate package containing the authentication client, and it does not appear possible to (cleanly) generate two packages from the same setup.py/same repository.
#!/usr/bin/env python # from setuptools import setup, find_packages import sys, os from distutils import versionpredicate here = os.path.abspath(os.path.dirname(__file__)) README = open(os.path.join(here, 'README')).read() version = '0.1dev' install_requires = [ 'pyhsm >= 1.0.3', 'ndnkdf >= 0.1', 'py-bcrypt >= 0.3', 'cherrypy >= 3.2.0', 'simplejson >= 2.6.2', 'pyserial >= 2.6', 'pymongo >= 2.4.2', ] setup(name='vccs_auth', version=version, description="Very Complicated Credential System - authentication backend", long_description=README, classifiers=[ # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers ], keywords='security password hashing bcrypt PBKDF2', author='Fredrik Thulin', author_email='[email protected]', license='BSD', packages=['vccs_auth',], package_dir = {'': 'src'}, #include_package_data=True, #package_data = { }, zip_safe=False, install_requires=install_requires, entry_points={ 'console_scripts': ['vccs_authbackend=vccs_auth.vccs_auth.vccs_authbackend:main', ] } )
#!/usr/bin/env python # from setuptools import setup, find_packages import sys, os from distutils import versionpredicate here = os.path.abspath(os.path.dirname(__file__)) README = open(os.path.join(here, 'README')).read() version = '0.1dev' install_requires = [ 'pyhsm >= 1.0.3', 'ndnkdf >= 0.1', 'py-bcrypt >= 0.3', 'cherrypy >= 3.2.0', 'simplejson >= 2.6.2', 'pyserial >= 2.6', 'pymongo >= 2.4.2', ] setup(name='VCCS', version=version, description="Very Complicated Credential System", long_description=README, classifiers=[ # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers ], keywords='security password hashing bcrypt PBKDF2', author='Fredrik Thulin', author_email='[email protected]', license='BSD', packages=find_packages('src'), package_dir = {'': 'src'}, include_package_data=True, package_data = { }, zip_safe=False, install_requires=install_requires, entry_points={ 'console_scripts': ['vccs_authbackend=vccs_auth.vccs_auth.vccs_authbackend:main', ] } )
Add settings table to get new nb
<?php require("_header.php"); ?> <div class="row"> <!--left--> <div class="col-md-3" id="leftCol"> <div class="row"> <ul class="nav nav-stacked" id="sidebar"> <li><a href="#secAdultes">BD Adultes</a></li> <li><a href="#secAdos">BD Ados</a></li> </ul> </div> </div><!--/left--> <!--middle--> <div class="col-md-9"> <?php require_once "model/Album.php"; $album = new Album(); require_once "model/Settings.php"; $settings = new Settings(); $nb = $settings->get_adulte_new_nb(); echo '<h2 id="secAdultes">Les ' . $nb . ' dernières BD Adultes</h2>'; insert_last_albums($nb, 'Adultes'); $nb = $settings->get_ado_new_nb(); echo '<h2 id="secAdos">Les ' . $nb . ' dernières BD Ados</h2>'; insert_last_albums($nb, 'Ado'); ?> <hr> </div><!--/right--> </div><!--/row--> <?php require("_footer.php"); ?>
<?php require("_header.php"); ?> <div class="row"> <!--left--> <div class="col-md-3" id="leftCol"> <div class="row"> <ul class="nav nav-stacked" id="sidebar"> <li><a href="#secAdultes">BD Adultes</a></li> <li><a href="#secAdos">BD Ados</a></li> </ul> </div> </div><!--/left--> <!--middle--> <div class="col-md-9"> <?php require_once "model/Album.php"; $album = new Album(); $nb = 24; echo '<h2 id="secAdultes">Les ' . $nb . ' dernières BD Adultes</h2>'; insert_last_albums($nb, 'Adultes'); echo '<h2 id="secAdos">Les ' . $nb . ' dernières BD Ados</h2>'; insert_last_albums($nb, 'Ado'); //echo '<h2 id="secVO">Les ' . $nb . ' dernières BD VO</h2>'; //insert_last_albums($nb, 'VO'); ?> <hr> </div><!--/right--> </div><!--/row--> <?php require("_footer.php"); ?>
PIO-129: Remove Unittests done as integrationtests, due to NotImplementedErrors from moto
from unittest2 import TestCase import simplejson as json import boto3 from moto import mock_s3 import permission_lambda class PermissionLambdaTests(TestCase): @mock_s3 def test_get_usofa_accountlist_from_bucket(self): bucketname = "testbucket" usofa_data = { "account1": { "id": "123456789", "email": "[email protected]" }, "account2": { "id": "987654321", "email": "[email protected]" } } client = boto3.client('s3') client.create_bucket( Bucket=bucketname, CreateBucketConfiguration={ 'LocationConstraint': 'eu-west-1' }) client.put_object( Bucket=bucketname, Key="accounts.json", Body=json.dumps(usofa_data) ) accountlist = permission_lambda.get_usofa_accountlist(bucketname) accountlist.sort() self.assertEqual(accountlist, ["123456789", "987654321"])
from unittest2 import TestCase import simplejson as json import boto3 from moto import mock_s3 import permission_lambda class PermissionLambdaTests(TestCase): def _get_permission_statements(self, client, queue_url): """ Return a list of policy statements for given queue""" policy_response = client.get_queue_attributes( QueueUrl=queue_url, AttributeNames=['Policy']) policy = policy_response['Attributes']['Policy'] return json.loads(policy)['Statement'] @mock_s3 def test_get_usofa_accountlist_from_bucket(self): bucketname = "testbucket" usofa_data = { "account1": { "id": "123456789", "email": "[email protected]" }, "account2": { "id": "987654321", "email": "[email protected]" } } client = boto3.client('s3') client.create_bucket( Bucket=bucketname, CreateBucketConfiguration={ 'LocationConstraint': 'eu-west-1' }) client.put_object( Bucket=bucketname, Key="accounts.json", Body=json.dumps(usofa_data) ) accountlist = permission_lambda.get_usofa_accountlist(bucketname) accountlist.sort() self.assertEqual(accountlist, ["123456789", "987654321"])
Fix warning invalid props for textarea
import React, { Component, PropTypes } from 'react' import classnames from 'classnames' import { ControlButtons } from './' class FormControl extends Component { render () { const { componentClass: Component, className, style, submitted, ...props } = this.props const { $formRedux: { formInline, submitting, dirty }, $formGroup: { controlId, ...field } } = this.context const fieldProps = Object.assign({}, field) if (Component === 'input' || Component === 'textarea') { delete fieldProps.layout delete fieldProps.error delete fieldProps.touched delete fieldProps.valid } return ( <div> <Component {...props} {...fieldProps} id={controlId} className={classnames( 'form-control-input block lightestgray', Component, formInline ? 'inline-block' : '', className )} style={style} /> { formInline && <ControlButtons {...{ submitted, submitting, dirty, showCancel: false, formInline }} /> } </div> ) } } FormControl.contextTypes = { $formRedux: PropTypes.shape({ formInline: PropTypes.bool, submitting: PropTypes.bool, dirty: PropTypes.bool }), $formGroup: PropTypes.shape({ controlId: PropTypes.string }) } FormControl.propTypes = { submitted: PropTypes.bool.isRequired, componentClass: PropTypes.string.isRequired, style: PropTypes.object } FormControl.defaultProps = { componentClass: 'input', submitted: false } export default FormControl
import React, { Component, PropTypes } from 'react' import classnames from 'classnames' import { ControlButtons } from './' class FormControl extends Component { render () { const { componentClass: Component, className, style, submitted, ...props } = this.props const { $formRedux: { formInline, submitting, dirty }, $formGroup: { controlId, ...field } } = this.context const fieldProps = Object.assign({}, field) if (Component === 'input') { delete fieldProps.layout delete fieldProps.error delete fieldProps.touched delete fieldProps.valid } return ( <div> <Component {...props} {...fieldProps} id={controlId} className={classnames( 'form-control-input block lightestgray', Component, formInline ? 'inline-block' : '', className )} style={style} /> { formInline && <ControlButtons {...{ submitted, submitting, dirty, showCancel: false, formInline }} /> } </div> ) } } FormControl.contextTypes = { $formRedux: PropTypes.shape({ formInline: PropTypes.bool, submitting: PropTypes.bool, dirty: PropTypes.bool }), $formGroup: PropTypes.shape({ controlId: PropTypes.string }) } FormControl.propTypes = { submitted: PropTypes.bool.isRequired, componentClass: PropTypes.string.isRequired, style: PropTypes.object } FormControl.defaultProps = { componentClass: 'input', submitted: false } export default FormControl
Fix generation of translated modules
<?php /** * Created by PhpStorm. * User: Conrad * Date: 9/11/2015 * Time: 5:28 PM */ class ContentModuleSiteTreeTranslatableExtension extends DataExtension { public function onTranslatableCreate($saveTranslation) { if ($saveTranslation) { //create new modules $manyManys = array_reverse($this->owner->manyMany()); if (!empty($manyManys)) { foreach ($manyManys as $relationship => $class) { if ($class === 'ContentModule' || ($class instanceof ContentModule)) { if ($original = $this->owner->getTranslation(Translatable::default_locale())) { foreach ($original->$relationship() as $module) { //create new module $newModule = Object::create(get_class($module)); $newModule->Title = $module->Title . ' - ' . $this->owner->Locale; $newModule->Locale = $this->owner->Locale; $newModule->OriginalID = $original->ID; $newModule->write(); $this->owner->$relationship()->add($newModule); } } } } } } } }
<?php /** * Created by PhpStorm. * User: Conrad * Date: 9/11/2015 * Time: 5:28 PM */ class ContentModuleSiteTreeTranslatableExtension extends DataExtension { public function onTranslatableCreate($saveTranslation) { if ($saveTranslation) { //create new modules $manyManys = array_reverse($page->manyMany()); if (!empty($manyManys)) { foreach ($manyManys as $relationship => $class) { if ($class === 'ContentModule' || ($class instanceof ContentModule)) { if ($original = $this->owner->getTranslation(Translatable::default_locale())) { foreach ($original->$relationship() as $module) { //create new module $newModule = Object::create(get_class($module)); $newModule->Title = $module->Title . ' - ' . Translatable::get_current_locale(); $newModule->Locale = Translatable::get_current_locale(); $newModule->OriginalID = $original->ID; $newModule->write(); $this->owner->$relationship()->add($newModule); } } } } } } }
Add ignition to exculded uris
<?php return [ /* ----------------------------------------------------------------- | Theme | ----------------------------------------------------------------- */ 'theme' => 'bootstrap-3', /* ----------------------------------------------------------------- | Route settings | ----------------------------------------------------------------- */ 'route' => [ 'enabled' => true, 'attributes' => [ 'prefix' => 'route-viewer', 'as' => 'route-viewer::', 'namespace' => 'Arcanedev\\RouteViewer\\Http\\Controllers', // 'middleware' => [], ], ], /* ----------------------------------------------------------------- | URIs | ----------------------------------------------------------------- */ 'uris' => [ 'excluded' => [ '_debugbar', '_ignition', 'route-viewer', ], ], /* ----------------------------------------------------------------- | Methods | ----------------------------------------------------------------- */ 'methods' => [ 'excluded' => [ 'HEAD', ], 'colors' => [ 'GET' => 'success', 'HEAD' => 'default', 'POST' => 'primary', 'PUT' => 'warning', 'PATCH' => 'info', 'DELETE' => 'danger', ], ], ];
<?php return [ /* ----------------------------------------------------------------- | Theme | ----------------------------------------------------------------- */ 'theme' => 'bootstrap-3', /* ----------------------------------------------------------------- | Route settings | ----------------------------------------------------------------- */ 'route' => [ 'enabled' => true, 'attributes' => [ 'prefix' => 'route-viewer', 'as' => 'route-viewer::', 'namespace' => 'Arcanedev\\RouteViewer\\Http\\Controllers', // 'middleware' => [], ], ], /* ----------------------------------------------------------------- | URIs | ----------------------------------------------------------------- */ 'uris' => [ 'excluded' => [ 'route-viewer', '_debugbar', ], ], /* ----------------------------------------------------------------- | Methods | ----------------------------------------------------------------- */ 'methods' => [ 'excluded' => [ 'HEAD', ], 'colors' => [ 'GET' => 'success', 'HEAD' => 'default', 'POST' => 'primary', 'PUT' => 'warning', 'PATCH' => 'info', 'DELETE' => 'danger', ], ], ];
Prepend menu- to all menu item IDs
<?php declare(strict_types=1); namespace PerFi\PerFiBundle\EventListener; use Avanzu\AdminThemeBundle\Event\SidebarMenuEvent; use Avanzu\AdminThemeBundle\Model\MenuItemModel; use Symfony\Component\HttpFoundation\Request; class MenuItemListener { public function onSetupMenu(SidebarMenuEvent $event) { $request = $event->getRequest(); foreach ($this->getMenu($request) as $item) { $event->addItem($item); } } protected function getMenu(Request $request) { $menuItems = array( $homepage = new MenuItemModel('menu-homepage', 'Home', 'homepage', [], 'iconclasses fa fa-home'), $accounts = new MenuItemModel('menu-accounts', 'Accounts', null, [], 'iconclasses fa fa-bank'), ); $accounts->addChild( new MenuItemModel('menu-list_accounts', 'List of accounts', 'accounts', [], 'iconclasses fa fa-list') ); $accounts->addChild( new MenuItemModel('menu-create_account', 'Create account', 'create_account', [], 'iconclasses fa fa-plus') ); return $this->activateByRoute($request->get('_route'), $menuItems); } protected function activateByRoute($route, $items) { foreach($items as $item) { if($item->hasChildren()) { $this->activateByRoute($route, $item->getChildren()); } else { if($item->getRoute() == $route) { $item->setIsActive(true); } } } return $items; } }
<?php declare(strict_types=1); namespace PerFi\PerFiBundle\EventListener; use Avanzu\AdminThemeBundle\Event\SidebarMenuEvent; use Avanzu\AdminThemeBundle\Model\MenuItemModel; use Symfony\Component\HttpFoundation\Request; class MenuItemListener { public function onSetupMenu(SidebarMenuEvent $event) { $request = $event->getRequest(); foreach ($this->getMenu($request) as $item) { $event->addItem($item); } } protected function getMenu(Request $request) { $menuItems = array( $homepage = new MenuItemModel('homepage', 'Home', 'homepage', [], 'iconclasses fa fa-home'), $accounts = new MenuItemModel('accounts', 'Accounts', null, [], 'iconclasses fa fa-bank'), ); $accounts->addChild( new MenuItemModel('list_accounts', 'List of accounts', 'accounts', [], 'iconclasses fa fa-list') ); $accounts->addChild( new MenuItemModel('create_account', 'Create account', 'create_account', [], 'iconclasses fa fa-plus') ); return $this->activateByRoute($request->get('_route'), $menuItems); } protected function activateByRoute($route, $items) { foreach($items as $item) { if($item->hasChildren()) { $this->activateByRoute($route, $item->getChildren()); } else { if($item->getRoute() == $route) { $item->setIsActive(true); } } } return $items; } }
Add Karma as Grunt task
module.exports = function(grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), bump: { options: { files: ['package.json'], updateConfigs: ['pkg'], commit: true, commitMessage: 'Release v%VERSION%', createTag: true, tagName: 'v%VERSION%', tagMessage: 'Version %VERSION%', push: true, pushTo: 'origin', gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d' } }, cucumberjs: { options: { format: 'html', output: 'reports/my_report.html', theme: 'bootstrap' }, features: ['features/**/*.feature'] }, jshint: { options: { esversion: 6, reporter: require('jshint-stylish') }, build: ['*.js', 'features/**/*.js', 'public/**/*.js', '!public/lib/**/*.js'] }, karma: { unit: { configFile: 'karma.conf.js' } } }); // LOAD GRUNT PACKAGES grunt.loadNpmTasks('grunt-bump'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-cucumberjs'); grunt.loadNpmTasks('grunt-karma'); };
module.exports = function(grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), bump: { options: { files: ['package.json'], updateConfigs: ['pkg'], commit: true, commitMessage: 'Release v%VERSION%', createTag: true, tagName: 'v%VERSION%', tagMessage: 'Version %VERSION%', push: true, pushTo: 'origin', gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d' } }, cucumberjs: { options: { format: 'html', output: 'reports/my_report.html', theme: 'bootstrap' }, features: ['features/**/*.feature'] }, jshint: { options: { esversion: 6, reporter: require('jshint-stylish') }, build: ['*.js', 'features/**/*.js', 'public/**/*.js', '!public/lib/**/*.js'] } }); // LOAD GRUNT PACKAGES grunt.loadNpmTasks('grunt-bump'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-cucumberjs'); };
Update illuminate paginator return instance rather than paginator on make
<?php namespace Michaeljennings\Carpenter\Pagination; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\BootstrapThreePresenter; use Michaeljennings\Carpenter\Contracts\Paginator as PaginatorContract; class IlluminateDriver implements PaginatorContract { /** * An instance of the IOC container. * * @var mixed */ protected $app; /** * The illuminate paginator. * * @var mixed */ protected $paginator; public function __construct($app) { $this->app = $app; } /** * Create a new paginator. * * @param string|integer $total * @param string|integer $perPage * @return mixed */ public function make($total, $perPage) { $this->paginator = new LengthAwarePaginator([], $total, $perPage, $this->app['request']->input('page'), [ 'path' => $this->app['request']->url(), ]); return $this; } /** * Get the pagination links. * * @return string */ public function links() { return $this->paginator->render(new BootstrapThreePresenter($this->paginator)); } /** * Get the current page. * * @return integer|string */ public function currentPage() { return $this->paginator->currentPage(); } }
<?php namespace Michaeljennings\Carpenter\Pagination; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\BootstrapThreePresenter; use Michaeljennings\Carpenter\Contracts\Paginator as PaginatorContract; class IlluminateDriver implements PaginatorContract { /** * An instance of the IOC container. * * @var mixed */ protected $app; /** * The illuminate paginator. * * @var mixed */ protected $paginator; public function __construct($app) { $this->app = $app; } /** * Create a new paginator. * * @param string|integer $total * @param string|integer $perPage * @return mixed */ public function make($total, $perPage) { $this->paginator = new LengthAwarePaginator([], $total, $perPage, $this->app['request']->input('page'), [ 'path' => $this->app['request']->url(), ]); return $this->paginator; } /** * Get the pagination links. * * @return string */ public function links() { return $this->paginator->render(new BootstrapThreePresenter($this->paginator)); } /** * Get the current page. * * @return integer|string */ public function currentPage() { return $this->paginator->currentPage(); } }
Remove public modifier from Method getter.
package com.novoda.downloadmanager; import java.util.Map; class DownloadManagerRequest { private final Map<String, String> headers; private final String url; private final Method method; DownloadManagerRequest(Map<String, String> headers, String url, Method method) { this.headers = headers; this.url = url; this.method = method; } Map<String, String> headers() { return headers; } String url() { return url; } Method method() { return method; } @Override public boolean equals(Object o) { if (this == o) { return true; } if (o == null || getClass() != o.getClass()) { return false; } DownloadManagerRequest that = (DownloadManagerRequest) o; if (!headers.equals(that.headers)) { return false; } if (!url.equals(that.url)) { return false; } return method == that.method; } @Override public int hashCode() { int result = headers.hashCode(); result = 31 * result + url.hashCode(); result = 31 * result + method.hashCode(); return result; } enum Method { GET("get"), HEAD("head"); private final String rawMethod; Method(String rawMethod) { this.rawMethod = rawMethod; } String rawMethod() { return rawMethod; } } }
package com.novoda.downloadmanager; import java.util.Map; class DownloadManagerRequest { private final Map<String, String> headers; private final String url; private final Method method; DownloadManagerRequest(Map<String, String> headers, String url, Method method) { this.headers = headers; this.url = url; this.method = method; } Map<String, String> headers() { return headers; } String url() { return url; } Method method() { return method; } @Override public boolean equals(Object o) { if (this == o) { return true; } if (o == null || getClass() != o.getClass()) { return false; } DownloadManagerRequest that = (DownloadManagerRequest) o; if (!headers.equals(that.headers)) { return false; } if (!url.equals(that.url)) { return false; } return method == that.method; } @Override public int hashCode() { int result = headers.hashCode(); result = 31 * result + url.hashCode(); result = 31 * result + method.hashCode(); return result; } enum Method { GET("get"), HEAD("head"); private final String rawMethod; Method(String rawMethod) { this.rawMethod = rawMethod; } public String rawMethod() { return rawMethod; } } }
Fix tests for django 2.2
import os BASE_DIR = os.path.dirname(os.path.abspath(__file__)) SECRET_KEY = 'fake-key' HASHID_FIELD_SALT = 'gg ez' INSTALLED_APPS = [ "django.contrib.auth", "django.contrib.contenttypes", "django.contrib.messages", "django.contrib.sessions", "django.contrib.admin", "tests", ] DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), } } MIDDLEWARE = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', ] TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': [], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ 'django.template.context_processors.debug', 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', ], }, }, ]
import os BASE_DIR = os.path.dirname(os.path.abspath(__file__)) SECRET_KEY = 'fake-key' HASHID_FIELD_SALT = 'gg ez' INSTALLED_APPS = [ "django.contrib.auth", "django.contrib.contenttypes", "django.contrib.messages", "django.contrib.sessions", "django.contrib.admin", "tests", ] DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), } } MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', ] TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': [], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ 'django.template.context_processors.debug', 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', ], }, }, ]
Use updated symbol path for file-system-roots plugin
var myApp = angular.module('CordovaAppHarness', ['ngRoute']); myApp.config(['$routeProvider', function($routeProvider){ $routeProvider.when('/', { templateUrl: 'views/list.html', controller: 'ListCtrl' }); $routeProvider.when('/add', { templateUrl: 'views/add.html', controller: 'AddCtrl' }); $routeProvider.when('/edit/:appId', { templateUrl: 'views/add.html', controller: 'AddCtrl' }); $routeProvider.when('/details/:index', { templateUrl: 'views/details.html', controller: 'DetailsCtrl' }); }]); // foo document.addEventListener('deviceready', function() { cordova.filesystem.getDataDirectory(false, function(dirEntry) { var path = dirEntry.fullPath; myApp.value('INSTALL_DIRECTORY', path + '/apps'); myApp.value('APPS_JSON', path + '/apps.json'); myApp.factory('UrlCleanup', function() { return function(url) { url = url.replace(/\/$/, '').replace(new RegExp(cordova.platformId + '$'), '').replace(/\/$/, ''); if (!/^[a-z]+:/.test(url)) { url = 'http://' + url; } return url; }; }); angular.bootstrap(document, ['CordovaAppHarness']); }); }, false);
var myApp = angular.module('CordovaAppHarness', ['ngRoute']); myApp.config(['$routeProvider', function($routeProvider){ $routeProvider.when('/', { templateUrl: 'views/list.html', controller: 'ListCtrl' }); $routeProvider.when('/add', { templateUrl: 'views/add.html', controller: 'AddCtrl' }); $routeProvider.when('/edit/:appId', { templateUrl: 'views/add.html', controller: 'AddCtrl' }); $routeProvider.when('/details/:index', { templateUrl: 'views/details.html', controller: 'DetailsCtrl' }); }]); // foo document.addEventListener('deviceready', function() { cordova.plugins.fileextras.getDataDirectory(false, function(dirEntry) { var path = dirEntry.fullPath; myApp.value('INSTALL_DIRECTORY', path + '/apps'); myApp.value('APPS_JSON', path + '/apps.json'); myApp.factory('UrlCleanup', function() { return function(url) { url = url.replace(/\/$/, '').replace(new RegExp(cordova.platformId + '$'), '').replace(/\/$/, ''); if (!/^[a-z]+:/.test(url)) { url = 'http://' + url; } return url; }; }); angular.bootstrap(document, ['CordovaAppHarness']); }); }, false);
Update leaflet request to be over https
from django.contrib.gis.forms import widgets class LeafletPointWidget(widgets.BaseGeometryWidget): template_name = 'leaflet/leaflet.html' class Media: css = { 'all': ('https://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css', 'leaflet/css/location_form.css', 'leaflet/css/LeafletWidget.css') } js = ( 'https://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js', 'leaflet/js/LeafletWidget.js' ) def render(self, name, value, attrs=None): # add point if value: attrs.update({ 'point': { 'x': value.x, 'y': value.y, 'z': value.z, 'srid': value.srid } }) return super().render(name, value, attrs)
from django.contrib.gis.forms import widgets class LeafletPointWidget(widgets.BaseGeometryWidget): template_name = 'leaflet/leaflet.html' class Media: css = { 'all': ('http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css', 'leaflet/css/location_form.css', 'leaflet/css/LeafletWidget.css') } js = ( 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js', 'leaflet/js/LeafletWidget.js' ) def render(self, name, value, attrs=None): # add point if value: attrs.update({ 'point': { 'x': value.x, 'y': value.y, 'z': value.z, 'srid': value.srid } }) return super().render(name, value, attrs)
Increase cluster-test timeout for slow CI machines.
var helper = require('./specHelper'); var cluster = require('cluster'); var http = require('http'); describe("clustering", function() { beforeEach(function() { helper.testComplete(false); }); it ('should be able to delegate requests to children', function() { waitsFor(helper.testComplete, "child to come online process a request and die", 10000); cluster.setupMaster( { exec: './src/test/javascript/cluster_child.js', silent: false } ); console.log( "master: forking" ); var child = cluster.fork(); expect( cluster.workers[1] ).toBe( child ); var body = ''; child.on('listening', function() { console.log( "master: child is listening" ); http.get( { port: 8000 }, function(response) { response.on('data', function(d) { body += d.toString(); }); response.on('end', function() { expect( body ).toContain( child.process.pid ); expect( body ).toContain( "worker#1" ); child.on( 'disconnect', function() { console.log( "master: disconnected, killing" ); child.kill(); }); child.on('exit', function() { console.log( "master: child exited" ); helper.testComplete(true); }) console.log( "master: disconnecting" ); child.disconnect(); }); } ); }) child.on( 'online', function() { console.log( "master: child is online" ); }) }); });
var helper = require('./specHelper'); var cluster = require('cluster'); var http = require('http'); describe("clustering", function() { beforeEach(function() { helper.testComplete(false); }); it ('should be able to delegate requests to children', function() { waitsFor(helper.testComplete, "child to come online process a request and die", 5000); cluster.setupMaster( { exec: './src/test/javascript/cluster_child.js', silent: false } ); console.log( "master: forking" ); var child = cluster.fork(); expect( cluster.workers[1] ).toBe( child ); var body = ''; child.on('listening', function() { console.log( "master: child is listening" ); http.get( { port: 8000 }, function(response) { response.on('data', function(d) { body += d.toString(); }); response.on('end', function() { expect( body ).toContain( child.process.pid ); expect( body ).toContain( "worker#1" ); child.on( 'disconnect', function() { console.log( "master: disconnected, killing" ); child.kill(); }); child.on('exit', function() { console.log( "master: child exited" ); helper.testComplete(true); }) console.log( "master: disconnecting" ); child.disconnect(); }); } ); }) child.on( 'online', function() { console.log( "master: child is online" ); }) }); });
Add test for Argument setter.
define( [ 'chai', 'fixtures', 'argumenta/widgets/Argument', 'argumenta/widgets/Base' ], function(chai, fixtures, Argument, Base) { var assert = chai.assert; describe('Argument', function() { it('should be a function', function() { assert.isFunction(Argument); }); it('should include a moduleID', function() { assert.equal(Argument.prototype.moduleID, 'Argument'); }); describe('new Argument( options, element )', function() { it('should return a new Argument widget', function() { var argData = fixtures.validArgumentData(); var argument = new Argument(argData); assert.instanceOf(argument, Argument); assert.instanceOf(argument, Base); }); }); describe('getType()', function() { it('should return the object type', function() { var argument = fixtures.validArgument(); assert.equal(argument.getType(), 'argument'); }); }); describe('getSha1()', function() { it('should return the object sha1', function() { var argument = fixtures.validArgument(); assert.equal( argument.getSha1(), '7077e1ce31bc8e9d2a88479aa2d159f2f9de4856', 'Check SHA1.' ); }); }); describe('setPropositions( props )', function() { it('should load the given propositions data', function() { var data = fixtures.validArgumentData(); var argument = new Argument(data); argument.setPropositions([]); assert.deepEqual( argument.propositions, [], 'Clear propositions.' ); argument.setPropositions(data.propositions); assert.deepEqual( argument.propositions, data.propositions, 'Set propositions.' ); }); }); }); });
define( [ 'chai', 'fixtures', 'argumenta/widgets/Argument', 'argumenta/widgets/Base' ], function(chai, fixtures, Argument, Base) { var assert = chai.assert; describe('Argument', function() { it('should be a function', function() { assert.isFunction(Argument); }); it('should include a moduleID', function() { assert.equal(Argument.prototype.moduleID, 'Argument'); }); describe('new Argument( options, element )', function() { it('should return a new Argument widget', function() { var argData = fixtures.validArgumentData(); var argument = new Argument(argData); assert.instanceOf(argument, Argument); assert.instanceOf(argument, Base); }); }); describe('getType()', function() { it('should return the object type', function() { var argument = fixtures.validArgument(); assert.equal(argument.getType(), 'argument'); }); }); describe('getSha1()', function() { it('should return the object sha1', function() { var argument = fixtures.validArgument(); assert.equal(argument.getSha1(), '7077e1ce31bc8e9d2a88479aa2d159f2f9de4856'); }); }); }); });
Test char rnn with static batch size
import tensorflow as tf from .char_rnn import char_rnn def test_char_rnn(): for i, (sentence_shape, labels_shape) in enumerate([ [[11, 64, 8], [11, 64]], [[None, 64, 8], [None, 64]], [[None, None, 8], [None, None]], [[None, None, None], [None, None]]]): for mode in [tf.contrib.learn.ModeKeys.TRAIN, tf.contrib.learn.ModeKeys.EVAL, tf.contrib.learn.ModeKeys.INFER]: with tf.variable_scope('model_{}_{}'.format(i, mode)): char_rnn(tf.placeholder(tf.int32, sentence_shape), tf.placeholder(tf.int32, labels_shape), mode=mode, num_classes=7, char_space_size=128, char_embedding_size=128, word_embedding_size=128, context_vector_size=128)
import tensorflow as tf from .char_rnn import char_rnn def test_char_rnn(): for i, (sentence_shape, labels_shape) in enumerate([ [[None, 64, 8], [None, 64]], [[None, None, 8], [None, None]], [[None, None, None], [None, None]]]): for mode in [tf.contrib.learn.ModeKeys.TRAIN, tf.contrib.learn.ModeKeys.EVAL, tf.contrib.learn.ModeKeys.INFER]: with tf.variable_scope('model_{}_{}'.format(i, mode)): char_rnn(tf.placeholder(tf.int32, sentence_shape), tf.placeholder(tf.int32, labels_shape), mode=mode, num_classes=7, char_space_size=128, char_embedding_size=128, word_embedding_size=128, context_vector_size=128)
Allow collapse all accordion tabs in profileeditor
(function($){ $(function(){ $('.button-collapse').sideNav(); }); // end of document ready })(jQuery); // end of jQuery name space // Keep one tab expanded while editing profile /*$('li div.collapsible-header').on('click',function(e){ if($(this).parents('li').hasClass('active')){ e.stopPropagation(); } });*/ // Expand "Home" upon loading Edit page $("document").ready(function() { setTimeout(function() { $("ul li:first-child div").trigger('click'); },10); }); // Sign-up form: Auto generate username based on first name and llast name inputs $('#last_name').on('blur',function(e) { if( document.getElementById('username').value=='' && document.getElementById('first_name').value!='' && document.getElementById('last_name').value!='') { // combine firstname and lastname to create username var username = document.getElementById('first_name').value.substr(0,490) + document.getElementById('last_name').value.substr(0,49); username = username.replace(/\s+/g, ''); username = username.replace(/\'+/g, ''); username = username.replace(/-+/g, ''); username = username.toLowerCase(); document.getElementById('username').value = username; // username label should translate up var label = $('label[for="username"]'); label['addClass']('active'); // username underline should turn green document.getElementById('username').className = "validate valid"; } });
(function($){ $(function(){ $('.button-collapse').sideNav(); }); // end of document ready })(jQuery); // end of jQuery name space // Keep one tab expanded while editing profile $('li div.collapsible-header').on('click',function(e){ if($(this).parents('li').hasClass('active')){ e.stopPropagation(); } }); // Expand "Home" upon loading Edit page $("document").ready(function() { setTimeout(function() { $("ul li:first-child div").trigger('click'); },10); }); $('#last_name').on('blur',function(e) { if( document.getElementById('username').value=='' && document.getElementById('first_name').value!='' && document.getElementById('last_name').value!='') { // combine firstname and lastname to create username var username = document.getElementById('first_name').value.substr(0,490) + document.getElementById('last_name').value.substr(0,49); username = username.replace(/\s+/g, ''); username = username.replace(/\'+/g, ''); username = username.replace(/-+/g, ''); username = username.toLowerCase(); document.getElementById('username').value = username; // username label should translate up var label = $('label[for="username"]'); label['addClass']('active'); // username underline should turn green document.getElementById('username').className = "validate valid"; } });
Fix exception 'local variable 'move' referenced before assignment' in case of upload of unknown file formats
#!/usr/bin/env python # vim: set fileencoding=utf-8 : from flask import flash from old_xml_import import old_xml_import from sml_import import sml_import import gzip from model import db, Sample from sqlalchemy.sql import func def move_import(xmlfile, filename, user): move = None if filename.endswith('.gz'): xmlfile = gzip.GzipFile(fileobj=xmlfile, mode='rb', filename=filename) filename = filename[:-len('.gz')] if filename.endswith('.xml'): move = old_xml_import(xmlfile, user) elif filename.endswith('.sml'): move = sml_import(xmlfile, user) else: flash("unknown fileformat: '%s'" % xmlfile.filename, 'error') if move: move.temperature_avg, = db.session.query(func.avg(Sample.temperature)).filter(Sample.move == move, Sample.temperature > 0).one() stroke_count = 0 for events, in db.session.query(Sample.events).filter(Sample.move == move, Sample.events != None): if 'swimming' in events and events['swimming']['type'] == 'Stroke': stroke_count += 1 if 'swimming' in move.activity: assert stroke_count > 0 if stroke_count > 0: move.stroke_count = stroke_count db.session.commit() return move
#!/usr/bin/env python # vim: set fileencoding=utf-8 : from flask import flash from old_xml_import import old_xml_import from sml_import import sml_import import gzip from model import db, Sample from sqlalchemy.sql import func def move_import(xmlfile, filename, user): if filename.endswith('.gz'): xmlfile = gzip.GzipFile(fileobj=xmlfile, mode='rb', filename=filename) filename = filename[:-len('.gz')] if filename.endswith('.xml'): move = old_xml_import(xmlfile, user) elif filename.endswith('.sml'): move = sml_import(xmlfile, user) else: flash("unknown fileformat: '%s'" % xmlfile.filename, 'error') if move: move.temperature_avg, = db.session.query(func.avg(Sample.temperature)).filter(Sample.move == move, Sample.temperature > 0).one() stroke_count = 0 for events, in db.session.query(Sample.events).filter(Sample.move == move, Sample.events != None): if 'swimming' in events and events['swimming']['type'] == 'Stroke': stroke_count += 1 if 'swimming' in move.activity: assert stroke_count > 0 if stroke_count > 0: move.stroke_count = stroke_count db.session.commit() return move
Mixins/Clonable: Create a deep clone of block data when cloning
(function() { var _ = window._; var SirTrevor = window.SirTrevor; var BlockMixins = SirTrevor.BlockMixins; var Block = SirTrevor.Block; Block.prototype.availableMixins.push('clonable'); BlockMixins.Clonable = { mixinName: 'Clonable', initializeClonable: function() { // For this mixin to work we need to also have the controllable mixin available. // Lets do some security checks if ((this.controllable === true && !this.$control_ui) || // controllable is enabled here but not yet initialized !this.controllable) { // we were not even marked as controllable this.controls = this.controls || {}; this.withMixin(BlockMixins.Controllable); this.controllable = false; // This will prevent from double initing the controllable ui } var stInstance = SirTrevor.getInstance(this.instanceID); this.addUiControl('clone', function(e) { var blockData = _.cloneDeep(this.getData()); var blocks = stInstance.block_manager.blocks; stInstance.block_controls.currentContainer = this.$el; // This will determine where the new block is added stInstance.block_manager.createBlock(blockData.type, blockData.data); SirTrevor.EventBus.trigger('block:cloned', blocks[blocks.length - 1]); }.bind(this)) }, } })();
(function() { var SirTrevor = window.SirTrevor; var BlockMixins = SirTrevor.BlockMixins; var Block = SirTrevor.Block; Block.prototype.availableMixins.push('clonable'); BlockMixins.Clonable = { mixinName: 'Clonable', initializeClonable: function() { // For this mixin to work we need to also have the controllable mixin available. // Lets do some security checks if ((this.controllable === true && !this.$control_ui) || // controllable is enabled here but not yet initialized !this.controllable) { // we were not even marked as controllable this.controls = this.controls || {}; this.withMixin(BlockMixins.Controllable); this.controllable = false; // This will prevent from double initing the controllable ui } var stInstance = SirTrevor.getInstance(this.instanceID); this.addUiControl('clone', function(e) { var blockData = this.getData(); var blocks = stInstance.block_manager.blocks; stInstance.block_controls.currentContainer = this.$el; // This will determine where the new block is added stInstance.block_manager.createBlock(blockData.type, blockData.data); SirTrevor.EventBus.trigger('block:cloned', blocks[blocks.length - 1]); }.bind(this)) }, } })();
Return cancelers from Aff actions
'use strict'; var Control_Monad_Aff = require('../Control.Monad.Aff'); var pg = require('pg'); exports.newPool = function(config) { return function(onSuccess, onError) { onSuccess(new pg.Pool(config)); return Control_Monad_Aff.nonCanceler; }; }; exports.withConnection = function(pool) { return function(body) { return function(onSuccess, onError) { pool.connect(function(err, client, done) { if (err !== null) { onError(err); return; } body(client)(function(r) { done(); onSuccess(r); }, function(e) { done(); onError(e); }); }); return Control_Monad_Aff.nonCanceler; }; }; }; exports._query = function(client) { return function(sql) { return function(values) { return function(onSuccess, onError) { client.query({ text: sql, values: values, rowMode: 'array', }, function(err, result) { if (err !== null) { onError(err); return; } onSuccess(result.rows); }); return Control_Monad_Aff.nonCanceler; }; }; }; }; exports.unsafeIsBuffer = function(x) { return x instanceof Buffer; };
'use strict'; var pg = require('pg'); exports.newPool = function(config) { return function(onSuccess, onError) { onSuccess(new pg.Pool(config)); }; }; exports.withConnection = function(pool) { return function(body) { return function(onSuccess, onError) { pool.connect(function(err, client, done) { if (err !== null) { onError(err); return; } body(client)(function(r) { done(); onSuccess(r); }, function(e) { done(); onError(e); }); }); }; }; }; exports._query = function(client) { return function(sql) { return function(values) { return function(onSuccess, onError) { client.query({ text: sql, values: values, rowMode: 'array', }, function(err, result) { if (err !== null) { onError(err); return; } onSuccess(result.rows); }); }; }; }; }; exports.unsafeIsBuffer = function(x) { return x instanceof Buffer; };
Remove static call to constructor.
<?php /** * Created by PhpStorm. * User: etcinit * Date: 10/3/15 * Time: 6:57 PM */ namespace Chromabits\Illuminated\Http\Factories; use Chromabits\Illuminated\Http\ApiResponse; use Chromabits\Illuminated\Http\Interfaces\ApiResponseFactoryInterface; use Chromabits\Nucleus\Exceptions\LackOfCoffeeException; use Chromabits\Nucleus\Foundation\BaseObject; use Chromabits\Nucleus\Meditation\Interfaces\CheckResultInterface; /** * Class ApiResponseFactory. * * @author Eduardo Trujillo <[email protected]> * @package Chromabits\Illuminated\Http\Factories */ class ApiResponseFactory extends BaseObject implements ApiResponseFactoryInterface { /** * Create an API validation response from a CheckResultInterface. * * @param CheckResultInterface $result * * @return ApiResponse * @throws LackOfCoffeeException */ public function fromCheckable(CheckResultInterface $result) { if ($result->passed()) { throw new LackOfCoffeeException( 'You are trying to send a validation error response,' . ' but your check actually passed!' ); } return new ApiResponse([ 'missing' => $result->getMissing(), 'validation' => $result->getFailed(), ], ApiResponse::STATUS_INVALID, [ 'One or more fields are invalid. Please check your input.', ]); } }
<?php /** * Created by PhpStorm. * User: etcinit * Date: 10/3/15 * Time: 6:57 PM */ namespace Chromabits\Illuminated\Http\Factories; use Chromabits\Illuminated\Http\ApiResponse; use Chromabits\Illuminated\Http\Interfaces\ApiResponseFactoryInterface; use Chromabits\Nucleus\Exceptions\LackOfCoffeeException; use Chromabits\Nucleus\Foundation\BaseObject; use Chromabits\Nucleus\Meditation\Interfaces\CheckResultInterface; /** * Class ApiResponseFactory. * * @author Eduardo Trujillo <[email protected]> * @package Chromabits\Illuminated\Http\Factories */ class ApiResponseFactory extends BaseObject implements ApiResponseFactoryInterface { /** * Create an API validation response from a CheckResultInterface. * * @param CheckResultInterface $result * * @return ApiResponse * @throws LackOfCoffeeException */ public function fromCheckable(CheckResultInterface $result) { if ($result->passed()) { throw new LackOfCoffeeException( 'You are trying to send a validation error response,' . ' but your check actually passed!' ); } return new static([ 'missing' => $result->getMissing(), 'validation' => $result->getFailed(), ], ApiResponse::STATUS_INVALID, [ 'One or more fields are invalid. Please check your input.', ]); } }
Allow for extra slashes in project paths, such as mq patch queues.
# Mimic the hggit extension. try: from hggit import * hggit_reposetup = reposetup except ImportError: # Allow this module to be imported without # hg-git installed, eg for setup.py pass __version__ = "0.1.0" def reposetup(ui, repo, **kwargs): """ Automatically adds Bitbucket->GitHub mirror paths to the repo. Also creates a `master` bookmark for the `default` branch. """ hggit_reposetup(ui, repo, **kwargs) bb = "ssh://[email protected]/" for pathname, path in ui.configitems("paths"): if path.startswith(bb): user, project = path.replace(bb, "").split("/", 1) # Strip slash and everything after it, # such as mq patch queue path. project = project.split("/")[0] for k, v in ui.configitems("github"): if k == "username": user = v gh_path = "git+ssh://[email protected]/%s/%s.git" % (user, project) if pathname == "default": if "master" not in repo._bookmarks: from mercurial.commands import bookmark bookmark(ui, repo, mark="master", rev="default") gh_pathname = "github" else: gh_pathname = "github-" + pathname ui.setconfig("paths", gh_pathname, gh_path)
# Mimic the hggit extension. try: from hggit import * hggit_reposetup = reposetup except ImportError: # Allow this module to be imported without # hg-git installed, eg for setup.py pass __version__ = "0.1.0" def reposetup(ui, repo, **kwargs): """ Automatically adds Bitbucket->GitHub mirror paths to the repo. Also creates a `master` bookmark for the `default` branch. """ hggit_reposetup(ui, repo, **kwargs) bb = "ssh://[email protected]/" for pathname, path in ui.configitems("paths"): if path.startswith(bb): user, project = path.replace(bb, "").rstrip("/").split("/") for k, v in ui.configitems("github"): if k == "username": user = v gh_path = "git+ssh://[email protected]/%s/%s.git" % (user, project) if pathname == "default": if "master" not in repo._bookmarks: from mercurial.commands import bookmark bookmark(ui, repo, mark="master", rev="default") gh_pathname = "github" else: gh_pathname = "github-" + pathname ui.setconfig("paths", gh_pathname, gh_path)
Mark the module as not zip safe. The template finder code in Flask doesn't handle zipped eggs well, and thus won't find index.template.html. This makes the module crash when attempting to load the UI.
from setuptools import setup from codecs import open from os import path here = path.abspath(path.dirname(__file__)) # Get the long description from the README file with open(path.join(here, 'flask_swagger_ui/README.md'), encoding='utf-8') as f: long_description = f.read() setup( name='flask-swagger-ui', version='3.0.12a', description='Swagger UI blueprint for Flask', long_description=long_description, zip_safe=False, url='https://github.com/sveint/flask-swagger-ui', author='Svein Tore Koksrud Seljebotn', author_email='[email protected]', license='MIT', classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', ], keywords='flask swagger', packages=['flask_swagger_ui'], package_data={ 'flask_swagger_ui': [ 'README.md', 'templates/*.html', 'dist/VERSION', 'dist/LICENSE', 'dist/README.md', 'dist/*.html', 'dist/*.js', 'dist/*.css', 'dist/*.png' ], } )
from setuptools import setup from codecs import open from os import path here = path.abspath(path.dirname(__file__)) # Get the long description from the README file with open(path.join(here, 'flask_swagger_ui/README.md'), encoding='utf-8') as f: long_description = f.read() setup( name='flask-swagger-ui', version='3.0.12a', description='Swagger UI blueprint for Flask', long_description=long_description, url='https://github.com/sveint/flask-swagger-ui', author='Svein Tore Koksrud Seljebotn', author_email='[email protected]', license='MIT', classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', ], keywords='flask swagger', packages=['flask_swagger_ui'], package_data={ 'flask_swagger_ui': [ 'README.md', 'templates/*.html', 'dist/VERSION', 'dist/LICENSE', 'dist/README.md', 'dist/*.html', 'dist/*.js', 'dist/*.css', 'dist/*.png' ], } )
fix: Add key iterator for categories map
/** * Created by farid on 8/16/2017. */ import React, {Component} from "react"; import Category from "./Category"; import {getCategories} from "../actions/Category"; import {connect} from "react-redux"; export class HomePage extends Component { componentDidMount() { this.props.getCategories(); } render() { let categories = this.props.categories; return ( <div className="container"> {categories && categories.map((category, index) => { return ( <div key={index}> <Category name={category.name}/> <br/> </div> ) }) } </div> ) } } const mapStateToProps = (state, props) => ({ categories: state.category.categories }); const mapDispatchToProps = dispatch => ({ getCategories: () => dispatch(getCategories()) }); HomePage.propTypes = {}; export default connect( mapStateToProps, mapDispatchToProps )(HomePage)
/** * Created by farid on 8/16/2017. */ import React, {Component} from "react"; import Category from "./Category"; import {getCategories} from "../actions/Category"; import {connect} from "react-redux"; export class HomePage extends Component { componentDidMount() { this.props.getCategories(); } render() { let categories = this.props.categories; return ( <div className="container"> {categories && categories.map((category) => { return ( <div> <Category name={category.name}/> <br/> </div> ) }) } </div> ) } } const mapStateToProps = (state, props) => ({ categories: state.category.categories }); const mapDispatchToProps = dispatch => ({ getCategories: () => dispatch(getCategories()) }); HomePage.propTypes = {}; export default connect( mapStateToProps, mapDispatchToProps )(HomePage)
Fix unicode issues with new tag
from django.dispatch import Signal, receiver from django.core.mail import EmailMultiAlternatives from search.models import Person import logging from django.conf import settings unknown_tag_signal = Signal(providing_args=['author', 'title', 'tags']) logger = logging.getLogger('search') @receiver(unknown_tag_signal) def unknown_tag_callback(sender, **kwargs): author = Person.objects.get(pk=kwargs['author']) title = kwargs['title'] unknown_tags = kwargs['tags'] message = "Dear moderator,\n\n" + \ u"{person} created an item '{title}' ".format(person=author.name, title=title) + \ "and tried to add the following nonexisting tags:\n\n" + \ "Tokens: " + ','.join(unknown_tags['token']) + "\n" + \ "Persons: " + ','.join(unknown_tags['person']) + "\n" + \ "Literals: " + ','.join(unknown_tags['literal']) + "\n\n" + \ "It is up to you to determine whether these tags should " + \ "exist and add them to both the system and this item." + \ "\n\nThis message was generated automatically." logger.debug(message) subject = u'[Starfish] User {person} uses unknown tags'.format( person=author.name) from_email = "notifications@%s" % (settings.HOSTNAME,) msg = EmailMultiAlternatives(subject, message, from_email, to=settings.ADMIN_NOTIFICATION_EMAIL) msg.send(fail_silently=True)
from django.dispatch import Signal, receiver from django.core.mail import EmailMultiAlternatives from search.models import Person import logging from django.conf import settings unknown_tag_signal = Signal(providing_args=['author', 'title', 'tags']) logger = logging.getLogger('search') @receiver(unknown_tag_signal) def unknown_tag_callback(sender, **kwargs): author = Person.objects.get(pk=kwargs['author']) title = kwargs['title'] unknown_tags = kwargs['tags'] message = "Dear moderator,\n\n" + \ "{person} created an item '{title}' ".format(person=author.name, title=title) + \ "and tried to add the following nonexisting tags:\n\n" + \ "Tokens: " + ','.join(unknown_tags['token']) + "\n" + \ "Persons: " + ','.join(unknown_tags['person']) + "\n" + \ "Literals: " + ','.join(unknown_tags['literal']) + "\n\n" + \ "It is up to you to determine whether these tags should " + \ "exist and add them to both the system and this item." + \ "\n\nThis message was generated automatically." logger.debug(message) subject = '[Starfish] User {person} uses unknown tags'.format(person=author.name) from_email = "notifications@%s" % (settings.HOSTNAME,) msg = EmailMultiAlternatives(subject, message, from_email, to=settings.ADMIN_NOTIFICATION_EMAIL) msg.send(fail_silently=True)
Validate that we can translate a NEWOBJECT into a FETCHOBJECT
import os import select import groundstation.fs_watcher as fs_watcher from groundstation.peer_socket import PeerSocket from groundstation.utils import path2id from integration_fixture import StationIntegrationFixture, \ TestListener, \ TestClient class StationFSWatcherIntegration(StationIntegrationFixture): def test_notifies_peer(self): read_sockets = [] write_sockets = [] def tick(): return select.select(read_sockets, write_sockets, [], 1) addr = os.path.join(self.dir, "listener") listener = TestListener(addr) client = TestClient(addr) peer = listener.accept(PeerSocket) watcher = fs_watcher.FSWatcher(self.stations[0].store.object_root) read_sockets.append(client) read_sockets.append(watcher) self.stations[0].write("trolololol") (sread, _, _) = tick() self.assertIn(watcher, sread) obj_name = path2id(watcher.read()) client.notify_new_object(self.stations[0], obj_name) client.send() peer.recv() data = peer.packet_queue.pop() gizmo = self.stations[1].gizmo_factory.hydrate(data, peer) assert gizmo is not None, "gizmo_factory returned None" gizmo.process() peer.send() client.recv() data = client.packet_queue.pop() gizmo = self.stations[0].gizmo_factory.hydrate(data, peer) assert gizmo is not None, "gizmo_factory returned None" self.assertEqual(gizmo.verb, "FETCHOBJECT") self.assertEqual(gizmo.payload, obj_name) gizmo.process() watcher.kill()
import os import select import groundstation.fs_watcher as fs_watcher from groundstation.peer_socket import PeerSocket from integration_fixture import StationIntegrationFixture, \ TestListener, \ TestClient class StationFSWatcherIntegration(StationIntegrationFixture): def test_notifies_peer(self): read_sockets = [] write_sockets = [] def tick(): return select.select(read_sockets, write_sockets, [], 1) addr = os.path.join(self.dir, "listener") listener = TestListener(addr) client = TestClient(addr) peer = listener.accept(PeerSocket) watcher = fs_watcher.FSWatcher(self.stations[0].store.object_root) read_sockets.append(client) read_sockets.append(watcher) self.stations[0].write("trolololol") (sread, _, _) = tick() self.assertIn(watcher, sread) obj_name = watcher.read() client.notify_new_object(self.stations[0], obj_name) client.send() peer.recv() data = peer.packet_queue.pop() gizmo = self.stations[1].gizmo_factory.hydrate(data, peer) assert gizmo is not None, "gizmo_factory returned None" gizmo.process() watcher.kill()
Add 'configuration' node in 'product_attribute' fixture
<?php /* * This file is part of the Sylius package. * * (c) Paweł Jędrzejewski * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ namespace Sylius\Bundle\CoreBundle\Fixture; use Doctrine\Common\Persistence\ObjectManager; use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; /** * @author Kamil Kokot <[email protected]> */ class ProductAttributeFixture extends AbstractResourceFixture { /** * @var array */ private $attributeTypes; /** * @param ObjectManager $objectManager * @param ExampleFactoryInterface $exampleFactory * @param array $attributeTypes */ public function __construct(ObjectManager $objectManager, ExampleFactoryInterface $exampleFactory, array $attributeTypes) { parent::__construct($objectManager, $exampleFactory); $this->attributeTypes = array_keys($attributeTypes); } /** * {@inheritdoc} */ public function getName() { return 'product_attribute'; } /** * {@inheritdoc} */ protected function configureResourceNode(ArrayNodeDefinition $resourceNode) { $resourceNode ->children() ->scalarNode('name')->cannotBeEmpty()->end() ->scalarNode('code')->cannotBeEmpty()->end() ->enumNode('type')->values($this->attributeTypes)->cannotBeEmpty()->end() ->variableNode('configuration')->end() ; } }
<?php /* * This file is part of the Sylius package. * * (c) Paweł Jędrzejewski * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ namespace Sylius\Bundle\CoreBundle\Fixture; use Doctrine\Common\Persistence\ObjectManager; use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; /** * @author Kamil Kokot <[email protected]> */ class ProductAttributeFixture extends AbstractResourceFixture { /** * @var array */ private $attributeTypes; /** * @param ObjectManager $objectManager * @param ExampleFactoryInterface $exampleFactory * @param array $attributeTypes */ public function __construct(ObjectManager $objectManager, ExampleFactoryInterface $exampleFactory, array $attributeTypes) { parent::__construct($objectManager, $exampleFactory); $this->attributeTypes = array_keys($attributeTypes); } /** * {@inheritdoc} */ public function getName() { return 'product_attribute'; } /** * {@inheritdoc} */ protected function configureResourceNode(ArrayNodeDefinition $resourceNode) { $resourceNode ->children() ->scalarNode('name')->cannotBeEmpty()->end() ->scalarNode('code')->cannotBeEmpty()->end() ->enumNode('type')->values($this->attributeTypes)->cannotBeEmpty()->end() ; } }
Patch to make work like we expect
import json import logging import os import sys def json_patch(path): logging.warn("Attempting to load local settings from %r" % (path,)) try: d = json.load(open(path)) except IOError: logging.exception("Unable to open json settings in %r" % (path,)) raise SystemExit(-1) except ValueError: logging.exception("Unable to parse json settings in %r" % (path,)) raise SystemExit(-1) for k, v in d.items(): globals()[k] = v def patch_settings(json_settings_file): env_settings = os.environ.get('JSON_SETTINGS', None) if env_settings is None: # We only use the default if it exists env_settings = os.path.join(sys.prefix, "etc", json_settings_file) if not os.path.exists(env_settings): return json_patch(env_settings) if "VAR_DIRECTORY" not in globals(): globals()["VAR_DIRECTORY"] = os.path.join(sys.prefix, "var") if "STATIC_ROOT" not in globals(): globals()["STATIC_ROOT"] = os.path.join( globals()["VAR_DIRECTORY"], "static") if "MEDIA_ROOT" not in globals(): globals()["MEDIA_ROOT"] = os.path.join( globals()["VAR_DIRECTORY"], "media")
import json import logging import os import sys def json_patch(path): logging.warn("Attempting to load local settings from %r" % (path,)) try: d = json.load(open(path)) except IOError: logging.exception("Unable to open json settings in %r" % (path,)) raise SystemExit(-1) except ValueError: logging.exception("Unable to parse json settings in %r" % (path,)) raise SystemExit(-1) for k, v in d.items(): globals()[k] = v def patch_settings(): env_settings = os.environ.get('JSON_SETTINGS', None) if env_settings is None: # We only use the default if it exists settings_file = globals().get('JSON_SETTINGS_FILE', 'settings.json') env_settings = os.path.join(sys.prefix, "etc", settings_file) if not os.path.exists(env_settings): return json_patch(env_settings) if "VAR_DIRECTORY" not in globals(): globals()["VAR_DIRECTORY"] = os.path.join(sys.prefix, "var") if "STATIC_ROOT" not in globals(): globals()["STATIC_ROOT"] = os.path.join( globals()["VAR_DIRECTORY"], "static") if "MEDIA_ROOT" not in globals(): globals()["MEDIA_ROOT"] = os.path.join( globals()["VAR_DIRECTORY"], "media") patch_settings()
Configure accept attr in image form type.
<?php /** * @author Igor Nikolaev <[email protected]> * @copyright Copyright (c) 2015, Darvin Studio * @link https://www.darvin-studio.ru * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ namespace Darvin\ImageBundle\Form\Type\Image; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; /** * Image form type */ class ImageType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType', [ 'label' => false, 'required' => false, 'attr' => [ 'accept' => 'image/*', ], ]); } /** * {@inheritdoc} */ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ 'csrf_token_id' => md5(__FILE__.$this->getBlockPrefix()), 'required' => false, ]) ->remove([ 'data_class', ]) ->setRequired([ 'data_class', ]); } /** * {@inheritdoc} */ public function getBlockPrefix() { return 'darvin_image_image'; } }
<?php /** * @author Igor Nikolaev <[email protected]> * @copyright Copyright (c) 2015, Darvin Studio * @link https://www.darvin-studio.ru * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ namespace Darvin\ImageBundle\Form\Type\Image; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; /** * Image form type */ class ImageType extends AbstractType { /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType', [ 'label' => false, 'required' => false, ]); } /** * {@inheritdoc} */ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ 'csrf_token_id' => md5(__FILE__.$this->getBlockPrefix()), 'required' => false, ]) ->remove([ 'data_class', ]) ->setRequired([ 'data_class', ]); } /** * {@inheritdoc} */ public function getBlockPrefix() { return 'darvin_image_image'; } }
Add profile link inside karma render
<?php namespace App\Middlewares; use App\Message; use App\Gitter\Middleware\MiddlewareInterface; /** * Проверяет слово "карма" и выводит статус * * Class KarmaRenderMiddleware * @package App\Gitter\Middleware */ class KarmaRenderMiddleware implements MiddlewareInterface { /** * @param Message $message * @return mixed */ public function handle(Message $message) { if (trim(mb_strtolower($message->text)) === 'карма') { $args = [ 'user' => $message->user->login, 'karma' => $message->user->karma_text, 'thanks' => $message->user->thanks_text ]; $karmaMessage = $args['karma'] ? \Lang::get('karma.count.message', $args) : \Lang::get('karma.count.empty', $args); $achievements = []; foreach ($message->user->achievements as $achieve) { $achievements[] = '"' . $achieve->title . '"'; } if (count($achievements)) { $karmaMessage .= ("\n" . '- Достижения: ' . implode(', ', $achievements)); } $karmaMessage .= "\n" . sprintf( '- [Профиль %s на laravel.su](http://karma.laravel.su/user/%s)', $message->user->login, $message->user->login ); $message->italic($karmaMessage); } return $message; } }
<?php namespace App\Middlewares; use App\Message; use App\Gitter\Middleware\MiddlewareInterface; /** * Проверяет слово "карма" и выводит статус * * Class KarmaRenderMiddleware * @package App\Gitter\Middleware */ class KarmaRenderMiddleware implements MiddlewareInterface { /** * @param Message $message * @return mixed */ public function handle(Message $message) { if (trim(mb_strtolower($message->text)) === 'карма') { $args = [ 'user' => $message->user->login, 'karma' => $message->user->karma_text, 'thanks' => $message->user->thanks_text ]; $karmaMessage = $args['karma'] ? \Lang::get('karma.count.message', $args) : \Lang::get('karma.count.empty', $args); $achievements = []; foreach ($message->user->achievements as $achieve) { $achievements[] = '"' . $achieve->title . '"'; } if (count($achievements)) { $karmaMessage .= ("\n" . '- Достижения: ' . implode(', ', $achievements)); } $message->italic($karmaMessage); } return $message; } }
Fix merging of Laravel .htaccess with h5bp .htaccess
(function(exports) { "use strict"; var request = require('request'); var Sink = require('pipette').Sink; var unzipper = require('../process-zip'); var fs = require('fs'); exports.downloadLaravel = function(grunt, init, done) { unzipper.processZip(request('https://github.com/laravel/laravel/archive/master.zip'), { fromdir: 'laravel-master/', todir: 'build/', verbose: function(msg) { grunt.verbose.writeln(msg); }, complete: done, rename: function(file) { var matches = /^(.*)\.md$/.exec(file); if (matches) { return matches[1] + '-Laravel.md'; } if (/build\/public\/.htaccess$/.test(file)) { // need to append this file because it already exists (comes with h5bp) new Sink(this).on('data', function(buffer) { var htaccess = '\n' + '# ----------------------------------------------------------------------\n' + '# Laravel framework\n' + '# ----------------------------------------------------------------------\n' + buffer.toString(); fs.appendFileSync(file, htaccess); }); } return file; } }); }; })(typeof exports === 'object' && exports || this);
(function(exports) { "use strict"; var request = require('request'); var Sink = require('pipette').Sink; var unzipper = require('../process-zip'); exports.downloadLaravel = function(grunt, init, done) { unzipper.processZip(request('https://github.com/laravel/laravel/archive/master.zip'), { fromdir: 'laravel-master/', todir: 'build/', verbose: function(msg) { grunt.verbose.writeln(msg); }, complete: done, rename: function(file) { var matches = /^(.*)\.md$/.exec(file); if (matches) { return matches[1] + '-Laravel.md'; } if (file === 'build/public/.htaccess') { // need to append this file because it already exists (comes with h5bp) new Sink(this).on('data', function(buffer) { var htaccess = '\n' + '# ----------------------------------------------------------------------\n' + '# Laravel framework\n' + '# ----------------------------------------------------------------------\n' + buffer.toString(); fs.appendFileSync(file, htaccess); }); } return file; } }); }; })(typeof exports === 'object' && exports || this);
Add documentation to card import handler
package editor.gui.ccp.handler; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; import java.util.Arrays; import java.util.stream.Collectors; import javax.swing.TransferHandler; import editor.database.card.Card; import editor.gui.ccp.data.DataFlavors; import editor.gui.editor.EditorFrame; /** * Import handler for importing a list of single copies of cards. */ @SuppressWarnings("serial") public class CardImportHandler extends TransferHandler implements ImportHandler { /** Editor frame that is importing the cards. */ private final EditorFrame editor; /** ID of the list to import cards to. */ private final int id; /** * Create a new card import handler. * * @param e editor frame containing the deck to import cards into * @param i ID of the list in the deck to import into */ public CardImportHandler(EditorFrame e, int i) { editor = e; id = i; } @Override public DataFlavor supportedFlavor() { return DataFlavors.cardFlavor; } @Override public boolean canImport(TransferSupport supp) { return supp.isDataFlavorSupported(supportedFlavor()); } @Override public boolean importData(TransferSupport supp) { if (!canImport(supp)) return false; else { try { var data = Arrays.stream((Card[])supp.getTransferable().getTransferData(supportedFlavor())).collect(Collectors.toSet()); return editor.addCards(id, data, 1); } catch (UnsupportedFlavorException | IOException e) { return false; } } } }
package editor.gui.ccp.handler; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; import java.util.Arrays; import java.util.stream.Collectors; import javax.swing.TransferHandler; import editor.database.card.Card; import editor.gui.ccp.data.DataFlavors; import editor.gui.editor.EditorFrame; @SuppressWarnings("serial") public class CardImportHandler extends TransferHandler implements ImportHandler { private final EditorFrame editor; private final int id; public CardImportHandler(EditorFrame e, int i) { editor = e; id = i; } @Override public DataFlavor supportedFlavor() { return DataFlavors.cardFlavor; } @Override public boolean canImport(TransferSupport supp) { return supp.isDataFlavorSupported(supportedFlavor()); } @Override public boolean importData(TransferSupport supp) { if (!canImport(supp)) return false; else { try { var data = Arrays.stream((Card[])supp.getTransferable().getTransferData(supportedFlavor())).collect(Collectors.toSet()); return editor.addCards(id, data, 1); } catch (UnsupportedFlavorException | IOException e) { return false; } } } }
Use builder to create object.
package com.theaccountant.accountabilityhack.processor; import com.theaccountant.accountabilityhack.data.SchoolEntry; import com.theaccountant.accountabilityhack.data.SchoolRegistry; import java.io.IOException; public final class FteAantalProcessor implements Processor { public void process(final SchoolRegistry registry) throws IOException { final CsvReader reader = new CsvReader("02.-po-fte-owtype-bestuur-brin-functie.csv"); while (reader.next()) { final String brin = reader.get("BRIN_NUMMER"); final SchoolEntry entry; if (registry.isSchoolPresent(brin)) { entry = registry.getSchoolByBrin(brin); } else { entry = SchoolEntry.builder().brin(brin).build(); registry.addSchool(entry); } final String functie = reader.get("FUNCTIEGROEP"); final String fte = reader.get("FTE'S 2016"); switch (functie) { case "Directie": entry.setFteDirectie(fte); break; case "Onderwijsgevend personeel": entry.setFteLeerkrachten(fte); break; case "Onderwijsondersteunend personeel (OOP/OBP)": entry.setFteOndersteunend(fte); break; default: System.err.println("Unknown functie: " + functie); break; } } } }
package com.theaccountant.accountabilityhack.processor; import com.theaccountant.accountabilityhack.data.SchoolEntry; import com.theaccountant.accountabilityhack.data.SchoolRegistry; import java.io.IOException; public final class FteAantalProcessor implements Processor { public void process(final SchoolRegistry registry) throws IOException { final CsvReader reader = new CsvReader("02.-po-fte-owtype-bestuur-brin-functie.csv"); while (reader.next()) { final String brin = reader.get("BRIN_NUMMER"); final SchoolEntry entry; if (registry.isSchoolPresent(brin)) { entry = registry.getSchoolByBrin(brin); } else { entry = new SchoolEntry(brin); registry.addSchool(entry); } final String functie = reader.get("FUNCTIEGROEP"); final String fte = reader.get("FTE'S 2016"); switch (functie) { case "Directie": entry.setFteDirectie(fte); break; case "Onderwijsgevend personeel": entry.setFteLeerkrachten(fte); break; case "Onderwijsondersteunend personeel (OOP/OBP)": entry.setFteOndersteunend(fte); break; default: System.err.println("Unknown functie: " + functie); break; } } } }
Add UA and matched UA to device-detection view output.
from pywurfl.algorithms import DeviceNotFound from django.http import Http404 from molly.utils.views import BaseView from molly.utils.breadcrumbs import NullBreadcrumb from molly.wurfl.vsm import vsa from molly.wurfl import device_parents from molly.wurfl.wurfl_data import devices class IndexView(BaseView): breadcrumb = NullBreadcrumb def handle_GET(cls, request, context): if not getattr(cls.conf, 'expose_view', False): raise Http404 ua = request.GET.get('ua', request.META.get('HTTP_USER_AGENT', '')) ua = ua.decode('ascii', 'ignore') try: device = devices.select_ua( ua, search=vsa ) except (KeyError, DeviceNotFound): device = devices.select_id('generic_xhtml') context = { 'id': device.devid, 'is_mobile': not 'generic_web_browser' in device_parents[device.devid], 'brand_name': device.brand_name, 'model_name': device.model_name, 'ua': ua, 'matched_ua': device.devua, } if request.GET.get('capabilities') == 'true': context['capabilities'] = dict((k, getattr(device, k)) for k in dir(device) if (not k.startswith('_') and not k.startswith('dev') and not k=='groups')) return cls.render(request, context, None)
from pywurfl.algorithms import DeviceNotFound from django.http import Http404 from molly.utils.views import BaseView from molly.utils.breadcrumbs import NullBreadcrumb from molly.wurfl.vsm import vsa from molly.wurfl import device_parents from molly.wurfl.wurfl_data import devices class IndexView(BaseView): breadcrumb = NullBreadcrumb def handle_GET(cls, request, context): if not getattr(cls.conf, 'expose_view', False): raise Http404 ua = request.GET.get('ua', request.META.get('HTTP_USER_AGENT', '')) ua = ua.decode('ascii', 'ignore') try: device = devices.select_ua( ua, search=vsa ) except (KeyError, DeviceNotFound): device = devices.select_id('generic_xhtml') context = { 'id': device.devid, 'is_mobile': not 'generic_web_browser' in device_parents[device.devid], 'brand_name': device.brand_name, 'model_name': device.model_name, } if request.GET.get('capabilities') == 'true': context['capabilities'] = dict((k, getattr(device, k)) for k in dir(device) if (not k.startswith('_') and not k.startswith('dev') and not k=='groups')) return cls.render(request, context, None)
Return cursor instead of our own cursor
<?php namespace EasyRepository\t{{$mt=uniqid(true)}}; use PDO; use EasySQL\Cursor; @foreach ($files as $query) class {{$query->getName()}}Repository { protected $dbh; public function __construct(PDO $pdo) { $this->dbh = $pdo; } @foreach ($query->getMethods() as $name => $method) public function {{$name}}({{$method->getFunctionSignature()}}) { $stmt = $this->dbh->prepare({{@$method->getSQL()}}); $result = $stmt->execute({{$method->getCompact()}}); @if ($method->isInsert()) return $this->dbh->lastInsertId(); @elif ($method->changeSchema()) return true; @elif ($method->singleResult()) @if ($method->mapAsObject()) return $stmt->fetchObject({{ @$method->mapAsObject() }}); @else return $stmt->fetch(PDO::FETCH_ASSOC); @end @else return $stmt; @end } @end } @end return function(PDO $pdo) { return [ @foreach ($files as $query) {{@strtolower($query->getName())}} => new {{$query->getName()}}Repository($pdo), @end ]; };
<?php namespace EasyRepository\t{{$mt=uniqid(true)}}; use PDO; use EasySQL\Cursor; @foreach ($files as $query) class {{$query->getName()}}Repository { protected $dbh; public function __construct(PDO $pdo) { $this->dbh = $pdo; } @foreach ($query->getMethods() as $name => $method) public function {{$name}}({{$method->getFunctionSignature()}}) { $stmt = $this->dbh->prepare({{@$method->getSQL()}}); $result = $stmt->execute({{$method->getCompact()}}); @if ($method->isInsert()) return $this->dbh->lastInsertId(); @elif ($method->changeSchema()) return true; @elif ($method->singleResult()) @if ($method->mapAsObject()) return $stmt->fetchObject({{ @$method->mapAsObject() }}); @else return $stmt->fetch(PDO::FETCH_ASSOC); @end @else return new Cursor($stmt, {{ @$method->mapAsObject() }}); @end } @end } @end return function(PDO $pdo) { return [ @foreach ($files as $query) {{@strtolower($query->getName())}} => new {{$query->getName()}}Repository($pdo), @end ]; };
ui: Enable compile-error dev server overlay, SPA routing
const HtmlWebpackPlugin = require('html-webpack-plugin') const webpack = require('webpack') module.exports = { mode: 'development', output: { filename: 'static/[name].js', publicPath: '/', }, module: { rules: [ { test: /\.elm$/, exclude: [/elm-stuff/, /node_modules/], use: [ { loader: 'elm-hot-webpack-loader' }, { loader: 'elm-webpack-loader', options: { debug: true }, }, ], }, { test: /\.css$/, exclude: [/node_modules/], loader: ['style-loader', 'css-loader'], }, ] }, plugins: [ new HtmlWebpackPlugin({ template: 'public/index.html', favicon: 'public/favicon.png', }), new webpack.HotModuleReplacementPlugin(), ], devServer: { inline: true, historyApiFallback: true, hot: true, stats: { colors: true }, overlay: true, open: true, proxy: [{ context: ['/api', '/debug', '/serve'], target: 'http://localhost:9000', ws: true, }], watchOptions: { ignored: /node_modules/, }, }, };
const HtmlWebpackPlugin = require('html-webpack-plugin') const webpack = require('webpack') module.exports = { mode: 'development', output: { filename: 'static/[name].js', publicPath: '/', }, module: { rules: [ { test: /\.elm$/, exclude: [/elm-stuff/, /node_modules/], use: [ { loader: 'elm-hot-webpack-loader' }, { loader: 'elm-webpack-loader', options: { debug: true }, }, ], }, { test: /\.css$/, exclude: [/node_modules/], loader: ['style-loader', 'css-loader'], }, ] }, plugins: [ new HtmlWebpackPlugin({ template: 'public/index.html', favicon: 'public/favicon.png', }), new webpack.HotModuleReplacementPlugin(), ], devServer: { inline: true, hot: true, stats: { colors: true }, proxy: [{ context: ['/api', '/debug', '/serve'], target: 'http://localhost:9000', ws: true, }], }, };
Add onExit disconnect of websockets
angular.module('urlShortener', ['ui.router', 'base64', 'ngStomp']) .config(function ($stateProvider, $urlRouterProvider) { $stateProvider //starter screen .state('starter', { url: "/starter", templateUrl: "templates/starter.html", controller: "starterCtrl" }) //sign up screen .state('signUp', { url: "/signUp", templateUrl: "templates/signUp.html", controller: "signUpCtrl" }) //sign in screen .state('signIn', { url: "/signIn", templateUrl: "templates/signIn.html", controller: "signInCtrl" }) //starter screen .state('viewStatistics', { url: "/viewStatistics", templateUrl: "templates/viewStatistics.html", controller: "viewStatisticsCtrl", onExit: function($state, viewStatistics){ viewStatistics.disconnectEliza(); } }) //restrict access .state('restrictAccess', { url: "/restrictAccess", templateUrl: "templates/restrictAccess.html", controller: "restrictAccessCtrl", onEnter: function($state, auth){ if(!auth.isAuthenticated()){ $state.go('starter'); } } }); $urlRouterProvider.otherwise('starter'); });
angular.module('urlShortener', ['ui.router', 'base64', 'ngStomp']) .config(function ($stateProvider, $urlRouterProvider) { $stateProvider //starter screen .state('starter', { url: "/starter", templateUrl: "templates/starter.html", controller: "starterCtrl" }) //sign up screen .state('signUp', { url: "/signUp", templateUrl: "templates/signUp.html", controller: "signUpCtrl" }) //sign in screen .state('signIn', { url: "/signIn", templateUrl: "templates/signIn.html", controller: "signInCtrl" }) //starter screen .state('viewStatistics', { url: "/viewStatistics", templateUrl: "templates/viewStatistics.html", controller: "viewStatisticsCtrl" }) //restrict access .state('restrictAccess', { url: "/restrictAccess", templateUrl: "templates/restrictAccess.html", controller: "restrictAccessCtrl", onEnter: function($state, auth){ if(!auth.isAuthenticated()){ $state.go('starter'); } } }); $urlRouterProvider.otherwise('starter'); });
Throw exceptions error responses from server
import requests import json from datetime import datetime def _json_serial(obj): """JSON serializer for objects not serializable by default json code""" if isinstance(obj, datetime): serial = obj.isoformat() return serial class SwisClient: def __init__(self, hostname, username, password, verify=False): self.url = "https://{}:17778/SolarWinds/InformationService/v3/Json/".\ format(hostname) self.credentials = (username, password) self.verify = verify def query(self, query, **params): return self._req( "POST", "Query", {'query': query, 'parameters': params}).json() def invoke(self, entity, verb, *args): return self._req( "POST", "Invoke/{}/{}".format(entity, verb), args).json() def create(self, entity, **properties): return self._req( "POST", "Create/" + entity, properties).json() def read(self, uri): return self._req("GET", uri).json() def update(self, uri, **properties): self._req("POST", uri, properties) def delete(self, uri): self._req("DELETE", uri) def _req(self, method, frag, data=None): resp = requests.request(method, self.url + frag, data=json.dumps(data, default=_json_serial), verify=self.verify, auth=self.credentials, headers={'Content-Type': 'application/json'}) resp.raise_for_status() return resp
import requests import json from datetime import datetime def _json_serial(obj): """JSON serializer for objects not serializable by default json code""" if isinstance(obj, datetime): serial = obj.isoformat() return serial class SwisClient: def __init__(self, hostname, username, password, verify=False): self.url = "https://{}:17778/SolarWinds/InformationService/v3/Json/".\ format(hostname) self.credentials = (username, password) self.verify = verify def query(self, query, **params): return self._req( "POST", "Query", {'query': query, 'parameters': params}).json() def invoke(self, entity, verb, *args): return self._req( "POST", "Invoke/{}/{}".format(entity, verb), args).json() def create(self, entity, **properties): return self._req( "POST", "Create/" + entity, properties).json() def read(self, uri): return self._req("GET", uri).json() def update(self, uri, **properties): self._req("POST", uri, properties) def delete(self, uri): self._req("DELETE", uri) def _req(self, method, frag, data=None): return requests.request(method, self.url + frag, data=json.dumps(data, default=_json_serial), verify=self.verify, auth=self.credentials, headers={'Content-Type': 'application/json'})
Align cfg logo right on larger screens
<footer class="row"> <div class="c-footer col-xs-12 col-md-offset-2 col-md-8"> <div class="row"> <div class="col-xs-6 col-sm-4"> <img src="{{ asset('img/logos/okf.svg') }}" alt="Logo der OpenKnowledge Foundation Deutschland" height="48" /> </div> <div class="col-xs-6 col-sm-4 end-sm"> <img src="{{ asset('img/logos/cfg.svg') }}" alt="Logo von Code for Germany" height="48" /> </div> <div class="col-xs-12 col-sm-4 first-sm middle-sm"> <a href="{{ route('locale.set', ['language' => 'de']) }}" title="Sprache auf Deutsch umstellen."> <span class="flag-icon flag-icon-de flag-icon-squared u-round"></span> </a> <a href="{{ route('locale.set', ['language' => 'en']) }}" title="Switch language to English."> <span class="flag-icon flag-icon-gb flag-icon-squared u-round"></span> </a> </div> </div> </div> </footer>
<footer class="row"> <div class="c-footer col-xs-12 col-md-offset-2 col-md-8"> <div class="row"> <div class="col-xs-6 col-sm-4"> <img src="{{ asset('img/logos/okf.svg') }}" alt="Logo der OpenKnowledge Foundation Deutschland" height="48" /> </div> <div class="col-xs-6 col-sm-4"> <img src="{{ asset('img/logos/cfg.svg') }}" alt="Logo von Code for Germany" height="48" /> </div> <div class="col-xs-12 col-sm-4 first-sm middle-sm"> <a href="{{ route('locale.set', ['language' => 'de']) }}" title="Sprache auf Deutsch umstellen."> <span class="flag-icon flag-icon-de flag-icon-squared u-round"></span> </a> <a href="{{ route('locale.set', ['language' => 'en']) }}" title="Switch language to English."> <span class="flag-icon flag-icon-gb flag-icon-squared u-round"></span> </a> </div> </div> </div> </footer>
Fix count param, use local es for now
import json import requests from elasticsearch_dsl import Search from elasticsearch_dsl.result import Response class ShareSearch(Search): BASE_URL = 'http://localhost:8000/api/search/abstractcreativework/_search' HEADERS = {'content-type': 'application/json'} PARAMS = dict(raw=True) def execute(self): return Response( self._query(self.to_dict()), callbacks=self._doc_type_map ) def count(self): d = self.to_dict() if d.get('aggs'): del d['aggs'] self = ShareSearch.from_dict(d) return self._query(self.to_dict(), params=dict(size=0))['hits']['total'] def scan(self, size=100): count = 0 page = list(self[0:size].execute()) while(page): for hit in page: count += 1 yield hit page = list(self[count:count + size].execute()) def _query(self, data, params=None): return requests.post( self.BASE_URL, headers=self.HEADERS, data=json.dumps(self.to_dict()), params=params or self.PARAMS ).json() basic_search = ShareSearch() basic_search.aggs.bucket( 'sourceAgg', 'terms', field='_type', size=0, min_doc_count=0 )
import json import requests from elasticsearch_dsl import Search from elasticsearch_dsl.result import Response class ShareSearch(Search): BASE_URL = 'https://osf.io/api/v1/share/search/' HEADERS = {'content-type': 'application/json'} PARAMS = dict(raw=True) def execute(self): return Response( self._query(self.to_dict()), callbacks=self._doc_type_map ) def count(self): d = self.to_dict() if d.get('aggs'): del d['aggs'] self = ShareSearch.from_dict(d) return self._query(self.to_dict(), params=dict(count=True))['count'] def scan(self, size=100): count = 0 page = list(self[0:size].execute()) while(page): for hit in page: count += 1 yield hit page = list(self[count:count + size].execute()) def _query(self, data, params=None): return requests.post( self.BASE_URL, headers=self.HEADERS, data=json.dumps(self.to_dict()), params=params or self.PARAMS ).json() basic_search = ShareSearch() basic_search.aggs.bucket( 'sourceAgg', 'terms', field='_type', size=0, min_doc_count=0 )
Change celery and kombu requirements to match ckanext-datastorer
from setuptools import setup, find_packages setup( name='ckanext-archiver', version='0.1', packages=find_packages(), install_requires=[ 'celery==2.4.2', 'kombu==2.1.3', 'kombu-sqlalchemy==1.1.0', 'SQLAlchemy>=0.6.6', 'requests==0.6.4', 'messytables>=0.1.4', 'flask==0.8' # flask needed for tests ], author='Open Knowledge Foundation', author_email='[email protected]', description='Archive ckan resources', long_description='Archive ckan resources', license='MIT', url='http://ckan.org/wiki/Extensions', download_url='', include_package_data=True, classifiers=[ 'Development Status :: 3 - Alpha', 'Environment :: Console', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries :: Python Modules' ], entry_points=''' [paste.paster_command] archiver = ckanext.archiver.commands:Archiver [ckan.plugins] archiver = ckanext.archiver.plugin:ArchiverPlugin [ckan.celery_task] tasks = ckanext.archiver.celery_import:task_imports ''' )
from setuptools import setup, find_packages setup( name='ckanext-archiver', version='0.1', packages=find_packages(), install_requires=[ 'celery==2.4.5', 'kombu==1.5.1', 'kombu-sqlalchemy==1.1.0', 'SQLAlchemy>=0.6.6', 'requests==0.6.4', 'messytables>=0.1.4', 'flask==0.8' # flask needed for tests ], author='Open Knowledge Foundation', author_email='[email protected]', description='Archive ckan resources', long_description='Archive ckan resources', license='MIT', url='http://ckan.org/wiki/Extensions', download_url='', include_package_data=True, classifiers=[ 'Development Status :: 3 - Alpha', 'Environment :: Console', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries :: Python Modules' ], entry_points=''' [paste.paster_command] archiver = ckanext.archiver.commands:Archiver [ckan.plugins] archiver = ckanext.archiver.plugin:ArchiverPlugin [ckan.celery_task] tasks = ckanext.archiver.celery_import:task_imports ''' )
Remove default value and cast always to array the options
<?php namespace Avanzu\AdminThemeBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; /** * This is the class that validates and merges configuration from your app/config files * * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class} */ class Configuration implements ConfigurationInterface { /** * {@inheritdoc} */ public function getConfigTreeBuilder() { $treeBuilder = new TreeBuilder(); $rootNode = $treeBuilder->root('avanzu_admin_theme'); $rootNode->children() ->scalarNode('bower_bin') ->defaultValue('/usr/local/bin/bower') ->end() ->scalarNode('use_assetic') ->defaultValue(true) ->end() ->scalarNode('use_twig') ->defaultValue(true) ->end() ->arrayNode('options') ->beforeNormalization()->castToArray()->end() ->end() ->end(); // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for // more information on that topic. return $treeBuilder; } }
<?php namespace Avanzu\AdminThemeBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; /** * This is the class that validates and merges configuration from your app/config files * * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class} */ class Configuration implements ConfigurationInterface { /** * {@inheritdoc} */ public function getConfigTreeBuilder() { $treeBuilder = new TreeBuilder(); $rootNode = $treeBuilder->root('avanzu_admin_theme'); $rootNode->children() ->scalarNode('bower_bin') ->defaultValue('/usr/local/bin/bower') ->end() ->scalarNode('use_assetic') ->defaultValue(true) ->end() ->scalarNode('use_twig') ->defaultValue(true) ->end() ->arrayNode('options') ->defaultValue([]) ->end() ->end(); // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for // more information on that topic. return $treeBuilder; } }
Fix bug where a validator chain was called as a promise instead of a function
import _ from 'lodash'; import BPromise from 'bluebird'; import { resolve } from '../utils'; export function parallel(...validators) { return function(context) { return BPromise.all(_.map(validators, (validator) => validator(context))); }; } export function series(...validators) { return function(context) { return BPromise.mapSeries(validators, function(validator) { return validator(context); }); }; } export function each(...validators) { return function(context) { const value = context.get('value'); if (_.isArray(value) || _.isObject(value)) { const keys = _.isArray(value) ? _.map(value, (v, i) => i) : _.keys(value); return BPromise.mapSeries(keys, (key) => { const keyValue = value[key]; return BPromise.mapSeries(validators, validator => { return resolve(validator.call(this, context, keyValue, key), context); }); }); } }; } export function eachParallel(...validators) { return function(context) { const value = context.get('value'); if (_.isArray(value) || _.isObject(value)) { return BPromise.all(_.map(value, (value, key) => { return BPromise.mapSeries(validators, validator => { return validator.call(this, context, value, key); }); })); } }; } export default function defaultValidatorsPlugin() { return function(valdsl) { valdsl.dsl.extend({ each: each, parallel: parallel, series: series }); }; }
import _ from 'lodash'; import BPromise from 'bluebird'; export function parallel(...validators) { return function(context) { return BPromise.all(_.map(validators, (validator) => validator(context))); }; } export function series(...validators) { return function(context) { return BPromise.mapSeries(validators, function(validator) { return validator(context); }); }; } export function each(...validators) { return function(context) { const value = context.get('value'); if (_.isArray(value) || _.isObject(value)) { const keys = _.isArray(value) ? _.map(value, (v, i) => i) : _.keys(value); return BPromise.mapSeries(keys, (key) => { const keyValue = value[key]; return BPromise.mapSeries(validators, validator => { return validator.call(this, context, keyValue, key); }); }); } }; } export function eachParallel(...validators) { return function(context) { const value = context.get('value'); if (_.isArray(value) || _.isObject(value)) { return BPromise.all(_.map(value, (value, key) => { return BPromise.mapSeries(validators, validator => { return validator.call(this, context, value, key); }); })); } }; } export default function defaultValidatorsPlugin() { return function(valdsl) { valdsl.dsl.extend({ each: each, parallel: parallel, series: series }); }; }
Send rest of request params
<?php use PHPUnit\Framework\TestCase; class DelegatedAuthorizationsTest extends TestCase { public function testDelegatedAuthorizations() { $profileId = "profileId"; $email = "emailOfAccountToAccess"; $callback_url = "http://www.example.com/callback"; $scopes = ["read_events"]; $state = "user-state"; $args = array( "profile_id" => $profileId, "email" => $email, "callback_url" => $callback_url, "scope" => $scopes, "state" => $state ); $http = $this->createMock('HttpRequest'); $http->expects($this->once()) ->method('http_post') ->with( $this->equalTo('https://api.cronofy.com/v1/delegated_authorizations'), $this->equalTo($args), $this->equalTo(array( 'Authorization: Bearer accessToken', 'Host: api.cronofy.com', 'Content-Type: application/json; charset=utf-8', )) ) ->will($this->returnValue(array("", 202))); $cronofy = new Cronofy(array( "client_id" => "clientId", "client_secret" => "clientSecret", "access_token" => "accessToken", "refresh_token" => "refreshToken", "http_client" => $http, )); $cronofy->request_delegated_authorization($args); } }
<?php use PHPUnit\Framework\TestCase; class DelegatedAuthorizationsTest extends TestCase { public function testDelegatedAuthorizations() { $profileId = "profileId"; $args = array( "profile_id" => $profileId, ); $http = $this->createMock('HttpRequest'); $http->expects($this->once()) ->method('http_post') ->with( $this->equalTo('https://api.cronofy.com/v1/delegated_authorizations'), $this->equalTo($args), $this->equalTo(array( 'Authorization: Bearer accessToken', 'Host: api.cronofy.com', 'Content-Type: application/json; charset=utf-8', )) ) ->will($this->returnValue(array("", 202))); $cronofy = new Cronofy(array( "client_id" => "clientId", "client_secret" => "clientSecret", "access_token" => "accessToken", "refresh_token" => "refreshToken", "http_client" => $http, )); $cronofy->request_delegated_authorization($args); } }
Remove obsolete object from scope
'use strict'; angular.module('com.module.sandbox') .controller('SandboxFormsCtrl', function ($scope, CoreService) { var now = new Date(); $scope.formOptions = {}; $scope.formData = { name: null, description: null, startDate: now, startTime: now, endDate: now, endTime: now }; $scope.formFields = [{ key: 'name', type: 'input', templateOptions: { label: 'Name' } }, { key: 'description', type: 'textarea', templateOptions: { label: 'Description' } }, { key: 'startDate', type: 'datepicker', templateOptions: { label: 'Start Date' } }, { key: 'startTime', type: 'timepicker', templateOptions: { label: 'Start Time' } }, { key: 'endDate', type: 'datepicker', templateOptions: { label: 'End Date' } }, { key: 'endTime', type: 'timepicker', templateOptions: { label: 'End Time' } }]; $scope.onSubmit = function (data) { CoreService.alertSuccess('Good job!', JSON.stringify(data, null, 2)); }; });
'use strict'; angular.module('com.module.sandbox') .controller('SandboxFormsCtrl', function ($scope, CoreService) { var now = new Date(); $scope.formOptions = {}; $scope.formData = { name: null, description: null, startDate: now, startTime: now, endDate: now, endTime: now }; $scope.formFields = [{ key: 'name', type: 'input', templateOptions: { label: 'Name' } }, { key: 'description', type: 'textarea', templateOptions: { label: 'Description' } }, { key: 'startDate', type: 'datepicker', templateOptions: { label: 'Start Date' } }, { key: 'startTime', type: 'timepicker', templateOptions: { label: 'Start Time' } }, { key: 'endDate', type: 'datepicker', templateOptions: { label: 'End Date' } }, { key: 'endTime', type: 'timepicker', templateOptions: { label: 'End Time' } }]; $scope.formOptions = {}; $scope.onSubmit = function (data) { CoreService.alertSuccess('Good job!', JSON.stringify(data, null, 2)); }; });
Add image when path is set, not only when SplInfo is present
<?php declare(strict_types=1); namespace SitemapPlugin\Generator; use Liip\ImagineBundle\Imagine\Cache\CacheManager; use SitemapPlugin\Factory\SitemapImageUrlFactoryInterface; use Sylius\Component\Core\Model\ProductImageInterface; use Sylius\Component\Core\Model\ProductInterface; final class ProductToImageSitemapArrayGenerator { /** @var CacheManager */ private $imagineCacheManager; /** @var SitemapImageUrlFactoryInterface */ private $sitemapImageUrlFactory; /** @var string */ private $imagePreset; public function __construct( SitemapImageUrlFactoryInterface $sitemapImageUrlFactory, CacheManager $imagineCacheManager, string $imagePreset = 'sylius_shop_product_original' ) { $this->sitemapImageUrlFactory = $sitemapImageUrlFactory; $this->imagineCacheManager = $imagineCacheManager; $this->imagePreset = $imagePreset; } public function generate(ProductInterface $product): array { $images = []; /** @var ProductImageInterface $image */ foreach ($product->getImages() as $image) { if (!$image->getPath()) { continue; } $sitemapImage = $this->sitemapImageUrlFactory->createNew(); $sitemapImage->setLocation($this->imagineCacheManager->getBrowserPath($image->getPath(), $this->imagePreset)); $images[] = $sitemapImage; } return $images; } }
<?php declare(strict_types=1); namespace SitemapPlugin\Generator; use Liip\ImagineBundle\Imagine\Cache\CacheManager; use SitemapPlugin\Factory\SitemapImageUrlFactoryInterface; use Sylius\Component\Core\Model\ProductImageInterface; use Sylius\Component\Core\Model\ProductInterface; final class ProductToImageSitemapArrayGenerator { /** @var CacheManager */ private $imagineCacheManager; /** @var SitemapImageUrlFactoryInterface */ private $sitemapImageUrlFactory; /** @var string */ private $imagePreset; public function __construct( SitemapImageUrlFactoryInterface $sitemapImageUrlFactory, CacheManager $imagineCacheManager, string $imagePreset = 'sylius_shop_product_original' ) { $this->sitemapImageUrlFactory = $sitemapImageUrlFactory; $this->imagineCacheManager = $imagineCacheManager; $this->imagePreset = $imagePreset; } public function generate(ProductInterface $product): array { $images = []; /** @var ProductImageInterface $image */ foreach ($product->getImages() as $image) { if (!$image->hasFile() || !$image->getPath()) { continue; } $sitemapImage = $this->sitemapImageUrlFactory->createNew(); $sitemapImage->setLocation($this->imagineCacheManager->getBrowserPath($image->getPath(), $this->imagePreset)); $images[] = $sitemapImage; } return $images; } }
Resolve style errors on input block
module.exports = { className: 'input-block', template: require('./index.html'), lazy: false, data: { name: 'Input', icon: '/images/blocks_input.png', attributes: { inputType: { label: 'Input Type', type: 'dropdownChoice', options: ['Single Line Text', 'Long Text'], value: 0, skipAutoRender: true }, label: { label: 'Title', type: 'string', value: '', placeholder: 'Your title goes here', skipAutoRender: true }, color: { label: 'Title Text Color', type: 'color', value: '#638093' } } }, methods: { reportDataChange: function (self) { self.$dispatch('dataChange', this.$index, self.$el.value ); } }, ready: function () { var self = this; if (self.isEditing) { if (self.$el.querySelector('input')) { self.$el.querySelector('input').disabled = 'disabled'; } if (self.$el.querySelector('textarea')) { self.$el.querySelector('textarea').disabled = 'disabled'; } } else { // register block on data object self.$dispatch('dataChange', self.$index, '', self.$data.attributes.label.value ); } } };
module.exports = { className: 'input-block', template: require('./index.html'), lazy: false, data: { name: 'Input', icon: '/images/blocks_input.png', attributes: { inputType: { label: 'Input Type', type: 'dropdownChoice', options: ['Single Line Text', 'Long Text'], value: 0, skipAutoRender: true }, label: { label: 'Title', type: 'string', value: '', placeholder: 'Your title goes here', skipAutoRender: true }, color: { label: 'Title Text Color', type: 'color', value: '#638093' } } }, methods: { reportDataChange: function(self) { self.$dispatch('dataChange', this.$index, self.$el.value ); } }, ready: function() { var self = this; if(self.isEditing) { if (self.$el.querySelector('input')) self.$el.querySelector('input').disabled = 'disabled'; if (self.$el.querySelector('textarea')) self.$el.querySelector('textarea').disabled = 'disabled'; } else { // register block on data object self.$dispatch('dataChange', self.$index, '', self.$data.attributes.label.value ); } } };
Make plugin loader more robust
class PluginLoader: def load(self, directory): ret = [] for plugin in directory.children: plugin_file = plugin.find(name=plugin.name, type='py') if not plugin_file: continue plugin_class = plugin_file.classes[plugin.name] self._check_attributes(plugin_class) plugin_instance = plugin_class() ret.append(plugin_instance) return ret def _check_attributes(self, klass): self._check_aliases(klass) self._check_matches(klass) self._check_priority(klass) def _check_aliases(self, klass): self._check_attribute(klass, 'aliases', '') def _check_matches(self, klass): def matches(self, expression): if isinstance(self.aliases, str): return expression == self.aliases return expression in self.aliases self._check_attribute(klass, 'matches', matches) def _check_priority(self, klass): self._check_attribute(klass, 'priority', 'normal') if klass.priority not in ('low', 'normal', 'high'): klass.priority = 'normal' def _check_attribute(self, klass, attribute, value): if not hasattr(klass, attribute): setattr(klass, attribute, value)
class PluginLoader: def load(self, directory): ret = [] for plugin in directory.children: plugin_file = plugin.find(name=plugin.name, type='py') plugin_class = plugin_file.classes[plugin.name] self._check_attributes(plugin_class) plugin_instance = plugin_class() ret.append(plugin_instance) return ret def _check_attributes(self, klass): self._check_aliases(klass) self._check_matches(klass) self._check_priority(klass) def _check_aliases(self, klass): self._check_attribute(klass, 'aliases', '') def _check_matches(self, klass): def matches(self, expression): if isinstance(self.aliases, str): return expression == self.aliases return expression in self.aliases self._check_attribute(klass, 'matches', matches) def _check_priority(self, klass): self._check_attribute(klass, 'priority', 'normal') if klass.priority not in ('low', 'normal', 'high'): klass.priority = 'normal' def _check_attribute(self, klass, attribute, value): if not hasattr(klass, attribute): setattr(klass, attribute, value)
Comment on alterative of using rectangle as bounding box.
/** * Copyright (c) 2013 Marshall Farrier * http://www.opensource.org/licenses/mit-license.php * * Handles image drawing for use in sprites * * Dependencies: * extend.js * point.js */ var _c = _c || {}; (function(_c) { 'use strict'; _c.draw = _c.draw || {}; _c.draw.Image = _c.Base.extend({ init: function(params) { this.image = new Image(); // required this.image.src = _c.path.images + params.src; this.image.onload = params.onload || function(event) {}; // a rectangle would work but is too heavyweight this.corner = params.corner; this.width = params.width; this.height = params.height; }, draw: function(context) { context.drawImage(this.image, this.corner.x, this.corner.y, this.width, this.height); }, contains: function(point) { if (point.x < this.corner.x || this.corner.x + this.width < point.x) { return false; } if (point.y < this.corner.y || this.corner.y + this.height < point.y) { return false; } return true; } }); })(_c);
/** * Copyright (c) 2013 Marshall Farrier * http://www.opensource.org/licenses/mit-license.php * * Handles image drawing for use in sprites * * Dependencies: * extend.js * point.js */ var _c = _c || {}; (function(_c) { 'use strict'; _c.draw = _c.draw || {}; _c.draw.Image = _c.Base.extend({ init: function(params) { this.image = new Image(); // required this.image.src = _c.path.images + params.src; this.image.onload = params.onload || function(event) {}; this.corner = params.corner; this.width = params.width; this.height = params.height; }, draw: function(context) { context.drawImage(this.image, this.corner.x, this.corner.y, this.width, this.height); }, contains: function(point) { if (point.x < this.corner.x || this.corner.x + this.absWidth() < point.x) { return false; } if (point.y < this.corner.y || this.corner.y + this.absHeight() < point.y) { return false; } return true; } }); })(_c);
Fix typo startContanier should be startContainer.
define([], function() { var saveSelection, restoreSelection; if (window.getSelection && document.createRange) { saveSelection = function(el) { var sel = window.getSelection && window.getSelection(); if (sel && sel.rangeCount > 0) { return sel.getRangeAt(0); } }; restoreSelection = function(el, sel) { var range = document.createRange(); range.setStart(sel.startContainer, sel.startOffset); range.setEnd(sel.endContainer, sel.endOffset) sel = window.getSelection(); sel.removeAllRanges(); sel.addRange(range); } } else if (document.selection && document.body.createTextRange) { saveSelection = function(el) { return document.selection.createRange(); }; restoreSelection = function(el, sel) { var textRange = document.body.createTextRange(); textRange.moveToElementText(el); textRange.setStart(sel.startContainer, sel.startOffset); textRange.setEnd(sel.endContainer, sel.endOffset); textRange.select(); }; } });
define([], function() { var saveSelection, restoreSelection; if (window.getSelection && document.createRange) { saveSelection = function(el) { var sel = window.getSelection && window.getSelection(); if (sel && sel.rangeCount > 0) { return sel.getRangeAt(0); } }; restoreSelection = function(el, sel) { var range = document.createRange(); range.setStart(sel.startContainer, sel.startOffset); range.setEnd(sel.endContainer, sel.endOffset) sel = window.getSelection(); sel.removeAllRanges(); sel.addRange(range); } } else if (document.selection && document.body.createTextRange) { saveSelection = function(el) { return document.selection.createRange(); }; restoreSelection = function(el, sel) { var textRange = document.body.createTextRange(); textRange.moveToElementText(el); textRange.setStart(sel.startContanier, sel.startOffset); textRange.setEnd(sel.endContainer, sel.endOffset); textRange.select(); }; } });
Add minimum version for pycryptodome
from setuptools import setup setup( name='scuevals-api', packages=['scuevals_api'], include_package_data=True, test_suite='tests', entry_points={ 'console_scripts': [ 'app=scuevals_api.cmd:cli' ] }, install_requires=[ 'alembic==0.9.7', 'beautifulsoup4==4.6.0', 'blinker==1.4', 'coveralls==1.2.0', 'Flask-Caching==1.3.3', 'Flask-Cors==3.0.3', 'Flask-JWT-Extended==3.6.0', 'Flask-Migrate==2.1.1', 'Flask-RESTful==0.3.6', 'Flask-Rollbar==1.0.1', 'Flask-SQLAlchemy==2.3.2', 'Flask==0.12.2', 'gunicorn==19.7.1', 'newrelic==2.100.0.84', 'psycopg2==2.7.3.2', 'pycryptodome>=3.4.7' 'python-jose==2.0.1', 'PyYAML==3.12', 'requests==2.18.4', 'rollbar==0.13.17', 'vcrpy==1.11.1', 'webargs==1.8.1', ], )
from setuptools import setup setup( name='scuevals-api', packages=['scuevals_api'], include_package_data=True, test_suite='tests', entry_points={ 'console_scripts': [ 'app=scuevals_api.cmd:cli' ] }, install_requires=[ 'alembic==0.9.7', 'beautifulsoup4==4.6.0', 'blinker==1.4', 'coveralls==1.2.0', 'Flask-Caching==1.3.3', 'Flask-Cors==3.0.3', 'Flask-JWT-Extended==3.6.0', 'Flask-Migrate==2.1.1', 'Flask-RESTful==0.3.6', 'Flask-Rollbar==1.0.1', 'Flask-SQLAlchemy==2.3.2', 'Flask==0.12.2', 'gunicorn==19.7.1', 'newrelic==2.100.0.84', 'psycopg2==2.7.3.2', 'python-jose==2.0.1', 'PyYAML==3.12', 'requests==2.18.4', 'rollbar==0.13.17', 'vcrpy==1.11.1', 'webargs==1.8.1', ], )