flipper-active_record 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4aa6610a01147dbc81d8e256344ecb508ee59fa87b74d6ad746de90d4306c5
-  data.tar.gz: a5c419782f0d82df4a417a5d5c89200fcc8322a8251f1cbba8c5628c40322aa2
+  metadata.gz: e7440c16ba96d1af13b04d53af4a794f2b2721ac9073f3be79399542d35f0e8b
+  data.tar.gz: 3bf38ab6f14dcf13cfaa53e1d8cfba1622be76cbd0cbb26313c2b135d9681b64
 SHA512:
-  metadata.gz: 9fb31e98eb30ac6323ed1f9662ef49df1ba44c71e6006aade9b7c55c2d236be1e2b608e2e2c3a12c8ab5ba9e748fc5d56fd63d0f663a009820fee37184a26ff5
-  data.tar.gz: bc3fa0ec74c8af61b1e5b537d1fc16c973d555de8f3d75238c6e620a33527af65e143d8ceee9999666950d6bcc5b2110c481c4ad4036c7dc9d01d3b097fab420
+  metadata.gz: ae73ab2931ebaa6ab45e8f12d75fd16859b7c35fe83c09311b51c3dd43243106db50588dd7605f9e98a8d1611305861fcf3f082561b06dceab042d21f67e56fd
+  data.tar.gz: 707051b6ad52cbbe0a50e817ba06d39ddb30cc42c1f7585e890d4c4f378bbd8775e519212cf38c43fe49907245c3e25da618e3644081dc5afcca3056d7b90b8b

data/flipper-active_record.gemspec

@@ -1,9 +1,16 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/flipper/version', __FILE__)
 require File.expand_path('../lib/flipper/metadata', __FILE__)
+require "set"
+
+# Files that should exist in main flipper gem.
+main_flipper_active_record_files = Set[
+  "lib/flipper/model/active_record.rb",
+  "spec/flipper/model/active_record_spec.rb",
+]
 
 flipper_active_record_files = lambda do |file|
-  file =~ /active_record/
+  file =~ /active_record/ && !main_flipper_active_record_files.include?(file)
 end
 
 Gem::Specification.new do |gem|

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -60,12 +60,10 @@ files:
 - flipper-active_record.gemspec
 - lib/flipper-active_record.rb
 - lib/flipper/adapters/active_record.rb
-- lib/flipper/model/active_record.rb
 - lib/flipper/version.rb
 - lib/generators/flipper/active_record_generator.rb
 - lib/generators/flipper/templates/migration.erb
 - spec/flipper/adapters/active_record_spec.rb
-- spec/flipper/model/active_record_spec.rb
 - test/adapters/active_record_test.rb
 - test_rails/generators/flipper/active_record_generator_test.rb
 homepage: https://www.flippercloud.io/docs/adapters/active-record
@@ -98,5 +96,4 @@ specification_version: 4
 summary: ActiveRecord adapter for Flipper
 test_files:
 - spec/flipper/adapters/active_record_spec.rb
-- spec/flipper/model/active_record_spec.rb
 - test/adapters/active_record_test.rb

data/lib/flipper/model/active_record.rb

@@ -1,23 +0,0 @@
-module Flipper
-  module Model
-    module ActiveRecord
-      # The id of the record when used as an actor.
-      #
-      #   class User < ActiveRecord::Base
-      #   end
-      #
-      #   user = User.first
-      #   Flipper.enable :some_feature, user
-      #   Flipper.enabled? :some_feature, user #=> true
-      #
-      def flipper_id
-        "#{self.class.base_class.name};#{id}"
-      end
-
-      # Properties used to evaluate expressions
-      def flipper_properties
-        {"type" => self.class.name}.merge(attributes)
-      end
-    end
-  end
-end

data/spec/flipper/model/active_record_spec.rb

@@ -1,61 +0,0 @@
-require 'active_record'
-require 'flipper/model/active_record'
-
-# Turn off migration logging for specs
-ActiveRecord::Migration.verbose = false
-
-RSpec.describe Flipper::Model::ActiveRecord do
-  before(:all) do
-    ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-  end
-
-  before(:each) do
-    ActiveRecord::Base.connection.execute <<-SQL
-      CREATE TABLE users (
-        id integer PRIMARY KEY,
-        name string NOT NULL,
-        age integer,
-        is_confirmed boolean,
-        created_at datetime NOT NULL,
-        updated_at datetime NOT NULL
-      )
-    SQL
-  end
-
-  after(:each) do
-    ActiveRecord::Base.connection.execute("DROP table IF EXISTS `users`")
-  end
-
-  class User < ActiveRecord::Base
-    include Flipper::Model::ActiveRecord
-  end
-
-  class Admin < User
-  end
-
-  describe "flipper_id" do
-    it "returns class name and id" do
-      expect(User.new(id: 1).flipper_id).to eq("User;1")
-    end
-
-    it "uses base class name" do
-      expect(Admin.new(id: 2).flipper_id).to eq("User;2")
-    end
-  end
-
-  describe "flipper_properties" do
-    subject { User.create!(name: "Test", age: 22, is_confirmed: true) }
-
-    it "includes all attributes" do
-      expect(subject.flipper_properties).to eq({
-        "type" => "User",
-        "id" => subject.id,
-        "name" => "Test",
-        "age" => 22,
-        "is_confirmed" => true,
-        "created_at" => subject.created_at,
-        "updated_at" => subject.updated_at
-      })
-    end
-  end
-end