github-ds 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06371d875489add31a6dada7ff308cee7355759a
-  data.tar.gz: 1cfaebb92a0ca5d4b75a71d89a4dcaf9fbda6634
+  metadata.gz: a1aaf710b392b3606a470e855ffc6df96bb8d02d
+  data.tar.gz: a0ccd759cda221b0749c2868e3b55f03aa800589
 SHA512:
-  metadata.gz: 65ce5774cd9519de0383bd3597c277246a977a038bec24cbe945d21b55116d1211487b98134170adb4a9851eb44addb1aa40d38004d09b4e756c3fdd43d79d5b
-  data.tar.gz: 2af9c3b7bc6fd3eaa5543f7c8272afca16afc3e639df64f83074d8ed740c91de37f69ef33c45544fc85bbce1febefeb1e5be92981ff36aef32faefede2d992a9
+  metadata.gz: 6b557340535961e3e89fe98a4f5cb84cad5b66d44accff0bec41398677d6d0f9e40df761da62360aae7083ce4a4df4c31be38750767d404eeb6f208b25af5312
+  data.tar.gz: 0fa602a4a8de432e7db165aacef4207e81daa4e03c8c0907aa7a48278f0aa5ae03ebc0dbf9949008bd62dc512151285e8a96bce293571bad4b0184fddfa7ba3b

data/.travis.yml

@@ -1,5 +1,11 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.3.3
-before_install: gem install bundler -v 1.14.6
+  - 2.2.7
+  - 2.3.4
+  - 2.4.0
+before_script: gem install bundler -v 1.14.6
+script: bundle exec rake
+env:
+  - RAILS_VERSION=5.1.0
+  - RAILS_VERSION=5.0.0
+  - RAILS_VERSION=4.2.5

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+## 0.2.0
+
+Fixes
+
+* Fixed rails generator name https://github.com/github/github-ds/pull/16
+* Add active_record as dependency (not just dev dependency) https://github.com/github/github-ds/commit/e9ce8e4e47d39152021976482e1a0a60efbb9d20
+
+## 0.1.0
+
+* Initial release.

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
-
-# Specify your gem's dependencies in github-ds.gemspec
 gemspec
 
-gem "rails", "~> #{ENV['RAILS_VERSION'] || '5.0.2'}"
+DEFAULT_RAILS_VERSION = '5.0.2'
+gem "rails", "~> #{ENV['RAILS_VERSION'] || DEFAULT_RAILS_VERSION}"
+gem "activerecord", "~> #{ENV['RAILS_VERSION'] || DEFAULT_RAILS_VERSION}"

data/README.md

@@ -33,7 +33,7 @@ Below is a taste of what you can do with these libraries. If you want to see mor
 First, you'll need to create the `key_values` table using the included Rails migration generator.
 
 ```
-rails generate github:kv:active_record
+rails generate github:ds:active_record
 rails db:migrate
 ```
 
