blockhead 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a25635acbe737a9bb1a835991c44832f3ac02388
-  data.tar.gz: 56b936c08c511abc20980fed4063f47618440c09
+  metadata.gz: 211e1d502a90c82116e5d5d16bcd63480313f796
+  data.tar.gz: 66e0903c9cd217b820e3d4d5094853c1b8bc84eb
 SHA512:
-  metadata.gz: 158300c7966ca2ef3c6f0e9a2e03d47dd679e1bc0daf4c6693d358d4361b3e11a67b603b75b18c2cb7b0953df8d9089664353b019a8f0a283ff7674a430e0600
-  data.tar.gz: 572f8400f3652eb2a73fd592156e0d868e9742b8e9cd4b91c56ce2ca7a6eed8e5e4bd782ac04869f49f5ba9a945dde9b915e5e6084328a739ba4a9bb11b63a48
+  metadata.gz: 2e1161b550868745a6e47844eb1b2140c998d2e9b304f0850fdd8eec1847eee909135c96bec51e0bf269f18cc905d00eb84eea0e1638b5367dcf271d918d7462
+  data.tar.gz: 68eb246e76b42dc4f65f08d4df295a3e2485a52d791a9178e2f6cbb956c80d6e7b90f49d6c87731911fec891ea73e8c06039dacea446eab647351c40fc1e94aa

data/lib/blockhead/extractors/abstract.rb

@@ -4,9 +4,9 @@ module Blockhead
       attr_writer :next
       attr_reader :object
 
-      def initialize(object, *args, proc)
+      def initialize(object, arg, proc)
         @object = object
-        @args = args
+        @arg = arg
         @proc = proc
       end
 
@@ -28,7 +28,7 @@ module Blockhead
 
       protected
 
-      attr_reader :args
+      attr_reader :arg, :proc
     end
   end
 end

data/lib/blockhead/extractors/block.rb

@@ -2,11 +2,11 @@ module Blockhead
   module Extractors
     class Block < Abstract
       def valid?
-        !!@proc
+        !!proc
       end
 
       def extract_value
-        Schema.define(object, &@proc).marshal
+        Schema.define(object, &proc).marshal
       end
     end
   end

data/lib/blockhead/extractors/enumerable.rb

@@ -2,11 +2,11 @@ module Blockhead
   module Extractors
     class Enumerable < Abstract
       def valid?
-        @proc && safe_enumerable?
+        proc && safe_enumerable?
       end
 
       def extract_value
-        object.map { |obj| Block.new(obj, [], @proc).extract_value }
+        object.map { |obj| Block.new(obj, [], proc).extract_value }
       end
 
       private

data/lib/blockhead/extractors/proc.rb

@@ -8,12 +8,6 @@ module Blockhead
       def extract_value
         arg.call
       end
-
-      private
-
-      def arg
-        @args.first
-      end
     end
   end
 end

data/lib/blockhead/extractors/value.rb

@@ -12,12 +12,20 @@ module Blockhead
       private
 
       def value
-        if object.is_a?(String) && args.first == :pretty_print
-          object.split(/ |\_/).map(&:capitalize).join(' ').strip
+        if arg.is_a?(Hash) && arg[:with]
+          send(:"#{modifier}_modifier")
         else
           object
         end
       end
+
+      def modifier
+        arg[:with]
+      end
+
+      def pretty_print_modifier
+        object.split(/ |\_/).map(&:capitalize).join(' ').strip
+      end
     end
   end
 end

data/lib/blockhead/marshaller.rb

@@ -14,7 +14,7 @@ module Blockhead
     def method_missing(name, *args, &block)
       @arg = args.first
       key = OptionKey.new(name, arg).key
-      attributes[key] = ValueExtractor.new(_call(name), *args, &block).extract
+      attributes[key] = ValueExtractor.new(_call(name), arg, &block).extract
     end
 
     private

data/lib/blockhead/option_key.rb

@@ -8,23 +8,22 @@ module Blockhead
     end
 
     def key
-      key = extract_key
-      raise TypeError, 'Aliases cannot be nil' unless key
-      key
-    end
-
-    private
-
-    def extract_key
       if options?
+        raise TypeError, 'Aliase is not of expected type' if bad_type?
         options[:as]
       else
         default
       end
     end
 
+    private
+
     def options?
-      options.is_a?(Hash)
+      options.is_a?(Hash) && options.has_key?(:as)
+    end
+
+    def bad_type?
+      !(options[:as].is_a?(Symbol) || options[:as].is_a?(String))
     end
   end
 end

data/lib/blockhead/value_extractor.rb

@@ -2,12 +2,12 @@ module Blockhead
   class ValueExtractor
     attr_reader :extractor
 
-    def initialize(value, *args, &block)
+    def initialize(value, arg, &block)
       proc = block.to_proc if block
-      @extractor = Extractors::Enumerable.new value, *args, proc
+      @extractor = Extractors::Enumerable.new value, arg, proc
 
       extractors.inject(extractor) do |fallback, link|
-        fallback.next = link.new value, *args, proc
+        fallback.next = link.new value, arg, proc
       end
     end
 

data/lib/blockhead/version.rb

@@ -1,3 +1,3 @@
 module Blockhead
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/blockhead/extractors/block_spec.rb

@@ -14,5 +14,5 @@ end
 
 def block_factory
   object = double('poro', title: 'This')
-  Blockhead::Extractors::Block.new object, [], Proc.new { title }
+  Blockhead::Extractors::Block.new object, nil, Proc.new { title }
 end

data/spec/blockhead/extractors/enumerable_spec.rb

@@ -26,5 +26,5 @@ describe Blockhead::Extractors::Enumerable, '#extract_value' do
 end
 
 def enum_factory(object, proc = nil)
-  Blockhead::Extractors::Enumerable.new(object, [], proc)
+  Blockhead::Extractors::Enumerable.new(object, nil, proc)
 end

data/spec/blockhead/extractors/value_spec.rb

@@ -2,14 +2,24 @@ require 'spec_helper'
 
 describe Blockhead::Extractors::Value, '#valid?' do
   it 'returns true' do
-    extractor = Blockhead::Extractors::Value.new('test', [], nil)
+    extractor = Blockhead::Extractors::Value.new('test', nil, nil)
     expect(extractor).to be_valid
   end
 end
 
 describe Blockhead::Extractors::Value, '#extract_value' do
   it 'returns @value unmolested' do
-    extractor = Blockhead::Extractors::Value.new('test', [], nil)
+    extractor = Blockhead::Extractors::Value.new('test', nil, nil)
     expect(extractor.extract_value).to eq 'test'
   end
+
+  it 'cleans up strings when passed with: :pretty_print' do
+    extractor = Blockhead::Extractors::Value.new(
+      "This is Crazy \n",
+      {with: :pretty_print},
+      nil
+    )
+
+    expect(extractor.extract_value).to eq 'This Is Crazy'
+  end
 end

data/spec/blockhead/schema_spec.rb

@@ -134,12 +134,12 @@ describe Blockhead::Schema, '::define' do
     expect(schema.marshal).to eq 'header' => 'Title', 'body' => 'Description'
   end
 
-  it 'raises TypeError on nil aliases' do
+  it 'raises TypeError on non symbol aliases' do
     expect {
       schema_with do
         title as: header
       end
-    }.to raise_error TypeError, 'Aliases cannot be nil'
+    }.to raise_error TypeError, 'Aliase is not of expected type'
   end
 
   it 'accepts procs' do
@@ -164,9 +164,9 @@ describe Blockhead::Schema, '::define' do
     expect(schema.marshal).to eq result
   end
 
-  it 'cleans fields when passed :cleanup' do
+  it 'cleans fields when passed with: :pretty_print' do
     schema = schema_with(BadFormatting) do
-      title :pretty_print
+      title with: :pretty_print
       another_field
     end.marshal
 
@@ -176,6 +176,14 @@ describe Blockhead::Schema, '::define' do
     )
   end
 
+  it 'allows multiple options on a field' do
+    schema = schema_with(BadFormatting) do
+      title with: :pretty_print, as: :alias
+    end.marshal
+
+    expect(schema).to eq alias: 'Title And Things'
+  end
+
   it 'handles nested objects with aliases' do
     schema = schema_with do
       nested_obj as: :cart do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blockhead
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Vincent Franco