app_config 2.1.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35fd2897702d6f84752be6616c399de404e77e2d
-  data.tar.gz: 65d8a105d4b606ea1edc931b839360ea04fd6216
+  metadata.gz: 34fdaa8f69598900e31d96ed27f715ad9fd0f77c
+  data.tar.gz: 5c4d38a1fd7e58262467b8bd1e8f3f34d04ca6ee
 SHA512:
-  metadata.gz: fb77e2f64fd7379620af5cc23fa8d72a7c9d7cf401a86f40514d124243879aeee9446224673cd4bc6b270e3af2b9d368ae9b628ed5f398cc4d71d0fd722acc2e
-  data.tar.gz: e24fa2a2197fbfbb8c413a1ec3e46139d812797368876a8d4ab42aee5cc0c69b8f6eaf37b13b65aa5ca59888b428f1d4f658684572569520adc765271e1a7c34
+  metadata.gz: 0404e1ef35e4cb6d26c75e546c6a3cdbf42a31a4477be011195b42e68be6fc88f985b1dfec77fae1bf8808992a082d4a710b2d7db6744d118a7dd5a32c6d8213
+  data.tar.gz: 17a69ff742b2ca5233a8ecf87b1c734a9d96da3280550f18fc743b009495af85e4a8ad07cc87a0ebce3273015b444d1a68800a868afb1bbb5352eb3db03f5119

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_config (2.1.3)
+    app_config (2.3.0)
 
 GEM
   remote: https://rubygems.org/

data/app_config.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage = 'http://oshuma.github.io/app_config'
 
   s.summary = %q{Quick and easy application configuration.}
-  s.description = %q{An easy to use, customizable library to easily store and retrieve application configuration.}
+  s.description = %q{An easy to use, framework agnostic, customizable library to easily store and retrieve application configuration.}
 
   s.add_development_dependency 'bson_ext'
   s.add_development_dependency 'mongo'

data/lib/app_config.rb

@@ -13,6 +13,7 @@ module AppConfig
     #
     # Valid storage methods:
     # * `:mongo` - {AppConfig::Storage::Mongo AppConfig::Storage::Mongo}
+    # * `:postgres` - {AppConfig::Storage::Mongo AppConfig::Storage::Postgres}
     # * `:yaml` - {AppConfig::Storage::YAML AppConfig::Storage::YAML}
     def setup!(options = {}, &block)
       @@options = options
@@ -37,6 +38,15 @@ module AppConfig
       defined?(@@storage) && !@@storage.nil?
     end
 
+    # Reload the data from storage.
+    def reload!
+      if storage.respond_to?(:reload!)
+        storage.reload!
+      else
+        raise AppConfig::Error::MustOverride.new("#{storage.class}#reload!")
+      end
+    end
+
     # Clears the `@@storage`.
     def reset!
       @@storage = nil
@@ -55,7 +65,11 @@ module AppConfig
 
     # Returns the `@@storage` contents, which is what is exposed as the configuration.
     def storage
-      @@storage
+      begin
+        @@storage
+      rescue NameError # @@storage does not exist
+        raise AppConfig::Error::NotSetup unless setup?
+      end
     end
 
   end # self

data/lib/app_config/storage/mongo.rb

@@ -27,6 +27,10 @@ module AppConfig
         fetch_data!
       end
 
+      def reload!
+        fetch_data!
+      end
+
       # Saves the data back to Mongo.  Returns `true`/`false`.
       def save!
         if @_id

data/lib/app_config/storage/postgres.rb

@@ -32,6 +32,10 @@ module AppConfig
         fetch_data!
       end
 
+      def reload!
+        fetch_data!
+      end
+
       # Saves the data to Postgres.  Returns `true`/`false`.
       def save!
         # Build the `SET foo = 'bar', ...` string for the UPDATE query.
@@ -43,17 +47,39 @@ module AppConfig
           set_attrs = data_hash.map { |k, v| "#{k} = '#{v}'" }.join(', ')
           save_query = "UPDATE #{@table} SET #{set_attrs} WHERE id = #{@id}"
         else  # Creating a new row.
-          columns = data_hash.keys.join(', ')
-          values = data_hash.map { |_, v| "'#{v}'" }.join(', ')
-          save_query = "INSERT INTO #{@table} (#{columns}) VALUES (#{values})"
+          if data_hash.empty?
+            save_query = "INSERT INTO #{@table} DEFAULT VALUES"
+          else
+            columns = data_hash.keys.join(', ')
+            values = data_hash.map { |_, v| "'#{v}'" }.join(', ')
+            save_query = "INSERT INTO #{@table} (#{columns}) VALUES (#{values})"
+          end
         end
 
         result = @connection.exec(save_query)
-        result.result_status == PG::Constants::PGRES_COMMAND_OK
+
+        if result.result_status == PG::Constants::PGRES_COMMAND_OK
+          # Initial write (no rows exist), so we have to set @id.
+          if result.cmd_status.split[0] == 'INSERT'
+            @connection.exec("SELECT id FROM #{@table}") do |result|
+              result.each { |row| @id = row['id'] }
+            end
+
+            fetch_data!
+          end
+
+          true
+        else
+          false
+        end
       end
 
       private
 
+      def connected?
+        @connection && @connection.status == PG::Constants::CONNECTION_OK
+      end
+
       def fetch_data!
         raise 'Not connected to PostgreSQL' unless connected?
 
@@ -66,8 +92,11 @@ module AppConfig
           if result.num_tuples == 0
             @data = Storage::ConfigData.new
           else
-            # TODO: Looping here is kinda pointless if we're just resetting `@data` on each pass.
             result.each do |row|
+              # Convert Postgres booleans into Ruby objects.
+              row.each { |k, v| row[k] = true  if v == 't' }
+              row.each { |k, v| row[k] = false if v == 'f' }
+
               @data = Storage::ConfigData.new(row)
               @id = @data.id
             end
@@ -75,10 +104,6 @@ module AppConfig
         end
       end
 
-      def connected?
-        @connection && @connection.status == PG::Constants::CONNECTION_OK
-      end
-
       def setup_connection!
         @connection = PG.connect(@options)
       end

data/lib/app_config/version.rb

@@ -1,3 +1,3 @@
 module AppConfig
-  VERSION = '2.1.3'
+  VERSION = '2.3.0'
 end

data/spec/app_config/storage/mongo_spec.rb

@@ -31,4 +31,17 @@ describe AppConfig::Storage::Mongo do
       .instance_variable_get(:@options)
       .should == AppConfig::Storage::Mongo::DEFAULTS
   end
+
+  it 'should reload the data' do
+    AppConfig.reset!
+    config_for_mongo(true, false)
+
+    # Set a variable, but do not call AppConfig.save!
+    AppConfig.true_option = false
+
+    AppConfig.reload!
+
+    AppConfig.true_option.should == true
+  end
+
 end

data/spec/app_config/storage/postgres_spec.rb

@@ -12,7 +12,10 @@ describe AppConfig::Storage::Postgres do
 
   it 'should update the values' do
     new_api_key = 'SOME_NEW_API_KEY'
+    new_admin_email = 'foo@example.com'
+
     AppConfig.api_key = new_api_key
+    AppConfig.admin_email = new_admin_email
 
     AppConfig.save!.should be_true
 
@@ -20,6 +23,7 @@ describe AppConfig::Storage::Postgres do
     config_for_postgres
 
     AppConfig.api_key.should == new_api_key
+    AppConfig.admin_email.should == new_admin_email
   end
 
   it "uses the defaults when 'true' is passed" do
@@ -59,4 +63,19 @@ describe AppConfig::Storage::Postgres do
       .instance_variable_set(:@id, original_id)
   end
 
+  it "turns Postgres booleans into Ruby objects" do
+    # set in spec/fixtures/app_config.yml
+    AppConfig.true_option.class.should  == TrueClass
+    AppConfig.false_option.class.should == FalseClass
+  end
+
+  it 'should reload the data' do
+    # Set a variable, but do not call AppConfig.save!
+    AppConfig.true_option = false
+
+    AppConfig.reload!
+
+    AppConfig.true_option.should == true
+  end
+
 end

data/spec/app_config_spec.rb

@@ -55,4 +55,12 @@ describe AppConfig do
     config.should be_instance_of(Hash)
   end
 
+  it 'raises NotSetup if .storage is accessed and .setup! has not been called' do
+    AppConfig.remove_class_variable(:@@storage)
+
+    lambda do
+      AppConfig.save!
+    end.should raise_error(AppConfig::Error::NotSetup)
+  end
+
 end

data/spec/fixtures/app_config.yml

@@ -2,3 +2,5 @@
 admin_email: 'admin@example.com'
 api_name:    'Supr Webz 2.0'
 api_key:     'SUPERAWESOMESERVICE'
+true_option:  true
+false_option: false

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ RSpec.configure do |config|
     config_for({ yaml: path }.merge(opts))
   end
 
-  def config_for_mongo(opts = {}, load_test_data = true)
+  def config_for_mongo(load_test_data = true, drop_collection = true, opts = {})
     mongo = AppConfig::Storage::Mongo::DEFAULTS.merge({
       database: 'app_config_test',
     })
@@ -34,9 +34,11 @@ RSpec.configure do |config|
       load_mongo_test_config(mongo) if load_test_data
       config_for({mongo: mongo}.merge(opts))
 
-      collection = AppConfig.class_variable_get(:@@storage)
-        .send(:collection)
-        .drop
+      if drop_collection
+        collection = AppConfig.class_variable_get(:@@storage)
+          .send(:collection)
+          .drop
+      end
     rescue Mongo::ConnectionFailure
       pending "***** Mongo specs require a running MongoDB server *****"
     end
@@ -66,7 +68,7 @@ RSpec.configure do |config|
     connection = ::Mongo::Connection.new(options[:host], options[:port].to_i)
     database   = connection.db(options[:database])
     collection = database.collection(options[:collection])
-    test_data = YAML.load_file(fixture('app_config.yml'))
+    test_data  = YAML.load_file(fixture('app_config.yml'))
 
     data = collection.find_one
     if data
@@ -88,7 +90,13 @@ RSpec.configure do |config|
       connection = ::PG.connect(options)
 
       config = ::YAML.load_file(fixture('app_config.yml'))
-      attrs = config.keys.map { |k| "#{k} character varying(255)" }.join(', ')
+      attrs = config.map do |k, v|
+        if v.class == String
+          "#{k} character varying(255)"
+        else
+          "#{k} boolean DEFAULT #{v}"
+        end
+      end.join(', ')
 
       create_query = "CREATE TABLE #{table} (id bigserial primary key, #{attrs})"
       insert_query = "INSERT INTO #{table} (#{config.keys.join(', ')}) VALUES (#{config.values.map { |v| "'#{v}'" }.join(', ')})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_config
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -122,8 +122,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: An easy to use, customizable library to easily store and retrieve application
-  configuration.
+description: An easy to use, framework agnostic, customizable library to easily store
+  and retrieve application configuration.
 email:
 - oshuma@gmail.com
 executables: []