@@ -91,24 +91,37 @@ pp kv.mdel(["foo", "bar"])
 
 ```ruby
 # Select, insert, update, delete or whatever you need...
-statement = "INSERT INTO example_key_values (`key`, `value`) VALUES (:key, :value)"
-GitHub::SQL.run statement, key: "foo", value: "bar"
+GitHub::SQL.results <<-SQL
+  SELECT * FROM example_key_values
+SQL
 
-statement = "SELECT value FROM example_key_values WHERE `key` = :key"
-GitHub::SQL.value select_statement, key: "foo"
+GitHub::SQL.run <<-SQL, key: "foo", value: "bar"
+  INSERT INTO example_key_values (`key`, `value`)
+  VALUES (:key, :value)
+SQL
+
+GitHub::SQL.value <<-SQL, key: "foo"
+  SELECT value FROM example_key_values WHERE `key` = :key
+SQL
 
 # Or slowly build up a query based on conditionals...
-sql = GitHub::SQL.new "SELECT `VALUE` FROM example_key_values"
+sql = GitHub::SQL.new <<-SQL
+  SELECT `value` FROM example_key_values
+SQL
 
 key = ENV["KEY"]
 unless key.nil?
-  sql.add "WHERE `key` = :key", key: key
+  sql.add <<-SQL, key: key
+    WHERE `key` = :key
+  SQL
 end
 
 limit = ENV["LIMIT"]
 unless limit.nil?
-  sql.add "ORDER BY `key` ASC"
-  sql.add "LIMIT :limit", limit: limit.to_i
+  sql.add <<-SQL, limit: limit.to_i
+    ORDER BY `key` ASC
+    LIMIT :limit
+  SQL
 end
 
 p sql.results
@@ -193,8 +206,9 @@ Nothing currently on our radar other than continued maintenance. Have a big idea
 
 | pic | @mention |
 |---|---|
-| ![@jnunemaker](https://avatars3.githubusercontent.com/u/235?s=64) | [@jnunemaker](https://github.com/jnunemaker) |
 | ![@charliesome](https://avatars3.githubusercontent.com/u/179065?s=64) | [@charliesome](https://github.com/charliesome) |
+| ![@jnunemaker](https://avatars3.githubusercontent.com/u/235?s=64) | [@jnunemaker](https://github.com/jnunemaker) |
+| ![@zerowidth](https://avatars3.githubusercontent.com/u/3999?s=64) | [@zerowidth](https://github.com/zerowidth) |
 
 ## License
 

data/examples/example_setup.rb

@@ -16,7 +16,7 @@ begin
   require "generators/github/ds/templates/migration"
   ActiveRecord::Migration.verbose = false
   CreateKeyValuesTable.up
-rescue ActiveRecord::NoDatabaseError
+rescue
   raise if attempts >= 1
   ActiveRecord::Base.establish_connection({
     adapter: "mysql2",

data/examples/sql.rb

@@ -1,44 +1,55 @@
 require File.expand_path("../example_setup", __FILE__)
 require "github/sql"
 
-insert_statement = "INSERT INTO example_key_values (`key`, `value`) VALUES (:key, :value)"
-select_statement = "SELECT value FROM example_key_values WHERE `key` = :key"
-update_statement = "UPDATE example_key_values SET value = :value WHERE `key` = :key"
-delete_statement = "DELETE FROM example_key_values WHERE `key` = :key"
-
 ################################# Class Style ##################################
-sql = GitHub::SQL.run insert_statement, key: "foo", value: "bar"
+sql = GitHub::SQL.run <<-SQL, key: "foo", value: "bar"
+  INSERT INTO example_key_values (`key`, `value`) VALUES (:key, :value)
+SQL
 p sql.last_insert_id
 # 1
 
-p GitHub::SQL.value select_statement, key: "foo"
+p GitHub::SQL.value <<-SQL, key: "foo"
+  SELECT value FROM example_key_values WHERE `key` = :key
+SQL
 # "bar"
 
-sql = GitHub::SQL.run update_statement, key: "foo", value: "new value"
+sql = GitHub::SQL.run <<-SQL, key: "foo", value: "new value"
+  UPDATE example_key_values SET value = :value WHERE `key` = :key
+SQL
 p sql.affected_rows
 # 1
 
-sql = GitHub::SQL.run delete_statement, key: "foo"
+sql = GitHub::SQL.run <<-SQL, key: "foo"
+  DELETE FROM example_key_values WHERE `key` = :key
+SQL
 p sql.affected_rows
 # 1
 
 
 ################################ Instance Style ################################
-sql = GitHub::SQL.new insert_statement, key: "foo", value: "bar"
+sql = GitHub::SQL.new <<-SQL, key: "foo", value: "bar"
+  INSERT INTO example_key_values (`key`, `value`) VALUES (:key, :value)
+SQL
 sql.run
 p sql.last_insert_id
 # 2
 
-sql = GitHub::SQL.new select_statement, key: "foo"
+sql = GitHub::SQL.new <<-SQL, key: "foo"
+  SELECT value FROM example_key_values WHERE `key` = :key
+SQL
 p sql.value
 # "bar"
 
-sql = GitHub::SQL.new update_statement, key: "foo", value: "new value"
+sql = GitHub::SQL.new <<-SQL, key: "foo", value: "new value"
+  UPDATE example_key_values SET value = :value WHERE `key` = :key
+SQL
 sql.run
 p sql.affected_rows
 # 1
 
-sql = GitHub::SQL.new delete_statement, key: "foo"
+sql = GitHub::SQL.new <<-SQL, key: "foo"
+  DELETE FROM example_key_values WHERE `key` = :key
+SQL
 sql.run
 p sql.affected_rows
 # 1

data/examples/sql_add.rb

@@ -6,17 +6,23 @@ GitHub::SQL.run <<-SQL
   VALUES ("foo", "bar"), ("baz", "wick")
 SQL
 
-sql = GitHub::SQL.new "SELECT `VALUE` FROM example_key_values"
+sql = GitHub::SQL.new <<-SQL
+  SELECT `VALUE` FROM example_key_values
+SQL
 
 key = ENV["KEY"]
 unless key.nil?
-  sql.add "WHERE `key` = :key", key: key
+  sql.add <<-SQL, key: key
+    WHERE `key` = :key
+  SQL
 end
 
 limit = ENV["LIMIT"]
 unless limit.nil?
-  sql.add "ORDER BY `key` ASC"
-  sql.add "LIMIT :limit", limit: limit.to_i
+  sql.add <<-SQL, limit: limit.to_i
+    ORDER BY `key` ASC
+    LIMIT :limit
+  SQL
 end
 
 p sql.results

data/examples/sql_with_connection.rb

@@ -10,15 +10,17 @@ class SomeModel < ActiveRecord::Base
   })
 end
 
-insert_statement = "INSERT INTO example_key_values (`key`, `value`) VALUES (:key, :value)"
-
 ActiveRecord::Base.transaction do
   # Insert bar on base connection.
-  GitHub::SQL.run insert_statement, key: "bar", value: "baz", connection: ActiveRecord::Base.connection
+  GitHub::SQL.run <<-SQL, key: "bar", value: "baz", connection: ActiveRecord::Base.connection
+    INSERT INTO example_key_values (`key`, `value`) VALUES (:key, :value)
+  SQL
 
   SomeModel.transaction do
     # Insert foo on different connection.
-    GitHub::SQL.run insert_statement, key: "foo", value: "bar", connection: SomeModel.connection
+    GitHub::SQL.run <<-SQL, key: "foo", value: "bar", connection: SomeModel.connection
+      INSERT INTO example_key_values (`key`, `value`) VALUES (:key, :value)
+    SQL
   end
 
   # Roll back "bar" insertion.
@@ -28,5 +30,7 @@ end
 # Show that "bar" key is not here because that connection's transaction was
 # rolled back. SomeModel is a different connection and started a different
 # transaction, which succeeded, so "foo" key was created.
-p GitHub::SQL.values "SELECT `key` FROM example_key_values"
+p GitHub::SQL.values <<-SQL
+  SELECT `key` FROM example_key_values
+SQL
 # ["foo"]

data/github-ds.gemspec

@@ -30,13 +30,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activerecord", ">= 3.2", "< 6.0"
+
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "timecop", "~> 0.8.1"
-  spec.add_development_dependency "activerecord", "~> 5.0"
   spec.add_development_dependency "activesupport"
   spec.add_development_dependency "mysql2"
-  spec.add_development_dependency "activerecord-mysql-adapter"
   spec.add_development_dependency "mocha", "~> 1.2.1"
 end

data/lib/generators/github/ds/active_record_generator.rb

@@ -1,7 +1,7 @@
 require "rails/generators/active_record"
 
 module Github
-  module DS
+  module Ds
     module Generators
       class ActiveRecordGenerator < ::Rails::Generators::Base
         include ::Rails::Generators::Migration

data/lib/github/ds/version.rb

@@ -1,5 +1,5 @@
 module GitHub
   module DS
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/script/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "github/kv"
+require "github/ds"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-ds
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - GitHub Open Source
@@ -9,8 +9,28 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +87,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +115,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-mysql-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +140,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile