flipper-activerecord 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a886563a18c40c7b980312b52cb6d5cb19fb69e
-  data.tar.gz: 6bfd3bb2d5614ead072521d28cecd4c72e2a9805
+  metadata.gz: 6ec2097f8dbc9a98ef38c03221acee5ac110f2ba
+  data.tar.gz: da9f1e5cabe70e31c723d8e99f3bf86380ff1fb1
 SHA512:
-  metadata.gz: 5a4469b453296c8085cb9fc271e81362132afa0508e98304c978288bf69695adf8314c0ed46139ce4572403216fb3814d6efbf8016f4d43f31eb5518a76d55aa
-  data.tar.gz: df879aa060f5d9c2d34047709b24ac2f53604484f4209e4dbbf9eecbea8560c1b20949b5730df1e1f192eb85131feb83169b619e8e92a309503a233525b4b8e0
+  metadata.gz: e1d30fd53b36dde9f18a0ee96a0f77f1c8e4e253765f2a2fc14881c1225ba62a9731d6cbd413b9de0dda210ac89adf151a7b845ccfacd6631f6cc658582d9f96
+  data.tar.gz: d0160bd0df31d7ef1605186092bde0e207eec478bf019e93ea62cbbc1e74a4da3a08cc16d2069a66d492996bc6fca35084f3552bf479bb968ae8723734b3c14d

data/Gemfile.lock

@@ -7,9 +7,9 @@ GIT
 PATH
   remote: .
   specs:
-    flipper-activerecord (0.1.0)
+    flipper-activerecord (0.1.1)
       activerecord (>= 4.2.0.beta2)
-      flipper (~> 0.6.0)
+      flipper (~> 0.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/flipper/activerecord/feature.rb

@@ -4,7 +4,6 @@ module Flipper
       self.table_name = "flipper_features"
 
       has_many :gates, foreign_key: "flipper_feature_id", :dependent => :destroy
-      default_scope { includes(:gates) }
     end
   end
 end

data/lib/flipper/adapters/activerecord.rb

@@ -13,8 +13,7 @@ module Flipper
       # Public: The name of the adapter.
       attr_reader :name
 
-      def initialize(collection)
-        @collection = collection
+      def initialize
         @name = :activerecord
       end
 
@@ -25,7 +24,7 @@ module Flipper
 
       # Public: Adds a feature to the set of known features.
       def add(feature)
-        Flipper::ActiveRecord::Feature.create!(name: feature.name.to_s)
+        Flipper::ActiveRecord::Feature.find_or_create_by!(name: feature.name.to_s)
         true
       end
 
@@ -45,7 +44,7 @@ module Flipper
       # Returns a Hash of Flipper::Gate#key => value.
       def get(feature)
         result = {}
-        f = Flipper::ActiveRecord::Feature.find_by(name: feature.key)
+        f = Flipper::ActiveRecord::Feature.eager_load(:gates).find_by(name: feature.key)
 
         feature.gates.each do |gate|
           result[gate.key] = case gate.data_type
@@ -76,23 +75,34 @@ module Flipper
       #
       # Returns true.
       def enable(feature, gate, thing)
-        f = Flipper::ActiveRecord::Feature.find_or_create_by(name: feature.key.to_s)
-        f.gates.find_or_create_by!(name: gate.key.to_s, value: thing.value.to_s)
+        case gate.data_type
+        when :boolean, :integer
+          g = Flipper::ActiveRecord::Gate.joins(:feature).
+            where(flipper_features: {name: feature.key}).
+            find_or_initialize_by({
+              name: gate.key.to_s,
+            })
+          g.value = thing.value.to_s
+          unless g.persisted?
+            g.feature = Flipper::ActiveRecord::Feature.select(:id).find_or_create_by!(name: feature.key)
+          end
+          g.save!
+        when :set
+          g = Flipper::ActiveRecord::Gate.joins(:feature).
+            where(flipper_features: {name: feature.key}).
+            find_or_initialize_by({
+              name:  gate.key.to_s,
+              value: thing.value.to_s,
+            })
+          unless g.persisted?
+            g.feature = Flipper::ActiveRecord::Feature.select(:id).find_or_create_by!(name: feature.key)
+          end
+          g.save!
+        else
+          unsupported_data_type gate.data_type
+        end
+
         true
-#         case gate.data_type
-#         when :boolean, :integer
-#           update feature.key, '$set' => {
-#             gate.key.to_s => thing.value.to_s,
-#           }
-#         when :set
-#           update feature.key, '$addToSet' => {
-#             gate.key.to_s => thing.value.to_s,
-#           }
-#         else
-#           unsupported_data_type gate.data_type
-#         end
-# 
-#         true
       end
 
       # Public: Disables a gate for a given thing.
@@ -103,18 +113,16 @@ module Flipper
       #
       # Returns true.
       def disable(feature, gate, thing)
-        conditions = { flipper_features: {name: feature.key} }
+        scope = Flipper::ActiveRecord::Gate.joins(:feature).where(flipper_features: {name: feature.key})
 
         g = case gate.data_type
         when :boolean
-          Flipper::ActiveRecord::Gate.joins(:feature).where(conditions).destroy_all
+          scope.destroy_all
         when :integer
-          conditions.merge!(name: gate.key.to_s)
-          Flipper::ActiveRecord::Gate.joins(:feature).where(conditions).
-            limit(1).update_all(value: thing.value.to_s)
+          scope.where(name: gate.key.to_s).limit(1).
+            update_all(value: thing.value.to_s)
         when :set
-          conditions.merge!(name: gate.key.to_s, value: thing.value.to_s)
-          Flipper::ActiveRecord::Gate.joins(:feature).where(conditions).destroy_all
+          scope.where(name: gate.key.to_s, value: thing.value.to_s).destroy_all
         else
           unsupported_data_type gate.data_type
         end
@@ -127,26 +135,6 @@ module Flipper
         raise "#{data_type} is not supported by this adapter"
       end
 
-      # Private
-      def find(key)
-        @collection.find_one(criteria(key)) || {}
-      end
-
-      # Private
-      def update(key, updates)
-        options = {:upsert => true}
-        @collection.update criteria(key), updates, options
-      end
-
-      # Private
-      def delete(key)
-        @collection.remove criteria(key)
-      end
-
-      # Private
-      def criteria(key)
-        {:_id => key.to_s}
-      end
     end
   end
 end

data/lib/flipper/adapters/activerecord/version.rb

@@ -1,7 +1,7 @@
 module Flipper
   module Adapters
     class ActiveRecord
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/lib/generators/flipper/templates/migration.rb

@@ -1,9 +1,10 @@
 class CreateFlipperTables < ActiveRecord::Migration
   def self.up
     create_table :flipper_features do |t|
-      t.string :name, null: false, unique: true
+      t.string :name, null: false
       t.timestamps null: false
     end
+    add_index :flipper_features, :name, unique: true
 
     create_table :flipper_gates do |t|
       t.integer :flipper_feature_id, null: false

data/spec/activerecord_spec.rb

@@ -3,10 +3,7 @@ require 'flipper/adapters/activerecord'
 require 'flipper/spec/shared_adapter_specs'
 
 describe Flipper::Adapters::ActiveRecord do
-  let(:pool) { ActiveRecord::Base.connection_pool }
-#     Que.connection = ::ActiveRecord if defined? ::ActiveRecord
-
-  subject { described_class.new(pool) }
+  subject { described_class.new }
 
   it_should_behave_like 'a flipper adapter'
 end

data/spec/helper.rb

@@ -12,7 +12,7 @@ config = YAML.load(File.read("spec/database.yml"))
 ActiveRecord::Base.establish_connection config["postgresql"]
 ActiveRecord::Migration.verbose = true
 
-require 'generators/flipper-activerecord/templates/migration'
+require 'generators/flipper/templates/migration'
 ActiveRecord::Schema.define do
   CreateFlipperTables.up
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flipper-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Blake Gentry