flip 0.0.1.alpha → 0.0.1.alpha2

data/lib/flip.rb

@@ -19,6 +19,8 @@
   feature_set
 }.each { |name| require "flip/#{name}" }
 
+require "flip/engine" if defined?(Rails)
+
 module Flip
   extend Facade
 end

data/lib/flip/database_strategy.rb

@@ -2,7 +2,7 @@
 module Flip
   class DatabaseStrategy < AbstractStrategy
 
-    def initialize(model_klass)
+    def initialize(model_klass = Feature)
       @klass = model_klass
     end
 
@@ -15,15 +15,15 @@ module Flip
     end
 
     def on? definition
-      feature(definition).on?
+      feature(definition).enabled?
     end
 
     def switchable?
       true
     end
 
-    def switch! key, on
-      @klass.find_or_initialize_by_key(key).update_attributes! on: on
+    def switch! key, enable
+      @klass.find_or_initialize_by_key(key).update_attributes! enabled: enable
     end
 
     def delete! key

data/lib/flip/declarable.rb

@@ -1,6 +1,10 @@
 module Flip
   module Declarable
 
+    def self.extended(base)
+      FeatureSet.reset
+    end
+
     # Adds a new feature definition, creates predicate method.
     def feature(key, options = {})
       FeatureSet.instance << Flip::Definition.new(key, options)

data/lib/flip/engine.rb

@@ -0,0 +1,4 @@
+module Flip
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/flip/feature_set.rb

@@ -6,7 +6,7 @@ module Flip
     end
 
     def self.reset
-      remove_instance_variable :@instance
+      @instance = nil
     end
 
     # Sets the default for definitions which fall through the strategies.

data/lib/flip/version.rb

@@ -1,3 +1,3 @@
 module Flip
-  VERSION = "0.0.1.alpha"
+  VERSION = "0.0.1.alpha2"
 end

data/lib/generators/flip/migration/USAGE

@@ -0,0 +1,5 @@
+Description:
+    Generates migration to create the features table for the Feature model.
+
+Example:
+    rails generate flip:migration

data/lib/generators/flip/migration/migration_generator.rb

@@ -0,0 +1,22 @@
+require "rails/generators/active_record/migration"
+
+class Flip::MigrationGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  source_root File.expand_path("../templates", __FILE__)
+
+  def create_migration_file
+    migration_template "create_features.rb", "db/migrate/create_features.rb"
+  end
+
+  # Stubbed in railties/lib/rails/generators/migration.rb
+  #
+  # This implementation a simplified version of:
+  #   activerecord/lib/rails/generators/active_record/migration.rb
+  #
+  # See: http://www.ruby-forum.com/topic/203205
+  def self.next_migration_number(dirname)
+    Time.now.utc.strftime("%Y%m%d%H%M%S")
+  end
+
+end

data/lib/generators/flip/migration/templates/create_features.rb

@@ -0,0 +1,10 @@
+class CreateFeatures < ActiveRecord::Migration
+  def change
+    create_table :features do |t|
+      t.string :key, null: false
+      t.boolean :enabled, null: false, default: false
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/generators/flip/model/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Generates the Feature database model class for Flip.
+
+Example:
+    rails generate flip:model
+
+    This will create:
+        app/models/feature.rb (class Feature < ActiveRecord::Base)

data/lib/generators/flip/model/model_generator.rb

@@ -0,0 +1,8 @@
+class Flip::ModelGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def copy_feature_model_file
+    copy_file "feature.rb", "app/models/feature.rb"
+  end
+
+end

data/lib/generators/flip/model/templates/feature.rb

@@ -0,0 +1,15 @@
+class Feature
+  extend Flip::Declarable
+
+  strategy Flip::CookieStrategy
+  strategy Flip::DatabaseStrategy
+  strategy Flip::DeclarationStrategy
+  default false
+
+  # Declare your features here, e.g:
+  #
+  # feature :world_domination,
+  #   default: true,
+  #   description: "Take over the world."
+
+end

data/lib/generators/flip/routes/USAGE

@@ -0,0 +1,7 @@
+Description:
+    Add routes for the Flip control page.
+
+Example:
+    rails generate flip:routes
+
+    This will add routes to app/routes.rb

data/lib/generators/flip/routes/routes_generator.rb

@@ -0,0 +1,7 @@
+class Flip::RoutesGenerator < Rails::Generators::Base
+
+  def add_route
+    route %{mount Flip::Engine => "/flip"}
+  end
+
+end

data/spec/database_strategy_spec.rb

@@ -12,8 +12,8 @@ describe Flip::DatabaseStrategy do
       feature :three, default: true
     end
   end
-  let(:enabled_record) { model_klass.new.tap { |m| m.stub(:on?) { true } } }
-  let(:disabled_record) { model_klass.new.tap { |m| m.stub(:on?) { false } } }
+  let(:enabled_record) { model_klass.new.tap { |m| m.stub(:enabled?) { true } } }
+  let(:disabled_record) { model_klass.new.tap { |m| m.stub(:enabled?) { false } } }
 
   subject { strategy }
 
@@ -45,12 +45,12 @@ describe Flip::DatabaseStrategy do
   describe "#switch!" do
     it "can switch a feature on" do
       model_klass.should_receive(:find_or_initialize_by_key).with(:one).and_return(disabled_record)
-      disabled_record.should_receive(:update_attributes!).with(on: true)
+      disabled_record.should_receive(:update_attributes!).with(enabled: true)
       strategy.switch! :one, true
     end
     it "can switch a feature off" do
       model_klass.should_receive(:find_or_initialize_by_key).with(:one).and_return(enabled_record)
-      enabled_record.should_receive(:update_attributes!).with(on: false)
+      enabled_record.should_receive(:update_attributes!).with(enabled: false)
       strategy.switch! :one, false
     end
   end

data/spec/declarable_spec.rb

@@ -1,19 +1,20 @@
 require "spec_helper"
 
-class TestableFlipModel
-  extend Flip::Declarable
+describe Flip::Declarable do
 
-  strategy Flip::DeclarationStrategy
-  default false
+  let!(:model_class) do
+    Class.new do
+      extend Flip::Declarable
 
-  feature :one
-  feature :two, description: "Second one."
-  feature :three, default: true
-end
+      strategy Flip::DeclarationStrategy
+      default false
 
-describe Flip::Declarable do
+      feature :one
+      feature :two, description: "Second one."
+      feature :three, default: true
+    end
+  end
 
-  let(:model_class) { TestableFlipModel }
   subject { Flip::FeatureSet.instance }
 
   describe "the .on? class method" do

data/spec/feature_set_spec.rb

@@ -33,6 +33,9 @@ describe Flip::FeatureSet do
       Flip::FeatureSet.reset
       Flip::FeatureSet.instance.should_not equal(instance_before_reset)
     end
+    it "can be reset multiple times without error" do
+      2.times { Flip::FeatureSet.reset }
+    end
   end
 
   describe "#default= and #on? with null strategy" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flip
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.0.1.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-24 00:00:00.000000000 +10:00
+date: 2011-05-29 00:00:00.000000000 +10:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153418240 !ruby/object:Gem::Requirement
+  requirement: &2153453820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153418240
+  version_requirements: *2153453820
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153417820 !ruby/object:Gem::Requirement
+  requirement: &2153451180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153417820
+  version_requirements: *2153451180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153417280 !ruby/object:Gem::Requirement
+  requirement: &2153445440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2153417280
+  version_requirements: *2153445440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153416860 !ruby/object:Gem::Requirement
+  requirement: &2153437540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153416860
+  version_requirements: *2153437540
 description: Declarative API for specifying features, switchable in declaration, database
   and cookies.
 email:
@@ -77,9 +77,18 @@ files:
 - lib/flip/declarable.rb
 - lib/flip/declaration_strategy.rb
 - lib/flip/definition.rb
+- lib/flip/engine.rb
 - lib/flip/facade.rb
 - lib/flip/feature_set.rb
 - lib/flip/version.rb
+- lib/generators/flip/migration/USAGE
+- lib/generators/flip/migration/migration_generator.rb
+- lib/generators/flip/migration/templates/create_features.rb
+- lib/generators/flip/model/USAGE
+- lib/generators/flip/model/model_generator.rb
+- lib/generators/flip/model/templates/feature.rb
+- lib/generators/flip/routes/USAGE
+- lib/generators/flip/routes/routes_generator.rb
 - spec/abstract_strategy_spec.rb
 - spec/controller_filters_spec.rb
 - spec/cookie_strategy_spec.rb