microscope 0.4.2 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe546a0992badf5f49cdc16de08a22bc41d8c7b
-  data.tar.gz: e384811bc6c78629902d024d4ad5b1ba35b5de91
+  metadata.gz: 5ce7b5f37e16e39e35c66a3656f23102f8e93cf0
+  data.tar.gz: c9e3f907ff0e7115aad4b1e6fea83554c6669c3f
 SHA512:
-  metadata.gz: b935b723edbfb69c5cc4f971ec09f2a4cf92fcaedc9b7b075b4323e77502cfa24090954a12a2e058278795e5829b7e34ebc0e033d3b9839f6f9a211b544eb929
-  data.tar.gz: 07087ccd590dd1e350bb57d52358d8e159d29ee1b5ac5cf31bc6b16fd391587bc655f971df64ea1564a54a76ac85100ac30848c38228e13d75e187b1be73037b
+  metadata.gz: 8797bc1a795441eb0c4a90028ea8a94fade80a51a2883848be7ec2c065cccaac3911cbc39c34e1d28043653af376d18f5bfcd495c6dac4badbf9b34274cc5f2b
+  data.tar.gz: 416d448370602b907d27a6713cd180a93b3510b9ac88f66ba12ab9094af21b3fc1563fcfce8498b32f2ad2d2e74f4315facda104e67d144c3b8e90c48da1d566

data/.travis.yml

@@ -8,4 +8,13 @@ gemfile:
   - gemfiles/Gemfile.activerecord-4.0
   - gemfiles/Gemfile.activerecord-3.2.x
 
+env:
+  - DB_ADAPTER=sqlite3
+  - DB_ADAPTER=mysql2
+  - DB_ADAPTER=postgresql
+
+before_script:
+  - mysql -e 'create database microscope_test;'
+  - psql -c 'create database microscope_test;' -U postgres
+
 script: "echo 'DO IT' && bundle exec rake spec"

data/lib/microscope/scope.rb

@@ -7,6 +7,14 @@ module Microscope
       @table_name = model.name.tableize
     end
 
+    def quoted_field
+      @quoted_field ||= "#{ActiveRecord::Base.connection.quote_table_name(@table_name)}.#{ActiveRecord::Base.connection.quote_column_name(@field_name)}"
+    end
+
+    def cropped_field
+      @cropped_field ||= @field_name.gsub(@cropped_field_regex, '')
+    end
+
     # Inject ActiveRecord scopes into a model
     def self.inject_scopes(model, fields, options = {})
       fields.each do |field|

data/lib/microscope/scope/datetime_scope.rb

@@ -11,7 +11,6 @@ module Microscope
 
       def apply
         return unless @field_name =~ @cropped_field_regex
-        @cropped_field = @field_name.gsub(@cropped_field_regex, '')
 
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           #{before_scopes}
@@ -25,30 +24,30 @@ module Microscope
 
       def before_scopes
         <<-RUBY
