cascade-rb 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e76a5428ad502dfd46ba38144264758b9db61701
-  data.tar.gz: c806af678c7b76c650100d0468b10894d6fd1e6d
+  metadata.gz: b321e02345f0116d9def142e1ef8ece2dda722e4
+  data.tar.gz: ae08c0071e7abf966764e3b2d8fc194428b28244
 SHA512:
-  metadata.gz: 81b4fee7d44a42ae18deea8c2cb61c7629bd56703350833f9cd0e3e52b01b1809c38e8a4c709d9cdfe7c596c9680e4079fb8c5c18b0cc289d4d118b67e6e0425
-  data.tar.gz: 12fb5bf658fd193b8dd92a45f90b9de140f834f534e3902fe0948f90b7507fdd6bb73a789ce70a9feeb12bed6e4901232eb886855046b22d47b6b77dc9c2af32
+  metadata.gz: 0b6d62c7ed816ab434ed9a245e8a278753e73bbf3b031b899946b7afe095eeb1276e9760fbe7c6ef1381a76a2c12a8c2a439b92aa24c328129c2e5a8b9d1bae8
+  data.tar.gz: 4604b3cd290fda7437b9e91dc4453d1e92800f4e8ea3f8cf5fef87973ccf42f235c60b598e247e34a7d9f5dbc3420dc88715ca3d4cbf65c60dc1fdbcf7f466b6

data/README.md

@@ -52,9 +52,9 @@ Cascade.configuration do
 end
 ```
 
-Provide file for parsing and run it!
+Provide iteratable object for parsing and run it!
 ```ruby
-Cascade::DataParser.new("data_test.txt").call
+Cascade::DataParser.new(data_provider: Csv.open("data_test.csv")).call
 ```
 
 ## Columns mapping
@@ -69,7 +69,6 @@ There are several alredy defined fields parsers (types):
 
 - currency
 - boolean
-- country_iso
 - string
 
 Feel free to add new fields parsers and provide it through PR.
@@ -110,9 +109,9 @@ DATE_PARSER = -> (value) { Date.parse(value) }
 ```
 Provide all this stuff into data parser
 ```ruby
-Cascade::DataParser.new("data_test.json",
+Cascade::DataParser.new(
+  data_provider: ParserJSON.new.open("data_test.csv"),
   row_processor: Cascade::RowProcessor.new(date: DateParser.new),
-  data_provider: ParserJSON.new,
   data_saver: PERSON_SAVER
  ).call
 ```

data/cascade.gemspec

@@ -18,15 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "iso_country_codes"
-  spec.add_dependency "awesome_print"
-
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rr"
-  spec.add_development_dependency "shoulda-matchers"
+  spec.add_development_dependency "shoulda-matchers", "2.8.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rubocop"

data/lib/cascade.rb

@@ -1,7 +1,6 @@
 require "cascade/version"
 require "cascade/columns_matching"
 require "cascade/row_processor"
-require "cascade/error_handler"
 require "cascade/helpers/configuration"
 
 # Base gem module

data/lib/cascade/columns_matching.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require 'forwardable'
 require "cascade/exceptions"
 require "cascade/helpers/configuration"
 

data/lib/cascade/complex_fields.rb

@@ -1,3 +1,2 @@
-require "cascade/complex_fields/country_iso"
 require "cascade/complex_fields/currency"
 require "cascade/complex_fields/boolean"

data/lib/cascade/data_parser.rb

@@ -1,21 +1,13 @@
-require "awesome_print"
-
 require "cascade/columns_matching"
-require "cascade/cascade_csv"
-require "cascade/row_processor"
-require "cascade/error_handler"
-require "cascade/helpers/hash"
+require "cascade/registry"
 
 module Cascade
   class DataParser
-    PUTS_DATA_SAVER = ->(*args) { ap args }
-
-    def initialize(filename, options = {})
-      @filename = filename
-      @data_provider    = options.fetch(:data_provider)    { CascadeCsv }
-      @row_processor    = options.fetch(:row_processor)    { RowProcessor.new }
-      @error_handler    = options.fetch(:error_handler)    { ErrorHandler.new }
-      @data_saver       = options.fetch(:data_saver)       { PUTS_DATA_SAVER }
+    def initialize(options = {})
+      @data_provider  = options.fetch(:data_provider) { Registry.data_provider }
+      @row_processor  = options.fetch(:row_processor) { Registry.row_processor }
+      @error_handler  = options.fetch(:error_handler) { Registry.error_handler }
+      @data_saver     = options.fetch(:data_saver)    { Registry.data_saver }
     end
 
     # Starts parsing processing with opening file and iterating through each
