config-file 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzAzYmE5YmNmNWU0ZmVmNGQ3NmU1MGE2NjJlNWZhNTM3ZmIxMTIwMA==
-  data.tar.gz: !binary |-
-    ZTRjN2I4YWI2NTcxNGViM2EyNTM5MDlkNmZmYTNkNjZkMmIxZjY5Ng==
+SHA1:
+  metadata.gz: afcd10b8ee5e413312dbc0c9b892872d4d95603a
+  data.tar.gz: d1ecc1d5c986192dcdbea8132390d4deff7b8ab9
 SHA512:
-  metadata.gz: !binary |-
-    OTNiMTNlMTQzODU1MzRkYWM3NzY1ODQ4OWM0NDk0N2ZiNWM0MjZkOTA0MzFj
-    ZWM3MGUxMDhiNDk0ZmQ5YjQ5MTcwN2JiNjRiOWNiNDE0OWJmNmY5Y2E1MjJj
-    NzhkNWNiODUzZTE3ZWQ5MGVhOWE0ZGQwYTRmYTVkMjQ3NjdjMzY=
-  data.tar.gz: !binary |-
-    ZWUzMDc3YmNhZTYyOGQ2M2Q4NzVjNGFmZTY5ZWE3YjRjZDQ5ZjA0NzcwZDFk
-    OWRkYTM1ZWRlODkyNzg2OTgwNjU0YzhjNDNiNTcxZGQ3MWMwZDE1NDU5YWYy
-    YmFlMGIxYzM2YzI0ODMxNmMxOTg3ZmRhOGY4MzMxYjcxMmUxMDc=
+  metadata.gz: e902f7c3f783d3ebc9b74d03ccec754bb9baf59e31eb7fe63a803b52541bb7e11cbdc122666efaf955d5dc4b3698e32fb07cb5f3b909fa96c85974298cf1042c
+  data.tar.gz: 9343dbeef9af122582d6065208d46205130996b4de0a777b5d3aa0ac271501c9a416390d6b75cbf7d208e717669e5b5c4a09c68743a8495b336d59eb757b7f73

data/.idea/.name

@@ -0,0 +1 @@
+config-file

data/.idea/config-file.iml

@@ -9,20 +9,110 @@
       </configuration>
     </facet>
   </component>
+  <component name="ModuleRunConfigurationManager">
+    <configuration default="false" name="tut.double" type="ErlangApplicationRunConfiguration" factoryName="Erlang Application" temporary="true">
+      <module name="config-file" />
+      <option name="erlFlags" value="" />
+      <option name="moduleAndFunction" value="tut double" />
+      <option name="name" value="tut.double" />
+      <option name="params" value="" />
+      <option name="saveOutputToFile" value="false" />
+      <option name="showConsoleOnStdErr" value="false" />
+      <option name="showConsoleOnStdOut" value="false" />
+      <RunnerSettings RunnerId="ErlangRunner" />
+      <ConfigurationWrapper RunnerId="ErlangRunner" />
+      <method />
+    </configuration>
+    <configuration default="false" name="Run spec 'config_file_spec': config-file" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+      <predefined_log_file id="RUBY_RSPEC" enabled="true" />
+      <module name="config-file" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+      <envs>
+        <env name="JRUBY_OPTS" value="-X+O" />
+      </envs>
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/config_file_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
+      <RunnerSettings RunnerId="RubyDebugRunner" />
+      <RunnerSettings RunnerId="RubyRunner" />
+      <ConfigurationWrapper RunnerId="RubyDebugRunner" />
+      <ConfigurationWrapper RunnerId="RubyRunner" />
+      <method />
+    </configuration>
+    <configuration default="false" name="ConfigFile raises exception for unsupported type: config-file" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+      <predefined_log_file id="RUBY_RSPEC" enabled="true" />
+      <module name="config-file" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+      <envs>
+        <env name="JRUBY_OPTS" value="-X+O" />
+      </envs>
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/config_file_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ConfigFile raises exception for unsupported type" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
+      <RunnerSettings RunnerId="RubyDebugRunner" />
+      <ConfigurationWrapper RunnerId="RubyDebugRunner" />
+      <method />
+    </configuration>
+  </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.1.4 [config_file]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.4, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.7, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.1.2, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.1.0, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.1.7, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.1.2, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.1.3, RVM: ruby-1.9.3-p547) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.1.2, RVM: ruby-1.9.3-p547) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.4, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.7, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.1.2, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="meta_methods (v1.3.0, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.1.0, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.1.7, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.1.2, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.1.3, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.1.2, RVM: ruby-2.1.4 [config_file]) [gem]" level="application" />
   </component>
 </module>

data/.idea/emacs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EmacsSettings">
+    <option name="emacsPath" value="/usr/bin/emacs" />
+  </component>
+</project>

data/CHANGES

@@ -3,3 +3,7 @@
 == Version 1.0.0
 
 * Initial release.
+
+== Version 1.0.1
+
+* Refactoring code.

data/README.md

@@ -22,11 +22,11 @@ Or install it yourself as:
 ```ruby
 require 'config_file'
 
-configurator = ConfigFile.bew
+config_file = ConfigFile.bew
 
-config1 = configurator.load "spec/config/test_config.yaml"
-config2 = configurator.load "spec/config/test_config.json"
-config3 = configurator.load "spec/config/test_config.rb"
+config1 = config_file.load "spec/config/test_config.yaml"
+config2 = config_file.load "spec/config/test_config.json"
+config3 = config_file.load "spec/config/test_config.rb"
 ```
 
 ## Contributing

