update spec

Author: dcalixto

config/database.yml

@@ -0,0 +1,2 @@
+test:
+  url: postgres://postgres:postgres@localhost:5432/punching_bag_test

db/migrations/20241217164800_create_punches.cr

@@ -0,0 +1,18 @@
+# +micrate Up
+CREATE TABLE punches (
+  id BIGSERIAL PRIMARY KEY,
+  punchable_type VARCHAR(255),
+  punchable_id BIGINT,
+  hits INTEGER DEFAULT 1,
+  created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+  starts_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+  ends_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_punches_created_at ON punches(created_at);
+CREATE INDEX idx_punches_punchable ON punches(punchable_type, punchable_id);
+CREATE INDEX idx_punches_starts_at ON punches(starts_at);
+CREATE INDEX idx_punches_ends_at ON punches(ends_at);
+
+# +micrate Down
+DROP TABLE IF EXISTS punches CASCADE;

db/migrations/20241217164800_create_punches.sql

@@ -9,10 +9,10 @@ CREATE TABLE punches (
   ends_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
 );
 
-CREATE INDEX punchable_index ON punches (punchable_type, punchable_id);
-CREATE INDEX created_at_index ON punches (created_at);
+CREATE INDEX idx_punches_created_at ON punches(created_at);
+CREATE INDEX idx_punches_punchable ON punches(punchable_type, punchable_id);
+CREATE INDEX idx_punches_starts_at ON punches(starts_at);
+CREATE INDEX idx_punches_ends_at ON punches(ends_at);
 
 -- +micrate Down
-DROP TABLE IF EXISTS punches;
-DROP INDEX IF EXISTS punchable_index;
-DROP INDEX IF EXISTS created_at_index;
+DROP TABLE IF EXISTS punches CASCADE;

spec/db_setup_spec.cr

@@ -1,7 +1,5 @@
 require "./spec_helper"
 
-require "./spec_helper"
-
 describe "DB Setup" do
   describe "database connection" do
     it "creates punches table with correct schema" do
@@ -23,6 +21,7 @@ describe "DB Setup" do
     end
   end
 end
+
 describe "table schema" do
   it "has the expected columns" do
     DB.open(PunchingBag::Configuration.database_url) do |db|
@@ -41,21 +40,16 @@ describe "table schema" do
   end
 end
 
-describe PunchingBag do
+describe PunchingBag::Configuration do
   before_each do
-    File.delete("./punching_bag.db") if File.exists?("./punching_bag.db")
-  end
-
-  after_each do
-    File.delete("./punching_bag.db") if File.exists?("./punching_bag.db")
+    PunchingBag.configure do |config|
+      config.database_url = "postgres://postgres:postgres@localhost:5432/punching_bag_test"
+    end
   end
 
-  describe ".configure" do
-    it "allows setting custom database url" do
-      PunchingBag.configure do |config|
-        config.database_url = "postgres://localhost/punching_bag_test"
-      end
-      PunchingBag::Configuration.database_url.should eq("postgres://localhost/punching_bag_test")
+  it "connects to database" do
+    DB.open(PunchingBag::Configuration.database_url) do |db|
+      # Your test code here
     end
   end
 end

spec/punching_bag_spec.cr

@@ -1,7 +1,12 @@
 require "./spec_helper"
+require "./test_helper"
 
 describe PunchingBag do
-  it "tracks and retrieves hits correctly" do
+  before_each do
+    TestHelper.setup_test_db
+  end
+
+  it "tracks hits" do
     bag = PunchingBag::Tracker.new(TestHelper.database)
     bag.clear
 
@@ -76,16 +81,17 @@ describe "Database Setup" do
     end
   end
 
-  it "creates required indexes" do
-    db = TestHelper.database
-    results = db.query_all(<<-SQL, as: {name: String})
-      SELECT indexname as name 
-      FROM pg_indexes 
-      WHERE tablename = 'punches'
-      AND indexname != 'punches_pkey';
-    SQL
-
-    results.any? { |r| r[:name] == "punchable_index" }.should be_true
-    results.any? { |r| r[:name] == "idx_punches_created_at" }.should be_true
+  describe "Database Setup" do
+    it "creates required indexes" do
+      results = [] of NamedTuple(name: String)
+      DB.open(DB_URL) do |db|
+        db.query "SELECT indexname as name FROM pg_indexes WHERE tablename = 'punches'" do |rs|
+          rs.each do
+            results << {name: rs.read(String)}
+          end
+        end
+      end
+      results.any? { |r| r[:name] == "idx_punches_created_at" }.should be_true
+    end
   end
 end

spec/spec_helper.cr

@@ -1,34 +1,29 @@
 require "spec"
+require "webmock"
 require "../src/punching_bag"
-require "./test_helper"
+require "db"
+require "pg"
+require "micrate"
 
-PunchingBag.configure do |config|
-  config.database_url = "postgres://postgres:postgres@localhost:5432/punching_bag_test"
-end
+DB_URL = "postgres://postgres:postgres@localhost:5432/punching_bag_test"
 
 Spec.before_each do
-  TestHelper.database.exec "DROP TABLE IF EXISTS punches"
-
-  TestHelper.database.exec <<-SQL
-    CREATE TABLE punches (
-      id BIGSERIAL PRIMARY KEY,
-      punchable_type VARCHAR(255),
-      punchable_id BIGINT,
-      hits INTEGER DEFAULT 1,
-      created_at TIMESTAMP WITH TIME ZONE,
-      starts_at TIMESTAMP WITH TIME ZONE,
-      ends_at TIMESTAMP WITH TIME ZONE
-    )
-  SQL
+  WebMock.reset
 
-  TestHelper.database.exec <<-SQL
-    CREATE INDEX punchable_index ON punches (punchable_type, punchable_id)
-  SQL
+  # Clean database first
+  DB.open(DB_URL) do |db|
+    db.exec "DROP TABLE IF EXISTS punches"
+    db.exec "DROP TABLE IF EXISTS micrate_db_version"
+  end
 
-  TestHelper.database.exec <<-SQL
-    CREATE INDEX idx_punches_created_at ON punches (created_at)
-  SQL
+  # Run migrations
+  Micrate::DB.connection_url = DB_URL
+  Micrate::Cli.run_up
 end
-Spec.after_suite do
-  TestHelper.database.close
+
+PunchingBag.configure do |config|
+  config.database_url = DB_URL
+  config.db = DB.open(DB_URL)
 end
+
+# No need to run migrations down since we're dropping tables in before_each

spec/test_helper.cr

@@ -1,7 +1,13 @@
-module TestHelper
-  @@db : DB::Database?
+require "./spec_helper"
 
+module TestHelper
   def self.database
-    @@db ||= DB.open(PunchingBag::Configuration.database_url)
+    DB.open("postgres://postgres:postgres@localhost:5432/punching_bag_test")
+  end
+
+  def self.setup_test_db
+    db = database
+    db.exec "DROP TABLE IF EXISTS hits"
+    db.exec "CREATE TABLE hits (id SERIAL PRIMARY KEY, punchable_type VARCHAR, punchable_id INTEGER, hits INTEGER DEFAULT 0, created_at TIMESTAMP, updated_at TIMESTAMP)"
   end
 end

src/punching_bag.cr

@@ -1,17 +1,13 @@
 require "db"
 require "pg"
+require "./punching_bag/version"
 require "./punching_bag/configuration"
+require "./punching_bag/tracker"
 require "./punching_bag/cli"
 
 module PunchingBag
-  @@db : DB::Database? = nil
-
-  def self.db
-    @@db.not_nil!
-  end
-
-  def self.db=(database : DB::Database)
-    @@db = database
+  def self.configure
+    yield Configuration.config
   end
 
   class Tracker

src/punching_bag/configuration.cr

@@ -1,21 +1,24 @@
 module PunchingBag
   class Configuration
-    @@db : DB::Database? = nil
+    property database_url : String = "postgres://postgres:postgres@localhost:5432/punching_bag_test"
+    property db : DB::Database?
 
-    def self.db : DB::Database
-      @@db ||= DB.open(ENV["DATABASE_URL"])
+    @@config = Configuration.new
+
+    def self.configure
+      yield @@config
     end
 
-    def self.db=(database : DB::Database)
-      @@db = database
+    def self.config
+      @@config
     end
-  end
 
-  def self.configure
-    yield Configuration
-  end
+    def self.database_url
+      @@config.database_url
+    end
 
-  def self.db
-    Configuration.db
+    def self.db
+      @@config.db
+    end
   end
 end

src/punching_bag/tracker.cr

@@ -1,27 +1,43 @@
-def setup_table
-  drop_table
-  create_table
-  create_indexes
-end
-
-private def drop_table
-  @db.exec("DROP TABLE IF EXISTS punches CASCADE")
-end
+module PunchingBag
+  class Tracker
+    def initialize(@db : DB::Database)
+    end
 
-private def create_table
-  @db.exec <<-SQL
-      CREATE TABLE punches (
-        id BIGSERIAL PRIMARY KEY,
-        punchable_type VARCHAR(255),
-        punchable_id BIGINT,
-        hits INTEGER DEFAULT 1,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        starts_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        ends_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
+    def hit(punchable_type : String, punchable_id : Int32)
+      @db.exec(
+        "INSERT INTO hits (punchable_type, punchable_id, hits, created_at, updated_at)
+         VALUES ($1, $2, 1, NOW(), NOW())
+         ON CONFLICT (punchable_type, punchable_id)
+         DO UPDATE SET hits = hits.hits + 1, updated_at = NOW()",
+        punchable_type, punchable_id
       )
-    SQL
-end
+    end
+
+    def setup_table
+      drop_table
+      create_table
+      create_indexes
+    end
+
+    private def drop_table
+      @db.exec("DROP TABLE IF EXISTS hits CASCADE")
+    end
+
+    private def create_table
+      @db.exec <<-SQL
+          CREATE TABLE hits (
+            id BIGSERIAL PRIMARY KEY,
+            punchable_type VARCHAR(255),
+            punchable_id BIGINT,
+            hits INTEGER DEFAULT 1,
+            created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+            updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
+          )
+        SQL
+    end
 
-private def create_indexes
-  @db.exec("CREATE INDEX IF NOT EXISTS idx_punches_punchable ON punches(punchable_type, punchable_id)")
+    private def create_indexes
+      @db.exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_hits_punchable ON hits(punchable_type, punchable_id)")
+    end
+  end
 end

src/punching_bag/version.cr

@@ -0,0 +1,3 @@
+module PunchingBag
+  VERSION = "0.1.0"
+end