fluidfeatures-rails 0.6.0 → 0.6.1

data/lib/fluidfeatures/rails/version.rb

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

data/lib/generators/fluidfeatures/config_generator.rb

@@ -5,47 +5,59 @@ module Fluidfeatures
 
     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
+      if File.file? CONFIG_FILE
+        config = YAML.load_file(CONFIG_FILE)
+      else
+        config = {
+          "common" => {
+            "base_uri" => "https://www.fluidfeatures.com/service",
+            "cache" => {
+              "enable" => false,
+              "dir" => "tmp/fluidfeatures",
+              "limit" => "10MB"
+            },
+          },
+          "development" => {},
+          "production" => {},
+          "test" => {},
+        }
+      end
 
-      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}
-"""
+      puts "Enter FluidFeatures credentials [press enter to skip]"
+      ["development", "production", "test"].each do |env|
+        config[env] ||= {}
+        ["app_id", "secret", "base_uri"].each do |key|
+          if config[env][key] and config[env][key].size > 0
+            default = config[env][key]
+          elsif config["common"][key] and config["common"][key].size
+            default = config["common"][key]
+          end
+          print "%s %s %s: " % [
+            env,
+            key,
+            default ? "[#{default}]" : ""
+          ]
+          value = gets.chomp.strip
+          if value and value.size > 0
+            config[env][key] = value
+          elsif default
+            config[env][key] = default
+          else
+            config[env][key] = nil
+          end
+        end
+        if config[env]["base_uri"] == config["common"]["base_uri"]
+          config[env].delete("base_uri")
+        end
+      end
+
+      yaml = YAML.dump(config)
+      # remove "---" at top
+      yaml.sub!(/^---\r?\n/, "")
+      # add extra line between environments
+      yaml.gsub!(/(\r?\n)(\S)/) {|m| $1 + $1 + $2 }
+
+      create_file CONFIG_FILE, yaml
     end
   end
 end

data/spec/generators/fluidfeatures/{rails/install/install_generator_spec.rb → config_generator_spec.rb}

@@ -1,7 +1,7 @@
 require "spec_helper"
-require "generators/fluidfeatures/rails/install/install_generator"
+require "generators/fluidfeatures/config_generator"
 
-describe FluidFeatures::Rails::Generators::InstallGenerator do
+describe Fluidfeatures::ConfigGenerator do
   it "creates a configuration file" do
     subject.should_receive(:create_file).with("config/fluidfeatures.yml", kind_of(String))
     subject.create_initializer_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidfeatures-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -115,7 +115,7 @@ files:
 - lib/pre_ruby192/uri.rb
 - spec/controller_extentions_spec.rb
 - spec/controller_spec.rb
-- spec/generators/fluidfeatures/rails/install/install_generator_spec.rb
+- spec/generators/fluidfeatures/config_generator_spec.rb
 - spec/initializer_spec.rb
 - spec/routes_spec.rb
 - spec/spec_helper.rb