app_config 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85532501e786eca705ac6224a529a1f1ea596b1f
-  data.tar.gz: cf1e1d838361c7bca2135db8274a52c2f9cef843
+  metadata.gz: 318df4378067f6ec5f0e70c42ab7af32ee235acf
+  data.tar.gz: 931193b4ba2fa09e79c0fd0772598cbde0deba45
 SHA512:
-  metadata.gz: 7ef79b6d4670050d2d583599d54889c2e219e71e7a8833b39f22a062a842fa919eaa06a8d74f4642548f3db3b8797cd016d66658a6ce31c0970b501ea506c9a2
-  data.tar.gz: e39497d9599c666bc615ff3ab3b669c977ce5b141cf6dff6506d54cbe50e7a3b21170a7776ace29ed5bd2439a340c10cecbdd6e3bcc2f6955dec5c6aa000fc5b
+  metadata.gz: ef84fdbb0dfa7c9deab6351d0a54eaa7f60c2c0758d49fd17c78ab5d6070762a17e6e93204a4c46ff1b79f1813623df549f5d594dd46d3c36aca1086a1794461
+  data.tar.gz: 7376e88e227b05ea545515109edff9426ab5d6f92702d1f799e04211bc66b5607f9be917c11587c8595653d29195799082fe7a0b63c86e135441e0bc8d64a58f

data/lib/app_config/storage.rb

@@ -1,8 +1,9 @@
 module AppConfig
   module Storage
-    autoload :Base,     'app_config/storage/base'
-    autoload :Mongo,    'app_config/storage/mongo'
-    autoload :Postgres, 'app_config/storage/postgres'
-    autoload :YAML,     'app_config/storage/yaml'
+    autoload :Base,       'app_config/storage/base'
+    autoload :ConfigData, 'app_config/storage/config_data'
+    autoload :Mongo,      'app_config/storage/mongo'
+    autoload :Postgres,   'app_config/storage/postgres'
+    autoload :YAML,       'app_config/storage/yaml'
   end
 end

data/lib/app_config/storage/base.rb

@@ -3,10 +3,11 @@ module AppConfig
     class Base
 
       def initialize
+        @data = Storage::ConfigData.new
       end
 
       def to_hash
-        defined?(@data) ? @data.marshal_dump : Hash.new
+        defined?(@data) ? @data.to_hash : Hash.new
       end
 
       # Wrap `method_missing` to proxy to `@data`.

data/lib/app_config/storage/config_data.rb

@@ -0,0 +1,17 @@
+module AppConfig
+  module Storage
+    # OpenStruct wrapper to hold the underlying `Storage` data.
+    class ConfigData < OpenStruct
+
+      # Accepts a Hash and passes that along to `OpenStruct.new`.
+      def initialize(hash = {})
+        super(hash)
+      end
+
+      def to_hash
+        marshal_dump
+      end
+
+    end
+  end
+end

data/lib/app_config/storage/mongo.rb

@@ -56,7 +56,7 @@ module AppConfig
       def fetch_data!
         raise 'Not connected to MongoDB' unless connected?
 
-        @data = OpenStruct.new(collection.find_one)
+        @data = Storage::ConfigData.new(collection.find_one)
         @_id = @data._id
       end
 

data/lib/app_config/storage/postgres.rb

@@ -32,16 +32,23 @@ module AppConfig
         fetch_data!
       end
 
-      # Saves the data back to Postgres.  Returns `true`/`false`.
+      # Saves the data to Postgres.  Returns `true`/`false`.
       def save!
         # Build the `SET foo = 'bar', ...` string for the UPDATE query.
         data_hash = @data.to_h
-        data_hash.delete(:id)  # Remove the primary key (id) from the SET attributes.
-        set_attrs = data_hash.map { |k, v| "#{k} = '#{v}'" }.join(', ')
-
-        update_query = "UPDATE #{@table} SET #{set_attrs} WHERE id = #{@id}"
+        # Remove the primary key (id) from the SET attributes.
+        data_hash.delete(:id)
+
+        if @id  # Updating existing values.
+          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})"
+        end
 
-        result = @connection.exec(update_query)
+        result = @connection.exec(save_query)
         result.result_status == PG::Constants::PGRES_COMMAND_OK
       end
 