@@ -23,7 +15,7 @@ module Cascade
     # DataSaver
     #
     def call
-      @data_provider.open(@filename).each do |row|
+      @data_provider.each do |row|
         @error_handler.with_errors_handling(row) do
           @data_saver.call @row_processor.call(row)
         end

data/lib/cascade/error_handler.rb

@@ -6,8 +6,8 @@ module Cascade
 
     define_setting :raise_parse_errors, false
 
-    HANDLING_EXCEPTIONS = [IsoCountryCodes::UnknownCodeError, IndexError]
-    DEFAULT_ERROR_STORE = ->(row, reason) do
+    HANDLING_EXCEPTIONS = [IndexError]
+    DEFAULT_ERROR_STORE = lambda do |row, reason|
       @errors ||= []
       @errors << [row, reason]
     end

data/lib/cascade/exceptions.rb

@@ -1,2 +1,3 @@
 require "cascade/exceptions/wrong_mapping_format"
 require "cascade/exceptions/unknown_presenter_type"
+require "cascade/exceptions/unsupported_component"

data/lib/cascade/exceptions/unsupported_component.rb

@@ -0,0 +1,9 @@
+module Cascade
+  class UnsupportedComponent < ::StandardError
+    MESSAGE = "You should provide data provider that respond to `each` method"
+
+    def initialize(msg = MESSAGE)
+      super
+    end
+  end
+end

data/lib/cascade/helpers/hash.rb

@@ -1,5 +1,5 @@
-class Hash
-  unless Hash.instance_methods.include? :reverse_merge
+module HashRefinements
+  refine Hash do
     # Merges the caller into +other_hash+
     #
     def reverse_merge(other_hash)

data/lib/cascade/registry.rb

@@ -0,0 +1,24 @@
+require "cascade/error_handler"
+require "cascade/row_processor"
+
+module Cascade
+  module Registry
+    PUTS_DATA_SAVER = ->(*args) { p args }
+
+    def self.row_processor
+      RowProcessor.new
+    end
+
+    def self.error_handler
+      ErrorHandler.new
+    end
+
+    def self.data_saver
+      PUTS_DATA_SAVER
+    end
+
+    def self.data_provider
+      raise Cascade::UnsupportedComponent
+    end
+  end
+end

data/lib/cascade/row_processor.rb

@@ -1,10 +1,12 @@
 require "cascade/complex_fields"
 require "cascade/exceptions"
 require "cascade/helpers/configuration"
+require "cascade/helpers/hash"
 
 module Cascade
   class RowProcessor
     extend Configuration
+    using HashRefinements
 
     DEFAULT_PROCESSOR = ->(value) { value }
 
@@ -43,7 +45,6 @@ module Cascade
       {
         string:      DEFAULT_PROCESSOR,
         currency:    ComplexFields::Currency.new,
-        country_iso: ComplexFields::CountryIso.new,
         boolean:     ComplexFields::Boolean.new,
       }
     end

data/lib/cascade/version.rb

@@ -1,4 +1,4 @@
 module Cascade
   # current gem version
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/spec/lib/data_parser_spec.rb

@@ -7,7 +7,7 @@ describe Cascade::DataParser do
   end
 
   class FakeDataProvider
