blockhead 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a618630b4969e83e6b735d3c023540ff6aabdde
-  data.tar.gz: ed1637e5025b3bd339447898804c021eb5a3b70c
+  metadata.gz: 1d85e332f28799c767b021c81011dccc97a05502
+  data.tar.gz: 0eee958ce6d644987b56e63eb2a344cd42147c84
 SHA512:
-  metadata.gz: c445ad32b130de394631fb39af9d27a2792cefda6e5749f8b440b27f3839fd88ab2e7d5a265fb28fbc1556029f24c8ee201d79efbc23a7a13411710e03915622
-  data.tar.gz: 413ba35cf9a73ea944acb1a3cb519038ad169a7750753e0a6e442aa98bec5f6edbeac64270fbff53f663957e532c2742c2282881dcca6ce6fd44b05c17abc492
+  metadata.gz: b851b618299b8567735cb1d8e66dbbd1bf611878d12249a76ee30965dd39d7c4b9984ebcd55057069e8d67712b7d882c66c5fc68454ea42ede15d32bb1a84612
+  data.tar.gz: b03b1672ec7e97419052c74279b173e15b672098835047f5da13d862a3d769839a11d12f77b413cf915b8ec6a56cd20930a7652987f87ef918465244ca18d0a4

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/vinniefranco/blockhead.svg)](https://travis-ci.org/vinniefranco/blockhead.svg)
 [![Code Climate](https://codeclimate.com/github/vinniefranco/blockhead.png)](https://codeclimate.com/github/vinniefranco/blockhead.png)
+[![Gem Version](https://badge.fury.io/rb/blockhead.svg)](http://badge.fury.io/rb/blockhead)
 Easy marshalling of object attributes.
 
 ## Installation

data/Rakefile

@@ -1,2 +1 @@
 require 'bundler/gem_tasks'
-

data/blockhead.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'debugger', '~> 1.6'
+  spec.add_development_dependency 'byebug'
 end

data/lib/blockhead.rb

@@ -1,7 +1,7 @@
 require 'blockhead/version'
 require 'blockhead/schema'
 require 'blockhead/marshaller'
-require 'blockhead/option_key'
+require 'blockhead/alias_key'
 require 'blockhead/value_extractor'
 require 'blockhead/extractors/abstract'
 require 'blockhead/extractors/block'

data/lib/blockhead/alias_key.rb

@@ -0,0 +1,33 @@
+module Blockhead
+  class AliasKey
+    attr_reader :default, :alias_key
+
+    def initialize(name, alias_key)
+      @default = name
+      @alias_key = alias_key
+    end
+
+    def key
+      send(:"alias_#{aliased_key?}")
+    end
+
+    private
+
+    def alias_true
+      raise TypeError, 'Alias is not of expected type' if bad_type?
+      alias_key[:as]
+    end
+
+    def alias_false
+      default
+    end
+
+    def aliased_key?
+      alias_key.is_a?(Hash) && alias_key.has_key?(:as)
+    end
+
+    def bad_type?
+      !(alias_key[:as].is_a?(Symbol) || alias_key[:as].is_a?(String))
+    end
+  end
+end

data/lib/blockhead/marshaller.rb

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

data/lib/blockhead/value_extractor.rb

@@ -1,9 +1,13 @@
 module Blockhead
   class ValueExtractor
+    extend Forwardable
+
+    def_delegator :@extractor, :extract
     attr_reader :extractor
 
     def initialize(value, arg, &block)
       proc = block.to_proc if block
+
       @extractor = Extractors::Enumerable.new value, arg, proc
 
       extractors.inject(extractor) do |fallback, link|
@@ -11,10 +15,6 @@ module Blockhead
       end
     end
 
-    def extract
-      extractor.extract
-    end
-
     private
 
     def extractors

data/lib/blockhead/version.rb

@@ -1,3 +1,3 @@
 module Blockhead
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/blockhead/extractors/enumerable_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Blockhead::Extractors::Enumerable, '#valid?' do
   it 'is valid with a @proc and a array @value' do
-    extractor = enum_factory([], Proc.new { 'Test.'})
+    extractor = enum_factory([], Proc.new { 'Test.' })
     expect(extractor).to be_valid
   end
 

data/spec/blockhead/extractors/value_spec.rb

@@ -16,7 +16,7 @@ describe Blockhead::Extractors::Value, '#extract_value' do
   it 'cleans up strings when passed with: :pretty_print' do
     extractor = Blockhead::Extractors::Value.new(
       "This is Crazy \n",
-      {with: :pretty_print},
+      { with: :pretty_print },
       nil
     )
 

data/spec/blockhead/schema_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'debugger'
 require 'ostruct'
 
 describe Blockhead::Schema, '::define' do
@@ -108,11 +107,10 @@ describe Blockhead::Schema, '::define' do
       end
     end
 
-    response = { a: { title: 'Title'}, nested_obj: { item: { sku: '4321' } } }
+    response = { a: { title: 'Title' }, nested_obj: { item: { sku: '4321' } } }
     expect(schema.marshal).to eq response
   end
 
-
   it 'handles nested nils' do
     schema = schema_with do
       nope do
@@ -122,7 +120,7 @@ describe Blockhead::Schema, '::define' do
       end
     end
 
-    expect(schema.marshal).to eq  nope: { more_nope: { still_nope: nil } }
+    expect(schema.marshal).to eq nope: { more_nope: { still_nope: nil } }
   end
 
   it 'accepts hash aliases' do
@@ -135,11 +133,9 @@ describe Blockhead::Schema, '::define' do
   end
 
   it 'raises TypeError on non symbol aliases' do
-    expect {
-      schema_with do
-        title as: header
-      end
-    }.to raise_error TypeError, 'Aliase is not of expected type'
+    expect do
+      schema_with { title as: header }
+    end.to raise_error TypeError, 'Alias is not of expected type'
   end
 
   it 'accepts procs' do

data/spec/spec_helper.rb

@@ -2,6 +2,5 @@ require 'rubygems'
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'debugger'
 require 'bundler/setup'
 Bundler.require

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blockhead
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Vincent Franco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 description: A simple DSL for marshaling objects into a schema
 email:
 - vince@freshivore.net
@@ -82,13 +82,13 @@ files:
 - Rakefile
 - blockhead.gemspec
 - lib/blockhead.rb
+- lib/blockhead/alias_key.rb
 - lib/blockhead/extractors/abstract.rb
 - lib/blockhead/extractors/block.rb
 - lib/blockhead/extractors/enumerable.rb
 - lib/blockhead/extractors/proc.rb
 - lib/blockhead/extractors/value.rb
 - lib/blockhead/marshaller.rb
-- lib/blockhead/option_key.rb
 - lib/blockhead/schema.rb
 - lib/blockhead/value_extractor.rb
 - lib/blockhead/version.rb
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple DSL for marshaling objects into a schema

data/lib/blockhead/option_key.rb

@@ -1,29 +0,0 @@
-module Blockhead
-  class OptionKey
-    attr_reader :default, :options
-
-    def initialize(name, options)
-      @default = name
-      @options = options
-    end
-
-    def 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.has_key?(:as)
-    end
-
-    def bad_type?
-      !(options[:as].is_a?(Symbol) || options[:as].is_a?(String))
-    end
-  end
-end