-          scope "#{@cropped_field}_before", lambda { |time| where("`#{@table_name}`.`#{@field_name}` < ?", time) }
-          scope "#{@cropped_field}_before_or_at", lambda { |time| where("`#{@table_name}`.`#{@field_name}` <= ?", time) }
-          scope "#{@cropped_field}_before#{@now_suffix}", lambda { where("`#{@table_name}`.`#{@field_name}` < ?", #{@now}) }
+          scope "#{cropped_field}_before", lambda { |time| where('#{quoted_field} < ?', time) }
+          scope "#{cropped_field}_before_or_at", lambda { |time| where('#{quoted_field} <= ?', time) }
+          scope "#{cropped_field}_before#{@now_suffix}", lambda { where('#{quoted_field} < ?', #{@now}) }
         RUBY
       end
 
       def after_scopes
         <<-RUBY
-          scope "#{@cropped_field}_after", lambda { |time| where("`#{@table_name}`.`#{@field_name}` > ?", time) }
-          scope "#{@cropped_field}_after_or_at", lambda { |time| where("`#{@table_name}`.`#{@field_name}` >= ?", time) }
-          scope "#{@cropped_field}_after#{@now_suffix}", lambda { where("`#{@table_name}`.`#{@field_name}` > ?", #{@now}) }
+          scope "#{cropped_field}_after", lambda { |time| where('#{quoted_field} > ?', time) }
+          scope "#{cropped_field}_after_or_at", lambda { |time| where('#{quoted_field} >= ?', time) }
+          scope "#{cropped_field}_after#{@now_suffix}", lambda { where('#{quoted_field} > ?', #{@now}) }
         RUBY
       end
 
       def between_scopes
         <<-RUBY
-          scope "#{@cropped_field}_between", lambda { |range| where("#{@field_name}" => range) }
+          scope "#{cropped_field}_between", lambda { |range| where("#{@field_name}" => range) }
         RUBY
       end
 
       def boolean_scopes
         <<-RUBY
-          scope "#{@cropped_field}", lambda { where("`#{@table_name}`.`#{@field_name}` IS NOT NULL AND `#{@table_name}`.`#{@field_name}` <= ?", #{@now}) }
-          scope "not_#{@cropped_field}", lambda { where("`#{@table_name}`.`#{@field_name}` IS NULL OR `#{@table_name}`.`#{@field_name}` > ?", #{@now}) }
+          scope "#{cropped_field}", lambda { where('#{quoted_field} IS NOT NULL AND #{quoted_field} <= ?', #{@now}) }
+          scope "not_#{cropped_field}", lambda { where('#{quoted_field} IS NULL OR #{quoted_field} > ?', #{@now}) }
         RUBY
       end
     end

data/lib/microscope/version.rb

@@ -1,3 +1,3 @@
 module Microscope
-  VERSION = "0.4.2"
+  VERSION = '0.5'
 end

data/microscope.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'mysql2', '~> 0.3.13'
 end

data/spec/spec_helper.rb

@@ -2,24 +2,21 @@ $:.unshift File.expand_path('../lib', __FILE__)
 
 require 'rspec'
 require 'sqlite3'
+require 'mysql2'
+require 'pg'
 
 require 'microscope'
 
 # Require our macros and extensions
-Dir[File.expand_path('../../spec/support/macros/*.rb', __FILE__)].map(&method(:require))
+Dir[File.expand_path('../../spec/support/macros/**/*.rb', __FILE__)].map(&method(:require))
 
 RSpec.configure do |config|
   # Include our macros
   config.include DatabaseMacros
   config.include ModelMacros
 
-  config.before(:each) do
-    # Create the SQLite database
-    setup_database
-  end
-
-  config.after(:each) do
-    # Make sure we remove our test database file
-    cleanup_database
+  config.before :each do
+    adapter = ENV['DB_ADAPTER'] || 'sqlite3'
+    setup_database(adapter: adapter, database: 'microscope_test')
   end
 end

data/spec/support/macros/database/database_adapter.rb

@@ -0,0 +1,9 @@
+class DatabaseAdapter
+  def initialize(opts = {})
+    @database = opts[:database]
+  end
+
+  def establish_connection!
+    ActiveRecord::Base.establish_connection(database_configuration)
+  end
+end

data/spec/support/macros/database/mysql2_adapter.rb

@@ -0,0 +1,16 @@
+require_relative 'database_adapter'
+
+class Mysql2Adapter < DatabaseAdapter
+  def database_configuration
+    {
+      adapter: 'mysql2',
+      database: @database,
+      username: 'travis',
+      encoding: 'utf8'
+    }
+  end
+
+  def reset_database!
+    ActiveRecord::Base.connection.execute("SELECT concat('DROP TABLE IF EXISTS ', table_name, ';') FROM information_schema.tables WHERE table_schema = '#{@database}';")
+  end
+end

data/spec/support/macros/database/postgresql_adapter.rb

@@ -0,0 +1,17 @@
+require_relative 'database_adapter'
+
+class PostgresqlAdapter < DatabaseAdapter
+  def database_configuration
+    {
+      adapter: 'postgresql',
+      database: @database,
+      user: 'postgres',
+      schema_search_path: 'public'
+    }
+  end
+
+  def reset_database!
+    ActiveRecord::Base.connection.execute('drop schema public cascade;')
+    ActiveRecord::Base.connection.execute('create schema public;')
+  end
+end

data/spec/support/macros/database/sqlite3_adapter.rb

@@ -0,0 +1,14 @@
+require_relative 'database_adapter'
+
+class Sqlite3Adapter < DatabaseAdapter
+  def database_configuration
+    {
+      adapter: 'sqlite3',
+      database: ':memory:'
+    }
+  end
+
+  def reset_database!
+    ActiveRecord::Base.connection.execute("select 'drop table ' || name || ';' from sqlite_master where type = 'table';")
+  end
+end

data/spec/support/macros/database_macros.rb

@@ -11,23 +11,12 @@ module DatabaseMacros
     klass.new.up
   end
 
-  def self.database_file
-    @database_file || File.expand_path('../test.db', __FILE__)
-  end
-
-  def setup_database
-    # Make sure the test database file is gone
-    cleanup_database
-
-    # Establish the connection
-    SQLite3::Database.new FileUtils.touch(DatabaseMacros.database_file).first
-    ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: DatabaseMacros.database_file)
+  def setup_database(opts = {})
+    adapter = "#{opts[:adapter].capitalize}Adapter".constantize.new(database: opts[:database])
+    adapter.establish_connection!
+    adapter.reset_database!
 
     # Silence everything
     ActiveRecord::Base.logger = ActiveRecord::Migration.verbose = false
   end
-
-  def cleanup_database
-    FileUtils.rm(DatabaseMacros.database_file) if File.exists?(DatabaseMacros.database_file)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microscope
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
 platform: ruby
 authors:
 - Simon Prévost
@@ -95,6 +95,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  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: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.13
 description: Microscope adds useful scopes targeting ActiveRecord boolean and datetime
   fields.
 email:
@@ -130,6 +158,10 @@ files:
 - spec/microscope/scope/datetime_scope_spec.rb
 - spec/microscope_spec.rb
 - spec/spec_helper.rb
+- spec/support/macros/database/database_adapter.rb
+- spec/support/macros/database/mysql2_adapter.rb
+- spec/support/macros/database/postgresql_adapter.rb
+- spec/support/macros/database/sqlite3_adapter.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb
 homepage: https://github.com/mirego/microscope
@@ -165,5 +197,9 @@ test_files:
 - spec/microscope/scope/datetime_scope_spec.rb
 - spec/microscope_spec.rb
 - spec/spec_helper.rb
+- spec/support/macros/database/database_adapter.rb
+- spec/support/macros/database/mysql2_adapter.rb
+- spec/support/macros/database/postgresql_adapter.rb
+- spec/support/macros/database/sqlite3_adapter.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb