fluidfeatures-rails 0.5.1 → 0.6.0

data/lib/fluidfeatures/rails.rb

@@ -7,44 +7,57 @@ module FluidFeatures
       attr_accessor :enabled
       attr_accessor :ff_app
     end
-    
+
     #
     # This is called once, when your Rails application fires up.
     # It sets up the before and after request hooks
     #
     def self.initializer
-      #fixes class variable state persisted between calls
+
       @enabled = false
-      #
-      # Without these FluidFeatures credentials we cannot talk to
-      # the FluidFeatures service.
-      #
-      #%w[FLUIDFEATURES_BASEURI FLUIDFEATURES_SECRET FLUIDFEATURES_APPID].each do |key|
-      #  unless ENV[key]
-      #    $stderr.puts "!! fluidfeatures-rails requires ENV[\"#{key}\"] (fluidfeatures is disabled)"
-      #    return
-      #  end
-      #end
-      unless defined? ::Rails
-        $stderr.puts "!! fluidfeatures-rails requires rails (fluidfeatures is disabled)"
-        return
-      end
-      $stderr.puts "=> fluidfeatures-rails initializing as app #{ENV["FLUIDFEATURES_APPID"]} with #{ENV["FLUIDFEATURES_BASEURI"]}"
 
+      # Initialize
       ::Rails::Application.initializer "fluidfeatures.initializer" do
         ActiveSupport.on_load(:action_controller) do
-          replacements = {}
-          replacements["baseuri"] = ENV["FLUIDFEATURES_BASEURI"] if ENV["FLUIDFEATURES_BASEURI"]
-          replacements["appid"] = ENV["FLUIDFEATURES_APPID"] if ENV["FLUIDFEATURES_APPID"]
-          replacements["secret"] = ENV["FLUIDFEATURES_SECRET"] if ENV["FLUIDFEATURES_SECRET"]
-          config = ::FluidFeatures::Config.new("#{::Rails.root}/config/fluidfeatures.yml", ::Rails.env, replacements)
+
+          # Without these FluidFeatures credentials we cannot talk to
+          # the FluidFeatures service.
+          is_configured = true
+          ff_config_path = "#{::Rails.root}/config/fluidfeatures.yml"
+          unless File.file? ff_config_path
+            %w[FLUIDFEATURES_BASEURI FLUIDFEATURES_SECRET FLUIDFEATURES_APPID].each do |key|
+              is_configured &= ENV[key]
+            end
+          end
+          unless is_configured
+            $stderr.puts "fluidfeatures-rails is not configured. Run 'rails g fluidfeatures:config'"
+            break
+          end
+
+          if File.file? ff_config_path
+            config = ::FluidFeatures::Config.new(ff_config_path, ::Rails.env)
+          else
+            config = ::FluidFeatures::Config.new({
+              "base_uri" => ENV["FLUIDFEATURES_BASEURI"],
+              "app_id"   => ENV["FLUIDFEATURES_APPID"],
+              "secret"   => ENV["FLUIDFEATURES_SECRET"]
+            })
+          end
+
+          $stderr.puts "fluidfeatures-rails is configured with app_id '#{config["app_id"]}'. Run 'rails g fluidfeatures:config' to update config"
+
+          # create FF app store in global rails namespace
           ::FluidFeatures::Rails.ff_app = ::FluidFeatures.app(config)
+
+          # wrap each request in fluidfeatures user transaction
           ActionController::Base.append_before_filter :fluidfeatures_request_before
           ActionController::Base.append_after_filter  :fluidfeatures_request_after
+
         end
       end
 
       @enabled = true
+
     end
 
   end
@@ -163,7 +176,7 @@ module ActionController
     # feature.
     # This helps the FluidFeatures database prepopulate the feature set
     # without requiring the developer to do it manually.
-    # 
+    #
     def fluidfeatures_request_after
       ff_transaction.end_transaction
     end

data/lib/fluidfeatures/rails/version.rb

@@ -1,5 +1,5 @@
 module FluidFeatures
   module Rails
-    VERSION = '0.5.1'
+    VERSION = '0.6.0'
   end
 end

data/lib/generators/fluidfeatures/config_generator.rb

@@ -0,0 +1,51 @@
+module Fluidfeatures
+  class ConfigGenerator < ::Rails::Generators::Base
+
+    CONFIG_FILE = "config/fluidfeatures.yml"
+
+    def create_initializer_file
+
+      puts "Enter FluidFeatures credentials [press enter to skip]"
+      print "development app_id: "
+      dev_app_id = gets.chomp
+
+      print "development secret: "
+      dev_secret = gets.chomp
+
+      print "production app_id: "
+      prod_app_id = gets.chomp
+
+      print "production secret: "
+      prod_secret = gets.chomp
+
+      print "test app_id: "
+      test_app_id = gets.chomp
+
+      print "test secret: "
+      test_secret = gets.chomp
+
+      puts "Warning: production app_id and secret have not been set in #{CONFIG_FILE}"
+
+      create_file CONFIG_FILE, """
+common:
+  base_uri: https://www.fluidfeatures.com/service
+  cache:
+    enable: false
+    dir: tmp/fluidfeatures
+    limit: 2mb
+
+development:
+  app_id: #{dev_app_id}
+  secret: #{dev_secret}
+
+test:
+  app_id: #{test_app_id}
+  secret: #{test_secret}
+
+production:
+  app_id: #{prod_app_id}
+  secret: #{prod_secret}
+"""
+    end
+  end
+end

data/spec/initializer_spec.rb

@@ -10,7 +10,6 @@ describe "FluidFeatures Rails initialization" do
 
   it "should start application if Rails defined" do
     defined?(Rails).should be_true
-    $stderr.should_receive(:puts).with("=> fluidfeatures-rails initializing as app #{ENV["FLUIDFEATURES_APPID"]} with #{ENV["FLUIDFEATURES_BASEURI"]}")
     FluidFeatures::Rails.initializer
     FluidFeatures::Rails.enabled.should be_true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidfeatures-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluidfeatures
@@ -111,7 +111,7 @@ files:
 - lib/fluidfeatures/rails/app/controllers/fluidfeatures_controller.rb
 - lib/fluidfeatures/rails/config/routes.rb
 - lib/fluidfeatures/rails/version.rb
-- lib/generators/fluidfeatures/rails/install/install_generator.rb
+- lib/generators/fluidfeatures/config_generator.rb
 - lib/pre_ruby192/uri.rb
 - spec/controller_extentions_spec.rb
 - spec/controller_spec.rb

data/lib/generators/fluidfeatures/rails/install/install_generator.rb

@@ -1,29 +0,0 @@
-module FluidFeatures
-  module Rails
-    module Generators
-      class InstallGenerator < ::Rails::Generators::Base
-        def create_initializer_file
-          create_file "config/fluidfeatures.yml", "common:
-  baseuri: https://www.fluidfeatures.com/service
-  cache:
-    enable: false
-    dir: tmp/fluidfeatures
-    limit: 2mb
-
-development:
-  appid:
-  secret:
-
-test:
-  appid:
-  secret:
-
-production:
-  appid:
-  secret:
-"
-        end
-      end
-    end
-  end
-end