@@ -56,9 +63,14 @@ module AppConfig
         fetch_query = "SELECT * FROM #{@table} ORDER BY id DESC LIMIT 1"
 
         @connection.exec(fetch_query) do |result|
-          result.each do |row|
-            @data = OpenStruct.new(row)
-            @id = @data.id
+          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|
+              @data = Storage::ConfigData.new(row)
+              @id = @data.id
+            end
           end
         end
       end

data/lib/app_config/storage/yaml.rb

@@ -17,7 +17,7 @@ module AppConfig
         path = DEFAULT_PATH if path == true
 
         # Make sure to use the top-level YAML module here.
-        @data = OpenStruct.new(::YAML.load_file(path))
+        @data = Storage::ConfigData.new(::YAML.load_file(path))
       end
 
     end # YAML

data/lib/app_config/version.rb

@@ -1,3 +1,3 @@
 module AppConfig
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/app_config/storage/config_data_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe AppConfig::Storage::ConfigData do
+
+  it 'has a #to_hash method' do
+    @data = Storage::ConfigData.new({foo: 'bar'})
+    @data.to_hash.should == {foo: 'bar' }
+  end
+
+end

data/spec/app_config/storage/postgres_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe AppConfig::Storage::Postgres do
 
   before(:all) do
-    config_for_postgres
+    config_for_postgres(true)
   end
 
   it 'should have some values' do
@@ -25,7 +25,8 @@ describe AppConfig::Storage::Postgres do
   it "uses the defaults when 'true' is passed" do
     AppConfig.reset!
 
-    # Hack to use a test database as the 'default'.
+    # HACK: Use a test database as the 'default'.
+    old_dbname = AppConfig::Storage::Postgres::DEFAULTS[:dbname]
     AppConfig::Storage::Postgres::DEFAULTS[:dbname] = 'app_config_test'
 
     begin
@@ -35,7 +36,27 @@ describe AppConfig::Storage::Postgres do
     end
 
     AppConfig.class_variable_get(:@@storage)
-    .instance_variable_get(:@options)
-    .should == AppConfig::Storage::Postgres::DEFAULTS
+      .instance_variable_get(:@options)
+      .should == AppConfig::Storage::Postgres::DEFAULTS
+
+    # HACK: Reset dbname default to original value.
+    AppConfig::Storage::Postgres::DEFAULTS[:dbname] = old_dbname
   end
+
+  it "should create a new row if @id is not set" do
+    # HACK: Save the old id so we can reset it.
+    original_id = AppConfig.class_variable_get(:@@storage)
+      .instance_variable_get(:@id)
+
+    AppConfig.class_variable_get(:@@storage)
+      .instance_variable_set(:@id, nil)
+
+    AppConfig.api_key = 'foobar'
+    AppConfig.save!.should be_true
+
+    # HACK: Reset the original id.
+    AppConfig.class_variable_get(:@@storage)
+      .instance_variable_set(:@id, original_id)
+  end
+
 end

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ RSpec.configure do |config|
     end
   end
 
-  def config_for_postgres(opts = {}, load_test_data = true)
+  def config_for_postgres(load_test_data = false, opts = {})
     postgres = AppConfig::Storage::Postgres::DEFAULTS.merge({
       dbname: 'app_config_test'
     })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_config
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -143,10 +143,12 @@ files:
 - lib/app_config/error.rb
 - lib/app_config/storage.rb
 - lib/app_config/storage/base.rb
+- lib/app_config/storage/config_data.rb
 - lib/app_config/storage/mongo.rb
 - lib/app_config/storage/postgres.rb
 - lib/app_config/storage/yaml.rb
 - lib/app_config/version.rb
+- spec/app_config/storage/config_data_spec.rb
 - spec/app_config/storage/mongo_spec.rb
 - spec/app_config/storage/postgres_spec.rb
 - spec/app_config/storage/yaml_spec.rb
@@ -180,6 +182,7 @@ signing_key:
 specification_version: 4
 summary: Quick and easy application configuration.
 test_files:
+- spec/app_config/storage/config_data_spec.rb
 - spec/app_config/storage/mongo_spec.rb
 - spec/app_config/storage/postgres_spec.rb
 - spec/app_config/storage/yaml_spec.rb