rom-yaml 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fb0f21b9cb89e51692a67a4590f3adc3a11ef0
-  data.tar.gz: 3b916caf45d21fbbe37f72834c56a35f4ecc2000
+  metadata.gz: 794b2d24bea0ff0867b5dcdbe980597c032c6971
+  data.tar.gz: edc4737b87e16147cf0cfa028549b4e2a53a888d
 SHA512:
-  metadata.gz: d087d68eebecfb3823c8bfecc98b34a5f4a27cee4d405de1fbd485e22eb193561f6093b1800a8fdf961a600cedd468dee4f7ec5a494dc19b366825c314275627
-  data.tar.gz: c27b34ce93067a04fe6d7f93ad48949fcc32a67e4268f3f809b5d7e89e7fb954c955c602f403ef44b32a0a43aec4cf01a057a8a75103e2fb5bb39c41d2d2fc1f
+  metadata.gz: 77a6e50f68d1f1a0141c0acd1cfa5b9597d32a1c0b0cfc7d484f63cab2136303e84d9b35218e7a41a0176865939970228ce141ef863ba0c1d01e9c4846bae7ab
+  data.tar.gz: 97f6d0a5b77b1a6fa8158fa3ebce5d12257f518d92386127a86ed1e6f22fab0a315c2dc3b087d0184aac6e5668ccd09a4738eeea86f327df72b1e12efd0e7628

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v0.1.0 2015-05-19
+
+### Added
+
+* Support for loading relations from multiple files (solnic)
+
+### Changed
+
+* Symbolize keys recursively in tuples (cflipse)
+* Make it work with ROM 0.7.0 (cflipse)
+
+[Compare v0.0.1...v0.1.0](https://github.com/rom-rb/rom-yaml/compare/v0.0.1...v0.1.0)
+
 ## v0.0.1 2015-03-22
 
 First public release

data/lib/rom/yaml/dataset.rb

@@ -10,8 +10,7 @@ module ROM
       #
       # @api private
       def self.row_proc
-        # TODO: this is not recursive
-        Transproc(:symbolize_keys)
+        Transproc(:hash_recursion, Transproc(:symbolize_keys))
       end
     end
   end

data/lib/rom/yaml/repository.rb

@@ -21,28 +21,66 @@ module ROM
     #
     # @api public
     class Repository < ROM::Repository
-      # Registered datasets
+      # @attr_reader [Hash] sources Data loaded from files
       #
       # @api private
-      attr_reader :datasets
+      attr_reader :sources
 
-      # @param [String] path The absolute path to yaml file
+      # @attr_reader [Hash] datasets YAML datasets from sources
       #
       # @api private
-      def initialize(path)
-        @datasets = {}
+      attr_reader :datasets
+
+      # Create a new yaml repository from a path to file(s)
+      #
+      # @example
+      #   repository = ROM::YAML::Repository.new('/path/to/files')
+      #
+      # @param [String, Pathname] path The path to your YAML file(s)
+      #
+      # @return [Repository]
+      #
+      # @api public
+      def self.new(path)
+        super(load_from(path))
+      end
 
+      # Load data from yaml file(s)
+      #
+      # @api private
+      def self.load_from(path)
         if File.directory?(path)
-          @connection = Dir["#{path}/*.yml"].each_with_object({}) do |file, h|
-            name = File.basename(file, '.*')
-            data = ::YAML.load_file(file)[name]
-            h[name] = data
-          end
+          load_files(path)
         else
-          @connection = ::YAML.load_file(path)
+          load_file(path)
+        end
+      end
+
+      # Load yaml files from a given directory and return a name => data map
+      #
+      # @api private
+      def self.load_files(path)
+        Dir["#{path}/*.yml"].each_with_object({}) do |file, h|
+          name = File.basename(file, '.*')
+          h[name] = load_file(file).fetch(name)
         end
       end
 
+      # Load yaml file
+      #
+      # @api private
+      def self.load_file(path)
+        ::YAML.load_file(path)
+      end
+
+      # @param [String] path The absolute path to yaml file
+      #
+      # @api private
+      def initialize(sources)
+        @sources = sources
+        @datasets = {}
+      end
+
       # Return dataset by its name
       #
       # @param [Symbol]
@@ -62,7 +100,7 @@ module ROM
       #
       # @api public
       def dataset(name)
-        datasets[name] = Dataset.new(connection.fetch(name.to_s))
+        datasets[name] = Dataset.new(sources.fetch(name.to_s))
       end
 
       # Return if a dataset with provided name exists

data/lib/rom/yaml/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module YAML
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/rom-yaml.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rom', '~> 0.6.0'
+  spec.add_runtime_dependency 'rom', '~> 0.7', '>= 0.7.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/spec/unit/dataset_spec.rb

@@ -13,8 +13,8 @@ describe ROM::YAML::Dataset do
     expect(dataset.to_a).to eq([{ foo: 23 }])
   end
 
-  it "does not symbolizes keys recursively" do
+  it "symbolizes keys recursively" do
     dataset = ROM::YAML::Dataset.new(["foo" => { "bar" => :baz }])
-    expect(dataset.to_a).to eq([foo: { "bar" => :baz }])
+    expect(dataset.to_a).to eq([foo: { bar: :baz }])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: YAML support for Ruby Object Mapper
@@ -130,4 +136,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/dataset_spec.rb
 - spec/unit/repository_spec.rb
-has_rdoc: