paraduct 0.0.2 → 0.0.3.beta2

data/.travis.yml

@@ -1,21 +1,25 @@
 language: ruby
 rvm:
-  - 1.9
-  - 2.0
-  - 2.1
-  - 2.2
-  - ruby-head
+- 1.9
+- 2.0
+- 2.1
+- 2.2
+- ruby-head
 bundler_args: --jobs=2
 before_script:
-  - export CODECLIMATE_REPO_TOKEN=bfa8a7ca9d8e18e9cad7593885aa11477a3c4b6b53f70f6be8ce60f470b48770
+- export CODECLIMATE_REPO_TOKEN=bfa8a7ca9d8e18e9cad7593885aa11477a3c4b6b53f70f6be8ce60f470b48770
+- export VERBOSE=1
+- export COVERAGE=true
 script:
-  - VERBOSE=1 bundle exec rspec
+- bundle exec rspec
 branches:
   only:
-    - master
+  - master
 notifications:
   email: false
+  slack:
+    secure: Va597DRHkMl8/mcoquZ0cNcR0GbJ+kbrXDMDnkiF8S7+xtsAXG3iQB9/Z3zOjF73wXmBjYWuawhcHiKD15atS1UN3xXCfguS26eANsnG+NsU8VXzY5wRW7G+Y4YpkACh4j2YLWlFqgffHgkJ+hM/OGtwnJPA6pSPXoJ7DS48lEs=
 matrix:
   allow_failures:
-    - rvm: 2.2
-    - rvm: ruby-head
+  - rvm: 2.2
+  - rvm: ruby-head

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## master
 [full changelog](http://github.com/sue445/paraduct/compare/v0.0.2...master)
 
+* relax exclude definition
+  * https://github.com/sue445/paraduct/pull/74
+
 ## v0.0.2
 [full changelog](http://github.com/sue445/paraduct/compare/v0.0.1...v0.0.2)
 

data/lib/paraduct/variable_converter.rb

@@ -26,11 +26,18 @@ module Paraduct
 
     def self.reject(product_variables, exclude_variables)
       product_variables.inject([]) do |rejected_product_variables, variables|
-        rejected_product_variables << variables unless exclude_variables.include?(variables)
+        rejected_product_variables << variables unless exclude_variables.any?{ |exclude| partial_match?(variables, exclude) }
         rejected_product_variables
       end
     end
 
+    def self.partial_match?(parent_hash, child_hash)
+      child_hash.each do |k, v|
+        return false unless parent_hash[k] == v
+      end
+      true
+    end
+
     def self.product_array(array)
       first_values = array.shift
       if array.empty?

data/lib/paraduct/version.rb

@@ -1,3 +1,3 @@
 module Paraduct
-  VERSION = "0.0.2"
+  VERSION = "0.0.3.beta2"
 end

data/paraduct.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 4.0.0"
-  spec.add_dependency "colorize"
-  spec.add_dependency "rsync"
-  spec.add_dependency "thor"
-  spec.add_dependency "thread"
+  spec.add_dependency "colorize"     , "~> 0.7.3"
+  spec.add_dependency "rsync"        , "~> 1.0.9"
+  spec.add_dependency "thor"         , "~> 0.19.1"
+  spec.add_dependency "thread"       , "~> 0.1.4"
 
   spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "codeclimate-test-reporter"

data/spec/paraduct/variable_converter_spec.rb

@@ -63,24 +63,72 @@ describe Paraduct::VariableConverter do
 
     let(:product_variables) do
       [
-        {"ruby" => "1.9", "database" => "mysql"     , "rails" => "3.2"},
-        {"ruby" => "2.0", "database" => "mysql"     , "rails" => "3.2"},
-        {"ruby" => "2.1", "database" => "mysql"     , "rails" => "3.2"},
+        { "ruby" => "1.9", "database" => "mysql"     , "rails" => "3.2" },
+        { "ruby" => "2.0", "database" => "mysql"     , "rails" => "3.2" },
+        { "ruby" => "2.1", "database" => "mysql"     , "rails" => "3.2" },
       ]
     end
 
-    let(:exclude_variables) do
-      [
-        {"rails" => "3.2", "ruby" => "2.0", "database" => "mysql"},
-      ]
+    context "with perfect matching" do
+      let(:exclude_variables) do
+        [
+          { "rails" => "3.2", "ruby" => "2.0", "database" => "mysql" },
+        ]
+      end
+
+      it do
+        should contain_exactly(
+                 { "ruby" => "1.9", "database" => "mysql", "rails" => "3.2" },
+                 { "ruby" => "2.1", "database" => "mysql", "rails" => "3.2" },
+               )
+      end
     end
 
-    it {
-      should contain_exactly(
-        {"ruby" => "1.9", "database" => "mysql"     , "rails" => "3.2"},
-        {"ruby" => "2.1", "database" => "mysql"     , "rails" => "3.2"},
-      )
-    }
+    context "with partial matching" do
+      let(:exclude_variables) do
+        [
+          { "ruby" => "1.9" },
+        ]
+      end
+
+      it do
+        should contain_exactly(
+                 { "ruby" => "2.0", "database" => "mysql", "rails" => "3.2" },
+                 { "ruby" => "2.1", "database" => "mysql", "rails" => "3.2" },
+               )
+      end
+    end
   end
 
+  describe "#partial_match?" do
+    subject{ Paraduct::VariableConverter.partial_match?(parent_hash, child_hash) }
+
+    context "with parent_hash == child_hash" do
+      let(:parent_hash){ { a: 1, b: 2, c: 3 } }
+      let(:child_hash) { { a: 1, b: 2, c: 3 } }
+
+      it{ should be true }
+    end
+
+    context "with parent_hash > child_hash" do
+      let(:parent_hash){ { a: 1, b: 2, c: 3 } }
+      let(:child_hash) { { a: 1, c: 3 } }
+
+      it{ should be true }
+    end
+
+    context "with parent_hash > child_hash, but value is not same" do
+      let(:parent_hash){ { a: 1, b: 2, c: 3 } }
+      let(:child_hash) { { a: 1, c: 4 } }
+
+      it{ should be false }
+    end
+
+    context "with parent_hash < child_hash" do
+      let(:parent_hash){ { a: 1, b: 2, c: 3 } }
+      let(:child_hash) { { a: 1, c: 3, d: 4 } }
+
+      it{ should be false }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,16 @@
-require 'simplecov'
-require 'coveralls'
-require 'codeclimate-test-reporter'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  CodeClimate::TestReporter::Formatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-  %w(/bin/ /vendor/ /spec/).each do |ignore_path|
-    add_filter(ignore_path)
+if ENV["COVERAGE"]
+  require 'simplecov'
+  require 'coveralls'
+  require 'codeclimate-test-reporter'
+
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    CodeClimate::TestReporter::Formatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.start do
+    %w(/bin/ /vendor/ /spec/).each do |ignore_path|
+      add_filter(ignore_path)
+    end
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: paraduct
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3.beta2
+  prerelease: 6
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,65 +32,65 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -386,16 +386,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -858746175039195430
+      hash: -487541919658723627
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -858746175039195430
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2