data/config-file.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__) + '/lib/config_file/version')
+
+Gem::Specification.new do |spec|
+  spec.name          = "config-file"
+  spec.summary       = %q{Simple library for reading configuration from different sources.}
+  spec.description   = %q{Description: Simple library for reading configuration from different sources.}
+  spec.email         = "alexander.shvets@gmail.com"
+  spec.authors       = ["Alexander Shvets"]
+  spec.homepage      = "http://github.com/shvets/config_file"
+
+  spec.files         = `git ls-files`.split($\)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.version       = ConfigFile::VERSION
+  spec.license       = "MIT"
+
+  
+  spec.add_runtime_dependency "meta_methods", [">= 0"]
+  spec.add_runtime_dependency "json", [">= 0"]
+  spec.add_development_dependency "gemspec_deps_gen", [">= 0"]
+  spec.add_development_dependency "gemcutter", [">= 0"]
+
+end
+

data/lib/config_file/config_file.rb

@@ -1,36 +1,27 @@
-require 'meta_methods/core'
-require 'yaml'
-require 'json'
-
 class ConfigFile
-  YAML_EXT = '.yaml'
-  RUBY_EXT = '.rb'
-  JSON_EXT = 'json'
+  @types = []
+
+  def self.register(type)
+    @types << type unless @types.include? type
+  end
+
+  def self.type(extension)
+    @types.detect { |type| type.extensions.include? extension }
+  end
 
   attr_reader :config
 
   def load file_name, ext=nil
     ext = File.extname(file_name) unless ext
 
-    @config = case ext
-      when YAML_EXT
-        YAML.load_file(File.expand_path(file_name))
+    config_file_type = ConfigFile.type(ext)
 
-      when RUBY_EXT
-        content = File.open(file_name).read
+    if config_file_type
+      config_file = config_file_type.new
 
-        MetaMethods::Core.instance.block_to_hash(content)
-
-      when JSON_EXT
-        content = File.open(file_name).read
-
-        JSON.parse(content)
-
-      else
-        content = File.open(file_name).read
-
-        JSON.parse(content)
+      @config = config_file.read file_name
+    else
+      raise ArgumentError, "Configuration from #{ext} is not supported"
     end
   end
-
 end

data/lib/config_file/config_type.rb

@@ -0,0 +1,47 @@
+require 'meta_methods/core'
+require 'yaml'
+require 'json'
+
+require 'config_file/config_file'
+
+class ConfigType
+  class Yaml
+    ConfigFile.register(self)
+
+    def self.extensions
+      [".yaml"]
+    end
+
+    def read file_name
+      ::YAML.load_file(File.expand_path(file_name))
+    end
+  end
+
+  class Ruby
+    ConfigFile.register(self)
+
+    def self.extensions
+      [".rb"]
+    end
+
+    def read file_name
+      content = File.open(file_name).read
+
+      MetaMethods::Core.instance.block_to_hash(content)
+    end
+  end
+
+  class Json
+    ConfigFile.register(self)
+
+    def self.extensions
+      [".json"]
+    end
+
+    def read file_name
+      content = File.open(file_name).read
+
+      ::JSON.parse(content)
+    end
+  end
+end

data/lib/config_file/version.rb

@@ -1,3 +1,3 @@
 class ConfigFile
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/config_file.rb

@@ -1 +1,2 @@
-require 'config_file/config_file'
+require 'config_file/config_file'
+require 'config_file/config_type'

data/spec/{configurator_spec.rb → config_file_spec.rb}

@@ -24,4 +24,10 @@ describe ConfigFile do
     expect(config[:property1]).to eq "value1"
     expect(config[:property2][:property21]).to eq "value21"
   end
+
+  it "raises exception for unsupported type" do
+    expect {
+      subject.load "spec/config/test_config.pdf"
+    }.to raise_exception(ArgumentError)
+  end
 end

metadata

@@ -1,102 +1,106 @@
 --- !ruby/object:Gem::Specification
 name: config-file
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: meta_methods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Description: Simple library for reading configuration from different
+description: 'Description: Simple library for reading configuration from different
   sources.'
 email: alexander.shvets@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .idea/.rakeTasks
-- .idea/config-file.iml
-- .idea/encodings.xml
-- .idea/misc.xml
-- .idea/modules.xml
-- .idea/scopes/scope_settings.xml
-- .idea/vcs.xml
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".idea/.name"
+- ".idea/.rakeTasks"
+- ".idea/config-file.iml"
+- ".idea/emacs.xml"
+- ".idea/encodings.xml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/scopes/scope_settings.xml"
+- ".idea/vcs.xml"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGES
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- config-file.gemspec
 - config-file.gemspec.erb
 - lib/config_file.rb
 - lib/config_file/config_file.rb
+- lib/config_file/config_type.rb
 - lib/config_file/version.rb
 - spec/config/test_config.json
 - spec/config/test_config.rb
 - spec/config/test_config.yaml
-- spec/configurator_spec.rb
+- spec/config_file_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/shvets/config_file
 licenses:
@@ -108,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Simple library for reading configuration from different sources.
@@ -126,5 +130,5 @@ test_files:
 - spec/config/test_config.json
 - spec/config/test_config.rb
 - spec/config/test_config.yaml
-- spec/configurator_spec.rb
+- spec/config_file_spec.rb
 - spec/spec_helper.rb