-    def open(_)
+    def self.open(_)
       [
         ["Sally Whittaker", "2018", "McCarren House", "312",
          "3.75", "France", "+", "123.123"],
@@ -18,14 +18,14 @@ describe Cascade::DataParser do
   end
 
   let(:filename) { "spec/examples/data_test.txt" }
-  let(:data_provider) { FakeDataProvider.new }
+  let(:data_provider) { FakeDataProvider.open(filename) }
 
   before do
     @processor_calls_count = 0
     @data_saves_count = 0
     row_processor =  ->(_row) { @processor_calls_count += 1 }
     data_saver    =  ->(*)   { @data_saves_count += 1 }
-    @parser = described_class.new(filename, row_processor: row_processor,
+    @parser = described_class.new(row_processor: row_processor,
       data_saver: data_saver, data_provider: data_provider)
   end
 

data/spec/lib/error_handler_spec.rb

@@ -7,7 +7,7 @@ describe Cascade::ErrorHandler do
   end
 
   let(:error_store) do
-    ->(row, reason) do
+    lambda do |row, reason|
       @errors ||= []
       @errors << [row, reason]
     end

data/spec/lib/exceptions/unsupported_component_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+require "cascade/exceptions/unsupported_component"
+
+describe Cascade::UnsupportedComponent do
+  subject { Cascade::UnsupportedComponent.new }
+  it "exception raisable" do
+    assert_respond_to subject, :exception
+  end
+
+  context "#message" do
+    it "uses passed message" do
+      subject = Cascade::UnsupportedComponent.new("custom_message")
+      assert_equal subject.message, "custom_message"
+    end
+
+    it "uses default message if not passed" do
+      assert_equal subject.message, Cascade::UnsupportedComponent::MESSAGE
+    end
+  end
+end

data/spec/lib/helpers/{hash.rb → hash_spec.rb}

@@ -3,11 +3,13 @@ require "cascade/helpers/hash"
 
 describe Hash do
   describe "#reverse_merge" do
+    using HashRefinements
+
     let(:another_hash) { { a: 1, b: 2 } }
-    let(:hash) { { a: 4, c: 3 } }
+    let(:example_hash) { { a: 4, c: 3 } }
 
     it "merge self into anothe hash" do
-      assert_equal hash.reverse_merge(another_hash),
+      assert_equal example_hash.reverse_merge(another_hash),
         a: 4, b: 2, c: 3
     end
   end

data/spec/lib/registry_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+require "cascade/registry"
+
+describe Cascade::Registry do
+  def described_class
+    Cascade::Registry
+  end
+
+  it "creates new instance of default row processor" do
+    mock(Cascade::RowProcessor).new
+    described_class.row_processor
+  end
+
+  it "creates new instance of default error handler" do
+    mock(Cascade::ErrorHandler).new
+    described_class.error_handler
+  end
+
+  it "return default callable data saver" do
+    assert_respond_to described_class.data_saver, :call
+  end
+
+  it "return default data provider" do
+    assert_raises(Cascade::UnsupportedComponent) do
+      described_class.data_provider
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,10 +7,17 @@ end
 require "minitest/autorun"
 require "minitest/pride"
 require "minitest/mock"
+require "minitest/hell"
 require "shoulda/matchers"
 require "rr"
 
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
-alias :context :describe
+class Minitest::Test
+  parallelize_me!
+end
+
+module Kernel
+  alias_method :context, :describe
+end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cascade-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ignat Zakrevsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: iso_country_codes
-  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: awesome_print
-  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +84,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -193,20 +165,20 @@ files:
 - Rakefile
 - cascade.gemspec
 - lib/cascade.rb
-- lib/cascade/cascade_csv.rb
 - lib/cascade/columns_matching.rb
 - lib/cascade/complex_fields.rb
 - lib/cascade/complex_fields/boolean.rb
-- lib/cascade/complex_fields/country_iso.rb
 - lib/cascade/complex_fields/currency.rb
 - lib/cascade/concerns/statistics_collectible.rb
 - lib/cascade/data_parser.rb
 - lib/cascade/error_handler.rb
 - lib/cascade/exceptions.rb
 - lib/cascade/exceptions/unknown_presenter_type.rb
+- lib/cascade/exceptions/unsupported_component.rb
 - lib/cascade/exceptions/wrong_mapping_format.rb
 - lib/cascade/helpers/configuration.rb
 - lib/cascade/helpers/hash.rb
+- lib/cascade/registry.rb
 - lib/cascade/row_processor.rb
 - lib/cascade/statistics.rb
 - lib/cascade/statistics_stores.rb
@@ -214,18 +186,18 @@ files:
 - lib/cascade/statistics_stores/array_store.rb
 - lib/cascade/statistics_stores/counter_store.rb
 - lib/cascade/version.rb
-- spec/lib/cascade_csv_spec.rb
 - spec/lib/columns_matching_spec.rb
 - spec/lib/complex_fields/boolean_spec.rb
-- spec/lib/complex_fields/country_iso_spec.rb
 - spec/lib/complex_fields/currency_spec.rb
 - spec/lib/concerns/statistics_collectible_spec.rb
 - spec/lib/data_parser_spec.rb
 - spec/lib/error_handler_spec.rb
 - spec/lib/exceptions/unknown_presenter_type_spec.rb
+- spec/lib/exceptions/unsupported_component_spec.rb
 - spec/lib/exceptions/wrong_mapping_format_spec.rb
 - spec/lib/helpers/configuration_spec.rb
-- spec/lib/helpers/hash.rb
+- spec/lib/helpers/hash_spec.rb
+- spec/lib/registry_spec.rb
 - spec/lib/row_processor_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/statistics_stores/abstract_store_spec.rb
@@ -252,27 +224,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby data parser gem.
 test_files:
-- spec/lib/cascade_csv_spec.rb
 - spec/lib/columns_matching_spec.rb
 - spec/lib/complex_fields/boolean_spec.rb
-- spec/lib/complex_fields/country_iso_spec.rb
 - spec/lib/complex_fields/currency_spec.rb
 - spec/lib/concerns/statistics_collectible_spec.rb
 - spec/lib/data_parser_spec.rb
 - spec/lib/error_handler_spec.rb
 - spec/lib/exceptions/unknown_presenter_type_spec.rb
+- spec/lib/exceptions/unsupported_component_spec.rb
 - spec/lib/exceptions/wrong_mapping_format_spec.rb
 - spec/lib/helpers/configuration_spec.rb
-- spec/lib/helpers/hash.rb
+- spec/lib/helpers/hash_spec.rb
+- spec/lib/registry_spec.rb
 - spec/lib/row_processor_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/statistics_stores/abstract_store_spec.rb
 - spec/lib/statistics_stores/array_store_spec.rb
 - spec/lib/statistics_stores/counter_store_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/cascade/cascade_csv.rb

@@ -1,13 +0,0 @@
-require "csv"
-
-module Cascade
-  class CascadeCsv
-    # Delegates oepn method to CSV with passed and alredy-defined params
-    # This method opens an IO object, and wraps that with CSV.
-    #
-    def self.open(*args)
-      options = if args.last.is_a? Hash then args.pop else Hash.new end
-      CSV.open(*args << options.reverse_merge(col_sep: "\t", quote_char:  "\0"))
-    end
-  end
-end

data/lib/cascade/complex_fields/country_iso.rb

@@ -1,12 +0,0 @@
-require "iso_country_codes"
-
-module Cascade
-  module ComplexFields
-    class CountryIso
-      def call(country)
-        return unless country
-        IsoCountryCodes.search_by_name(country).first.alpha2
-      end
-    end
-  end
-end

data/spec/lib/cascade_csv_spec.rb

@@ -1,21 +0,0 @@
-require "spec_helper"
-require "cascade/cascade_csv"
-
-describe Cascade::CascadeCsv do
-  def described_class
-    Cascade::CascadeCsv
-  end
-
-  let(:filename) { "filename.csv" }
-
-  it "pass default col_sep and quote_char if in not setted" do
-    mock(CSV).open(filename, col_sep: "\t", quote_char: "\0")
-    described_class.open(filename)
-  end
-
-  it "pass specified col_sep and quote_char" do
-    mock(CSV).open(filename, col_sep: "custom_sep", quote_char: "custom_quote")
-    described_class.open(filename, col_sep: "custom_sep",
-      quote_char: "custom_quote")
-  end
-end

data/spec/lib/complex_fields/country_iso_spec.rb

@@ -1,24 +0,0 @@
-require "spec_helper"
-require "cascade/complex_fields/country_iso"
-
-describe Cascade::ComplexFields::CountryIso do
-  def described_class
-    Cascade::ComplexFields::CountryIso
-  end
-
-  let(:subject) { described_class.new }
-
-  it "translate country name to alpha-2 code" do
-    assert_equal subject.call("France"), "FR"
-  end
-
-  it "raise error if there is no such country" do
-    assert_raises IsoCountryCodes::UnknownCodeError do
-      subject.call("some_blank_value")
-    end
-  end
-
-  it "return nil if nil value passed" do
-    assert_nil subject.call(nil)
-  end
-end