morfo 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9745685e231af883b84df5fff36681de804fa51
-  data.tar.gz: 2907a87a4dc0903ce1144e0b274950d8cdf02056
+  metadata.gz: 3dacdb6d0f61b40610a10e7c98846c1a9cf80112
+  data.tar.gz: 02281f2f9f9c33335c12acb90e511e3351724f3e
 SHA512:
-  metadata.gz: 28fdf38411af5ddf9ab0d413c591b3a71e232cb38745a6abbe471e8dffcd0f142547acd7114ed3ad1704a80aa5b9357b16acbae1c93347c5ee453161c342caf8
-  data.tar.gz: 29ce48337dbd64783e7f00cadfbe44113b7c807a3adda00956308140748f45e4dd761bf810513f052d2917d22318a79b72a1eca1e2fedca2b518ccc2f35aa48e
+  metadata.gz: 4d25e176a5594b68a1f6d9a0813da091963da55ff3f77e5dd5bfca0f12e7219cfb7a6778c92ccb389bf3d11f1fac0e45da4c65ac65e3d55e5c0781393c744274
+  data.tar.gz: 01153864d73f8c816c56a389af3f45fa6da76dc68d6e1b4780f21895b0d80b8e835cbc67ab9364c78ee97e5ce3a87f3ec4ced4e894156147595cfc7bb05aa161

data/.travis.yml

@@ -1,13 +1,16 @@
+sudo: false
 language: ruby
 cache: bundler
 env: JRUBY_OPTS=--2.0
 rvm:
   - 2.0.0
-  - 2.1.3
-  - jruby-1.7.16
+  - 2.1.7
+  - 2.2.3
+  - jruby-1.7.22
+  - jruby-9.0.3.0
   - ruby-head
   - jruby-head
-  - rbx-2.2.3
+  - rbx-2.2.9
 matrix:
   fast_finish: true
   allow_failures:

data/lib/morfo/builder.rb

@@ -17,7 +17,8 @@ module Morfo
           end
 
           if definition[:calculated]
-            f = f.calculated { |r| definition[:calculated] % Morfo::Tools::FlattenHashKeys.new(r).flatten }
+            base_hash = Morfo::Tools::BaseKeys.new(definition[:calculated]).build
+            f = f.calculated { |r| definition[:calculated] % base_hash.merge(Morfo::Tools::FlattenHashKeys.new(r).flatten) }
           end
 
           if definition[:transformed]

data/lib/morfo/tools.rb

@@ -30,5 +30,21 @@ module Morfo
         end
       end
     end
+
+    class BaseKeys
+      attr_reader :input_string
+
+      def initialize(input_string)
+        @input_string = input_string.nil? ? "" : input_string.dup.freeze
+      end
+
+      def build
+        keys = input_string.scan(/\%\{([^\}]+)\}/).flatten
+
+        keys.inject({}) do |hash, key|
+          hash.merge!(key.to_sym => nil)
+        end
+      end
+    end
   end
 end

data/lib/morfo/version.rb

@@ -1,3 +1,3 @@
 module Morfo
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/lib/morfo/tools_spec.rb

@@ -32,6 +32,19 @@ module Morfo
           end
         end
 
+        context "already nested" do
+          let(:input_hash) { { :"a.nested" => :hash } }
+          let(:expected_output) { { :"a.nested" => :hash } }
+
+          it "returns a new hash" do
+            expect(subject.flatten).not_to be(input_hash)
+          end
+
+          it "returns the correct hash" do
+            expect(subject.flatten).to eq(expected_output)
+          end
+        end
+
         context "multiple nested hash" do
           let(:input_hash) { { a: { deeper: { nested: :hash } } } }
           let(:expected_output) { { :"a.deeper.nested" => :hash } }
@@ -87,5 +100,44 @@ module Morfo
         end
       end
     end
+
+    describe BaseKeys do
+      subject { described_class.new(input_string) }
+
+      describe "#build" do
+        context "empty string" do
+          let(:input_string) { "" }
+          let(:expected_output) { { } }
+
+          context "empty string" do
+            it "returns empty hash" do
+              expect(subject.build).to eq(expected_output)
+            end
+          end
+        end
+
+        context "nil input" do
+          let(:input_string) { nil }
+          let(:expected_output) { { } }
+
+          context "empty string" do
+            it "returns empty hash" do
+              expect(subject.build).to eq(expected_output)
+            end
+          end
+        end
+
+        context "non nested values" do
+          let(:input_string) { "The rating is: %{rating}" }
+          let(:expected_output) { { rating: nil } }
+
+          describe "build" do
+            it "returns expected values" do
+              expect(subject.build).to eq(expected_output)
+            end
+          end
+        end
+      end
+    end
   end
 end

data/spec/lib/morfo_spec.rb

@@ -73,7 +73,7 @@ describe Morfo::Base do
 
     subject(:valid_path_with_calculation) do
       class ImdbRatingMorferWithCalculation < Morfo::Base
-        field(:ratings).calculated {|r| "IMDB: #{r[:ratings][:imdb]}, Trakt: #{r[:ratings][:trakt]}, Rotten Tommatoes: #{r[:ratings][:rotten_tomatoes]}" }
+        field(:ratings).calculated {|r| "IMDB: #{r[:ratings] && r[:ratings][:imdb]}, Trakt: #{r[:ratings] && r[:ratings][:trakt]}, Rotten Tommatoes: #{r[:ratings] && r[:ratings][:rotten_tomatoes]}" }
       end
       ImdbRatingMorferWithCalculation
     end

data/spec/support/shared_examples.rb

@@ -175,15 +175,37 @@ shared_examples "a morfer with nested source" do
     end
 
     context "valid path with calculation" do
-      let(:expected_output) do
-        [
-          { ratings: "IMDB: 8.7, Trakt: 89, Rotten Tommatoes: 93" },
-          { ratings: "IMDB: 9.5, Trakt: 95, Rotten Tommatoes: 100" },
-        ]
+      context "all inputs matched" do
+        let(:expected_output) do
+          [
+            { ratings: "IMDB: 8.7, Trakt: 89, Rotten Tommatoes: 93" },
+            { ratings: "IMDB: 9.5, Trakt: 95, Rotten Tommatoes: 100" },
+          ]
+        end
+
+        it "maps nested attributes with transformation" do
+          expect(valid_path_with_calculation.morf(input)).to eq(expected_output)
+        end
       end
 
-      it "maps nested attributes with transformation" do
-        expect(valid_path_with_calculation.morf(input)).to eq(expected_output)
+      context "inputs not matched" do
+        let(:expected_output) do
+          [
+            { ratings: "IMDB: , Trakt: , Rotten Tommatoes: " },
+            { ratings: "IMDB: , Trakt: , Rotten Tommatoes: " },
+          ]
+        end
+
+        let(:modified_input) do
+          input.map do |row|
+            row.delete(:ratings)
+            row
+          end
+        end
+
+        it "maps nested attributes with transformation" do
+          expect(valid_path_with_calculation.morf(modified_input)).to eq(expected_output)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morfo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Leif Gensert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake