simple-sql 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f45fc27ee92d2023cdcd3eb2b5a0cfbd1a05672
-  data.tar.gz: 8036ee0f56cd039cf1555f8f3fbe323dbaf76a09
+  metadata.gz: 04497955a6185ca1fe0d3d75e30daa7e39e1de2a
+  data.tar.gz: 71e54b945961921b96f3a8bf45333200b3b49de1
 SHA512:
-  metadata.gz: fcef39ebaa97f2807ea6812257b22775d70b3ac21620bdfcf508e4a06340c4142791d7bb6a93d7a17a1c40950236aa3431691afe7c3fcd4072cd1b78d199e1fe
-  data.tar.gz: af8c3af9c817824a76e89c2ed5e7cb9856ad87a696da7e87c26c5cad8a0b9d48d5df92841484e8c27a33a48152069be9a22a0e4269ae7bfb8043a00938cac8d5
+  metadata.gz: d9145018af24cf8c373aeada3b319da669f51d886a0886d1e2f71b2776adf08d6c76e5306313b24448f5c609de23469711cffc482dc13e1bf9bcfca0c9ca23f0
+  data.tar.gz: 0288c8e8d9543799086345b344c3d55d25913d50233cdb143450393c17172b07084631e50787ad6ddfd43957c1106e67fbc40127e95881d7cf7c79b97800e148

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.3.2)
+    simple-sql (0.3.3)
       pg (~> 0.20)
       pg_array_parser (~> 0)
 
@@ -28,8 +28,6 @@ GEM
     database_cleaner (1.6.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    factory_girl (4.8.0)
-      activesupport (>= 3.0.0)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
@@ -81,7 +79,6 @@ DEPENDENCIES
   activerecord (~> 4)
   awesome_print (~> 0)
   database_cleaner (~> 1)
-  factory_girl (= 4.8.0)
   pg (= 0.20)
   rake (~> 11)
   rspec (~> 3.7)

data/Rakefile

@@ -1,9 +1,7 @@
-require "rubocop/rake_task"
-require "rspec/core/rake_task"
-
 Dir.glob("tasks/*.rake").each { |r| import r }
 
-RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new(:rubocop)
-
-task default: [:spec, :rubocop]
+task :default do
+  sh "rspec"
+  sh "USE_ACTIVE_RECORD=1 rspec"
+  sh "rubocop -D"
+end

data/lib/simple/sql/connection.rb

@@ -3,32 +3,20 @@
 
 # private
 module Simple::SQL::Connection
-  def self.new(connection)
-    if defined?(ActiveRecord)
-      if connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-        return ActiveRecordConnection.new(connection)
-      end
-    end
-
-    SimpleConnection.new(connection)
+  def self.active_record_connection
+    ActiveRecordConnection
   end
 
-  class RawConnection
-    def initialize(raw_connection)
-      @raw_connection = raw_connection
-    end
+  def self.pg_connection(connection)
+    PgConnection.new(connection)
+  end
 
+  class PgConnection
     extend Forwardable
     delegate %w(exec_params exec escape wait_for_notify) => :@raw_connection
 
-    def transaction(&_block)
-      raise ArgumentError, "Implementation missing for #transaction"
-    end
-  end
-
-  class SimpleConnection < RawConnection
     def initialize(raw_connection)
-      super(raw_connection)
+      @raw_connection = raw_connection
       @tx_nesting_level = 0
     end
 
@@ -68,12 +56,19 @@ module Simple::SQL::Connection
     end
   end
 
-  class ActiveRecordConnection < RawConnection
-    def initialize(connection)
-      super(connection.raw_connection)
-      @connection = connection
+  module ActiveRecordConnection
+    extend self
+
+    extend Forwardable
+    delegate %w(exec_params exec escape wait_for_notify) => :raw_connection
+    delegate [:transaction] => :connection
+
+    def raw_connection
+      connection.raw_connection
     end
 
-    delegate [:transaction] => :@connection
+    def connection
+      ActiveRecord::Base.connection
+    end
   end
 end

data/lib/simple/sql/duplicate.rb

@@ -48,7 +48,9 @@ module Simple
       # all values in there are SQL::Fragments
       def validated_overrides(overrides)
         overrides.inject({}) do |hsh, (key, value)|
-          raise ArgumentError, "Unknown value #{value.inspect}" unless value.is_a?(Fragment)
+          unless value.is_a?(Fragment)
+            raise ArgumentError, "Pass in override values via SQL.fragment (for #{value.inspect})"
+          end
           hsh.update key.to_s => value.to_sql
         end
       end

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/simple/sql.rb

@@ -25,13 +25,12 @@ module Simple
     end
 
     def default_logger
-      if defined?(ActiveRecord)
-        ActiveRecord::Base.logger
-      else
-        logger = Logger.new(STDERR)
-        logger.level = Logger::INFO
-        logger
-      end
+      logger = ActiveRecord::Base.logger if defined?(ActiveRecord)
+      return logger if logger
+
+      logger = Logger.new(STDERR)
+      logger.level = Logger::INFO
+      logger
     end
 
     # execute one or more sql statements. This method does not allow to pass in
@@ -148,12 +147,12 @@ module Simple
     }
 
     def connect_to_active_record
-      return Connection.new(ActiveRecord::Base.connection) if defined?(ActiveRecord)
+      return Connection.active_record_connection if defined?(ActiveRecord)
 
       STDERR.puts <<~SQL
         Simple::SQL works out of the box with ActiveRecord-based postgres connections, reusing the current connection.
         To use without ActiveRecord you must connect to a database via Simple::SQL.connect!.
-SQL
+      SQL
 
       raise ArgumentError, "simple-sql: missing connection"
     end
@@ -171,7 +170,7 @@ SQL
       config = Config.parse_url(database_url)
 
       require "pg"
-      connection = Connection.new(PG::Connection.new(config))
+      connection = Connection.pg_connection(PG::Connection.new(config))
       self.connector = lambda { connection }
     end
   end

data/simple-sql.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 11'
   gem.add_development_dependency 'rspec', '~> 3.7'
   gem.add_development_dependency 'rubocop', '~> 0.52.1'
-  gem.add_development_dependency 'factory_girl', '4.8.0'
   gem.add_development_dependency 'database_cleaner', '~> 1'
   gem.add_development_dependency 'simplecov', '~> 0'
   gem.add_development_dependency 'awesome_print', '~> 0'

data/spec/spec_helper.rb

@@ -12,6 +12,11 @@ Dir.glob("./spec/support/**/*.rb").sort.each { |path| load path }
 
 require "simple/sql"
 
+unless ENV["USE_ACTIVE_RECORD"]
+  Simple::SQL.connect!
+  Simple::SQL.ask "DELETE FROM users"
+end
+
 SQL = Simple::SQL
 USER_COUNT = 2
 
@@ -21,6 +26,10 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: (ENV["CI"] != "true")
   config.expect_with(:rspec) { |c| c.syntax = :expect }
-  config.include FactoryGirl::Syntax::Methods
   config.order = "random"
+  config.around(:each) do |example|
+    Simple::SQL.ask "DELETE FROM users"
+    Simple::SQL.ask "DELETE FROM unique_users"
+    example.run
+  end
 end

data/spec/support/003_factories.rb

@@ -1,3 +1,33 @@
-require "factory_girl"
+$sequence_counter = 0
 
-# factories are loaded from support/factories automatically
+def sequence(pattern)
+  # pattern.gsub(/\{\{sequence\}\}/) do
+  pattern.gsub(/\{\{sequence\}\}/) do "JH" 
+    $sequence_counter += 1
+  end
+end
+
+def attrs(table)
+  case table
+  when :user
+    {
+      role_id: 123,
+      first_name: sequence("First {{sequence}}"),
+      last_name: sequence("Last {{sequence}}"),
+      access_level: "viewable"
+    }
+  when :unique_user
+    {
+      first_name: sequence("First {{sequence}}"),
+      last_name: sequence("Last {{sequence}}")
+    }
+  else
+    raise ArgumentError, "Invalid table for factory: #{table.inspect}"
+  end
+end
+
+def create(table)
+  table_name = table.to_s.pluralize
+  id = Simple::SQL.insert(table_name, attrs(table))
+  Simple::SQL.record("SELECT * FROM #{table_name} WHERE id=$1", id, into: OpenStruct)
+end

data/spec/support/004_simplecov.rb

@@ -1,10 +1,14 @@
 require "simplecov"
 
+# make sure multiple runs result in multiple result set. SimpleCov will take
+# care of merging these results automatically.
+SimpleCov.command_name "test:#{ENV['USE_ACTIVE_RECORD']}"
+
 SimpleCov.start do
   # return true to remove src from coverage 
   add_filter do |src|
     src.filename =~ /\/spec\//
   end
 
-  minimum_coverage 96
+  minimum_coverage 90
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -109,20 +109,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.52.1
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +193,6 @@ files:
 - spec/support/002_database_cleaner.rb
 - spec/support/003_factories.rb
 - spec/support/004_simplecov.rb
-- spec/support/factories/user_factory.rb
 - spec/support/model/user.rb
 - tasks/release.rake
 homepage: http://github.com/radiospiel/simple-sql
@@ -248,5 +233,4 @@ test_files:
 - spec/support/002_database_cleaner.rb
 - spec/support/003_factories.rb
 - spec/support/004_simplecov.rb
-- spec/support/factories/user_factory.rb
 - spec/support/model/user.rb

data/spec/support/factories/user_factory.rb

@@ -1,14 +0,0 @@
-FactoryGirl.define do
-  factory :user do
-    role_id         123
-
-    sequence :first_name do |n| "First #{n}" end
-    sequence :last_name  do |n| "Last #{n}"  end
-    access_level    "viewable"
-  end
-
-  factory :unique_user do
-    sequence :first_name do |n| "First #{n}" end
-    sequence :last_name  do |n| "Last #{n}"  end
-  end
-end